diff --git a/.sbt-java-formatter.conf b/.sbt-java-formatter.conf index 3e3b0b7a12..64b4b8c15d 100644 --- a/.sbt-java-formatter.conf +++ b/.sbt-java-formatter.conf @@ -14,21 +14,21 @@ ignored-files = [ // 1. adated source code // 2. protobuf generated messages ignored-packages = [ - "akka.dispatch", - "akka.protobuf", + "org.apache.pekko.dispatch", + "org.apache.pekko.protobuf", "sun.reflect", - "akka.cluster.protobuf.msg", - "akka.cluster.metrics.protobuf.msg", - "akka.cluster.sharding.protobuf.msg", - "akka.cluster.sharding.typed.internal.protobuf", - "akka.cluster.client.protobuf.msg", - "akka.cluster.pubsub.protobuf.msg", - "akka.cluster.typed.internal.protobuf", - "akka.cluster.ddata.protobuf.msg", - "akka.remote.testconductor", - "akka.persistence.serialization", + "org.apache.pekko.cluster.protobuf.msg", + "org.apache.pekko.cluster.metrics.protobuf.msg", + "org.apache.pekko.cluster.sharding.protobuf.msg", + "org.apache.pekko.cluster.sharding.typed.internal.protobuf", + "org.apache.pekko.cluster.client.protobuf.msg", + "org.apache.pekko.cluster.pubsub.protobuf.msg", + "org.apache.pekko.cluster.typed.internal.protobuf", + "org.apache.pekko.cluster.ddata.protobuf.msg", + "org.apache.pekko.remote.testconductor", + "org.apache.pekko.persistence.serialization", //in tests - "akka.remote.artery.protobuf", + "org.apache.pekko.remote.artery.protobuf", //in docs "docs.ddata.protobuf.msg", "docs.persistence.proto" diff --git a/.scalafix.conf b/.scalafix.conf index 32662d3687..26c6150ac0 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -46,5 +46,5 @@ SortImports.blocks = [ "scala.", "*", "com.sun." - "akka." + "org.apache.pekko." ] \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 65bf399aae..f09d245197 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -263,7 +263,7 @@ in the file that describes briefly why the incompatibility can be ignored. Situations when it may be acceptable to ignore a MiMa issued warning include: -- if it is touching any class marked as `private[akka]`, `/** INTERNAL API*/` or similar markers +- if it is touching any class marked as `private[pekko]`, `/** INTERNAL API*/` or similar markers - if it is concerning internal classes (often recognisable by package names like `dungeon`, `impl`, `internal` etc.) - if it is adding API to classes / traits which are only meant for extension by Akka itself, i.e. should not be extended by end-users - other tricky situations @@ -542,7 +542,7 @@ Scala has proven the most viable way to do it, as long as you keep the following 1. Provide `getX` style accessors for values in the Java APIs 1. Place classes not part of the public APIs in a shared `internal` package. This package can contain implementations of - both Java and Scala APIs. Make such classes `private[akka]` and also, since that becomes `public` from Java's point of + both Java and Scala APIs. Make such classes `private[pekko]` and also, since that becomes `public` from Java's point of view, annotate with `@InternalApi` and add a scaladoc saying `INTERNAL API` 1. Traits that are part of the Java API should only be used to define pure interfaces, as soon as there are implementations of methods, prefer diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala similarity index 85% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala index 21f35a6f55..0e83b42a64 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed +package org.apache.pekko.actor.testkit.typed import java.util.Optional @@ -11,13 +11,14 @@ import scala.compat.java8.OptionConverters._ import org.slf4j.Marker import org.slf4j.event.Level -import akka.annotation.InternalApi -import akka.util.OptionVal +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.util.OptionVal /** - * Representation of a Log Event issued by a [[akka.actor.typed.Behavior]] - * when testing with [[akka.actor.testkit.typed.scaladsl.BehaviorTestKit]] - * or [[akka.actor.testkit.typed.javadsl.BehaviorTestKit]]. + * Representation of a Log Event issued by a [[pekko.actor.typed.Behavior]] + * when testing with [[pekko.actor.testkit.typed.scaladsl.BehaviorTestKit]] + * or [[pekko.actor.testkit.typed.javadsl.BehaviorTestKit]]. */ final case class CapturedLogEvent(level: Level, message: String, cause: Option[Throwable], marker: Option[Marker]) { @@ -80,7 +81,7 @@ object CapturedLogEvent { * INTERNAL API */ @InternalApi - private[akka] def apply( + private[pekko] def apply( level: Level, message: String, errorCause: OptionVal[Throwable], diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala similarity index 88% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala index a9c69bcb60..d5c96e5208 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala @@ -2,27 +2,28 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor.testkit.typed +package org.apache.pekko.actor.testkit.typed import scala.compat.java8.FunctionConverters._ import scala.concurrent.duration.FiniteDuration -import akka.actor.typed.{ ActorRef, Behavior, Props } -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.util.JavaDurationConverters._ -import akka.util.unused +import org.apache.pekko +import pekko.actor.typed.{ ActorRef, Behavior, Props } +import pekko.annotation.{ DoNotInherit, InternalApi } +import pekko.util.JavaDurationConverters._ +import pekko.util.unused /** - * All tracked effects for the [[akka.actor.testkit.typed.scaladsl.BehaviorTestKit]] and - * [[akka.actor.testkit.typed.javadsl.BehaviorTestKit]] must extend this type. + * All tracked effects for the [[pekko.actor.testkit.typed.scaladsl.BehaviorTestKit]] and + * [[pekko.actor.testkit.typed.javadsl.BehaviorTestKit]] must extend this type. * - * Factories/types for effects are available through [[akka.actor.testkit.typed.javadsl.Effects]] - * and [[akka.actor.testkit.typed.javadsl.Effects]] + * Factories/types for effects are available through [[pekko.actor.testkit.typed.javadsl.Effects]] + * and [[pekko.actor.testkit.typed.javadsl.Effects]] * * Not for user extension */ @DoNotInherit -abstract class Effect private[akka] () +abstract class Effect private[pekko] () object Effect { @@ -86,10 +87,10 @@ object Effect { /** * INTERNAL API - * Spawning adapters is private[akka] + * Spawning adapters is private[pekko] */ @InternalApi - private[akka] final class SpawnedAdapter[T](val name: String, val ref: ActorRef[T]) + private[pekko] final class SpawnedAdapter[T](val name: String, val ref: ActorRef[T]) extends Effect with Product1[String] with Serializable { @@ -108,10 +109,10 @@ object Effect { /** * INTERNAL API - * Spawning adapters is private[akka] + * Spawning adapters is private[pekko] */ @InternalApi - private[akka] object SpawnedAdapter { + private[pekko] object SpawnedAdapter { def apply[T](name: String): SpawnedAdapter[T] = new SpawnedAdapter(name, null) def unapply[T](s: SpawnedAdapter[T]): Option[Tuple1[String]] = Some(Tuple1(s.name)) } @@ -121,7 +122,7 @@ object Effect { * The behavior spawned an anonymous adapter, through `context.spawnMessageAdapter` */ @InternalApi - private[akka] final class SpawnedAnonymousAdapter[T](val ref: ActorRef[T]) + private[pekko] final class SpawnedAnonymousAdapter[T](val ref: ActorRef[T]) extends Effect with Product with Serializable { @@ -144,7 +145,7 @@ object Effect { * INTERNAL API */ @InternalApi - private[akka] object SpawnedAnonymousAdapter { + private[pekko] object SpawnedAnonymousAdapter { def apply[T]() = new SpawnedAnonymousAdapter[T](null) def unapply[T](@unused s: SpawnedAnonymousAdapter[T]): Boolean = true } @@ -214,7 +215,7 @@ object Effect { } object TimerScheduled { - import akka.util.JavaDurationConverters._ + import pekko.util.JavaDurationConverters._ sealed trait TimerMode case object FixedRateMode extends TimerMode diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/FishingOutcome.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala similarity index 69% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/FishingOutcome.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala index 49a6f1e400..447b459537 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/FishingOutcome.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed +package org.apache.pekko.actor.testkit.typed -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.annotation.DoNotInherit /** * Not for user extension. * - * Instances are available from `FishingOutcomes` in the respective dsls: [[akka.actor.testkit.typed.scaladsl.FishingOutcomes]] - * and [[akka.actor.testkit.typed.javadsl.FishingOutcomes]] + * Instances are available from `FishingOutcomes` in the respective dsls: [[pekko.actor.testkit.typed.scaladsl.FishingOutcomes]] + * and [[pekko.actor.testkit.typed.javadsl.FishingOutcomes]] */ @DoNotInherit sealed trait FishingOutcome diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/LoggingEvent.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala similarity index 82% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/LoggingEvent.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala index 1050bfe36a..7bbcff28c6 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/LoggingEvent.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed +package org.apache.pekko.actor.testkit.typed import java.util.Optional @@ -11,7 +11,8 @@ import scala.compat.java8.OptionConverters._ import org.slf4j.Marker import org.slf4j.event.Level -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.util.ccompat.JavaConverters._ object LoggingEvent { @@ -43,8 +44,8 @@ object LoggingEvent { } /** - * Representation of logging event when testing with [[akka.actor.testkit.typed.scaladsl.LoggingTestKit]] - * or [[akka.actor.testkit.typed.javadsl.LoggingTestKit]]. + * Representation of logging event when testing with [[pekko.actor.testkit.typed.scaladsl.LoggingTestKit]] + * or [[pekko.actor.testkit.typed.javadsl.LoggingTestKit]]. */ final case class LoggingEvent( level: Level, @@ -72,7 +73,7 @@ final case class LoggingEvent( * Java API */ def getMdc: java.util.Map[String, String] = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ mdc.asJava } diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestException.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestException.scala similarity index 87% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestException.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestException.scala index e604ba75c5..5b1bcc68bf 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestException.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestException.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed +package org.apache.pekko.actor.testkit.typed import scala.util.control.NoStackTrace diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala similarity index 91% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala index bd8d56a345..b4e15d8322 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala @@ -2,17 +2,18 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.testkit.typed +package org.apache.pekko.actor.testkit.typed import scala.concurrent.duration.{ Duration, FiniteDuration } import com.typesafe.config.Config -import akka.actor.typed.ActorSystem -import akka.actor.typed.Extension -import akka.actor.typed.ExtensionId -import akka.util.JavaDurationConverters._ -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Extension +import pekko.actor.typed.ExtensionId +import pekko.util.JavaDurationConverters._ +import pekko.util.Timeout object TestKitSettings { @@ -54,7 +55,7 @@ object TestKitSettings { final class TestKitSettings(val config: Config) { - import akka.util.Helpers._ + import pekko.util.Helpers._ val TestTimeFactor: Double = config .getDouble("timefactor") diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala similarity index 82% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala index cf285449f3..977a4ce98b 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import java.util.concurrent.{ CompletionStage, ThreadFactory } import scala.compat.java8.FutureConverters @@ -11,29 +11,30 @@ import scala.annotation.nowarn import com.typesafe.config.{ Config, ConfigFactory } import org.slf4j.Logger import org.slf4j.LoggerFactory -import akka.{ actor => classic } -import akka.Done -import akka.actor.{ ActorPath, ActorRefProvider, Address, ReflectiveDynamicAccess } -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.DispatcherSelector -import akka.actor.typed.Dispatchers -import akka.actor.typed.Extension -import akka.actor.typed.ExtensionId -import akka.actor.typed.Props -import akka.actor.typed.Scheduler -import akka.actor.typed.Settings -import akka.actor.typed.internal.ActorRefImpl -import akka.actor.typed.internal.InternalRecipientRef -import akka.actor.typed.receptionist.Receptionist -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.{ actor => classic } +import pekko.Done +import pekko.actor.{ ActorPath, ActorRefProvider, Address, ReflectiveDynamicAccess } +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.DispatcherSelector +import pekko.actor.typed.Dispatchers +import pekko.actor.typed.Extension +import pekko.actor.typed.ExtensionId +import pekko.actor.typed.Props +import pekko.actor.typed.Scheduler +import pekko.actor.typed.Settings +import pekko.actor.typed.internal.ActorRefImpl +import pekko.actor.typed.internal.InternalRecipientRef +import pekko.actor.typed.receptionist.Receptionist +import pekko.annotation.InternalApi /** * INTERNAL API */ @nowarn -@InternalApi private[akka] final class ActorSystemStub( +@InternalApi private[pekko] final class ActorSystemStub( val name: String, config: Config = ActorSystemStub.config.defaultReference) extends ActorSystem[Nothing] @@ -60,7 +61,7 @@ import akka.annotation.InternalApi // impl ActorRefImpl override def isLocal: Boolean = true // impl ActorRefImpl - override def sendSystem(signal: akka.actor.typed.internal.SystemMessage): Unit = + override def sendSystem(signal: pekko.actor.typed.internal.SystemMessage): Unit = throw new UnsupportedOperationException("must not send SYSTEM message to ActorSystemStub") // impl InternalRecipientRef, ask not supported @@ -84,7 +85,7 @@ import akka.annotation.InternalApi val controlledExecutor = new ControlledExecutor implicit override def executionContext: scala.concurrent.ExecutionContextExecutor = controlledExecutor - override def dispatchers: akka.actor.typed.Dispatchers = new Dispatchers { + override def dispatchers: pekko.actor.typed.Dispatchers = new Dispatchers { def lookup(selector: DispatcherSelector): ExecutionContextExecutor = controlledExecutor def shutdown(): Unit = () } @@ -125,7 +126,7 @@ import akka.annotation.InternalApi def address: Address = rootPath.address } -@InternalApi private[akka] object ActorSystemStub { +@InternalApi private[pekko] object ActorSystemStub { object config { // this is backward compatible with the old behaviour, hence it uses the loader used to load the test-kit // which is not necessarily the one used to load the tests... diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala similarity index 87% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala index 1308d70fbf..3a786f817d 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import java.util @@ -11,32 +11,33 @@ import scala.collection.immutable import scala.reflect.ClassTag import scala.util.control.Exception.Catcher import scala.util.control.NonFatal -import akka.actor.ActorPath -import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } -import akka.actor.testkit.typed.Effect._ -import akka.actor.typed.internal.AdaptWithRegisteredMessageAdapter -import akka.actor.typed.{ ActorRef, Behavior, BehaviorInterceptor, PostStop, Signal, TypedActorContext } -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.InternalApi -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.actor.ActorPath +import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect } +import pekko.actor.testkit.typed.Effect._ +import pekko.actor.typed.internal.AdaptWithRegisteredMessageAdapter +import pekko.actor.typed.{ ActorRef, Behavior, BehaviorInterceptor, PostStop, Signal, TypedActorContext } +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.InternalApi +import pekko.util.ccompat.JavaConverters._ /** * INTERNAL API */ @InternalApi -private[akka] final class BehaviorTestKitImpl[T]( +private[pekko] final class BehaviorTestKitImpl[T]( system: ActorSystemStub, _path: ActorPath, _initialBehavior: Behavior[T]) - extends akka.actor.testkit.typed.javadsl.BehaviorTestKit[T] - with akka.actor.testkit.typed.scaladsl.BehaviorTestKit[T] { + extends pekko.actor.testkit.typed.javadsl.BehaviorTestKit[T] + with pekko.actor.testkit.typed.scaladsl.BehaviorTestKit[T] { // really this should be private, make so when we port out tests that need it - private[akka] val context: EffectfulActorContext[T] = + private[pekko] val context: EffectfulActorContext[T] = new EffectfulActorContext[T](system, _path, () => currentBehavior) - private[akka] def as[U]: BehaviorTestKitImpl[U] = this.asInstanceOf[BehaviorTestKitImpl[U]] + private[pekko] def as[U]: BehaviorTestKitImpl[U] = this.asInstanceOf[BehaviorTestKitImpl[U]] private var currentUncanonical = _initialBehavior private var current = { @@ -174,7 +175,7 @@ private[akka] final class BehaviorTestKitImpl[T]( override def receptionistInbox(): TestInboxImpl[Receptionist.Command] = context.system.receptionistInbox } -private[akka] object BehaviorTestKitImpl { +private[pekko] object BehaviorTestKitImpl { object Interceptor extends BehaviorInterceptor[Any, Any]() { // Intercept a internal message adaptors related messages, forward the rest diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/CapturingAppender.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala similarity index 72% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/CapturingAppender.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala index 84032d8299..f6a8f027df 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/CapturingAppender.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala @@ -2,17 +2,18 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import ch.qos.logback.classic.spi.ILoggingEvent import ch.qos.logback.core.AppenderBase -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] object CapturingAppender { +@InternalApi private[pekko] object CapturingAppender { import LogbackUtil._ private val CapturingAppenderName = "CapturingAppender" @@ -36,17 +37,17 @@ import akka.annotation.InternalApi * * Logging from tests can be silenced by this appender. When there is a test failure * the captured logging events are flushed to the appenders defined for the - * akka.actor.testkit.typed.internal.CapturingAppenderDelegate logger. + * org.apache.pekko.actor.testkit.typed.internal.CapturingAppenderDelegate logger. * - * The flushing on test failure is handled by [[akka.actor.testkit.typed.scaladsl.LogCapturing]] - * for ScalaTest and [[akka.actor.testkit.typed.javadsl.LogCapturing]] for JUnit. + * The flushing on test failure is handled by [[pekko.actor.testkit.typed.scaladsl.LogCapturing]] + * for ScalaTest and [[pekko.actor.testkit.typed.javadsl.LogCapturing]] for JUnit. * * Use configuration like the following the logback-test.xml: * * {{{ - * + * * - * + * * * * @@ -55,7 +56,7 @@ import akka.annotation.InternalApi * * }}} */ -@InternalApi private[akka] class CapturingAppender extends AppenderBase[ILoggingEvent] { +@InternalApi private[pekko] class CapturingAppender extends AppenderBase[ILoggingEvent] { import LogbackUtil._ private var buffer: Vector[ILoggingEvent] = Vector.empty @@ -71,7 +72,7 @@ import akka.annotation.InternalApi * Also clears the buffer.. */ def flush(): Unit = synchronized { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ val logbackLogger = getLogbackLogger(classOf[CapturingAppender].getName + "Delegate") val appenders = logbackLogger.iteratorForAppenders().asScala.filterNot(_ == this).toList for (event <- buffer; appender <- appenders) { diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ControlledExecutor.scala similarity index 74% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ControlledExecutor.scala index 8be41123ea..299e70b030 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ControlledExecutor.scala @@ -2,19 +2,19 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import java.util.LinkedList import scala.concurrent.ExecutionContextExecutor -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi /** * INTERNAL API */ @InternalApi -private[akka] final class ControlledExecutor extends ExecutionContextExecutor { +private[pekko] final class ControlledExecutor extends ExecutionContextExecutor { private val tasks = new LinkedList[Runnable] def queueSize: Int = tasks.size() diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala similarity index 79% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala index aac84a6ada..edc10202c8 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala @@ -2,23 +2,24 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import java.util.concurrent.ConcurrentLinkedQueue import scala.annotation.tailrec -import akka.{ actor => classic } -import akka.actor.ActorRefProvider -import akka.actor.typed.ActorRef -import akka.actor.typed.internal.{ ActorRefImpl, SystemMessage } -import akka.actor.typed.internal.InternalRecipientRef -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.{ actor => classic } +import pekko.actor.ActorRefProvider +import pekko.actor.typed.ActorRef +import pekko.actor.typed.internal.{ ActorRefImpl, SystemMessage } +import pekko.actor.typed.internal.InternalRecipientRef +import pekko.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] final class DebugRef[T](override val path: classic.ActorPath, override val isLocal: Boolean) +@InternalApi private[pekko] final class DebugRef[T](override val path: classic.ActorPath, override val isLocal: Boolean) extends ActorRef[T] with ActorRefImpl[T] with InternalRecipientRef[T] { diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala similarity index 88% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala index de8d6afa25..0fa5767755 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import java.util.concurrent.ConcurrentLinkedQueue -import akka.actor.testkit.typed.Effect -import akka.actor.testkit.typed.Effect._ -import akka.actor.typed.internal.TimerSchedulerCrossDslSupport -import akka.actor.typed.{ ActorRef, Behavior, Props } -import akka.actor.{ ActorPath, Cancellable } -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.testkit.typed.Effect +import pekko.actor.testkit.typed.Effect._ +import pekko.actor.typed.internal.TimerSchedulerCrossDslSupport +import pekko.actor.typed.{ ActorRef, Behavior, Props } +import pekko.actor.{ ActorPath, Cancellable } +import pekko.annotation.InternalApi import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag @@ -19,13 +20,13 @@ import scala.reflect.ClassTag /** * INTERNAL API */ -@InternalApi private[akka] final class EffectfulActorContext[T]( +@InternalApi private[pekko] final class EffectfulActorContext[T]( system: ActorSystemStub, path: ActorPath, currentBehaviorProvider: () => Behavior[T]) extends StubbedActorContext[T](system, path, currentBehaviorProvider) { - private[akka] val effectQueue = new ConcurrentLinkedQueue[Effect] + private[pekko] val effectQueue = new ConcurrentLinkedQueue[Effect] override def spawnAnonymous[U](behavior: Behavior[U], props: Props = Props.empty): ActorRef[U] = { val ref = super.spawnAnonymous(behavior, props) @@ -47,7 +48,7 @@ import scala.reflect.ClassTag effectQueue.offer(MessageAdapter(implicitly[ClassTag[U]].runtimeClass.asInstanceOf[Class[U]], f)) ref } - override def messageAdapter[U](messageClass: Class[U], f: akka.japi.function.Function[U, T]): ActorRef[U] = { + override def messageAdapter[U](messageClass: Class[U], f: pekko.japi.function.Function[U, T]): ActorRef[U] = { val ref = super.messageAdapter(messageClass, f) effectQueue.offer(MessageAdapter[U, T](messageClass, f.apply)) ref diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LogbackUtil.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala similarity index 92% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LogbackUtil.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala index b168b2c2d0..e17074d510 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LogbackUtil.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala @@ -2,18 +2,18 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import org.slf4j.LoggerFactory import org.slf4j.event.Level -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi import scala.annotation.tailrec /** * INTERNAL API */ -@InternalApi private[akka] object LogbackUtil { +@InternalApi private[pekko] object LogbackUtil { def loggerNameOrRoot(loggerName: String): String = if (loggerName == "") org.slf4j.Logger.ROOT_LOGGER_NAME else loggerName diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LoggingTestKitImpl.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala similarity index 90% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LoggingTestKitImpl.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala index df00bc45c3..feeb964861 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LoggingTestKitImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import java.util.function.Supplier @@ -12,18 +12,19 @@ import scala.util.matching.Regex import org.slf4j.event.Level -import akka.actor.testkit.typed.LoggingEvent -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.javadsl -import akka.actor.testkit.typed.scaladsl -import akka.actor.typed.ActorSystem -import akka.annotation.InternalApi -import akka.testkit.TestKit +import org.apache.pekko +import pekko.actor.testkit.typed.LoggingEvent +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.javadsl +import pekko.actor.testkit.typed.scaladsl +import pekko.actor.typed.ActorSystem +import pekko.annotation.InternalApi +import pekko.testkit.TestKit /** * INTERNAL API */ -@InternalApi private[akka] object LoggingTestKitImpl { +@InternalApi private[pekko] object LoggingTestKitImpl { def empty: LoggingTestKitImpl = new LoggingTestKitImpl(1, None, None, None, None, None, None, Map.empty, checkExcess = true, None) } @@ -31,7 +32,7 @@ import akka.testkit.TestKit /** * INTERNAL API */ -@InternalApi private[akka] final case class LoggingTestKitImpl( +@InternalApi private[pekko] final case class LoggingTestKitImpl( occurrences: Int, logLevel: Option[Level], loggerName: Option[String], @@ -150,7 +151,7 @@ import akka.testkit.TestKit copy(mdc = newMdc) override def withMdc(newMdc: java.util.Map[String, String]): javadsl.LoggingTestKit = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ withMdc(newMdc.asScala.toMap) } diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala similarity index 89% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala index c92facae07..aedd3d486a 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala @@ -2,15 +2,16 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal -import akka.actor.testkit.typed.CapturedLogEvent -import akka.actor.typed._ -import akka.actor.typed.internal._ -import akka.actor.{ ActorPath, ActorRefProvider, InvalidMessageException } -import akka.annotation.InternalApi -import akka.util.Helpers -import akka.{ actor => classic } +import org.apache.pekko +import pekko.actor.testkit.typed.CapturedLogEvent +import pekko.actor.typed._ +import pekko.actor.typed.internal._ +import pekko.actor.{ ActorPath, ActorRefProvider, InvalidMessageException } +import pekko.annotation.InternalApi +import pekko.util.Helpers +import pekko.{ actor => classic } import org.slf4j.Logger import org.slf4j.helpers.{ MessageFormatter, SubstituteLoggerFactory } @@ -26,7 +27,7 @@ import scala.concurrent.duration.FiniteDuration * This reference cannot watch other references. */ @InternalApi -private[akka] final class FunctionRef[-T](override val path: ActorPath, send: (T, FunctionRef[T]) => Unit) +private[pekko] final class FunctionRef[-T](override val path: ActorPath, send: (T, FunctionRef[T]) => Unit) extends ActorRef[T] with ActorRefImpl[T] with InternalRecipientRef[T] { @@ -58,7 +59,7 @@ private[akka] final class FunctionRef[-T](override val path: ActorPath, send: (T * provides only stubs for the effects an Actor can perform and replaces * created child Actors by a synchronous Inbox (see `Inbox.sync`). */ -@InternalApi private[akka] class StubbedActorContext[T]( +@InternalApi private[pekko] class StubbedActorContext[T]( val system: ActorSystemStub, val path: ActorPath, currentBehaviorProvider: () => Behavior[T]) @@ -75,7 +76,7 @@ private[akka] final class FunctionRef[-T](override val path: ActorPath, send: (T /** * INTERNAL API */ - @InternalApi private[akka] val selfInbox = new TestInboxImpl[T](path) + @InternalApi private[pekko] val selfInbox = new TestInboxImpl[T](path) override val self = selfInbox.ref private var _children = TreeMap.empty[String, BehaviorTestKitImpl[_]] @@ -84,7 +85,7 @@ private[akka] final class FunctionRef[-T](override val path: ActorPath, send: (T private val logger: Logger = substituteLoggerFactory.getLogger("StubbedLogger") private var unhandled: List[T] = Nil - private[akka] def classicActorContext = + private[pekko] def classicActorContext = throw new UnsupportedOperationException( "No classic ActorContext available with the stubbed actor context, to spawn materializers and run streams you will need a real actor") @@ -159,7 +160,7 @@ private[akka] final class FunctionRef[-T](override val path: ActorPath, send: (T /** * INTERNAL API */ - @InternalApi private[akka] def internalSpawnMessageAdapter[U](f: U => T, name: String): ActorRef[U] = { + @InternalApi private[pekko] def internalSpawnMessageAdapter[U](f: U => T, name: String): ActorRef[U] = { val n = if (name != "") s"${childName.next()}-$name" else childName.next() val p = (path / n).withUid(rnd().nextInt()) @@ -228,7 +229,7 @@ private[akka] final class FunctionRef[-T](override val path: ActorPath, send: (T * this method. */ def logEntries: List[CapturedLogEvent] = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ substituteLoggerFactory.getEventQueue .iterator() .asScala @@ -248,7 +249,7 @@ private[akka] final class FunctionRef[-T](override val path: ActorPath, send: (T def clearLog(): Unit = substituteLoggerFactory.getEventQueue.clear() - override private[akka] def onUnhandled(msg: T): Unit = + override private[pekko] def onUnhandled(msg: T): Unit = unhandled = msg :: unhandled /** @@ -261,6 +262,6 @@ private[akka] final class FunctionRef[-T](override val path: ActorPath, send: (T */ def clearUnhandled(): Unit = unhandled = Nil - override private[akka] def currentBehavior: Behavior[T] = currentBehaviorProvider() + override private[pekko] def currentBehavior: Behavior[T] = currentBehaviorProvider() } diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestAppender.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala similarity index 91% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestAppender.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala index 08f8d6f1ea..c1a00e97bc 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestAppender.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala @@ -2,14 +2,15 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import ch.qos.logback.classic.spi.ILoggingEvent import ch.qos.logback.classic.spi.ThrowableProxy import ch.qos.logback.core.AppenderBase -import akka.actor.testkit.typed.LoggingEvent -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.testkit.typed.LoggingEvent +import pekko.annotation.InternalApi /** * INTERNAL API @@ -20,7 +21,7 @@ import akka.annotation.InternalApi * `TestAppender` is currently requiring Logback as SLF4J implementation. * Similar can probably be implemented with other backends, such as Log4j2. */ -@InternalApi private[akka] object TestAppender { +@InternalApi private[pekko] object TestAppender { import LogbackUtil._ private val TestAppenderName = "AkkaTestAppender" @@ -63,14 +64,14 @@ import akka.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] class TestAppender extends AppenderBase[ILoggingEvent] { +@InternalApi private[pekko] class TestAppender extends AppenderBase[ILoggingEvent] { import LogbackUtil._ private var filters: List[LoggingTestKitImpl] = Nil // invocations are synchronized via doAppend in AppenderBase override def append(event: ILoggingEvent): Unit = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ val throwable = event.getThrowableProxy match { case p: ThrowableProxy => diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala similarity index 72% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala index eb60575163..4920c94b0e 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala @@ -2,24 +2,25 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import java.util.concurrent.ConcurrentLinkedQueue import scala.annotation.tailrec import scala.collection.immutable -import akka.actor.ActorPath -import akka.actor.typed.ActorRef -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.ActorPath +import pekko.actor.typed.ActorRef +import pekko.annotation.InternalApi /** * INTERNAL API */ @InternalApi -private[akka] final class TestInboxImpl[T](path: ActorPath) - extends akka.actor.testkit.typed.javadsl.TestInbox[T] - with akka.actor.testkit.typed.scaladsl.TestInbox[T] { +private[pekko] final class TestInboxImpl[T](path: ActorPath) + extends pekko.actor.testkit.typed.javadsl.TestInbox[T] + with pekko.actor.testkit.typed.scaladsl.TestInbox[T] { private val q = new ConcurrentLinkedQueue[T] @@ -50,6 +51,6 @@ private[akka] final class TestInboxImpl[T](path: ActorPath) def hasMessages: Boolean = q.peek() != null - @InternalApi private[akka] def as[U]: TestInboxImpl[U] = this.asInstanceOf[TestInboxImpl[U]] + @InternalApi private[pekko] def as[U]: TestInboxImpl[U] = this.asInstanceOf[TestInboxImpl[U]] } diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala similarity index 81% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala index 8cbe581495..03548a50b1 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala @@ -2,23 +2,24 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import scala.concurrent.{ Await, TimeoutException } import scala.concurrent.duration.Duration import scala.util.control.Exception.Catcher import scala.util.control.NonFatal -import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props } -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.{ ActorRef, ActorSystem, Behavior, Props } +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.InternalApi /** * INTERNAL API */ @InternalApi -private[akka] object ActorTestKitGuardian { +private[pekko] object ActorTestKitGuardian { sealed trait TestKitCommand final case class SpawnActor[T](name: String, behavior: Behavior[T], replyTo: ActorRef[ActorRef[T]], props: Props) extends TestKitCommand @@ -64,13 +65,13 @@ private[akka] object ActorTestKitGuardian { * INTERNAL API */ @InternalApi -private[akka] object TestKitUtils { +private[pekko] object TestKitUtils { // common internal utility impls for Java and Scala - private val TestKitRegex = """akka\.testkit\.typed\.(?:javadsl|scaladsl)\.ActorTestKit(?:\$.*)?""".r + private val TestKitRegex = """org\.apache\.pekko\.testkit\.typed\.(?:javadsl|scaladsl)\.ActorTestKit(?:\$.*)?""".r def testNameFromCallStack(classToStartFrom: Class[_]): String = - akka.testkit.TestKitUtils.testNameFromCallStack(classToStartFrom, TestKitRegex) + pekko.testkit.TestKitUtils.testNameFromCallStack(classToStartFrom, TestKitRegex) /** * Sanitize the `name` to be used as valid actor system name by @@ -78,7 +79,7 @@ private[akka] object TestKitUtils { * class name and then the short class name will be used. */ def scrubActorSystemName(name: String): String = - akka.testkit.TestKitUtils.scrubActorSystemName(name) + pekko.testkit.TestKitUtils.scrubActorSystemName(name) def shutdown(system: ActorSystem[_], timeout: Duration, throwIfShutdownTimesOut: Boolean): Unit = { system.terminate() diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala similarity index 92% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala index 941c4dfd0e..29f81bbb40 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.internal +package org.apache.pekko.actor.testkit.typed.internal import java.time.{ Duration => JDuration } import java.util.{ List => JList } @@ -16,29 +16,30 @@ import scala.concurrent.duration._ import scala.reflect.ClassTag import scala.util.control.NonFatal -import akka.actor.ActorRefProvider -import akka.actor.ExtendedActorSystem -import akka.actor.testkit.typed.FishingOutcome -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.javadsl.{ TestProbe => JavaTestProbe } -import akka.actor.testkit.typed.scaladsl.{ TestProbe => ScalaTestProbe } -import akka.actor.testkit.typed.scaladsl.TestDuration -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.Signal -import akka.actor.typed.Terminated -import akka.actor.typed.internal.InternalRecipientRef -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.InternalApi -import akka.japi.function.Creator -import akka.util.BoxedType -import akka.util.JavaDurationConverters._ -import akka.util.PrettyDuration._ -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.actor.ActorRefProvider +import pekko.actor.ExtendedActorSystem +import pekko.actor.testkit.typed.FishingOutcome +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.javadsl.{ TestProbe => JavaTestProbe } +import pekko.actor.testkit.typed.scaladsl.{ TestProbe => ScalaTestProbe } +import pekko.actor.testkit.typed.scaladsl.TestDuration +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.Signal +import pekko.actor.typed.Terminated +import pekko.actor.typed.internal.InternalRecipientRef +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.InternalApi +import pekko.japi.function.Creator +import pekko.util.BoxedType +import pekko.util.JavaDurationConverters._ +import pekko.util.PrettyDuration._ +import pekko.util.ccompat.JavaConverters._ @InternalApi -private[akka] object TestProbeImpl { +private[pekko] object TestProbeImpl { private final case class WatchActor[U](actor: ActorRef[U]) private case object Stop @@ -64,7 +65,7 @@ private[akka] object TestProbeImpl { } @InternalApi -private[akka] final class TestProbeImpl[M](name: String, system: ActorSystem[_]) +private[pekko] final class TestProbeImpl[M](name: String, system: ActorSystem[_]) extends JavaTestProbe[M] with ScalaTestProbe[M] with InternalRecipientRef[M] { @@ -72,7 +73,7 @@ private[akka] final class TestProbeImpl[M](name: String, system: ActorSystem[_]) import TestProbeImpl._ // have to use same global counter as Classic TestKit to ensure unique names - private def testActorId = akka.testkit.TestKit.testActorId + private def testActorId = pekko.testkit.TestKit.testActorId protected implicit val settings: TestKitSettings = TestKitSettings(system) private val queue = new LinkedBlockingDeque[M] private val terminations = new LinkedBlockingDeque[Terminated] @@ -412,5 +413,5 @@ private[akka] final class TestProbeImpl[M](name: String, system: ActorSystem[_]) // impl InternalRecipientRef def isTerminated: Boolean = false - override private[akka] def asJava: JavaTestProbe[M] = this + override private[pekko] def asJava: JavaTestProbe[M] = this } diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala similarity index 89% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala index 31fa9cb0ed..e60671363a 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala @@ -2,25 +2,26 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl import java.time.Duration import com.typesafe.config.Config -import akka.actor.DeadLetter -import akka.actor.Dropped -import akka.actor.UnhandledMessage -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.internal.TestKitUtils -import akka.actor.testkit.typed.scaladsl -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.Props -import akka.actor.typed.Scheduler -import akka.util.JavaDurationConverters._ -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.DeadLetter +import pekko.actor.Dropped +import pekko.actor.UnhandledMessage +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.internal.TestKitUtils +import pekko.actor.testkit.typed.scaladsl +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.Props +import pekko.actor.typed.Scheduler +import pekko.util.JavaDurationConverters._ +import pekko.util.Timeout object ActorTestKit { @@ -52,7 +53,7 @@ object ActorTestKit { /** * Create a testkit using the provided name. * - * It will create an [[akka.actor.typed.ActorSystem]] with this name, + * It will create an [[pekko.actor.typed.ActorSystem]] with this name, * e.g. threads will include the name. * When the test has completed you should terminate the `ActorSystem` and * the testkit with [[ActorTestKit#shutdownTestKit]]. @@ -80,7 +81,7 @@ object ActorTestKit { * Create a test kit named based on the provided name, * and uses the provided custom config for the actor system. * - * It will create an [[akka.actor.typed.ActorSystem]] with this name, + * It will create an [[pekko.actor.typed.ActorSystem]] with this name, * e.g. threads will include the name. * * It will also used the provided customConfig provided to create the `ActorSystem` @@ -92,10 +93,10 @@ object ActorTestKit { new ActorTestKit(scaladsl.ActorTestKit(name, customConfig)) /** - * Create an [[akka.actor.typed.ActorSystem]] named based on the provided name, + * Create an [[pekko.actor.typed.ActorSystem]] named based on the provided name, * use the provided custom config for the actor system, and the testkit will use the provided setting. * - * It will create an [[akka.actor.typed.ActorSystem]] with this name, + * It will create an [[pekko.actor.typed.ActorSystem]] with this name, * e.g. threads will include the name. * * It will also used the provided customConfig provided to create the `ActorSystem`, and provided setting. @@ -117,7 +118,7 @@ object ActorTestKit { } /** - * Shutdown the given [[akka.actor.typed.ActorSystem]] and block until it shuts down, + * Shutdown the given [[pekko.actor.typed.ActorSystem]] and block until it shuts down, * if more time than `system-shutdown-default` passes an exception is thrown * (can be configured with `throw-on-shutdown-timeout`). */ @@ -127,7 +128,7 @@ object ActorTestKit { } /** - * Shutdown the given [[akka.actor.typed.ActorSystem]] and block until it shuts down, + * Shutdown the given [[pekko.actor.typed.ActorSystem]] and block until it shuts down, * if more time than `system-shutdown-default` passes an exception is thrown * (can be configured with `throw-on-shutdown-timeout`). */ @@ -157,10 +158,10 @@ object ActorTestKit { * * For synchronous testing of a `Behavior` see [[BehaviorTestKit]] */ -final class ActorTestKit private[akka] (delegate: akka.actor.testkit.typed.scaladsl.ActorTestKit) { +final class ActorTestKit private[pekko] (delegate: pekko.actor.testkit.typed.scaladsl.ActorTestKit) { /** - * The default timeout as specified with the config/[[akka.actor.testkit.typed.TestKitSettings]] + * The default timeout as specified with the config/[[pekko.actor.testkit.typed.TestKitSettings]] */ def timeout: Timeout = delegate.timeout diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala similarity index 82% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala index 68d5fcec92..fa4d2c0f60 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl -import akka.actor.testkit.typed.internal.{ ActorSystemStub, BehaviorTestKitImpl } -import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.{ ActorRef, Behavior, Signal } -import akka.annotation.{ ApiMayChange, DoNotInherit } +import org.apache.pekko +import pekko.actor.testkit.typed.internal.{ ActorSystemStub, BehaviorTestKitImpl } +import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect } +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.{ ActorRef, Behavior, Signal } +import pekko.annotation.{ ApiMayChange, DoNotInherit } import com.typesafe.config.Config import java.util.concurrent.ThreadLocalRandom @@ -19,7 +20,7 @@ object BehaviorTestKit { * JAVA API */ @ApiMayChange - def applicationTestConfig: Config = akka.actor.testkit.typed.scaladsl.BehaviorTestKit.ApplicationTestConfig + def applicationTestConfig: Config = pekko.actor.testkit.typed.scaladsl.BehaviorTestKit.ApplicationTestConfig /** * JAVA API @@ -49,7 +50,7 @@ object BehaviorTestKit { } /** - * Used for synchronous testing [[akka.actor.typed.Behavior]]s. Stores all effects e.g. Spawning of children, + * Used for synchronous testing [[pekko.actor.typed.Behavior]]s. Stores all effects e.g. Spawning of children, * watching and offers access to what effects have taken place. * * Not for user extension or instantiation. See `BehaviorTestKit.create` factory methods @@ -61,7 +62,7 @@ object BehaviorTestKit { abstract class BehaviorTestKit[T] { /** - * Requests the oldest [[Effect]] or [[akka.actor.testkit.typed.javadsl.Effects.noEffects]] if no effects + * Requests the oldest [[Effect]] or [[pekko.actor.testkit.typed.javadsl.Effects.noEffects]] if no effects * have taken place. The effect is consumed, subsequent calls won't * will not include this effect. */ @@ -80,7 +81,7 @@ abstract class BehaviorTestKit[T] { def childInbox[U](child: ActorRef[U]): TestInbox[U] /** - * Get the [[akka.actor.typed.Behavior]] testkit for the given child [[akka.actor.typed.ActorRef]]. + * Get the [[pekko.actor.typed.Behavior]] testkit for the given child [[pekko.actor.typed.ActorRef]]. */ def childTestKit[U](child: ActorRef[U]): BehaviorTestKit[U] diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/Effects.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala similarity index 92% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/Effects.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala index 93022115d9..76ba08692f 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/Effects.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl import java.time.Duration -import akka.actor.typed.{ ActorRef, Behavior, Props } -import akka.util.JavaDurationConverters._ +import org.apache.pekko +import pekko.actor.typed.{ ActorRef, Behavior, Props } +import pekko.util.JavaDurationConverters._ /** * Factories for behavior effects for [[BehaviorTestKit]], each effect has a suitable equals and can be used to compare * actual effects to expected ones. */ object Effects { - import akka.actor.testkit.typed.Effect._ + import org.apache.pekko.actor.testkit.typed.Effect._ /** * The behavior spawned a named child with the given behavior with no specific props @@ -99,7 +100,7 @@ object Effects { delay: Duration, mode: TimerScheduled.TimerMode, overriding: Boolean, - send: akka.japi.function.Effect): TimerScheduled[U] = + send: pekko.japi.function.Effect): TimerScheduled[U] = TimerScheduled(key, msg, delay.asScala, mode, overriding)(send.apply _) /** diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LogCapturing.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturing.scala similarity index 85% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LogCapturing.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturing.scala index fa965d54d5..aea93978fb 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LogCapturing.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturing.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl import scala.util.control.NonFatal @@ -11,7 +11,7 @@ import org.junit.runner.Description import org.junit.runners.model.Statement import org.slf4j.LoggerFactory -import akka.actor.testkit.typed.internal.CapturingAppender +import org.apache.pekko.actor.testkit.typed.internal.CapturingAppender /** * JUnit `TestRule` to make log lines appear only when the test failed. @@ -24,9 +24,9 @@ import akka.actor.testkit.typed.internal.CapturingAppender * Requires Logback and configuration like the following the logback-test.xml: * * {{{ - * + * * - * + * * * * diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LoggingTestKit.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala similarity index 96% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LoggingTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala index 71541413d2..8ee1ed1dcf 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LoggingTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala @@ -2,16 +2,17 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl import java.util.function.Supplier import org.slf4j.event.Level -import akka.actor.testkit.typed.LoggingEvent -import akka.actor.testkit.typed.internal.LoggingTestKitImpl -import akka.actor.typed.ActorSystem -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.actor.testkit.typed.LoggingEvent +import pekko.actor.testkit.typed.internal.LoggingTestKitImpl +import pekko.actor.typed.ActorSystem +import pekko.annotation.DoNotInherit /** * Facilities for verifying logs. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala similarity index 76% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala index 20e21ec2e7..01c58479a1 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl import java.time.Duration @@ -10,9 +10,10 @@ import scala.annotation.varargs import com.typesafe.config.Config -import akka.actor.typed.ActorSystem -import akka.actor.typed.internal.adapter.SchedulerAdapter -import akka.util.JavaDurationConverters._ +import org.apache.pekko +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.internal.adapter.SchedulerAdapter +import pekko.util.JavaDurationConverters._ /** * Manual time allows you to do async tests while controlling the scheduler of the system. @@ -25,7 +26,7 @@ object ManualTime { /** * Config that needs to be in place for the actor system to use the manual */ - def config(): Config = akka.actor.testkit.typed.scaladsl.ManualTime.config + def config(): Config = pekko.actor.testkit.typed.scaladsl.ManualTime.config /** * Access the manual scheduler, note that you need to setup the actor system/testkit with [[ManualTime.config]] @@ -35,11 +36,11 @@ object ManualTime { system.scheduler match { case adapter: SchedulerAdapter => adapter.classicScheduler match { - case sc: akka.testkit.ExplicitlyTriggeredScheduler => new ManualTime(sc) + case sc: pekko.testkit.ExplicitlyTriggeredScheduler => new ManualTime(sc) case _ => throw new IllegalArgumentException( "ActorSystem not configured with explicitly triggered scheduler, " + - "make sure to include akka.actor.testkit.typed.scaladsl.ManualTime.config() when setting up the test") + "make sure to include org.apache.pekko.actor.testkit.typed.scaladsl.ManualTime.config() when setting up the test") } case s => throw new IllegalArgumentException( @@ -51,7 +52,7 @@ object ManualTime { /** * Not for user instantiation, see [[ManualTime#get]] */ -final class ManualTime(delegate: akka.testkit.ExplicitlyTriggeredScheduler) { +final class ManualTime(delegate: pekko.testkit.ExplicitlyTriggeredScheduler) { /** * Advance the clock by the specified duration, executing all outstanding jobs on the calling thread before returning. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/SerializationTestKit.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala similarity index 82% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/SerializationTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala index 1e68a7c899..c4b88593e7 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/SerializationTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala @@ -2,10 +2,11 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl -import akka.actor.testkit.typed.scaladsl -import akka.actor.typed.ActorSystem +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl +import pekko.actor.typed.ActorSystem /** * Utilities to test serialization. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala similarity index 70% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala index fa2223b41a..936cf06b58 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl import java.util.concurrent.ThreadLocalRandom import scala.collection.immutable -import akka.actor.testkit.typed.internal.TestInboxImpl -import akka.actor.typed.ActorRef -import akka.annotation.DoNotInherit -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.actor.testkit.typed.internal.TestInboxImpl +import pekko.actor.typed.ActorRef +import pekko.annotation.DoNotInherit +import pekko.util.ccompat.JavaConverters._ object TestInbox { - import akka.actor.testkit.typed.scaladsl.TestInbox.address + import pekko.actor.testkit.typed.scaladsl.TestInbox.address def create[T](name: String): TestInbox[T] = { val uid = ThreadLocalRandom.current().nextInt() @@ -27,10 +28,10 @@ object TestInbox { } /** - * Utility for use as an [[ActorRef]] when *synchronously* testing [[akka.actor.typed.Behavior]] - * with [[akka.actor.testkit.typed.javadsl.BehaviorTestKit]]. + * Utility for use as an [[ActorRef]] when *synchronously* testing [[pekko.actor.typed.Behavior]] + * with [[pekko.actor.testkit.typed.javadsl.BehaviorTestKit]]. * - * If you plan to use a real [[akka.actor.typed.ActorSystem]] then use [[akka.actor.testkit.typed.javadsl.TestProbe]] + * If you plan to use a real [[pekko.actor.typed.ActorSystem]] then use [[pekko.actor.testkit.typed.javadsl.TestProbe]] * for asynchronous testing. * * Use `TestInbox.create` factory methods to create instances diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala similarity index 88% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala index 30ebaa4cef..9a69fa3a38 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl import java.time.Duration @@ -11,17 +11,18 @@ import com.typesafe.config.ConfigFactory import org.junit.Rule import org.junit.rules.ExternalResource -import akka.actor.DeadLetter -import akka.actor.Dropped -import akka.actor.UnhandledMessage -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.internal.TestKitUtils -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.Props -import akka.actor.typed.Scheduler -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.DeadLetter +import pekko.actor.Dropped +import pekko.actor.UnhandledMessage +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.internal.TestKitUtils +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.Props +import pekko.actor.typed.Scheduler +import pekko.util.Timeout /** * A Junit external resource for the [[ActorTestKit]], making it possible to have Junit manage the lifecycle of the testkit. @@ -59,7 +60,7 @@ final class TestKitJunitResource(_kit: ActorTestKit) extends ExternalResource { def this() = this(ActorTestKit.create(TestKitUtils.testNameFromCallStack(classOf[TestKitJunitResource]))) /** - * Use a custom [[akka.actor.typed.ActorSystem]] for the actor system. + * Use a custom [[pekko.actor.typed.ActorSystem]] for the actor system. */ def this(system: ActorSystem[_]) = this(ActorTestKit.create(system)) @@ -79,7 +80,7 @@ final class TestKitJunitResource(_kit: ActorTestKit) extends ExternalResource { this(ActorTestKit.create(TestKitUtils.testNameFromCallStack(classOf[TestKitJunitResource]), customConfig)) /** - * Use a custom config for the actor system, and a custom [[akka.actor.testkit.typed.TestKitSettings]]. + * Use a custom config for the actor system, and a custom [[pekko.actor.testkit.typed.TestKitSettings]]. */ def this(customConfig: Config, settings: TestKitSettings) = this(ActorTestKit.create(TestKitUtils.testNameFromCallStack(classOf[TestKitJunitResource]), customConfig, settings)) diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala similarity index 91% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala index 0b57c37a8d..51fa2f035d 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala @@ -2,22 +2,23 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl +package org.apache.pekko.actor.testkit.typed.javadsl import java.time.Duration import java.util.{ List => JList } import java.util.function.Supplier -import akka.japi.function.Creator -import akka.actor.testkit.typed.FishingOutcome -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.internal.TestProbeImpl -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.RecipientRef -import akka.actor.typed.internal.InternalRecipientRef -import akka.annotation.DoNotInherit -import akka.util.unused +import org.apache.pekko +import pekko.japi.function.Creator +import pekko.actor.testkit.typed.FishingOutcome +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.internal.TestProbeImpl +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.RecipientRef +import pekko.actor.typed.internal.InternalRecipientRef +import pekko.annotation.DoNotInherit +import pekko.util.unused object FishingOutcomes { @@ -29,17 +30,17 @@ object FishingOutcomes { /** * Consume this message and continue with the next */ - def continueAndIgnore(): FishingOutcome = akka.actor.testkit.typed.FishingOutcome.ContinueAndIgnore + def continueAndIgnore(): FishingOutcome = pekko.actor.testkit.typed.FishingOutcome.ContinueAndIgnore /** * Complete fishing and return this message */ - def complete(): FishingOutcome = akka.actor.testkit.typed.FishingOutcome.Complete + def complete(): FishingOutcome = pekko.actor.testkit.typed.FishingOutcome.Complete /** * Fail fishing with a custom error message */ - def fail(error: String): FishingOutcome = akka.actor.testkit.typed.FishingOutcome.Fail(error) + def fail(error: String): FishingOutcome = pekko.actor.testkit.typed.FishingOutcome.Fail(error) } object TestProbe { diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala similarity index 88% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala index 7bdd2c6771..e92733bf34 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.AtomicInteger @@ -15,23 +15,24 @@ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.slf4j.LoggerFactory -import akka.actor.DeadLetter -import akka.actor.DeadLetterSuppression -import akka.actor.Dropped -import akka.actor.UnhandledMessage -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.internal.ActorTestKitGuardian -import akka.actor.testkit.typed.internal.TestKitUtils -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.Props -import akka.actor.typed.Scheduler -import akka.actor.typed.eventstream.EventStream -import akka.actor.typed.scaladsl.AskPattern._ -import akka.actor.typed.scaladsl.adapter._ -import akka.annotation.InternalApi -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.DeadLetter +import pekko.actor.DeadLetterSuppression +import pekko.actor.Dropped +import pekko.actor.UnhandledMessage +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.internal.ActorTestKitGuardian +import pekko.actor.testkit.typed.internal.TestKitUtils +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.Props +import pekko.actor.typed.Scheduler +import pekko.actor.typed.eventstream.EventStream +import pekko.actor.typed.scaladsl.AskPattern._ +import pekko.actor.typed.scaladsl.adapter._ +import pekko.annotation.InternalApi +import pekko.util.Timeout object ActorTestKit { @@ -77,7 +78,7 @@ object ActorTestKit { /** * Create a testkit using the provided name. * - * It will create an [[akka.actor.typed.ActorSystem]] with this name, + * It will create an [[pekko.actor.typed.ActorSystem]] with this name, * e.g. threads will include the name. * When the test has completed you should terminate the `ActorSystem` and * the testkit with [[ActorTestKit#shutdownTestKit]]. @@ -113,7 +114,7 @@ object ActorTestKit { * Create a test kit named based on the provided name, * and uses the provided custom config for the actor system. * - * It will create an [[akka.actor.typed.ActorSystem]] with this name, + * It will create an [[pekko.actor.typed.ActorSystem]] with this name, * e.g. threads will include the name. * * It will also used the provided customConfig provided to create the `ActorSystem` @@ -128,10 +129,10 @@ object ActorTestKit { } /** - * Create an [[akka.actor.typed.ActorSystem]] named based on the provided name, + * Create an [[pekko.actor.typed.ActorSystem]] named based on the provided name, * use the provided custom config for the actor system, and the testkit will use the provided setting. * - * It will create an [[akka.actor.typed.ActorSystem]] with this name, + * It will create an [[pekko.actor.typed.ActorSystem]] with this name, * e.g. threads will include the name. * * It will also used the provided customConfig provided to create the `ActorSystem`, and provided setting. @@ -146,7 +147,7 @@ object ActorTestKit { } /** - * Shutdown the given [[akka.actor.typed.ActorSystem]] and block until it shuts down, + * Shutdown the given [[pekko.actor.typed.ActorSystem]] and block until it shuts down, * if more time than `TestKitSettings.DefaultActorSystemShutdownTimeout` passes an exception is thrown */ def shutdown(system: ActorSystem[_]): Unit = { @@ -155,7 +156,7 @@ object ActorTestKit { } /** - * Shutdown the given [[akka.actor.typed.ActorSystem]] and block until it shuts down + * Shutdown the given [[pekko.actor.typed.ActorSystem]] and block until it shuts down * or the `duration` hits. If the timeout hits `verifySystemShutdown` decides */ def shutdown(system: ActorSystem[_], timeout: Duration, throwIfShutdownFails: Boolean = false): Unit = @@ -181,7 +182,7 @@ object ActorTestKit { * * For synchronous testing of a `Behavior` see [[BehaviorTestKit]] */ -final class ActorTestKit private[akka] ( +final class ActorTestKit private[pekko] ( val internalSystem: ActorSystem[_], internalTestKitGuardian: ActorRef[ActorTestKitGuardian.TestKitCommand], settings: Option[TestKitSettings]) { @@ -318,10 +319,10 @@ final class ActorTestKit private[akka] ( // FIXME needed for Akka internal tests but, users shouldn't spawn system actors? @InternalApi - private[akka] def systemActor[T](behavior: Behavior[T], name: String): ActorRef[T] = + private[pekko] def systemActor[T](behavior: Behavior[T], name: String): ActorRef[T] = system.systemActorOf(behavior, name) @InternalApi - private[akka] def systemActor[T](behavior: Behavior[T]): ActorRef[T] = + private[pekko] def systemActor[T](behavior: Behavior[T]): ActorRef[T] = system.systemActorOf(behavior, childName.next()) } diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitBase.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala similarity index 86% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitBase.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala index de92c17a35..1617414a11 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitBase.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala @@ -2,21 +2,22 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import com.typesafe.config.Config import com.typesafe.config.ConfigFactory -import akka.actor.DeadLetter -import akka.actor.Dropped -import akka.actor.UnhandledMessage -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.internal.TestKitUtils -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.Props -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.DeadLetter +import pekko.actor.Dropped +import pekko.actor.UnhandledMessage +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.internal.TestKitUtils +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.Props +import pekko.util.Timeout object ActorTestKitBase { def testNameFromCallStack(): String = TestKitUtils.testNameFromCallStack(classOf[ActorTestKitBase]) @@ -47,7 +48,7 @@ abstract class ActorTestKitBase(val testKit: ActorTestKit) { def this(config: Config) = this(ActorTestKit(ActorTestKitBase.testNameFromCallStack(), config)) /** - * Use a custom config for the actor system, and a custom [[akka.actor.testkit.typed.TestKitSettings]]. + * Use a custom config for the actor system, and a custom [[pekko.actor.testkit.typed.TestKitSettings]]. */ def this(config: Config, settings: TestKitSettings) = this(ActorTestKit(ActorTestKitBase.testNameFromCallStack(), config, settings)) diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala similarity index 83% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala index 0643bf97c2..ebbd50a2a8 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl -import akka.actor.testkit.typed.internal.{ ActorSystemStub, BehaviorTestKitImpl } -import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.{ ActorRef, Behavior, Signal, TypedActorContext } -import akka.annotation.{ ApiMayChange, DoNotInherit } +import org.apache.pekko +import pekko.actor.testkit.typed.internal.{ ActorSystemStub, BehaviorTestKitImpl } +import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect } +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.{ ActorRef, Behavior, Signal, TypedActorContext } +import pekko.annotation.{ ApiMayChange, DoNotInherit } import com.typesafe.config.Config import java.util.concurrent.ThreadLocalRandom @@ -34,7 +35,7 @@ object BehaviorTestKit { } /** - * Used for synchronous testing [[akka.actor.typed.Behavior]]s. Stores all effects e.g. Spawning of children, + * Used for synchronous testing [[pekko.actor.typed.Behavior]]s. Stores all effects e.g. Spawning of children, * watching and offers access to what effects have taken place. * * For asynchronous testing of `Behavior`s running see [[ActorTestKit]] @@ -46,10 +47,10 @@ object BehaviorTestKit { trait BehaviorTestKit[T] { // FIXME it is weird that this is public but it is used in BehaviorSpec, could we avoid that? - private[akka] def context: TypedActorContext[T] + private[pekko] def context: TypedActorContext[T] /** - * Requests the oldest [[Effect]] or [[akka.actor.testkit.typed.Effect.NoEffects]] if no effects + * Requests the oldest [[Effect]] or [[pekko.actor.testkit.typed.Effect.NoEffects]] if no effects * have taken place. The effect is consumed, subsequent calls won't * will not include this effect. */ @@ -67,7 +68,7 @@ trait BehaviorTestKit[T] { def childInbox[U](child: ActorRef[U]): TestInbox[U] /** - * Get the [[akka.actor.typed.Behavior]] testkit for the given child [[akka.actor.typed.ActorRef]]. + * Get the [[pekko.actor.typed.Behavior]] testkit for the given child [[pekko.actor.typed.ActorRef]]. */ def childTestKit[U](child: ActorRef[U]): BehaviorTestKit[U] diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala similarity index 95% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala index d2b26fa010..e575bc164f 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala @@ -2,18 +2,19 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import scala.concurrent.duration.FiniteDuration -import akka.actor.typed.{ ActorRef, Behavior, Props } +import org.apache.pekko +import pekko.actor.typed.{ ActorRef, Behavior, Props } /** * Factories for behavior effects for [[BehaviorTestKit]], each effect has a suitable equals and can be used to compare * actual effects to expected ones. */ object Effects { - import akka.actor.testkit.typed.Effect._ + import pekko.actor.testkit.typed.Effect._ /** * The behavior spawned a named child with the given behavior with no specific props diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LogCapturing.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LogCapturing.scala similarity index 87% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LogCapturing.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LogCapturing.scala index 95479a32b0..f08dd38cd4 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LogCapturing.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LogCapturing.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import scala.util.control.NonFatal @@ -11,7 +11,7 @@ import org.scalatest.Outcome import org.scalatest.TestSuite import org.slf4j.LoggerFactory -import akka.actor.testkit.typed.internal.CapturingAppender +import org.apache.pekko.actor.testkit.typed.internal.CapturingAppender /** * Mixin this trait to a ScalaTest test to make log lines appear only when the test failed. @@ -19,9 +19,9 @@ import akka.actor.testkit.typed.internal.CapturingAppender * Requires Logback and configuration like the following the logback-test.xml: * * {{{ - * + * * - * + * * * * diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LoggingTestKit.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala similarity index 96% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LoggingTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala index f009932be5..250b5d5efe 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LoggingTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala @@ -2,16 +2,17 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import scala.reflect.ClassTag import org.slf4j.event.Level -import akka.actor.testkit.typed.LoggingEvent -import akka.actor.testkit.typed.internal.LoggingTestKitImpl -import akka.actor.typed.ActorSystem -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.actor.testkit.typed.LoggingEvent +import pekko.actor.testkit.typed.internal.LoggingTestKitImpl +import pekko.actor.typed.ActorSystem +import pekko.annotation.DoNotInherit /** * Facilities for verifying logs. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala similarity index 76% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala index 6a3d004c67..144c771658 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala @@ -2,15 +2,16 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import scala.annotation.varargs import scala.concurrent.duration.{ Duration, FiniteDuration } import com.typesafe.config.{ Config, ConfigFactory } -import akka.actor.typed.ActorSystem -import akka.actor.typed.internal.adapter.SchedulerAdapter +import org.apache.pekko +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.internal.adapter.SchedulerAdapter /** * Manual time allows you to do async tests while controlling the scheduler of the system. @@ -24,7 +25,8 @@ object ManualTime { * Config needed to use the `ExplicitlyTriggeredScheduler` */ val config: Config = - ConfigFactory.parseString("""akka.scheduler.implementation = "akka.testkit.ExplicitlyTriggeredScheduler"""") + ConfigFactory.parseString( + """akka.scheduler.implementation = "org.apache.pekko.testkit.ExplicitlyTriggeredScheduler"""") /** * Access the manual scheduler, note that you need to setup the actor system/testkit with [[ManualTime.config]] @@ -34,11 +36,11 @@ object ManualTime { system.scheduler match { case adapter: SchedulerAdapter => adapter.classicScheduler match { - case sc: akka.testkit.ExplicitlyTriggeredScheduler => new ManualTime(sc) + case sc: pekko.testkit.ExplicitlyTriggeredScheduler => new ManualTime(sc) case _ => throw new IllegalArgumentException( "ActorSystem not configured with explicitly triggered scheduler, " + - "make sure to include akka.actor.testkit.typed.scaladsl.ManualTime.config() when setting up the test") + "make sure to include org.apache.pekko.actor.testkit.typed.scaladsl.ManualTime.config() when setting up the test") } case s => throw new IllegalArgumentException( @@ -50,7 +52,7 @@ object ManualTime { /** * Not for user instantiation, see [[ManualTime#apply]] */ -final class ManualTime(delegate: akka.testkit.ExplicitlyTriggeredScheduler) { +final class ManualTime(delegate: pekko.testkit.ExplicitlyTriggeredScheduler) { /** * Advance the clock by the specified duration, executing all outstanding jobs on the calling thread before returning. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala similarity index 83% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala index e3e13f004f..a8a8be378b 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import com.typesafe.config.Config import com.typesafe.config.ConfigFactory @@ -12,8 +12,9 @@ import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.time.Span -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.typed.ActorSystem +import org.apache.pekko +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.typed.ActorSystem /** * A ScalaTest base class for the [[ActorTestKit]], making it possible to have ScalaTest manage the lifecycle of the testkit. @@ -44,7 +45,7 @@ abstract class ScalaTestWithActorTestKit(testKit: ActorTestKit) def this() = this(ActorTestKit(ActorTestKitBase.testNameFromCallStack())) /** - * Use a custom [[akka.actor.typed.ActorSystem]] for the actor system. + * Use a custom [[pekko.actor.typed.ActorSystem]] for the actor system. */ def this(system: ActorSystem[_]) = this(ActorTestKit(system)) @@ -60,14 +61,14 @@ abstract class ScalaTestWithActorTestKit(testKit: ActorTestKit) def this(config: Config) = this(ActorTestKit(ActorTestKitBase.testNameFromCallStack(), config)) /** - * Use a custom config for the actor system, and a custom [[akka.actor.testkit.typed.TestKitSettings]]. + * Use a custom config for the actor system, and a custom [[pekko.actor.testkit.typed.TestKitSettings]]. */ def this(config: Config, settings: TestKitSettings) = this(ActorTestKit(ActorTestKitBase.testNameFromCallStack(), config, settings)) /** - * `PatienceConfig` from [[akka.actor.testkit.typed.TestKitSettings#DefaultTimeout]]. - * `DefaultTimeout` is dilated with [[akka.actor.testkit.typed.TestKitSettings#TestTimeFactor]], + * `PatienceConfig` from [[pekko.actor.testkit.typed.TestKitSettings#DefaultTimeout]]. + * `DefaultTimeout` is dilated with [[pekko.actor.testkit.typed.TestKitSettings#TestTimeFactor]], * which means that the patience is also dilated. */ implicit val patience: PatienceConfig = diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/SerializationTestKit.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala similarity index 88% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/SerializationTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala index c981cf3827..ed9af4e086 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/SerializationTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala @@ -2,12 +2,13 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl -import akka.actor.typed.ActorSystem -import akka.actor.typed.scaladsl.adapter._ -import akka.serialization.SerializationExtension -import akka.serialization.Serializers +import org.apache.pekko +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.scaladsl.adapter._ +import pekko.serialization.SerializationExtension +import pekko.serialization.Serializers /** * Utilities to test serialization. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala similarity index 65% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala index a6f0dce388..5d55910e73 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import java.util.concurrent.ThreadLocalRandom import scala.collection.immutable -import akka.actor.{ Address, RootActorPath } -import akka.actor.testkit.typed.internal.TestInboxImpl -import akka.actor.typed.ActorRef -import akka.annotation.{ ApiMayChange, DoNotInherit } +import org.apache.pekko +import pekko.actor.{ Address, RootActorPath } +import pekko.actor.testkit.typed.internal.TestInboxImpl +import pekko.actor.typed.ActorRef +import pekko.annotation.{ ApiMayChange, DoNotInherit } @ApiMayChange object TestInbox { @@ -20,14 +21,14 @@ object TestInbox { new TestInboxImpl((address / name).withUid(uid)) } - private[akka] val address = RootActorPath(Address("akka.actor.typed.inbox", "anonymous")) + private[pekko] val address = RootActorPath(Address("akka.actor.typed.inbox", "anonymous")) } /** - * Utility for use as an [[ActorRef]] when *synchronously* testing [[akka.actor.typed.Behavior]] - * with [[akka.actor.testkit.typed.javadsl.BehaviorTestKit]]. + * Utility for use as an [[ActorRef]] when *synchronously* testing [[pekko.actor.typed.Behavior]] + * with [[pekko.actor.testkit.typed.javadsl.BehaviorTestKit]]. * - * If you plan to use a real [[akka.actor.typed.ActorSystem]] then use [[akka.actor.testkit.typed.javadsl.TestProbe]] + * If you plan to use a real [[pekko.actor.typed.ActorSystem]] then use [[pekko.actor.testkit.typed.javadsl.TestProbe]] * for asynchronous testing. * * Use factory `apply` in companion to create instances diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala similarity index 93% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala index 5da55900e0..5a63cb1a49 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala @@ -2,21 +2,22 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import scala.collection.immutable import scala.concurrent.duration._ import scala.reflect.ClassTag -import akka.actor.testkit.typed.FishingOutcome -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.internal.TestProbeImpl -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.RecipientRef -import akka.actor.typed.internal.InternalRecipientRef -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.testkit.typed.FishingOutcome +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.internal.TestProbeImpl +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.RecipientRef +import pekko.actor.typed.internal.InternalRecipientRef +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi object FishingOutcomes { @@ -259,5 +260,5 @@ object TestProbe { * INTERNAL API */ @InternalApi - private[akka] def asJava: akka.actor.testkit.typed.javadsl.TestProbe[M] + private[pekko] def asJava: pekko.actor.testkit.typed.javadsl.TestProbe[M] } diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/package.scala similarity index 87% rename from akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala rename to akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/package.scala index 574914cf3e..c0558a5e89 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala +++ b/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/package.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed +package org.apache.pekko.actor.testkit.typed import scala.concurrent.duration.FiniteDuration @@ -15,7 +15,7 @@ package object scaladsl { * * {{{ * import scala.concurrent.duration._ - * import akka.actor.testkit.typed.scaladsl._ + * import org.apache.pekko.actor.testkit.typed.scaladsl._ * 10.milliseconds.dilated * }}} * diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java similarity index 91% rename from akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java rename to akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java index 0b247f5115..f7c10b9b0e 100644 --- a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java @@ -2,18 +2,18 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package jdocs.akka.actor.testkit.typed.javadsl; +package jdocs.org.apache.pekko.actor.testkit.typed.javadsl; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.Scheduler; -import akka.actor.typed.javadsl.AskPattern; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.Scheduler; +import org.apache.pekko.actor.typed.javadsl.AskPattern; +import org.apache.pekko.actor.typed.javadsl.Behaviors; // #test-header -import akka.actor.testkit.typed.javadsl.ActorTestKit; +import org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit; // #test-header -import akka.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; import org.junit.AfterClass; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java similarity index 65% rename from akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java rename to akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java index 2f64048005..54b26679d4 100644 --- a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java @@ -2,17 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package jdocs.akka.actor.testkit.typed.javadsl; +package jdocs.org.apache.pekko.actor.testkit.typed.javadsl; -import static jdocs.akka.actor.testkit.typed.javadsl.AsyncTestingExampleTest.Echo; +import static jdocs.org.apache.pekko.actor.testkit.typed.javadsl.AsyncTestingExampleTest.Echo; -import akka.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; import org.junit.Rule; // #junit-integration -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.ActorRef; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Test; diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/LogCapturingExampleTest.java b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExampleTest.java similarity index 62% rename from akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/LogCapturingExampleTest.java rename to akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExampleTest.java index e61775a60a..4dd03eb910 100644 --- a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/LogCapturingExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExampleTest.java @@ -2,15 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package jdocs.akka.actor.testkit.typed.javadsl; +package jdocs.org.apache.pekko.actor.testkit.typed.javadsl; -import static jdocs.akka.actor.testkit.typed.javadsl.AsyncTestingExampleTest.*; +import static jdocs.org.apache.pekko.actor.testkit.typed.javadsl.AsyncTestingExampleTest.*; // #log-capturing -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.ActorRef; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java similarity index 77% rename from akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java rename to akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java index 8467b0d9ce..1d4dcd187c 100644 --- a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java @@ -2,24 +2,24 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package jdocs.akka.actor.testkit.typed.javadsl; +package jdocs.org.apache.pekko.actor.testkit.typed.javadsl; // #manual-scheduling-simple -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.typed.Behavior; -import akka.actor.testkit.typed.javadsl.ManualTime; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.testkit.typed.javadsl.ManualTime; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; import org.junit.ClassRule; import org.junit.Rule; import org.scalatestplus.junit.JUnitSuite; import java.time.Duration; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import org.junit.Test; -import akka.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; public class ManualTimerExampleTest extends JUnitSuite { diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java similarity index 94% rename from akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java rename to akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java index ff8dda6802..d6dbc864fe 100644 --- a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java @@ -2,15 +2,15 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package jdocs.akka.actor.testkit.typed.javadsl; +package jdocs.org.apache.pekko.actor.testkit.typed.javadsl; // #imports -import akka.actor.testkit.typed.CapturedLogEvent; -import akka.actor.testkit.typed.Effect; -import akka.actor.testkit.typed.javadsl.BehaviorTestKit; -import akka.actor.testkit.typed.javadsl.TestInbox; -import akka.actor.typed.*; -import akka.actor.typed.javadsl.*; +import org.apache.pekko.actor.testkit.typed.CapturedLogEvent; +import org.apache.pekko.actor.testkit.typed.Effect; +import org.apache.pekko.actor.testkit.typed.javadsl.BehaviorTestKit; +import org.apache.pekko.actor.testkit.typed.javadsl.TestInbox; +import org.apache.pekko.actor.typed.*; +import org.apache.pekko.actor.typed.javadsl.*; import java.util.HashMap; import java.util.List; import java.util.Optional; diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/TestConfigExample.java b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java similarity index 92% rename from akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/TestConfigExample.java rename to akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java index d9d4a95ffc..6c102ef2e1 100644 --- a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/TestConfigExample.java +++ b/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.actor.testkit.typed.javadsl; +package jdocs.org.apache.pekko.actor.testkit.typed.javadsl; // #default-application-conf import com.typesafe.config.ConfigFactory; diff --git a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitApiTest.java b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java similarity index 92% rename from akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitApiTest.java rename to akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java index 19ac46fe65..54318da838 100644 --- a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitApiTest.java +++ b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java @@ -2,12 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl; +package org.apache.pekko.actor.testkit.typed.javadsl; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Props; -import akka.actor.typed.Scheduler; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Props; +import org.apache.pekko.actor.typed.Scheduler; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import java.time.Duration; import java.util.List; diff --git a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java similarity index 89% rename from akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java rename to akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java index a029e11a8b..d54e5d6944 100644 --- a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java +++ b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java @@ -2,10 +2,10 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl; +package org.apache.pekko.actor.testkit.typed.javadsl; -import akka.Done; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.Done; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import static akka.Done.done; +import static org.apache.pekko.Done.done; import static org.junit.Assert.assertEquals; public class ActorTestKitTest extends JUnitSuite { diff --git a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java similarity index 95% rename from akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java rename to akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java index a1ccc7f091..9aa39ae3b0 100644 --- a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java +++ b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java @@ -2,15 +2,15 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl; +package org.apache.pekko.actor.testkit.typed.javadsl; -import akka.Done; -import akka.actor.testkit.typed.CapturedLogEvent; -import akka.actor.testkit.typed.Effect; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.Props; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.Done; +import org.apache.pekko.actor.testkit.typed.CapturedLogEvent; +import org.apache.pekko.actor.testkit.typed.Effect; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.Props; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import org.junit.Ignore; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; @@ -66,10 +66,11 @@ public class BehaviorTestKitTest extends JUnitSuite { public static class CreateMessageAdapter implements Command { private final Class clazz; - private final akka.japi.function.Function f; + private final org.apache.pekko.japi.function.Function f; @SuppressWarnings("unchecked") - public CreateMessageAdapter(Class clazz, akka.japi.function.Function f) { + public CreateMessageAdapter( + Class clazz, org.apache.pekko.japi.function.Function f) { this.clazz = clazz; this.f = f; } diff --git a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/LoggingTestKitTest.java b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java similarity index 93% rename from akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/LoggingTestKitTest.java rename to akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java index 317c2e4849..0f640b8297 100644 --- a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/LoggingTestKitTest.java +++ b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java @@ -2,10 +2,10 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl; +package org.apache.pekko.actor.testkit.typed.javadsl; -import akka.actor.testkit.typed.LoggingEvent; -import akka.actor.testkit.typed.TestException; +import org.apache.pekko.actor.testkit.typed.LoggingEvent; +import org.apache.pekko.actor.testkit.typed.TestException; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java similarity index 90% rename from akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java rename to akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java index 885d29fd26..1fb32a6c4f 100644 --- a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java +++ b/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java @@ -2,14 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.javadsl; +package org.apache.pekko.actor.testkit.typed.javadsl; import java.time.Duration; import java.util.Arrays; import java.util.List; -import akka.actor.testkit.typed.scaladsl.TestProbeSpec; -import akka.actor.testkit.typed.scaladsl.TestProbeSpec.*; +import org.apache.pekko.actor.testkit.typed.scaladsl.TestProbeSpec; +import org.apache.pekko.actor.testkit.typed.scaladsl.TestProbeSpec.*; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -27,7 +27,7 @@ public class TestProbeTest extends JUnitSuite { public void testReceiveMessage() { TestProbe probe = TestProbe.create(testKit.system()); - List eventsT = akka.japi.Util.javaArrayList(TestProbeSpec.eventsT(10)); + List eventsT = org.apache.pekko.japi.Util.javaArrayList(TestProbeSpec.eventsT(10)); eventsT.forEach( e -> { @@ -42,7 +42,7 @@ public class TestProbeTest extends JUnitSuite { public void testReceiveMessageMaxDuration() { TestProbe probe = TestProbe.create(testKit.system()); - List eventsT = akka.japi.Util.javaArrayList(TestProbeSpec.eventsT(2)); + List eventsT = org.apache.pekko.japi.Util.javaArrayList(TestProbeSpec.eventsT(2)); eventsT.forEach( e -> { diff --git a/akka-actor-testkit-typed/src/test/resources/logback-test.xml b/akka-actor-testkit-typed/src/test/resources/logback-test.xml index 1befd69129..3c37e138ab 100644 --- a/akka-actor-testkit-typed/src/test/resources/logback-test.xml +++ b/akka-actor-testkit-typed/src/test/resources/logback-test.xml @@ -15,16 +15,16 @@ - + - + diff --git a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala similarity index 90% rename from akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala rename to akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala index 2ff1dff96a..070037d8db 100644 --- a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package docs.akka.actor.testkit.typed.scaladsl +package docs.org.apache.pekko.actor.testkit.typed.scaladsl -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.Scheduler +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed.Scheduler //#test-header -import akka.actor.testkit.typed.scaladsl.ActorTestKit +import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit //#test-header -import akka.actor.typed._ -import akka.actor.typed.scaladsl.AskPattern._ -import akka.actor.typed.scaladsl.Behaviors -import akka.util.Timeout +import pekko.actor.typed._ +import pekko.actor.typed.scaladsl.AskPattern._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.util.Timeout //#test-header import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers diff --git a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala similarity index 89% rename from akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala rename to akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala index 24f9819d24..84a2a441f1 100644 --- a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package docs.akka.actor.testkit.typed.scaladsl +package docs.org.apache.pekko.actor.testkit.typed.scaladsl //#manual-scheduling-simple import scala.concurrent.duration._ -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.ManualTime -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.ManualTime +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed.scaladsl.Behaviors import org.scalatest.wordspec.AnyWordSpecLike class ManualTimerExampleSpec diff --git a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala similarity index 78% rename from akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala rename to akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala index 667f6fcd9b..b97d6be671 100644 --- a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package docs.akka.actor.testkit.typed.scaladsl +package docs.org.apache.pekko.actor.testkit.typed.scaladsl import scala.annotation.nowarn -import docs.akka.actor.testkit.typed.scaladsl.AsyncTestingExampleSpec.Echo +import docs.org.apache.pekko.actor.testkit.typed.scaladsl.AsyncTestingExampleSpec.Echo //#log-capturing -import akka.actor.testkit.typed.scaladsl.LogCapturing +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing //#scalatest-integration -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import org.scalatest.wordspec.AnyWordSpecLike //#scalatest-integration diff --git a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala similarity index 93% rename from akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala rename to akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala index b2977a12e1..0cc80ed014 100644 --- a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package docs.akka.actor.testkit.typed.scaladsl +package docs.org.apache.pekko.actor.testkit.typed.scaladsl //#imports -import akka.actor.testkit.typed.CapturedLogEvent -import akka.actor.testkit.typed.Effect._ -import akka.actor.testkit.typed.scaladsl.BehaviorTestKit -import akka.actor.testkit.typed.scaladsl.TestInbox -import akka.actor.typed._ -import akka.actor.typed.scaladsl._ +import org.apache.pekko +import pekko.actor.testkit.typed.CapturedLogEvent +import pekko.actor.testkit.typed.Effect._ +import pekko.actor.testkit.typed.scaladsl.BehaviorTestKit +import pekko.actor.testkit.typed.scaladsl.TestInbox +import pekko.actor.typed._ +import pekko.actor.typed.scaladsl._ import com.typesafe.config.ConfigFactory import org.slf4j.event.Level diff --git a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala similarity index 91% rename from akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala rename to akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala index 52ea76c096..cb66e0ecf7 100644 --- a/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala +++ b/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package docs.akka.actor.testkit.typed.scaladsl +package docs.org.apache.pekko.actor.testkit.typed.scaladsl object TestConfigExample { diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala similarity index 91% rename from akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala rename to akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala index 5248128e12..bd6996cfc0 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import scala.concurrent.Promise @@ -11,13 +11,14 @@ import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } -import akka.Done -import akka.actor.Dropped -import akka.actor.UnhandledMessage -import akka.actor.testkit.typed.internal.ActorTestKitGuardian -import akka.actor.typed.ActorSystem -import akka.actor.typed.eventstream.EventStream -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.Done +import pekko.actor.Dropped +import pekko.actor.UnhandledMessage +import pekko.actor.testkit.typed.internal.ActorTestKitGuardian +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.eventstream.EventStream +import pekko.actor.typed.scaladsl.Behaviors class ActorTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { @@ -114,14 +115,14 @@ class ActorTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike wi } "have unique names for probes across untyped testkit" in { - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ createTestProbe() - akka.testkit.TestProbe()(system.toClassic) + pekko.testkit.TestProbe()(system.toClassic) // not throw } "allow subscriptions for unhandled" in { - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ val probe = testKit.createUnhandledMessageProbe() system.eventStream ! EventStream.Publish(UnhandledMessage("message", probe.ref.toClassic, probe.ref.toClassic)) probe.receiveMessage().message should ===("message") @@ -135,7 +136,7 @@ class ActorTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike wi "allow subscriptions for dropped messages" in { val probe = testKit.createDroppedMessageProbe() - system.eventStream ! EventStream.Publish(Dropped("message", "it had gone bad", akka.actor.ActorRef.noSender)) + system.eventStream ! EventStream.Publish(Dropped("message", "it had gone bad", pekko.actor.ActorRef.noSender)) probe.receiveMessage().message should ===("message") } diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala similarity index 97% rename from akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala rename to akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala index ee4827ec08..4128cc38c8 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala @@ -2,17 +2,18 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl -import akka.Done -import akka.actor.Address -import akka.actor.testkit.typed.Effect._ -import akka.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.Parent._ -import akka.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.{ Child, Parent } -import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } -import akka.actor.typed.receptionist.{ Receptionist, ServiceKey } -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.{ ActorRef, Behavior, Props, Terminated } +import org.apache.pekko +import pekko.Done +import pekko.actor.Address +import pekko.actor.testkit.typed.Effect._ +import pekko.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.Parent._ +import pekko.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.{ Child, Parent } +import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect } +import pekko.actor.typed.receptionist.{ Receptionist, ServiceKey } +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.{ ActorRef, Behavior, Props, Terminated } import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import org.slf4j.event.Level diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala similarity index 97% rename from akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala rename to akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala index 2ad0d33d83..c0ed7dc57f 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import org.scalatest.wordspec.AnyWordSpecLike import org.slf4j.event.Level -import akka.actor.testkit.typed.LoggingEvent +import org.apache.pekko.actor.testkit.typed.LoggingEvent class LoggingTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestAppenderSpec.scala similarity index 97% rename from akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala rename to akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestAppenderSpec.scala index ba496e0f9d..64d0dfbd20 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestAppenderSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import java.util.concurrent.atomic.AtomicInteger @@ -11,7 +11,7 @@ import scala.concurrent.Future import org.scalatest.wordspec.AnyWordSpecLike import org.slf4j.LoggerFactory -import akka.actor.testkit.typed.TestException +import org.apache.pekko.actor.testkit.typed.TestException class TestAppenderSpec extends ScalaTestWithActorTestKit( diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbeSpec.scala similarity index 97% rename from akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala rename to akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbeSpec.scala index 48b76e5635..a052744d60 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbeSpec.scala @@ -2,14 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.testkit.typed.scaladsl +package org.apache.pekko.actor.testkit.typed.scaladsl import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko.actor.typed.scaladsl.Behaviors class TestProbeSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-tests/src/test/java/akka/actor/AbstractFSMActorTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/AbstractFSMActorTest.java similarity index 89% rename from akka-actor-tests/src/test/java/akka/actor/AbstractFSMActorTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/AbstractFSMActorTest.java index bf969c137f..5d8d851728 100644 --- a/akka-actor-tests/src/test/java/akka/actor/AbstractFSMActorTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/AbstractFSMActorTest.java @@ -2,11 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.testkit.AkkaSpec; -import akka.testkit.TestProbe; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.AkkaSpec; +import org.apache.pekko.testkit.TestProbe; import org.junit.ClassRule; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/actor/ActorCreationTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java similarity index 99% rename from akka-actor-tests/src/test/java/akka/actor/ActorCreationTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java index 49da2638d2..46d8da19b4 100644 --- a/akka-actor-tests/src/test/java/akka/actor/ActorCreationTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; import static org.junit.Assert.*; import static java.util.stream.Collectors.toCollection; @@ -13,7 +13,7 @@ import java.util.stream.IntStream; import org.junit.Assert; import org.junit.Test; -import akka.japi.Creator; +import org.apache.pekko.japi.Creator; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/actor/ActorSelectionTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java similarity index 88% rename from akka-actor-tests/src/test/java/akka/actor/ActorSelectionTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java index 4b3e8c832d..73ba340ec7 100644 --- a/akka-actor-tests/src/test/java/akka/actor/ActorSelectionTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java @@ -2,14 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; import java.time.Duration; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.testkit.AkkaSpec; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.AkkaSpec; import org.junit.ClassRule; import org.junit.Test; diff --git a/akka-actor-tests/src/test/java/akka/actor/ActorSystemTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java similarity index 91% rename from akka-actor-tests/src/test/java/akka/actor/ActorSystemTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java index 6787db8763..e095ecd2a0 100644 --- a/akka-actor-tests/src/test/java/akka/actor/ActorSystemTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; -import akka.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/akka-actor-tests/src/test/java/akka/actor/AddressTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java similarity index 94% rename from akka-actor-tests/src/test/java/akka/actor/AddressTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java index 4bf8392be0..df2851cd27 100644 --- a/akka-actor-tests/src/test/java/akka/actor/AddressTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java similarity index 90% rename from akka-actor-tests/src/test/java/akka/actor/JavaAPI.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java index a80540f9a4..695ec63541 100644 --- a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java @@ -2,21 +2,21 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; -import akka.event.Logging; -import akka.event.Logging.LoggerInitialized; -import akka.japi.Creator; -import akka.japi.Pair; -import akka.japi.Util; -import akka.japi.tuple.Tuple22; -import akka.japi.tuple.Tuple4; -import akka.routing.GetRoutees; -import akka.routing.FromConfig; -import akka.routing.NoRouter; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.testkit.AkkaSpec; -import akka.testkit.TestProbe; +import org.apache.pekko.event.Logging; +import org.apache.pekko.event.Logging.LoggerInitialized; +import org.apache.pekko.japi.Creator; +import org.apache.pekko.japi.Pair; +import org.apache.pekko.japi.Util; +import org.apache.pekko.japi.tuple.Tuple22; +import org.apache.pekko.japi.tuple.Tuple4; +import org.apache.pekko.routing.GetRoutees; +import org.apache.pekko.routing.FromConfig; +import org.apache.pekko.routing.NoRouter; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.AkkaSpec; +import org.apache.pekko.testkit.TestProbe; import org.junit.ClassRule; import org.junit.Test; diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaAPITestActor.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPITestActor.java similarity index 90% rename from akka-actor-tests/src/test/java/akka/actor/JavaAPITestActor.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPITestActor.java index dc87c4cc42..5475099915 100644 --- a/akka-actor-tests/src/test/java/akka/actor/JavaAPITestActor.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPITestActor.java @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; public class JavaAPITestActor extends UntypedAbstractActor { public static String ANSWER = "got it!"; diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java similarity index 90% rename from akka-actor-tests/src/test/java/akka/actor/JavaExtension.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java index fe4d6801ee..73630e2871 100644 --- a/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java @@ -2,11 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; -import akka.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; import org.junit.*; -import akka.testkit.AkkaSpec; +import org.apache.pekko.testkit.AkkaSpec; import com.typesafe.config.ConfigFactory; import org.scalatestplus.junit.JUnitSuite; @@ -66,7 +66,7 @@ public class JavaExtension extends JUnitSuite { new AkkaJUnitActorSystemResource( "JavaExtension", ConfigFactory.parseString( - "akka.extensions = [ \"akka.actor.JavaExtension$TestExtensionId\" ]") + "akka.extensions = [ \"org.apache.pekko.actor.JavaExtension$TestExtensionId\" ]") .withFallback(AkkaSpec.testConf())); private final ActorSystem system = actorSystemResource.getSystem(); diff --git a/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/NonPublicClass.java similarity index 91% rename from akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/NonPublicClass.java index f9bd60d588..5bfe1d4184 100644 --- a/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/NonPublicClass.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; public class NonPublicClass { public static Props createProps() { diff --git a/akka-actor-tests/src/test/java/akka/actor/NonStaticCreator.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/NonStaticCreator.java similarity index 77% rename from akka-actor-tests/src/test/java/akka/actor/NonStaticCreator.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/NonStaticCreator.java index 652011ede0..1fe8b8ee39 100644 --- a/akka-actor-tests/src/test/java/akka/actor/NonStaticCreator.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/NonStaticCreator.java @@ -2,9 +2,9 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; -import akka.japi.Creator; +import org.apache.pekko.japi.Creator; public class NonStaticCreator implements Creator { @Override diff --git a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java similarity index 89% rename from akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java index e3fa18f05e..b01eca3881 100644 --- a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java @@ -2,10 +2,10 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.testkit.TestProbe; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.TestProbe; import org.junit.ClassRule; import org.junit.Test; diff --git a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPITestActors.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPITestActors.java similarity index 98% rename from akka-actor-tests/src/test/java/akka/actor/StashJavaAPITestActors.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPITestActors.java index 2698e7a8e4..40c576e580 100644 --- a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPITestActors.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPITestActors.java @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; import static org.junit.Assert.*; diff --git a/akka-actor-tests/src/test/java/akka/actor/TestAnnotation.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/TestAnnotation.java similarity index 89% rename from akka-actor-tests/src/test/java/akka/actor/TestAnnotation.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/TestAnnotation.java index ada7d2cdfc..137943e4ab 100644 --- a/akka-actor-tests/src/test/java/akka/actor/TestAnnotation.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/TestAnnotation.java @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; import java.lang.annotation.*; diff --git a/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java similarity index 95% rename from akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java index f88c6731b1..219d36d9c8 100644 --- a/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.setup; +package org.apache.pekko.actor.setup; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java b/akka-actor-tests/src/test/java/org/apache/pekko/dispatch/JavaFutureTests.java similarity index 97% rename from akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java rename to akka-actor-tests/src/test/java/org/apache/pekko/dispatch/JavaFutureTests.java index 97e4e70da3..f407072e1e 100644 --- a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/dispatch/JavaFutureTests.java @@ -2,12 +2,12 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.dispatch; +package org.apache.pekko.dispatch; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.actor.ActorSystem; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.actor.ActorSystem; -import akka.japi.*; +import org.apache.pekko.japi.*; import org.junit.ClassRule; import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.Await; @@ -23,9 +23,9 @@ import java.util.LinkedList; import java.lang.Iterable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static akka.japi.Util.classTag; +import static org.apache.pekko.japi.Util.classTag; -import akka.testkit.AkkaSpec; +import org.apache.pekko.testkit.AkkaSpec; public class JavaFutureTests extends JUnitSuite { diff --git a/akka-actor-tests/src/test/java/akka/event/ActorWithMDC.java b/akka-actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java similarity index 94% rename from akka-actor-tests/src/test/java/akka/event/ActorWithMDC.java rename to akka-actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java index 3c68a3f00f..46e387bdd7 100644 --- a/akka-actor-tests/src/test/java/akka/event/ActorWithMDC.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java @@ -2,9 +2,9 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.event; +package org.apache.pekko.event; -import akka.actor.AbstractActor; +import org.apache.pekko.actor.AbstractActor; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java similarity index 93% rename from akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java index f7b5fac56e..314e8761b3 100644 --- a/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java @@ -2,17 +2,17 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.event; +package org.apache.pekko.event; -import akka.actor.ActorRef; -import akka.actor.ActorSystem; -import akka.actor.Props; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.event.Logging.Error; -import akka.event.ActorWithMDC.Log; -import static akka.event.Logging.*; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.actor.ActorSystem; +import org.apache.pekko.actor.Props; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.event.Logging.Error; +import org.apache.pekko.event.ActorWithMDC.Log; +import static org.apache.pekko.event.Logging.*; -import akka.testkit.javadsl.TestKit; +import org.apache.pekko.testkit.javadsl.TestKit; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.Before; diff --git a/akka-actor-tests/src/test/java/akka/japi/JavaAPITestBase.java b/akka-actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java similarity index 89% rename from akka-actor-tests/src/test/java/akka/japi/JavaAPITestBase.java rename to akka-actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java index 5525445cea..0b2ce34b41 100644 --- a/akka-actor-tests/src/test/java/akka/japi/JavaAPITestBase.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java @@ -2,12 +2,12 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.japi; +package org.apache.pekko.japi; -import akka.actor.ExtendedActorSystem; -import akka.event.LoggingAdapter; -import akka.event.NoLogging; -import akka.serialization.JavaSerializer; +import org.apache.pekko.actor.ExtendedActorSystem; +import org.apache.pekko.event.LoggingAdapter; +import org.apache.pekko.event.NoLogging; +import org.apache.pekko.serialization.JavaSerializer; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/japi/MatchBuilderTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java similarity index 96% rename from akka-actor-tests/src/test/java/akka/japi/MatchBuilderTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java index b547d66c9c..a09532db94 100644 --- a/akka-actor-tests/src/test/java/akka/japi/MatchBuilderTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java @@ -2,10 +2,10 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi; +package org.apache.pekko.japi; -import akka.japi.pf.FI; -import akka.japi.pf.Match; +import org.apache.pekko.japi.pf.FI; +import org.apache.pekko.japi.pf.Match; import org.junit.Assert; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/japi/ThrowablesTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/japi/ThrowablesTest.java similarity index 95% rename from akka-actor-tests/src/test/java/akka/japi/ThrowablesTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/japi/ThrowablesTest.java index 7e69f5c865..9c75ca85bf 100644 --- a/akka-actor-tests/src/test/java/akka/japi/ThrowablesTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/japi/ThrowablesTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.japi; +package org.apache.pekko.japi; import org.junit.Assert; import org.junit.Test; diff --git a/akka-actor-tests/src/test/java/akka/japi/pf/PFBuilderTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java similarity index 95% rename from akka-actor-tests/src/test/java/akka/japi/pf/PFBuilderTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java index 6ded222ce4..79e2f601cf 100644 --- a/akka-actor-tests/src/test/java/akka/japi/pf/PFBuilderTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/japi/pf/ReceiveBuilderTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java similarity index 98% rename from akka-actor-tests/src/test/java/akka/japi/pf/ReceiveBuilderTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java index dc94427113..6280d6ba2d 100644 --- a/akka-actor-tests/src/test/java/akka/japi/pf/ReceiveBuilderTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; import java.util.Arrays; import java.util.List; @@ -10,7 +10,7 @@ import org.junit.Test; import org.junit.Before; import org.scalatestplus.junit.JUnitSuite; -import akka.actor.AbstractActor.Receive; +import org.apache.pekko.actor.AbstractActor.Receive; import static org.junit.Assert.*; diff --git a/akka-actor-tests/src/test/java/akka/pattern/CircuitBreakerTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java similarity index 91% rename from akka-actor-tests/src/test/java/akka/pattern/CircuitBreakerTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java index ed221d1f11..e45f19f72d 100644 --- a/akka-actor-tests/src/test/java/akka/pattern/CircuitBreakerTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java @@ -2,12 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern; +package org.apache.pekko.pattern; -import akka.actor.*; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.testkit.AkkaSpec; -import akka.util.JavaDurationConverters; +import org.apache.pekko.actor.*; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.AkkaSpec; +import org.apache.pekko.util.JavaDurationConverters; import org.junit.ClassRule; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/pattern/PatternsTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java similarity index 97% rename from akka-actor-tests/src/test/java/akka/pattern/PatternsTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java index fd9c41f600..9672ce5372 100644 --- a/akka-actor-tests/src/test/java/akka/pattern/PatternsTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java @@ -2,14 +2,14 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.pattern; +package org.apache.pekko.pattern; -import akka.actor.*; -import akka.dispatch.Futures; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.testkit.AkkaSpec; -import akka.testkit.TestProbe; -import akka.util.Timeout; +import org.apache.pekko.actor.*; +import org.apache.pekko.dispatch.Futures; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.AkkaSpec; +import org.apache.pekko.testkit.TestProbe; +import org.apache.pekko.util.Timeout; import org.junit.ClassRule; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; @@ -23,8 +23,8 @@ import java.util.concurrent.*; import java.time.Duration; import java.util.concurrent.atomic.AtomicInteger; -import static akka.pattern.Patterns.ask; -import static akka.pattern.Patterns.pipe; +import static org.apache.pekko.pattern.Patterns.ask; +import static org.apache.pekko.pattern.Patterns.pipe; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; diff --git a/akka-actor-tests/src/test/java/akka/pattern/StatusReplyTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java similarity index 91% rename from akka-actor-tests/src/test/java/akka/pattern/StatusReplyTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java index 9eda5781a8..cad3454dbb 100644 --- a/akka-actor-tests/src/test/java/akka/pattern/StatusReplyTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java @@ -2,13 +2,13 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.pattern; +package org.apache.pekko.pattern; -import akka.actor.ActorRef; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.testkit.AkkaSpec; -import akka.testkit.TestException; -import akka.testkit.TestProbe; +import org.apache.pekko.actor.ActorRef; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.AkkaSpec; +import org.apache.pekko.testkit.TestException; +import org.apache.pekko.testkit.TestProbe; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; @@ -19,7 +19,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import static akka.pattern.Patterns.askWithStatus; +import static org.apache.pekko.pattern.Patterns.askWithStatus; import static org.junit.Assert.*; diff --git a/akka-actor-tests/src/test/java/akka/util/ByteStringTest.java b/akka-actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java similarity index 95% rename from akka-actor-tests/src/test/java/akka/util/ByteStringTest.java rename to akka-actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java index 81fa48d4ff..1ac354a66e 100644 --- a/akka-actor-tests/src/test/java/akka/util/ByteStringTest.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util; +package org.apache.pekko.util; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/util/JavaDuration.java b/akka-actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java similarity index 95% rename from akka-actor-tests/src/test/java/akka/util/JavaDuration.java rename to akka-actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java index a6ccd84563..15e1543adf 100644 --- a/akka-actor-tests/src/test/java/akka/util/JavaDuration.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util; +package org.apache.pekko.util; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-tests/src/test/java/akka/util/LineNumberSpecCodeForJava.java b/akka-actor-tests/src/test/java/org/apache/pekko/util/LineNumberSpecCodeForJava.java similarity index 95% rename from akka-actor-tests/src/test/java/akka/util/LineNumberSpecCodeForJava.java rename to akka-actor-tests/src/test/java/org/apache/pekko/util/LineNumberSpecCodeForJava.java index 87ac1221d5..c11ae8568b 100644 --- a/akka-actor-tests/src/test/java/akka/util/LineNumberSpecCodeForJava.java +++ b/akka-actor-tests/src/test/java/org/apache/pekko/util/LineNumberSpecCodeForJava.java @@ -2,7 +2,7 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.util; +package org.apache.pekko.util; import java.io.Serializable; diff --git a/akka-actor-tests/src/test/resources/reference.conf b/akka-actor-tests/src/test/resources/reference.conf index 7a5f0db94e..c04e3f6740 100644 --- a/akka-actor-tests/src/test/resources/reference.conf +++ b/akka-actor-tests/src/test/resources/reference.conf @@ -1,6 +1,6 @@ akka { - # for the akka.actor.ExtensionSpec - library-extensions += "akka.actor.InstanceCountingExtension" + # for the org.apache.pekko.actor.ExtensionSpec + library-extensions += "org.apache.pekko.actor.InstanceCountingExtension" } # FIXME Some test depend on this setting when running on windows. diff --git a/akka-actor-tests/src/test/scala-2.12/akka/util/LineNumberSpec.scala b/akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/LineNumberSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala-2.12/akka/util/LineNumberSpec.scala rename to akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/LineNumberSpec.scala index d503a1ebb1..54d1a9c326 100644 --- a/akka-actor-tests/src/test/scala-2.12/akka/util/LineNumberSpec.scala +++ b/akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/LineNumberSpec.scala @@ -2,10 +2,11 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util -import akka.testkit.AkkaSpec -import akka.util.LineNumbers._ +import org.apache.pekko +import pekko.testkit.AkkaSpec +import pekko.util.LineNumbers._ class LineNumberSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala-2.13/akka/util/TypedMultiMapSpec.scala b/akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/TypedMultiMapSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala-2.13/akka/util/TypedMultiMapSpec.scala rename to akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/TypedMultiMapSpec.scala index 97116d3b2a..eb1b40180b 100644 --- a/akka-actor-tests/src/test/scala-2.13/akka/util/TypedMultiMapSpec.scala +++ b/akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/TypedMultiMapSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalactic.TypeCheckedTripleEquals import org.scalatest.matchers.should.Matchers diff --git a/akka-actor-tests/src/test/scala-2.13/akka/util/LineNumberSpec.scala b/akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/LineNumberSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala-2.13/akka/util/LineNumberSpec.scala rename to akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/LineNumberSpec.scala index d503a1ebb1..54d1a9c326 100644 --- a/akka-actor-tests/src/test/scala-2.13/akka/util/LineNumberSpec.scala +++ b/akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/LineNumberSpec.scala @@ -2,10 +2,11 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util -import akka.testkit.AkkaSpec -import akka.util.LineNumbers._ +import org.apache.pekko +import pekko.testkit.AkkaSpec +import pekko.util.LineNumbers._ class LineNumberSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala-2.12/akka/util/TypedMultiMapSpec.scala b/akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/TypedMultiMapSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala-2.12/akka/util/TypedMultiMapSpec.scala rename to akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/TypedMultiMapSpec.scala index 97116d3b2a..eb1b40180b 100644 --- a/akka-actor-tests/src/test/scala-2.12/akka/util/TypedMultiMapSpec.scala +++ b/akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/TypedMultiMapSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalactic.TypeCheckedTripleEquals import org.scalatest.matchers.should.Matchers diff --git a/akka-actor-tests/src/test/scala-3/akka/util/LineNumberSpec.scala b/akka-actor-tests/src/test/scala-3/org/apache/pekko/util/LineNumberSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala-3/akka/util/LineNumberSpec.scala rename to akka-actor-tests/src/test/scala-3/org/apache/pekko/util/LineNumberSpec.scala index a4e599826a..9718ee1a30 100644 --- a/akka-actor-tests/src/test/scala-3/akka/util/LineNumberSpec.scala +++ b/akka-actor-tests/src/test/scala-3/org/apache/pekko/util/LineNumberSpec.scala @@ -2,10 +2,11 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util -import akka.testkit.AkkaSpec -import akka.util.LineNumbers._ +import org.apache.pekko +import pekko.testkit.AkkaSpec +import pekko.util.LineNumbers._ class LineNumberSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/AkkaExceptionSpec.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/AkkaExceptionSpec.scala index b934a52168..f6e298c187 100644 --- a/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/AkkaExceptionSpec.scala @@ -2,12 +2,12 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka +package org.apache.pekko import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor._ +import org.apache.pekko.actor._ /** * A spec that verified that the AkkaException has at least a single argument constructor of type String. diff --git a/akka-actor-tests/src/test/scala/akka/AkkaVersionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/AkkaVersionSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/AkkaVersionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/AkkaVersionSpec.scala index 2ed1bc7958..52e9c22a4d 100644 --- a/akka-actor-tests/src/test/scala/akka/AkkaVersionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/AkkaVersionSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka +package org.apache.pekko import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/Messages.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/Messages.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/Messages.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/Messages.scala index a3987f5502..99391d145e 100644 --- a/akka-actor-tests/src/test/scala/akka/Messages.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/Messages.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka +package org.apache.pekko abstract class TestMessage diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala index 08a6426e1a..dd4d0dfb76 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration._ import language.postfixOps import org.scalatest.BeforeAndAfterEach -import akka.ConfigurationException -import akka.routing._ -import akka.testkit._ -import akka.testkit.DefaultTimeout -import akka.testkit.TestEvent._ +import org.apache.pekko +import pekko.ConfigurationException +import pekko.routing._ +import pekko.testkit._ +import pekko.testkit.DefaultTimeout +import pekko.testkit.TestEvent._ object ActorConfigurationVerificationSpec { @@ -25,7 +26,7 @@ object ActorConfigurationVerificationSpec { val config = """ balancing-dispatcher { - type = "akka.dispatch.BalancingDispatcherConfigurator" + type = "org.apache.pekko.dispatch.BalancingDispatcherConfigurator" throughput = 1 } pinned-dispatcher { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala similarity index 91% rename from akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala index f8a5484e9d..2fce01491f 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration._ import scala.language.postfixOps @@ -11,14 +11,15 @@ import com.codahale.metrics.Histogram import com.typesafe.config.ConfigFactory import org.scalatest.BeforeAndAfterAll -import akka.testkit.{ AkkaSpec, ImplicitSender, PerformanceTest } -import akka.testkit.metrics._ -import akka.testkit.metrics.HeapMemoryUsage +import org.apache.pekko +import pekko.testkit.{ AkkaSpec, ImplicitSender, PerformanceTest } +import pekko.testkit.metrics._ +import pekko.testkit.metrics.HeapMemoryUsage object ActorCreationPerfSpec { val config = ConfigFactory.parseString(""" - akka.test.actor.ActorPerfSpec { + pekko.test.actor.ActorPerfSpec { warmUp = 5 numberOfActors = 10 numberOfRepeats = 1 @@ -129,11 +130,11 @@ class ActorCreationPerfSpec val BlockingTimeKey = ActorCreationKey / "synchronous-part" val TotalTimeKey = ActorCreationKey / "total" - val warmUp = metricsConfig.getInt("akka.test.actor.ActorPerfSpec.warmUp") - val nrOfActors = metricsConfig.getInt("akka.test.actor.ActorPerfSpec.numberOfActors") - val nrOfRepeats = metricsConfig.getInt("akka.test.actor.ActorPerfSpec.numberOfRepeats") - override val reportMetricsEnabled = metricsConfig.getBoolean("akka.test.actor.ActorPerfSpec.report-metrics") - override val forceGcEnabled = metricsConfig.getBoolean("akka.test.actor.ActorPerfSpec.force-gc") + val warmUp = metricsConfig.getInt("pekko.test.actor.ActorPerfSpec.warmUp") + val nrOfActors = metricsConfig.getInt("pekko.test.actor.ActorPerfSpec.numberOfActors") + val nrOfRepeats = metricsConfig.getInt("pekko.test.actor.ActorPerfSpec.numberOfRepeats") + override val reportMetricsEnabled = metricsConfig.getBoolean("pekko.test.actor.ActorPerfSpec.report-metrics") + override val forceGcEnabled = metricsConfig.getBoolean("pekko.test.actor.ActorPerfSpec.force-gc") def runWithCounterInside(metricName: String, scenarioName: String, number: Int, propsCreator: () => Props): Unit = { val hist = histogram(BlockingTimeKey / metricName) diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala index 90460eddd0..a71e4049d3 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.UUID.{ randomUUID => newUuid } import java.util.concurrent.CountDownLatch @@ -12,9 +12,10 @@ import scala.concurrent.{ Await, Future } import org.scalatest.BeforeAndAfterEach -import akka.actor.Actor._ -import akka.pattern.ask -import akka.testkit._ +import org.apache.pekko +import pekko.actor.Actor._ +import pekko.pattern.ask +import pekko.testkit._ object ActorLifeCycleSpec { @@ -156,7 +157,7 @@ class ActorLifeCycleSpec extends AkkaSpec with BeforeAndAfterEach with ImplicitS class StopBeforeFutureFinishes(val latch: CountDownLatch) extends Actor { import context.dispatcher - import akka.pattern._ + import pekko.pattern._ override def receive: Receive = { case "ping" => diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala index f23f95c6f9..2a6f90fa09 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala @@ -2,85 +2,86 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration.{ Duration, FiniteDuration } import com.typesafe.config.Config import com.typesafe.config.ConfigFactory -import akka.ConfigurationException -import akka.dispatch._ -import akka.testkit._ -import akka.util.Helpers.ConfigOps -import akka.util.unused +import org.apache.pekko +import pekko.ConfigurationException +import pekko.dispatch._ +import pekko.testkit._ +import pekko.util.Helpers.ConfigOps +import pekko.util.unused object ActorMailboxSpec { val mailboxConf = ConfigFactory.parseString(s""" unbounded-dispatcher { - mailbox-type = "akka.dispatch.UnboundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.UnboundedMailbox" } bounded-dispatcher { mailbox-capacity = 1000 mailbox-push-timeout-time = 10s - mailbox-type = "akka.dispatch.BoundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.BoundedMailbox" } requiring-bounded-dispatcher { mailbox-capacity = 1000 mailbox-push-timeout-time = 10s - mailbox-type = "akka.dispatch.BoundedMailbox" - mailbox-requirement = "akka.dispatch.BoundedMessageQueueSemantics" + mailbox-type = "org.apache.pekko.dispatch.BoundedMailbox" + mailbox-requirement = "org.apache.pekko.dispatch.BoundedMessageQueueSemantics" } balancing-dispatcher { - type = "akka.dispatch.BalancingDispatcherConfigurator" + type = "org.apache.pekko.dispatch.BalancingDispatcherConfigurator" } balancing-bounded-dispatcher { - type = "akka.dispatch.BalancingDispatcherConfigurator" + type = "org.apache.pekko.dispatch.BalancingDispatcherConfigurator" mailbox-push-timeout-time = 10s mailbox-capacity = 1000 - mailbox-type = "akka.dispatch.BoundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.BoundedMailbox" } requiring-balancing-bounded-dispatcher { - type = "akka.dispatch.BalancingDispatcherConfigurator" - mailbox-requirement = "akka.actor.ActorMailboxSpec$$MCBoundedMessageQueueSemantics" + type = "org.apache.pekko.dispatch.BalancingDispatcherConfigurator" + mailbox-requirement = "org.apache.pekko.actor.ActorMailboxSpec$$MCBoundedMessageQueueSemantics" } unbounded-mailbox { - mailbox-type = "akka.dispatch.UnboundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.UnboundedMailbox" } bounded-mailbox { mailbox-capacity = 1000 mailbox-push-timeout-time = 10s - mailbox-type = "akka.dispatch.BoundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.BoundedMailbox" } bounded-mailbox-with-zero-pushtimeout { mailbox-capacity = 1000 mailbox-push-timeout-time = 0s - mailbox-type = "akka.dispatch.BoundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.BoundedMailbox" } bounded-control-aware-mailbox { mailbox-capacity = 1000 mailbox-push-timeout-time = 10s - mailbox-type = "akka.dispatch.BoundedControlAwareMailbox" + mailbox-type = "org.apache.pekko.dispatch.BoundedControlAwareMailbox" } unbounded-control-aware-mailbox { - mailbox-type = "akka.dispatch.UnboundedControlAwareMailbox" + mailbox-type = "org.apache.pekko.dispatch.UnboundedControlAwareMailbox" } mc-bounded-mailbox { mailbox-capacity = 1000 mailbox-push-timeout-time = 10s - mailbox-type = "akka.actor.ActorMailboxSpec$$MCBoundedMailbox" + mailbox-type = "org.apache.pekko.actor.ActorMailboxSpec$$MCBoundedMailbox" } akka.actor.deployment { @@ -164,7 +165,7 @@ object ActorMailboxSpec { } akka.actor.mailbox.requirements { - "akka.actor.ActorMailboxSpec$$MCBoundedMessageQueueSemantics" = + "org.apache.pekko.actor.ActorMailboxSpec$$MCBoundedMessageQueueSemantics" = mc-bounded-mailbox } """) diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorPathSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorPathSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/actor/ActorPathSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorPathSpec.scala index abf12788d9..68d5d126cb 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorPathSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorPathSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.net.MalformedURLException diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala index b6289d8aa5..1db23837cf 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.lang.IllegalStateException @@ -12,10 +12,11 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.pattern.ask -import akka.serialization.JavaSerializer -import akka.testkit._ -import akka.util.Timeout +import org.apache.pekko +import pekko.pattern.ask +import pekko.serialization.JavaSerializer +import pekko.testkit._ +import pekko.util.Timeout object ActorRefSpec { @@ -115,7 +116,7 @@ class ActorRefSpec extends AkkaSpec(""" # testing Java serialization of ActorRef akka.actor.allow-java-serialization = on """) with DefaultTimeout { - import akka.actor.ActorRefSpec._ + import org.apache.pekko.actor.ActorRefSpec._ def promiseIntercept(f: => Actor)(to: Promise[Actor]): Actor = try { @@ -139,14 +140,14 @@ class ActorRefSpec extends AkkaSpec(""" "not allow Actors to be created outside of an actorOf" in { import system.actorOf - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { new Actor { def receive = { case _ => } } } def contextStackMustBeEmpty(): Unit = ActorCell.contextStack.get.headOption should ===(None) EventFilter[ActorInitializationException](occurrences = 1).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf(Props(new Actor { val nested = promiseIntercept(new Actor { def receive = { case _ => } })(result) @@ -158,7 +159,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 1).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf(Props(promiseIntercept(new FailingOuterActor(actorOf(Props(new InnerActor))))(result)))) } @@ -167,7 +168,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 1).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf(Props(new OuterActor(actorOf(Props(promiseIntercept(new FailingInnerActor)(result))))))) } @@ -176,7 +177,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 1).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf(Props(promiseIntercept(new FailingInheritingOuterActor(actorOf(Props(new InnerActor))))(result)))) } @@ -185,7 +186,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 2).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf( Props(new FailingOuterActor(actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result))))))) @@ -195,7 +196,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 2).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf(Props(new FailingInheritingOuterActor( actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result))))))) @@ -205,7 +206,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 2).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf( Props(new FailingInheritingOuterActor(actorOf(Props(promiseIntercept(new FailingInnerActor)(result))))))) @@ -215,7 +216,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 1).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf(Props(new OuterActor(actorOf(Props(new InnerActor { val a = promiseIntercept(new InnerActor)(result) @@ -226,7 +227,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 2).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf( Props(new FailingOuterActor(actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result))))))) @@ -236,7 +237,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 1).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf(Props(new OuterActor(actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result))))))) } @@ -245,7 +246,7 @@ class ActorRefSpec extends AkkaSpec(""" } EventFilter[ActorInitializationException](occurrences = 1).intercept { - intercept[akka.actor.ActorInitializationException] { + intercept[pekko.actor.ActorInitializationException] { wrap(result => actorOf( Props(new OuterActor(actorOf(Props(promiseIntercept { new InnerActor; new InnerActor }(result))))))) @@ -327,7 +328,7 @@ class ActorRefSpec extends AkkaSpec(""" in.readObject }.getMessage should ===( "Trying to deserialize a serialized ActorRef without an ActorSystem in scope." + - " Use 'akka.serialization.JavaSerializer.currentSystem.withValue(system) { ... }'") + " Use 'org.apache.pekko.serialization.JavaSerializer.currentSystem.withValue(system) { ... }'") } "return EmptyLocalActorRef on deserialize if not present in actor hierarchy (and remoting is not enabled)" in { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala index b4edb3b036..595a5c9a89 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.Await import scala.concurrent.duration._ -import akka.pattern.ask -import akka.testkit._ +import org.apache.pekko +import pekko.pattern.ask +import pekko.testkit._ object ActorSelectionSpec { @@ -97,7 +98,7 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout { identify(system.child("c2").child("c21")) should ===(Some(c21)) // test Java API identify(system / Seq("c2", "c21")) should ===(Some(c21)) - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ identify(system.descendant(Seq("c2", "c21").asJava)) // test Java API } @@ -246,7 +247,7 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout { } "return deadLetters or ActorIdentity(None), respectively, for non-existing paths" in { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ def checkOne(looker: ActorRef, query: Query, result: Option[ActorRef]): Unit = { val lookup = askNode(looker, query) diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemDispatcherSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala similarity index 95% rename from akka-actor-tests/src/test/scala/akka/actor/ActorSystemDispatcherSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala index 43e8149c86..4158ecb767 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala @@ -2,17 +2,18 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.ExecutionContext import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory -import akka.ConfigurationException -import akka.actor.setup.ActorSystemSetup -import akka.dispatch.{ Dispatchers, ExecutionContexts } -import akka.testkit.{ AkkaSpec, ImplicitSender, TestActors, TestProbe } +import org.apache.pekko +import pekko.ConfigurationException +import pekko.actor.setup.ActorSystemSetup +import pekko.dispatch.{ Dispatchers, ExecutionContexts } +import pekko.testkit.{ AkkaSpec, ImplicitSender, TestActors, TestProbe } object ActorSystemDispatchersSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala index d152a9121f..0ec95b43b6 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.{ ConcurrentLinkedQueue, RejectedExecutionException } import java.util.concurrent.atomic.AtomicInteger @@ -14,13 +14,14 @@ import scala.language.postfixOps import scala.annotation.nowarn import com.typesafe.config.{ Config, ConfigFactory } -import akka.actor.setup.ActorSystemSetup -import akka.dispatch._ -import akka.japi.Util.immutableSeq -import akka.pattern.ask -import akka.testkit.{ TestKit, _ } -import akka.util.{ Switch, Timeout } -import akka.util.Helpers.ConfigOps +import org.apache.pekko +import pekko.actor.setup.ActorSystemSetup +import pekko.dispatch._ +import pekko.japi.Util.immutableSeq +import pekko.pattern.ask +import pekko.testkit.{ TestKit, _ } +import pekko.util.{ Switch, Timeout } +import pekko.util.Helpers.ConfigOps object ActorSystemSpec { @@ -85,7 +86,7 @@ object ActorSystemSpec { configureExecutor(), this.config.getMillisDuration("shutdown-timeout")) { val doneIt = new Switch - override protected[akka] def registerForExecution( + override protected[pekko] def registerForExecution( mbox: Mailbox, hasMessageHint: Boolean, hasSystemMessageHint: Boolean): Boolean = { @@ -316,7 +317,7 @@ class ActorSystemSpec extends AkkaSpec(ActorSystemSpec.config) with ImplicitSend ActorSystem( "Stop", ConfigFactory - .parseString("akka.actor.guardian-supervisor-strategy=akka.actor.StoppingSupervisorStrategy") + .parseString("akka.actor.guardian-supervisor-strategy=org.apache.pekko.actor.StoppingSupervisorStrategy") .withFallback(AkkaSpec.testConf)) val a = system.actorOf(Props(new Actor { def receive = { @@ -339,7 +340,7 @@ class ActorSystemSpec extends AkkaSpec(ActorSystemSpec.config) with ImplicitSend ActorSystem( "Stop", ConfigFactory - .parseString("akka.actor.guardian-supervisor-strategy=\"akka.actor.ActorSystemSpec$Strategy\"") + .parseString("akka.actor.guardian-supervisor-strategy=\"org.apache.pekko.actor.ActorSystemSpec$Strategy\"") .withFallback(AkkaSpec.testConf)) val a = system.actorOf(Props(new Actor { def receive = { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala similarity index 82% rename from akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala index 630cd2e718..6596a9399c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.Await import scala.concurrent.duration._ -import akka.pattern.{ ask, AskTimeoutException } -import akka.testkit._ -import akka.testkit.TestEvent._ -import akka.util.Timeout +import org.apache.pekko +import pekko.pattern.{ ask, AskTimeoutException } +import pekko.testkit._ +import pekko.testkit.TestEvent._ +import pekko.util.Timeout class ActorTimeoutSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala index bdf74f42f1..3524bfdf74 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration._ @@ -10,12 +10,13 @@ import com.typesafe.config.{ Config, ConfigFactory } import language.postfixOps import org.scalatest.BeforeAndAfterEach -import akka.actor.ActorSystem.Settings -import akka.dispatch.BoundedDequeBasedMailbox -import akka.testkit._ -import akka.testkit.DefaultTimeout -import akka.testkit.TestEvent._ -import akka.util.unused +import org.apache.pekko +import pekko.actor.ActorSystem.Settings +import pekko.dispatch.BoundedDequeBasedMailbox +import pekko.testkit._ +import pekko.testkit.DefaultTimeout +import pekko.testkit.TestEvent._ +import pekko.util.unused object ActorWithBoundedStashSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala index 37d7af5e5e..93caf8e449 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.Await import scala.concurrent.duration._ @@ -11,10 +11,11 @@ import scala.annotation.nowarn import language.postfixOps import org.scalatest.BeforeAndAfterEach -import akka.pattern.ask -import akka.testkit._ -import akka.testkit.DefaultTimeout -import akka.testkit.TestEvent._ +import org.apache.pekko +import pekko.pattern.ask +import pekko.testkit._ +import pekko.testkit.DefaultTimeout +import pekko.testkit.TestEvent._ object ActorWithStashSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/Bench.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/Bench.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/actor/Bench.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/Bench.scala index c74aadc527..bcc9c242b6 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/Bench.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/Bench.scala @@ -4,7 +4,7 @@ inspired by the version contributed by Yura Taras and modified by Isaac Gouy */ -package akka.actor +package org.apache.pekko.actor object Chameneos { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala index e9956ec30e..c4adb55f3c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration._ import language.postfixOps -import akka.dispatch.ThreadPoolConfig -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.dispatch.ThreadPoolConfig +import pekko.testkit.AkkaSpec object ConsistencySpec { val minThreads = 1 diff --git a/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala index 6778f3ddaa..f2bc587a1a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala @@ -2,17 +2,18 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor -import akka.ConfigurationException -import akka.Done -import akka.actor.CoordinatedShutdown.Phase -import akka.actor.CoordinatedShutdown.UnknownReason -import akka.dispatch.ExecutionContexts -import akka.testkit.AkkaSpec -import akka.testkit.EventFilter -import akka.testkit.TestKit -import akka.testkit.TestProbe +import org.apache.pekko +import pekko.ConfigurationException +import pekko.Done +import pekko.actor.CoordinatedShutdown.Phase +import pekko.actor.CoordinatedShutdown.UnknownReason +import pekko.dispatch.ExecutionContexts +import pekko.testkit.AkkaSpec +import pekko.testkit.EventFilter +import pekko.testkit.TestKit +import pekko.testkit.TestProbe import com.typesafe.config.Config import com.typesafe.config.ConfigFactory @@ -27,7 +28,7 @@ import scala.concurrent.Promise class CoordinatedShutdownSpec extends AkkaSpec(ConfigFactory.parseString(""" akka.loglevel=INFO - akka.loggers = ["akka.testkit.TestEventListener"] + akka.loggers = ["org.apache.pekko.testkit.TestEventListener"] """)) { def extSys = system.asInstanceOf[ExtendedActorSystem] diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeadLetterSupressionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/actor/DeadLetterSupressionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala index a1af3044ee..a886688606 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeadLetterSupressionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration._ -import akka.event.Logging -import akka.testkit.AkkaSpec -import akka.testkit.ImplicitSender -import akka.testkit.TestActors -import akka.testkit.TestProbe +import org.apache.pekko +import pekko.event.Logging +import pekko.testkit.AkkaSpec +import pekko.testkit.ImplicitSender +import pekko.testkit.TestActors +import pekko.testkit.TestProbe object DeadLetterSupressionSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeadLetterSuspensionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala similarity index 93% rename from akka-actor-tests/src/test/scala/akka/actor/DeadLetterSuspensionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala index b195d430ae..152137b990 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeadLetterSuspensionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala @@ -2,12 +2,13 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor -import akka.testkit.AkkaSpec -import akka.testkit.EventFilter -import akka.testkit.ImplicitSender -import akka.testkit.TestActors +import org.apache.pekko +import pekko.testkit.AkkaSpec +import pekko.testkit.EventFilter +import pekko.testkit.ImplicitSender +import pekko.testkit.TestActors object DeadLetterSuspensionSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala index 02a74ddf9e..39b8aae04a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.Await import scala.concurrent.duration._ @@ -10,10 +10,11 @@ import scala.concurrent.duration._ import scala.annotation.nowarn import language.postfixOps -import akka.actor.Props.EmptyActor -import akka.dispatch.sysmsg.{ DeathWatchNotification, Failed } -import akka.pattern.ask -import akka.testkit._ +import org.apache.pekko +import pekko.actor.Props.EmptyActor +import pekko.dispatch.sysmsg.{ DeathWatchNotification, Failed } +import pekko.pattern.ask +import pekko.testkit._ class LocalDeathWatchSpec extends AkkaSpec with ImplicitSender with DefaultTimeout with DeathWatchSpec diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala similarity index 84% rename from akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala index 5ad7b7f646..065c2b36b6 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration._ @@ -10,8 +10,9 @@ import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigParseOptions import language.postfixOps -import akka.routing._ -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.routing._ +import pekko.testkit.AkkaSpec object DeployerSpec { val deployerConf = ConfigFactory.parseString( @@ -221,19 +222,19 @@ class DeployerSpec extends AkkaSpec(DeployerSpec.deployerConf) { "have correct router mappings" in { val mapping = system.asInstanceOf[ExtendedActorSystem].provider.deployer.routerTypeMapping - mapping("from-code") should ===(classOf[akka.routing.NoRouter].getName) - mapping("round-robin-pool") should ===(classOf[akka.routing.RoundRobinPool].getName) - mapping("round-robin-group") should ===(classOf[akka.routing.RoundRobinGroup].getName) - mapping("random-pool") should ===(classOf[akka.routing.RandomPool].getName) - mapping("random-group") should ===(classOf[akka.routing.RandomGroup].getName) - mapping("balancing-pool") should ===(classOf[akka.routing.BalancingPool].getName) - mapping("smallest-mailbox-pool") should ===(classOf[akka.routing.SmallestMailboxPool].getName) - mapping("broadcast-pool") should ===(classOf[akka.routing.BroadcastPool].getName) - mapping("broadcast-group") should ===(classOf[akka.routing.BroadcastGroup].getName) - mapping("scatter-gather-pool") should ===(classOf[akka.routing.ScatterGatherFirstCompletedPool].getName) - mapping("scatter-gather-group") should ===(classOf[akka.routing.ScatterGatherFirstCompletedGroup].getName) - mapping("consistent-hashing-pool") should ===(classOf[akka.routing.ConsistentHashingPool].getName) - mapping("consistent-hashing-group") should ===(classOf[akka.routing.ConsistentHashingGroup].getName) + mapping("from-code") should ===(classOf[pekko.routing.NoRouter].getName) + mapping("round-robin-pool") should ===(classOf[pekko.routing.RoundRobinPool].getName) + mapping("round-robin-group") should ===(classOf[pekko.routing.RoundRobinGroup].getName) + mapping("random-pool") should ===(classOf[pekko.routing.RandomPool].getName) + mapping("random-group") should ===(classOf[pekko.routing.RandomGroup].getName) + mapping("balancing-pool") should ===(classOf[pekko.routing.BalancingPool].getName) + mapping("smallest-mailbox-pool") should ===(classOf[pekko.routing.SmallestMailboxPool].getName) + mapping("broadcast-pool") should ===(classOf[pekko.routing.BroadcastPool].getName) + mapping("broadcast-group") should ===(classOf[pekko.routing.BroadcastGroup].getName) + mapping("scatter-gather-pool") should ===(classOf[pekko.routing.ScatterGatherFirstCompletedPool].getName) + mapping("scatter-gather-group") should ===(classOf[pekko.routing.ScatterGatherFirstCompletedGroup].getName) + mapping("consistent-hashing-pool") should ===(classOf[pekko.routing.ConsistentHashingPool].getName) + mapping("consistent-hashing-group") should ===(classOf[pekko.routing.ConsistentHashingGroup].getName) } def assertNoRouting(service: String): Unit = { diff --git a/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala similarity index 80% rename from akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala index 68e6844c3d..88e48eca14 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.collection.immutable import scala.concurrent.Await @@ -30,7 +30,8 @@ class DynamicAccessSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll "instantiate an object with a default constructor" in { val instance: Try[TestClassWithDefaultConstructor] = dynamicAccess - .createInstanceFor[TestClassWithDefaultConstructor]("akka.actor.TestClassWithDefaultConstructor", Nil) + .createInstanceFor[TestClassWithDefaultConstructor]("org.apache.pekko.actor.TestClassWithDefaultConstructor", + Nil) instance match { case Success(i) => i shouldNot be(null) case Failure(t) => fail(t) @@ -48,9 +49,10 @@ class DynamicAccessSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll "try different constructors with recoverWith" in { instantiateWithDefaultOrStringCtor( - "akka.actor.TestClassWithStringConstructor").get.name shouldBe "string ctor argument" - instantiateWithDefaultOrStringCtor("akka.actor.TestClassWithDefaultConstructor").get.name shouldBe "default" - instantiateWithDefaultOrStringCtor("akka.actor.foo.NonExistingClass") match { + "org.apache.pekko.actor.TestClassWithStringConstructor").get.name shouldBe "string ctor argument" + instantiateWithDefaultOrStringCtor( + "org.apache.pekko.actor.TestClassWithDefaultConstructor").get.name shouldBe "default" + instantiateWithDefaultOrStringCtor("org.apache.pekko.actor.foo.NonExistingClass") match { case Failure(t) => t shouldBe a[ClassNotFoundException] case Success(instance) => @@ -60,7 +62,7 @@ class DynamicAccessSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll "know if a class exists on the classpath or not" in { dynamicAccess.classIsOnClasspath("i.just.made.it.up.to.hurt.Myself") should ===(false) - dynamicAccess.classIsOnClasspath("akka.actor.Actor") should ===(true) + dynamicAccess.classIsOnClasspath("org.apache.pekko.actor.Actor") should ===(true) } def instantiateWithDefaultOrStringCtor(fqcn: String): Try[TestSuperclass] = diff --git a/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala similarity index 85% rename from akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala index 04d626c51a..ea64ba6c8f 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.atomic.AtomicInteger @@ -12,8 +12,9 @@ import com.typesafe.config.ConfigFactory import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.testkit.EventFilter -import akka.testkit.TestKit._ +import org.apache.pekko +import pekko.testkit.EventFilter +import pekko.testkit.TestKit._ object TestExtension extends ExtensionId[TestExtension] with ExtensionIdProvider { def lookup = this @@ -58,7 +59,7 @@ class ExtensionSpec extends AnyWordSpec with Matchers { "The ActorSystem extensions support" should { "support extensions" in { - val config = ConfigFactory.parseString("""akka.extensions = ["akka.actor.TestExtension"]""") + val config = ConfigFactory.parseString("""akka.extensions = ["org.apache.pekko.actor.TestExtension"]""") val system = ActorSystem("extensions", config) // TestExtension is configured and should be loaded at startup @@ -91,7 +92,7 @@ class ExtensionSpec extends AnyWordSpec with Matchers { val system = ActorSystem( "failing", ConfigFactory.parseString(""" - akka.extensions = ["akka.actor.FailingTestExtension"] + akka.extensions = ["org.apache.pekko.actor.FailingTestExtension"] """)) shutdownActorSystem(system) @@ -102,14 +103,15 @@ class ExtensionSpec extends AnyWordSpec with Matchers { val system = ActorSystem( "failing", ConfigFactory.parseString(""" - akka.extensions = ["akka.actor.MissingExtension"] + akka.extensions = ["org.apache.pekko.actor.MissingExtension"] """)) - EventFilter.error("While trying to load extension [akka.actor.MissingExtension], skipping.").intercept(())(system) + EventFilter.error( + "While trying to load extension [org.apache.pekko.actor.MissingExtension], skipping.").intercept(())(system) shutdownActorSystem(system) } "allow for auto-loading of library-extensions from reference.conf" in { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ // could be initialized by other tests, but assuming tests are not running in parallel val countBefore = InstanceCountingExtension.createCount.get() val system = ActorSystem("extensions") @@ -122,14 +124,14 @@ class ExtensionSpec extends AnyWordSpec with Matchers { } "not create duplicate instances when auto-loading of library-extensions" in { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ // could be initialized by other tests, but assuming tests are not running in parallel val countBefore = InstanceCountingExtension.createCount.get() val system = ActorSystem( "extensions", ConfigFactory.parseString( """ - akka.library-extensions = ["akka.actor.InstanceCountingExtension", "akka.actor.InstanceCountingExtension", "akka.actor.InstanceCountingExtension$"] + akka.library-extensions = ["org.apache.pekko.actor.InstanceCountingExtension", "org.apache.pekko.actor.InstanceCountingExtension", "org.apache.pekko.actor.InstanceCountingExtension$"] """)) val listedExtensions = system.settings.config.getStringList("akka.library-extensions").asScala listedExtensions.count(_.contains("InstanceCountingExtension")) should ===(3) // testing duplicate names @@ -144,7 +146,7 @@ class ExtensionSpec extends AnyWordSpec with Matchers { ActorSystem( "failing", ConfigFactory.parseString(""" - akka.library-extensions += "akka.actor.FailingTestExtension" + akka.library-extensions += "org.apache.pekko.actor.FailingTestExtension" """).withFallback(ConfigFactory.load()).resolve()) } @@ -155,7 +157,7 @@ class ExtensionSpec extends AnyWordSpec with Matchers { ActorSystem( "failing", ConfigFactory.parseString(""" - akka.library-extensions += "akka.actor.MissingExtension" + akka.library-extensions += "org.apache.pekko.actor.MissingExtension" """).withFallback(ConfigFactory.load())) } } diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala index cd83c6073a..997a3da770 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.Await import scala.concurrent.duration._ @@ -10,9 +10,10 @@ import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import language.postfixOps -import akka.event._ -import akka.testkit._ -import akka.util.{ unused, Timeout } +import org.apache.pekko +import pekko.event._ +import pekko.testkit._ +import pekko.util.{ unused, Timeout } object FSMActorSpec { @@ -251,7 +252,7 @@ class FSMActorSpec extends AkkaSpec(Map("akka.actor.debug.fsm" -> true)) with Im } "log events and transitions if asked to do so" in { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ val config = ConfigFactory .parseMap(Map("akka.loglevel" -> "DEBUG", "akka.actor.debug.fsm" -> true).asJava) .withFallback(system.settings.config) @@ -323,7 +324,7 @@ class FSMActorSpec extends AkkaSpec(Map("akka.actor.debug.fsm" -> true)) with Im } "allow transforming of state results" in { - import akka.actor.FSM._ + import pekko.actor.FSM._ val fsmref = system.actorOf(Props(new Actor with FSM[Int, Int] { startWith(0, 0) when(0)(transform { diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTimingSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTimingSpec.scala index 6b5fc0da65..50b9e44fb7 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTimingSpec.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import language.postfixOps -import akka.testkit._ +import org.apache.pekko.testkit._ import scala.concurrent.duration._ class FSMTimingSpec extends AkkaSpec with ImplicitSender { diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala index 8826dde982..c05cbc9c33 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala @@ -2,12 +2,13 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration._ import scala.language.postfixOps -import akka.testkit._ +import org.apache.pekko +import pekko.testkit._ object FSMTransitionSpec { @@ -98,7 +99,7 @@ class FSMTransitionSpec extends AkkaSpec with ImplicitSender { within(1 second) { fsm ! FSM.SubscribeTransitionCallBack(forward) expectMsg(FSM.CurrentState(fsm, 0)) - akka.pattern.gracefulStop(forward, 5 seconds) + pekko.pattern.gracefulStop(forward, 5 seconds) fsm ! "tick" expectNoMessage() } diff --git a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala index 4fdd99bf66..2022746c86 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration._ import language.postfixOps -import akka.pattern.{ ask, pipe } -import akka.testkit._ +import org.apache.pekko +import pekko.pattern.{ ask, pipe } +import pekko.testkit._ object ForwardActorSpec { val ExpectedMessage = "FOO" diff --git a/akka-actor-tests/src/test/scala/akka/actor/FunctionRefSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/actor/FunctionRefSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala index e7d002aac4..5c16cda488 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FunctionRefSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala @@ -2,12 +2,13 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor -import akka.actor.dungeon.SerializationCheckFailedException -import akka.testkit.AkkaSpec -import akka.testkit.EventFilter -import akka.testkit.ImplicitSender +import org.apache.pekko +import pekko.actor.dungeon.SerializationCheckFailedException +import pekko.testkit.AkkaSpec +import pekko.testkit.EventFilter +import pekko.testkit.ImplicitSender object FunctionRefSpec { @@ -100,7 +101,7 @@ class FunctionRefSpec extends AkkaSpec(""" val provider = system.asInstanceOf[ExtendedActorSystem].provider val ref = new FunctionRef(testActor.path / "blabla", provider, system, (_, _) => ()) EventFilter[SerializationCheckFailedException]( - start = "Failed to serialize and deserialize message of type akka.actor.FunctionRefSpec", + start = "Failed to serialize and deserialize message of type org.apache.pekko.actor.FunctionRefSpec", occurrences = 1).intercept { // needs to be something that fails when the deserialized form is not a FunctionRef // this relies upon serialize-messages during tests diff --git a/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala index 1e0166979c..433409e104 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor -import akka.testkit._ +import org.apache.pekko.testkit._ object HotSwapSpec { abstract class Becomer extends Actor {} diff --git a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala index ea052cae99..7378192fbc 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.Await import scala.concurrent.Future @@ -13,8 +13,9 @@ import scala.util.Success import scala.annotation.nowarn import language.postfixOps -import akka.testkit._ -import akka.util.Timeout +import org.apache.pekko +import pekko.testkit._ +import pekko.util.Timeout object LocalActorRefProviderSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/actor/PropsCreationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala similarity index 87% rename from akka-actor-tests/src/test/scala/akka/actor/PropsCreationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala index c58518b59b..dcf60fc0f6 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/PropsCreationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala @@ -2,12 +2,13 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.annotation.nowarn -import akka.testkit.AkkaSpec -import akka.util.unused +import org.apache.pekko +import pekko.testkit.AkkaSpec +import pekko.util.unused object PropsCreationSpec { @@ -23,7 +24,7 @@ object PropsCreationSpec { override def receive = Actor.emptyBehavior } - object OneParamActorCreator extends akka.japi.Creator[Actor] { + object OneParamActorCreator extends pekko.japi.Creator[Actor] { override def create(): Actor = new OneParamActor(null) } @@ -37,7 +38,7 @@ class PropsCreationSpec extends AkkaSpec(""" akka.actor.warn-about-java-serializer-usage = off """) { - import akka.actor.PropsCreationSpec._ + import org.apache.pekko.actor.PropsCreationSpec._ "Props" must { "work with creator" in { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala similarity index 90% rename from akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala index c6925a27f8..ba10b8ac5a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import com.typesafe.config.ConfigFactory -import akka.actor.ActorSystem.Settings -import akka.actor.ActorSystem.findClassLoader -import akka.actor.setup.ActorSystemSetup -import akka.testkit.AbstractSpec +import org.apache.pekko +import pekko.actor.ActorSystem.Settings +import pekko.actor.ActorSystem.findClassLoader +import pekko.actor.setup.ActorSystemSetup +import pekko.testkit.AbstractSpec class ProviderSelectionSpec extends AbstractSpec { import ProviderSelection.{ ClusterActorRefProvider, RemoteActorRefProvider } diff --git a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala index f159d4b0b6..48f05dbdfe 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.AtomicBoolean @@ -13,7 +13,7 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.testkit._ +import org.apache.pekko.testkit._ object ReceiveTimeoutSpec { case object Tick diff --git a/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/RelativeActorPathSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/RelativeActorPathSpec.scala index 04848c4b72..0b990fb753 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/RelativeActorPathSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.net.URLEncoder diff --git a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala index a95a02f3c4..ed0452617c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.lang.Thread.sleep @@ -12,12 +12,13 @@ import scala.concurrent.duration._ import scala.annotation.nowarn import language.postfixOps -import akka.pattern.ask -import akka.testkit.AkkaSpec -import akka.testkit.DefaultTimeout -import akka.testkit.EventFilter -import akka.testkit.TestEvent._ -import akka.testkit.TestLatch +import org.apache.pekko +import pekko.pattern.ask +import pekko.testkit.AkkaSpec +import pekko.testkit.DefaultTimeout +import pekko.testkit.EventFilter +import pekko.testkit.TestEvent._ +import pekko.testkit.TestLatch @nowarn class RestartStrategySpec extends AkkaSpec with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala index 09dbc51f03..9219cde749 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.io.Closeable import java.util.concurrent._ @@ -20,13 +20,14 @@ import com.typesafe.config.{ Config, ConfigFactory } import language.postfixOps import org.scalatest.BeforeAndAfterEach -import akka.pattern.ask -import akka.testkit._ +import org.apache.pekko +import pekko.pattern.ask +import pekko.testkit._ object SchedulerSpec { val testConfRevolver = ConfigFactory.parseString(""" - akka.scheduler.implementation = akka.actor.LightArrayRevolverScheduler + akka.scheduler.implementation = org.apache.pekko.actor.LightArrayRevolverScheduler akka.scheduler.ticks-per-wheel = 32 """).withFallback(AkkaSpec.testConf) diff --git a/akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/Supervisor.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/Supervisor.scala index b480ef5eeb..b6bdfd3436 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/Supervisor.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor /** * For testing Supervisor behavior, normally you don't supply the strategy diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala index 433b81a4c3..be555deced 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.lang.System.identityHashCode import java.lang.ref.WeakReference @@ -20,15 +20,16 @@ import scala.annotation.nowarn import com.typesafe.config.{ Config, ConfigFactory } import language.postfixOps -import akka.actor.SupervisorStrategy.seqThrowable2Decider -import akka.dispatch.{ Dispatcher, DispatcherConfigurator, DispatcherPrerequisites, MessageDispatcher } -import akka.event.Logging -import akka.pattern.ask -import akka.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender } -import akka.testkit.{ filterEvents, filterException, TestDuration, TestLatch } -import akka.testkit.LongRunningTest -import akka.testkit.TestEvent.Mute -import akka.util.Helpers.ConfigOps +import org.apache.pekko +import pekko.actor.SupervisorStrategy.seqThrowable2Decider +import pekko.dispatch.{ Dispatcher, DispatcherConfigurator, DispatcherPrerequisites, MessageDispatcher } +import pekko.event.Logging +import pekko.pattern.ask +import pekko.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender } +import pekko.testkit.{ filterEvents, filterException, TestDuration, TestLatch } +import pekko.testkit.LongRunningTest +import pekko.testkit.TestEvent.Mute +import pekko.util.Helpers.ConfigOps object SupervisorHierarchySpec { @@ -82,7 +83,7 @@ object SupervisorHierarchySpec { val config = ConfigFactory.parseString(""" hierarchy { - type = "akka.actor.SupervisorHierarchySpec$MyDispatcherConfigurator" + type = "org.apache.pekko.actor.SupervisorHierarchySpec$MyDispatcherConfigurator" } akka.loglevel = INFO akka.actor.debug.fsm = on diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala index 33fef10126..7d4a2b23ab 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.{ CountDownLatch, TimeUnit } @@ -13,10 +13,11 @@ import scala.util.control.NonFatal import scala.annotation.nowarn import language.postfixOps -import akka.pattern.ask -import akka.testkit.{ filterEvents, EventFilter } -import akka.testkit.AkkaSpec -import akka.testkit.DefaultTimeout +import org.apache.pekko +import pekko.pattern.ask +import pekko.testkit.{ filterEvents, EventFilter } +import pekko.testkit.AkkaSpec +import pekko.testkit.DefaultTimeout object SupervisorMiscSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala index c99e4ce3a8..3e2b82032e 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.atomic.AtomicInteger @@ -14,15 +14,16 @@ import com.typesafe.config.ConfigFactory import language.postfixOps import org.scalatest.BeforeAndAfterEach -import akka.{ Die, Ping } -import akka.ConfigurationException -import akka.dispatch.MailboxType -import akka.dispatch.MessageQueue -import akka.pattern.ask -import akka.routing.RoundRobinPool -import akka.testkit._ -import akka.testkit.TestEvent._ -import akka.util.unused +import org.apache.pekko +import pekko.{ Die, Ping } +import pekko.ConfigurationException +import pekko.dispatch.MailboxType +import pekko.dispatch.MessageQueue +import pekko.pattern.ask +import pekko.routing.RoundRobinPool +import pekko.testkit._ +import pekko.testkit.TestEvent._ +import pekko.util.unused object SupervisorSpec { val Timeout = 5.seconds @@ -99,7 +100,7 @@ object SupervisorSpec { val config = ConfigFactory.parseString(""" error-mailbox { - mailbox-type = "akka.actor.SupervisorSpec$Mailbox" + mailbox-type = "org.apache.pekko.actor.SupervisorSpec$Mailbox" } """) } diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala similarity index 89% rename from akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala index 62acb0514a..d217a8a968 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.Await import scala.concurrent.duration._ import language.postfixOps -import akka.pattern.ask -import akka.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender } +import org.apache.pekko +import pekko.pattern.ask +import pekko.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender } class SupervisorTreeSpec extends AkkaSpec with ImplicitSender with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala similarity index 88% rename from akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala index 267807e8e2..2766be3ccf 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.Await import scala.concurrent.duration._ @@ -10,11 +10,12 @@ import scala.concurrent.duration._ import language.postfixOps import org.scalatest.BeforeAndAfterAll -import akka.pattern.ask -import akka.testkit.{ filterEvents, EventFilter } -import akka.testkit.AkkaSpec -import akka.testkit.DefaultTimeout -import akka.testkit.ImplicitSender +import org.apache.pekko +import pekko.pattern.ask +import pekko.testkit.{ filterEvents, EventFilter } +import pekko.testkit.AkkaSpec +import pekko.testkit.DefaultTimeout +import pekko.testkit.ImplicitSender class Ticket669Spec extends AkkaSpec with BeforeAndAfterAll with ImplicitSender with DefaultTimeout { import Ticket669Spec._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/TimerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/TimerSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/actor/TimerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/TimerSpec.scala index 4ea469fb7f..46b76cd421 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/TimerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/TimerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.atomic.AtomicInteger @@ -10,7 +10,7 @@ import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace -import akka.testkit._ +import org.apache.pekko.testkit._ object TimerSpec { sealed trait Command diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/TypedActorSpec.scala similarity index 85% rename from akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/TypedActorSpec.scala index ec1579157d..a5ca46edda 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/TypedActorSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.{ CountDownLatch, TimeUnit, TimeoutException } import java.util.concurrent.atomic.AtomicReference @@ -16,27 +16,28 @@ import scala.language.postfixOps import scala.annotation.nowarn import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } -import akka.actor.TypedActor._ -import akka.japi.{ Option => JOption } -import akka.pattern.ask -import akka.routing.RoundRobinGroup -import akka.serialization.{ JavaSerializer, SerializerWithStringManifest } -import akka.testkit.{ filterEvents, AkkaSpec, DefaultTimeout, EventFilter, TimingTest } -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.TypedActor._ +import pekko.japi.{ Option => JOption } +import pekko.pattern.ask +import pekko.routing.RoundRobinGroup +import pekko.serialization.{ JavaSerializer, SerializerWithStringManifest } +import pekko.testkit.{ filterEvents, AkkaSpec, DefaultTimeout, EventFilter, TimingTest } +import pekko.util.Timeout object TypedActorSpec { @nowarn val config = """ pooled-dispatcher { - type = "akka.dispatch.BalancingDispatcherConfigurator" + type = "org.apache.pekko.dispatch.BalancingDispatcherConfigurator" executor = "thread-pool-executor" thread-pool-executor { fixed-pool-size = 60 } } - akka.actor.serializers.sample = "akka.actor.TypedActorSpec$SampleSerializerWithStringManifest$" - akka.actor.serialization-bindings."akka.actor.TypedActorSpec$WithStringSerializedClass" = sample + akka.actor.serializers.sample = "org.apache.pekko.actor.TypedActorSpec$SampleSerializerWithStringManifest$" + akka.actor.serialization-bindings."org.apache.pekko.actor.TypedActorSpec$WithStringSerializedClass" = sample # test is using Java serialization and not priority to convert akka.actor.allow-java-serialization = on akka.actor.warn-about-java-serializer-usage = off @@ -72,7 +73,7 @@ object TypedActorSpec { @nowarn @throws(classOf[TimeoutException]) - def self = akka.actor.TypedActor.self[Foo] + def self = pekko.actor.TypedActor.self[Foo] def futurePigdog(): Future[String] @@ -120,7 +121,7 @@ object TypedActorSpec { class Bar extends Foo with Serializable { - import akka.actor.TypedActor.dispatcher + import pekko.actor.TypedActor.dispatcher def pigdog() = "Pigdog" @@ -193,7 +194,7 @@ object TypedActorSpec { with Receiver { @nowarn - private def ensureContextAvailable[T](f: => T): T = akka.actor.TypedActor.context match { + private def ensureContextAvailable[T](f: => T): T = pekko.actor.TypedActor.context match { case null => throw new IllegalStateException("TypedActor.context is null!") case _ => f } @@ -255,30 +256,30 @@ class TypedActorSpec with BeforeAndAfterAll with DefaultTimeout { - import akka.actor.TypedActorSpec._ + import pekko.actor.TypedActorSpec._ def newFooBar: Foo = newFooBar(timeout.duration) def newFooBar(d: FiniteDuration): Foo = - akka.actor.TypedActor(system).typedActorOf(TypedProps[Bar](classOf[Foo], classOf[Bar]).withTimeout(Timeout(d))) + pekko.actor.TypedActor(system).typedActorOf(TypedProps[Bar](classOf[Foo], classOf[Bar]).withTimeout(Timeout(d))) def newFooBar(dispatcher: String, d: FiniteDuration): Foo = - akka.actor + pekko.actor .TypedActor(system) .typedActorOf(TypedProps[Bar](classOf[Foo], classOf[Bar]).withTimeout(Timeout(d)).withDispatcher(dispatcher)) def newStacked(): Stacked = - akka.actor + pekko.actor .TypedActor(system) .typedActorOf(TypedProps[StackedImpl](classOf[Stacked], classOf[StackedImpl]).withTimeout(timeout)) - def mustStop(typedActor: AnyRef) = akka.actor.TypedActor(system).stop(typedActor) should ===(true) + def mustStop(typedActor: AnyRef) = pekko.actor.TypedActor(system).stop(typedActor) should ===(true) "TypedActors" must { "be able to instantiate" in { val t = newFooBar - akka.actor.TypedActor(system).isTypedActor(t) should ===(true) + pekko.actor.TypedActor(system).isTypedActor(t) should ===(true) mustStop(t) } @@ -288,13 +289,13 @@ class TypedActorSpec } "not stop non-started ones" in { - akka.actor.TypedActor(system).stop(null) should ===(false) + pekko.actor.TypedActor(system).stop(null) should ===(false) } "throw an IllegalStateException when TypedActor.self is called in the wrong scope" in { filterEvents(EventFilter[IllegalStateException]("Calling")) { intercept[IllegalStateException] { - akka.actor.TypedActor.self[Foo] + pekko.actor.TypedActor.self[Foo] }.getMessage should ===("Calling TypedActor.self outside of a TypedActor implementation method!") } } @@ -307,7 +308,7 @@ class TypedActorSpec "be able to call toString" in { val t = newFooBar - t.toString should ===(akka.actor.TypedActor(system).getActorRefFor(t).toString) + t.toString should ===(pekko.actor.TypedActor(system).getActorRefFor(t).toString) mustStop(t) } @@ -320,7 +321,7 @@ class TypedActorSpec "be able to call hashCode" in { val t = newFooBar - t.hashCode should ===(akka.actor.TypedActor(system).getActorRefFor(t).hashCode) + t.hashCode should ===(pekko.actor.TypedActor(system).getActorRefFor(t).hashCode) mustStop(t) } @@ -401,7 +402,7 @@ class TypedActorSpec case e: IllegalStateException if e.getMessage == "expected" => SupervisorStrategy.Resume } def receive = { - case p: TypedProps[_] => context.sender() ! akka.actor.TypedActor(context).typedActorOf(p) + case p: TypedProps[_] => context.sender() ! pekko.actor.TypedActor(context).typedActorOf(p) } })) val t = Await.result( @@ -434,7 +435,7 @@ class TypedActorSpec t.optionPigdog() should ===(Some("Pigdog")) mustStop(t) - val ta: F = akka.actor.TypedActor(system).typedActorOf(TypedProps[FI]()) + val ta: F = pekko.actor.TypedActor(system).typedActorOf(TypedProps[FI]()) intercept[IllegalStateException] { ta.f(true) }.getMessage should ===("expected") ta.f(false) should ===(1) @@ -450,7 +451,7 @@ class TypedActorSpec } "be able to support implementation only typed actors" in within(timeout.duration) { - val t: Foo = akka.actor.TypedActor(system).typedActorOf(TypedProps[Bar]()) + val t: Foo = pekko.actor.TypedActor(system).typedActorOf(TypedProps[Bar]()) val f = t.futurePigdog(200 millis) val f2 = t.futurePigdog(Duration.Zero) f2.isCompleted should ===(false) @@ -460,7 +461,7 @@ class TypedActorSpec } "be able to support implementation only typed actors with complex interfaces" in { - val t: Stackable1 with Stackable2 = akka.actor.TypedActor(system).typedActorOf(TypedProps[StackedImpl]()) + val t: Stackable1 with Stackable2 = pekko.actor.TypedActor(system).typedActorOf(TypedProps[StackedImpl]()) t.stackable1 should ===("foo") t.stackable2 should ===("bar") mustStop(t) @@ -480,7 +481,7 @@ class TypedActorSpec "be able to serialize and deserialize invocations" in { import java.io._ JavaSerializer.currentSystem.withValue(system.asInstanceOf[ExtendedActorSystem]) { - val m = akka.actor.TypedActor.MethodCall(classOf[Foo].getDeclaredMethod("pigdog"), Array[AnyRef]()) + val m = pekko.actor.TypedActor.MethodCall(classOf[Foo].getDeclaredMethod("pigdog"), Array[AnyRef]()) val baos = new ByteArrayOutputStream(8192 * 4) val out = new ObjectOutputStream(baos) @@ -489,7 +490,7 @@ class TypedActorSpec val in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray)) - val mNew = in.readObject().asInstanceOf[akka.actor.TypedActor.MethodCall] + val mNew = in.readObject().asInstanceOf[pekko.actor.TypedActor.MethodCall] mNew.method should ===(m.method) } @@ -499,7 +500,7 @@ class TypedActorSpec import java.io._ val someFoo: Foo = new Bar JavaSerializer.currentSystem.withValue(system.asInstanceOf[ExtendedActorSystem]) { - val m = akka.actor.TypedActor.MethodCall( + val m = pekko.actor.TypedActor.MethodCall( classOf[Foo].getDeclaredMethod( "testMethodCallSerialization", Array[Class[_]](classOf[Foo], classOf[String], classOf[Int], classOf[WithStringSerializedClass]): _*), @@ -512,7 +513,7 @@ class TypedActorSpec val in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray)) - val mNew = in.readObject().asInstanceOf[akka.actor.TypedActor.MethodCall] + val mNew = in.readObject().asInstanceOf[pekko.actor.TypedActor.MethodCall] mNew.method should ===(m.method) mNew.parameters should have size 4 @@ -553,7 +554,7 @@ class TypedActorSpec "be able to override lifecycle callbacks" in { val latch = new CountDownLatch(16) - val ta = akka.actor.TypedActor(system) + val ta = pekko.actor.TypedActor(system) val t: LifeCycles = ta.typedActorOf(TypedProps[LifeCyclesImpl](classOf[LifeCycles], new LifeCyclesImpl(latch))) EventFilter[IllegalStateException]("Crash!", occurrences = 1).intercept { t.crash() @@ -581,14 +582,14 @@ class TypedActorRouterSpec with BeforeAndAfterAll with DefaultTimeout { - import akka.actor.TypedActorSpec._ + import pekko.actor.TypedActorSpec._ def newFooBar: Foo = newFooBar(timeout.duration) def newFooBar(d: FiniteDuration): Foo = - akka.actor.TypedActor(system).typedActorOf(TypedProps[Bar](classOf[Foo], classOf[Bar]).withTimeout(Timeout(d))) + pekko.actor.TypedActor(system).typedActorOf(TypedProps[Bar](classOf[Foo], classOf[Bar]).withTimeout(Timeout(d))) - def mustStop(typedActor: AnyRef) = akka.actor.TypedActor(system).stop(typedActor) should ===(true) + def mustStop(typedActor: AnyRef) = pekko.actor.TypedActor(system).stop(typedActor) should ===(true) "TypedActor Router" must { @@ -598,15 +599,15 @@ class TypedActorRouterSpec val t3 = newFooBar val t4 = newFooBar val routees = List(t1, t2, t3, t4).map { t => - akka.actor.TypedActor(system).getActorRefFor(t).path.toStringWithoutAddress + pekko.actor.TypedActor(system).getActorRefFor(t).path.toStringWithoutAddress } - akka.actor.TypedActor(system).isTypedActor(t1) should ===(true) - akka.actor.TypedActor(system).isTypedActor(t2) should ===(true) + pekko.actor.TypedActor(system).isTypedActor(t1) should ===(true) + pekko.actor.TypedActor(system).isTypedActor(t2) should ===(true) val router = system.actorOf(RoundRobinGroup(routees).props(), "router") - val typedRouter = akka.actor.TypedActor(system).typedActorOf[Foo, Foo](TypedProps[Foo](), router) + val typedRouter = pekko.actor.TypedActor(system).typedActorOf[Foo, Foo](TypedProps[Foo](), router) info("got = " + typedRouter.optionPigdog()) info("got = " + typedRouter.optionPigdog()) diff --git a/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala index 27cbb90582..c83359382e 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.util.control.NoStackTrace -import akka.actor.SupervisorStrategy.{ Restart, Stop } -import akka.dispatch.sysmsg.SystemMessage -import akka.event.EventStream -import akka.testkit.{ AkkaSpec, TestProbe } +import org.apache.pekko +import pekko.actor.SupervisorStrategy.{ Restart, Stop } +import pekko.dispatch.sysmsg.SystemMessage +import pekko.event.EventStream +import pekko.testkit.{ AkkaSpec, TestProbe } object UidClashTest { @@ -19,7 +20,7 @@ object UidClashTest { @volatile var oldActor: ActorRef = _ - private[akka] class EvilCollidingActorRef( + private[pekko] class EvilCollidingActorRef( override val provider: ActorRefProvider, override val path: ActorPath, val eventStream: EventStream) diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala similarity index 95% rename from akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala index 6f2870a0b0..2182571f81 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.dispatch +package org.apache.pekko.actor.dispatch import java.rmi.RemoteException import java.util.concurrent.{ ConcurrentHashMap, CountDownLatch, TimeUnit } @@ -17,12 +17,13 @@ import com.typesafe.config.Config import language.postfixOps import org.scalatest.Assertions._ -import akka.actor._ -import akka.dispatch._ -import akka.event.Logging.Error -import akka.pattern.ask -import akka.testkit._ -import akka.util.Switch +import org.apache.pekko +import pekko.actor._ +import pekko.dispatch._ +import pekko.event.Logging.Error +import pekko.pattern.ask +import pekko.testkit._ +import pekko.util.Switch object ActorModelSpec { @@ -131,33 +132,33 @@ object ActorModelSpec { } - protected[akka] abstract override def suspend(actor: ActorCell): Unit = { + protected[pekko] abstract override def suspend(actor: ActorCell): Unit = { getStats(actor.self).suspensions.incrementAndGet() super.suspend(actor) } - protected[akka] abstract override def resume(actor: ActorCell): Unit = { + protected[pekko] abstract override def resume(actor: ActorCell): Unit = { super.resume(actor) getStats(actor.self).resumes.incrementAndGet() } - protected[akka] abstract override def register(actor: ActorCell): Unit = { + protected[pekko] abstract override def register(actor: ActorCell): Unit = { assert(getStats(actor.self).registers.incrementAndGet() == 1) super.register(actor) } - protected[akka] abstract override def unregister(actor: ActorCell): Unit = { + protected[pekko] abstract override def unregister(actor: ActorCell): Unit = { assert(getStats(actor.self).unregisters.incrementAndGet() == 1) super.unregister(actor) } - protected[akka] abstract override def dispatch(receiver: ActorCell, invocation: Envelope): Unit = { + protected[pekko] abstract override def dispatch(receiver: ActorCell, invocation: Envelope): Unit = { val stats = getStats(receiver.self) stats.msgsReceived.incrementAndGet() super.dispatch(receiver, invocation) } - protected[akka] abstract override def shutdown(): Unit = { + protected[pekko] abstract override def shutdown(): Unit = { stops.incrementAndGet() super.shutdown() } @@ -414,7 +415,7 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa filterEvents( EventFilter[InterruptedException](), EventFilter[ActorInterruptedException](), - EventFilter[akka.event.Logging.LoggerException]()) { + EventFilter[pekko.event.Logging.LoggerException]()) { implicit val dispatcher = interceptedDispatcher() val a = newTestActor(dispatcher.id) val f1 = a ? Reply("foo") @@ -427,7 +428,7 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa val f6 = a ? Reply("bar2") val c = system.scheduler.scheduleOnce(2.seconds) { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ Thread.getAllStackTraces().asScala.foreach { case (thread, stack) => println(s"$thread:") @@ -511,14 +512,14 @@ object DispatcherModelSpec { // use unique dispatcher id for each test, since MessageDispatcherInterceptor holds state (for (n <- 1 to 30) yield """ test-dispatcher-%s { - type = "akka.actor.dispatch.DispatcherModelSpec$MessageDispatcherInterceptorConfigurator" + type = "org.apache.pekko.actor.dispatch.DispatcherModelSpec$MessageDispatcherInterceptorConfigurator" }""".format(n)).mkString } class MessageDispatcherInterceptorConfigurator(config: Config, prerequisites: DispatcherPrerequisites) extends MessageDispatcherConfigurator(config, prerequisites) { - import akka.util.Helpers.ConfigOps + import pekko.util.Helpers.ConfigOps private val instance: MessageDispatcher = new Dispatcher( @@ -592,7 +593,7 @@ object BalancingDispatcherModelSpec { (for (n <- 1 to 30) yield """ test-balancing-dispatcher-%s { - type = "akka.actor.dispatch.BalancingDispatcherModelSpec$BalancingMessageDispatcherInterceptorConfigurator" + type = "org.apache.pekko.actor.dispatch.BalancingDispatcherModelSpec$BalancingMessageDispatcherInterceptorConfigurator" throughput=1 }""".format(n)).mkString } @@ -600,7 +601,7 @@ object BalancingDispatcherModelSpec { class BalancingMessageDispatcherInterceptorConfigurator(config: Config, prerequisites: DispatcherPrerequisites) extends BalancingDispatcherConfigurator(config, prerequisites) { - import akka.util.Helpers.ConfigOps + import pekko.util.Helpers.ConfigOps override protected def create(mailboxType: MailboxType): BalancingDispatcher = new BalancingDispatcher( diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/BalancingDispatcherSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala similarity index 91% rename from akka-actor-tests/src/test/scala/akka/actor/dispatch/BalancingDispatcherSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala index f92ce217a2..fb7e77498e 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/BalancingDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala @@ -2,17 +2,18 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.dispatch +package org.apache.pekko.actor.dispatch import java.util.concurrent.{ CountDownLatch, TimeUnit } -import akka.actor.{ Actor, ActorCell, ActorRefWithCell, Props } -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor.{ Actor, ActorCell, ActorRefWithCell, Props } +import pekko.testkit.AkkaSpec object BalancingDispatcherSpec { val config = """ pooled-dispatcher { - type = "akka.dispatch.BalancingDispatcherConfigurator" + type = "org.apache.pekko.dispatch.BalancingDispatcherConfigurator" throughput = 1 } """ diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala similarity index 95% rename from akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala index ee10299d5b..9f6ba56b44 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.dispatch +package org.apache.pekko.actor.dispatch import java.util.concurrent.{ CountDownLatch, TimeUnit } import java.util.concurrent.atomic.AtomicBoolean @@ -12,10 +12,11 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.actor.{ Actor, Props } -import akka.pattern.ask -import akka.testkit.AkkaSpec -import akka.testkit.DefaultTimeout +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.pattern.ask +import pekko.testkit.AkkaSpec +import pekko.testkit.DefaultTimeout object DispatcherActorSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorsSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorsSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala index 66a8bc34af..268506efdb 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorsSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala @@ -2,12 +2,13 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.dispatch +package org.apache.pekko.actor.dispatch import java.util.concurrent.CountDownLatch -import akka.actor._ -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor._ +import pekko.testkit.AkkaSpec /** * Tests the behavior of the executor based event driven dispatcher when multiple actors are being dispatched on it. diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala index 72dfa0d39f..e0f817f08d 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.dispatch +package org.apache.pekko.actor.dispatch import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicBoolean @@ -12,12 +12,13 @@ import scala.reflect.ClassTag import com.typesafe.config.Config import com.typesafe.config.ConfigFactory -import akka.ConfigurationException -import akka.actor._ -import akka.dispatch._ -import akka.routing.FromConfig -import akka.testkit.{ AkkaSpec, ImplicitSender } -import akka.util.unused +import org.apache.pekko +import pekko.ConfigurationException +import pekko.actor._ +import pekko.dispatch._ +import pekko.routing.FromConfig +import pekko.testkit.{ AkkaSpec, ImplicitSender } +import pekko.util.unused object DispatchersSpec { val config = """ @@ -33,10 +34,10 @@ object DispatchersSpec { type = PinnedDispatcher } balancing-dispatcher { - type = "akka.dispatch.BalancingDispatcherConfigurator" + type = "org.apache.pekko.dispatch.BalancingDispatcherConfigurator" } mymailbox { - mailbox-type = "akka.actor.dispatch.DispatchersSpec$OneShotMailboxType" + mailbox-type = "org.apache.pekko.actor.dispatch.DispatchersSpec$OneShotMailboxType" } my-aliased-dispatcher = myapp.mydispatcher missing-aliased-dispatcher = myapp.missing-dispatcher @@ -125,7 +126,7 @@ class DispatchersSpec extends AkkaSpec(DispatchersSpec.config) with ImplicitSend val defaultDispatcherConfig = settings.config.getConfig("akka.actor.default-dispatcher") lazy val allDispatchers: Map[String, MessageDispatcher] = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ validTypes .map(t => (t, from(ConfigFactory.parseMap(Map(tipe -> t, id -> t).asJava).withFallback(defaultDispatcherConfig)))) @@ -165,7 +166,7 @@ class DispatchersSpec extends AkkaSpec(DispatchersSpec.config) with ImplicitSend } "throw ConfigurationException if type does not exist" in { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ intercept[ConfigurationException] { from( ConfigFactory diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala similarity index 87% rename from akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala index 572e13bcda..9e5bab57d4 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.dispatch +package org.apache.pekko.actor.dispatch import java.util.concurrent.{ CountDownLatch, TimeUnit } @@ -10,10 +10,11 @@ import scala.concurrent.Await import org.scalatest.BeforeAndAfterEach -import akka.actor.{ Actor, Props } -import akka.pattern.ask -import akka.testkit._ -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.pattern.ask +import pekko.testkit._ +import pekko.testkit.AkkaSpec object PinnedActorSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala similarity index 85% rename from akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala index 8e69762a78..a8d576e5d1 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala @@ -2,11 +2,12 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.dungeon +package org.apache.pekko.actor.dungeon -import akka.actor.Actor -import akka.actor.Props -import akka.testkit._ +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.Props +import pekko.testkit._ object DispatchSpec { class UnserializableMessageClass diff --git a/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala similarity index 90% rename from akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala index 81ca2a8bac..f28823ecfb 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.routing +package org.apache.pekko.actor.routing import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await -import akka.actor._ -import akka.routing._ -import akka.testkit._ +import org.apache.pekko +import pekko.actor._ +import pekko.routing._ +import pekko.testkit._ class ListenerSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/setup/ActorSystemSetupSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/actor/setup/ActorSystemSetupSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala index 446538a4da..344afb157e 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/setup/ActorSystemSetupSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala @@ -2,13 +2,14 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.setup +package org.apache.pekko.actor.setup import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.ActorSystem -import akka.testkit.TestKit +import org.apache.pekko +import pekko.actor.ActorSystem +import pekko.testkit.TestKit case class DummySetup(name: String) extends Setup case class DummySetup2(name: String) extends Setup diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala similarity index 93% rename from akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala index 112410e248..86bf0c17d2 100644 --- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.config +package org.apache.pekko.config import java.util.concurrent.TimeUnit @@ -11,11 +11,12 @@ import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import org.scalatest.Assertions -import akka.actor.ActorSystem -import akka.actor.ExtendedActorSystem -import akka.event.DefaultLoggingFilter -import akka.event.Logging.DefaultLogger -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor.ActorSystem +import pekko.actor.ExtendedActorSystem +import pekko.event.DefaultLoggingFilter +import pekko.event.Logging.DefaultLogger +import pekko.testkit.AkkaSpec class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.findClassLoader())) with Assertions { @@ -36,11 +37,11 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin getBoolean("akka.actor.serialize-messages") should ===(false) settings.SerializeAllMessages should ===(false) - settings.NoSerializationVerificationNeededClassPrefix should ===(Set("akka.")) + settings.NoSerializationVerificationNeededClassPrefix should ===(Set("org.apache.pekko.")) getInt("akka.scheduler.ticks-per-wheel") should ===(512) getDuration("akka.scheduler.tick-duration", TimeUnit.MILLISECONDS) should ===(10L) - getString("akka.scheduler.implementation") should ===("akka.actor.LightArrayRevolverScheduler") + getString("akka.scheduler.implementation") should ===("org.apache.pekko.actor.LightArrayRevolverScheduler") getBoolean("akka.daemonic") should ===(false) settings.Daemonicity should ===(false) @@ -166,7 +167,7 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin { c.getInt("mailbox-capacity") should ===(1000) c.getDuration("mailbox-push-timeout-time", TimeUnit.MILLISECONDS) should ===(10 * 1000L) - c.getString("mailbox-type") should ===("akka.dispatch.UnboundedMailbox") + c.getString("mailbox-type") should ===("org.apache.pekko.dispatch.UnboundedMailbox") } } } diff --git a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala similarity index 89% rename from akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala index 86de84dd3b..6edbdaa70e 100644 --- a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dataflow +package org.apache.pekko.dataflow import scala.concurrent.Await import scala.concurrent.ExecutionContextExecutor @@ -12,10 +12,11 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.actor.{ Actor, Props } -import akka.actor.ActorRef -import akka.pattern.{ ask, pipe } -import akka.testkit.{ AkkaSpec, DefaultTimeout } +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.actor.ActorRef +import pekko.pattern.{ ask, pipe } +import pekko.testkit.{ AkkaSpec, DefaultTimeout } class Future2ActorSpec extends AkkaSpec with DefaultTimeout { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala similarity index 83% rename from akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala index fa23d30565..d0e9fc7496 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch -import akka.actor.{ Actor, Props } -import akka.testkit.{ AkkaSpec, DefaultTimeout } +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.testkit.{ AkkaSpec, DefaultTimeout } object ControlAwareDispatcherSpec { val config = """ unbounded-control-dispatcher { - mailbox-type = "akka.dispatch.UnboundedControlAwareMailbox" + mailbox-type = "org.apache.pekko.dispatch.UnboundedControlAwareMailbox" } bounded-control-dispatcher { - mailbox-type = "akka.dispatch.BoundedControlAwareMailbox" + mailbox-type = "org.apache.pekko.dispatch.BoundedControlAwareMailbox" } """ diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/DispatcherShutdownSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala similarity index 85% rename from akka-actor-tests/src/test/scala/akka/dispatch/DispatcherShutdownSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala index 3826c470cc..c6fbd55900 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/DispatcherShutdownSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.lang.management.ManagementFactory @@ -12,8 +12,9 @@ import scala.concurrent.duration._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.ActorSystem -import akka.testkit.TestKit +import org.apache.pekko +import pekko.actor.ActorSystem +import pekko.testkit.TestKit class DispatcherShutdownSpec extends AnyWordSpec with Matchers { @@ -36,7 +37,7 @@ class DispatcherShutdownSpec extends AnyWordSpec with Matchers { threadCount should be > 0 Await.ready(system.terminate(), 1.second) - Await.ready(Future(akka.Done)(system.dispatcher), 1.second) + Await.ready(Future(pekko.Done)(system.dispatcher), 1.second) TestKit.awaitCond(threadCount == 0, 3.second) } diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala similarity index 95% rename from akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala index ec140d906c..3f3548f725 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.util.concurrent.{ Executor, ExecutorService, Executors } import java.util.concurrent.atomic.AtomicInteger @@ -11,13 +11,14 @@ import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, ExecutionC import scala.concurrent.{ blocking, Await, Future, Promise } import scala.concurrent.duration._ -import akka.actor.Actor -import akka.actor.Props -import akka.testkit.{ AkkaSpec, DefaultTimeout, TestLatch } -import akka.testkit.CallingThreadDispatcher -import akka.testkit.TestActorRef -import akka.testkit.TestProbe -import akka.util.SerializedSuspendableExecutionContext +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.Props +import pekko.testkit.{ AkkaSpec, DefaultTimeout, TestLatch } +import pekko.testkit.CallingThreadDispatcher +import pekko.testkit.TestActorRef +import pekko.testkit.TestProbe +import pekko.util.SerializedSuspendableExecutionContext class ExecutionContextSpec extends AkkaSpec with DefaultTimeout { @@ -141,7 +142,7 @@ class ExecutionContextSpec extends AkkaSpec with DefaultTimeout { } "work with same-thread executor plus blocking" in { - val ec = akka.dispatch.ExecutionContexts.parasitic + val ec = pekko.dispatch.ExecutionContexts.parasitic var x = 0 ec.execute(new Runnable { override def run = { diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala similarity index 88% rename from akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala index 3419f2c318..718389f301 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import com.typesafe.config.ConfigFactory -import akka.actor.{ Actor, Props } -import akka.testkit.{ AkkaSpec, ImplicitSender } +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.testkit.{ AkkaSpec, ImplicitSender } object ForkJoinPoolStarvationSpec { val config = ConfigFactory.parseString(""" |actorhang { | task-dispatcher { - | mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox" + | mailbox-type = "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox" | throughput = 5 | fork-join-executor { | parallelism-factor = 2 diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala index a5a6a1182c..811ec611b5 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.util.concurrent.{ BlockingQueue, ConcurrentLinkedQueue } @@ -13,9 +13,10 @@ import com.typesafe.config.{ Config, ConfigFactory } import language.postfixOps import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } -import akka.actor._ -import akka.testkit.{ AkkaSpec, EventFilter } -import akka.util.unused +import org.apache.pekko +import pekko.actor._ +import pekko.testkit.{ AkkaSpec, EventFilter } +import pekko.util.unused abstract class MailboxSpec extends AkkaSpec with BeforeAndAfterAll with BeforeAndAfterEach { def name: String @@ -227,7 +228,7 @@ class ControlAwareMailboxSpec extends MailboxSpec { object CustomMailboxSpec { val config = """ my-dispatcher { - mailbox-type = "akka.dispatch.CustomMailboxSpec$MyMailboxType" + mailbox-type = "org.apache.pekko.dispatch.CustomMailboxSpec$MyMailboxType" } """ @@ -271,11 +272,11 @@ object SingleConsumerOnlyMailboxVerificationSpec { case object Ping val mailboxConf = ConfigFactory.parseString(""" test-unbounded-dispatcher { - mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox" throughput = 1 } test-bounded-dispatcher { - mailbox-type = "akka.dispatch.NonBlockingBoundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.NonBlockingBoundedMailbox" mailbox-capacity = 1 throughput = 1 }""") diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala similarity index 87% rename from akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala index 1f1b7f54b8..38fdc2428d 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import scala.concurrent.duration._ import com.typesafe.config.Config import language.postfixOps -import akka.actor.{ Actor, ActorSystem, Props } -import akka.testkit.{ AkkaSpec, DefaultTimeout } -import akka.util.unused +import org.apache.pekko +import pekko.actor.{ Actor, ActorSystem, Props } +import pekko.testkit.{ AkkaSpec, DefaultTimeout } +import pekko.util.unused object PriorityDispatcherSpec { @@ -19,10 +20,10 @@ object PriorityDispatcherSpec { val config = """ unbounded-prio-dispatcher { - mailbox-type = "akka.dispatch.PriorityDispatcherSpec$Unbounded" + mailbox-type = "org.apache.pekko.dispatch.PriorityDispatcherSpec$Unbounded" } bounded-prio-dispatcher { - mailbox-type = "akka.dispatch.PriorityDispatcherSpec$Bounded" + mailbox-type = "org.apache.pekko.dispatch.PriorityDispatcherSpec$Bounded" } """ diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/SameThreadExecutionContextSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala similarity index 86% rename from akka-actor-tests/src/test/scala/akka/dispatch/SameThreadExecutionContextSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala index 5dec778d10..14221f607b 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/SameThreadExecutionContextSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import scala.concurrent.ExecutionContext import scala.concurrent.Promise import org.scalatest.matchers.should.Matchers -import akka.Done -import akka.dispatch.internal.SameThreadExecutionContext -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.Done +import pekko.dispatch.internal.SameThreadExecutionContext +import pekko.testkit.AkkaSpec class SameThreadExecutionContextSpec extends AkkaSpec with Matchers { @@ -20,7 +21,7 @@ class SameThreadExecutionContextSpec extends AkkaSpec with Matchers { "return a Scala specific version" in { val ec = SameThreadExecutionContext() if (util.Properties.versionNumberString.startsWith("2.12")) { - ec.getClass.getName should startWith("akka.dispatch.internal.SameThreadExecutionContext") + ec.getClass.getName should startWith("org.apache.pekko.dispatch.internal.SameThreadExecutionContext") } else { // in 2.13 and higher parasitic is available ec.getClass.getName should ===("scala.concurrent.ExecutionContext$parasitic$") diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala similarity index 90% rename from akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala index 52615a6b0c..7a40e9c14a 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala @@ -2,26 +2,27 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import scala.concurrent.duration._ import com.typesafe.config.Config import language.postfixOps -import akka.actor.{ Actor, ActorSystem, Props } -import akka.testkit.{ AkkaSpec, DefaultTimeout } -import akka.util.unused +import org.apache.pekko +import pekko.actor.{ Actor, ActorSystem, Props } +import pekko.testkit.{ AkkaSpec, DefaultTimeout } +import pekko.util.unused object StablePriorityDispatcherSpec { case object Result val config = """ unbounded-stable-prio-dispatcher { - mailbox-type = "akka.dispatch.StablePriorityDispatcherSpec$Unbounded" + mailbox-type = "org.apache.pekko.dispatch.StablePriorityDispatcherSpec$Unbounded" } bounded-stable-prio-dispatcher { - mailbox-type = "akka.dispatch.StablePriorityDispatcherSpec$Bounded" + mailbox-type = "org.apache.pekko.dispatch.StablePriorityDispatcherSpec$Bounded" } """ diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/sysmsg/SystemMessageListSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/dispatch/sysmsg/SystemMessageListSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala index e7d6c516f7..b8f515e98f 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/sysmsg/SystemMessageListSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala @@ -2,10 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch.sysmsg +package org.apache.pekko.dispatch.sysmsg -import akka.actor.Props -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor.Props +import pekko.testkit.AkkaSpec class SystemMessageListSpec extends AkkaSpec { import SystemMessageList.ENil diff --git a/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala similarity index 87% rename from akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala index d38340b54d..7d259aa2e7 100644 --- a/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import scala.concurrent.duration._ -import akka.actor.Actor -import akka.actor.ActorRef -import akka.actor.ActorSystem -import akka.actor.Props -import akka.testkit._ +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.ActorRef +import pekko.actor.ActorSystem +import pekko.actor.Props +import pekko.testkit._ object AddressTerminatedTopicBenchSpec { diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala index fb3434a164..8cd39e47f8 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.BeforeAndAfterEach -import akka.actor.{ Actor, ActorRef, ActorSystem, PoisonPill, Props } -import akka.japi.Procedure -import akka.testkit._ +import org.apache.pekko +import pekko.actor.{ Actor, ActorRef, ActorSystem, PoisonPill, Props } +import pekko.japi.Procedure +import pekko.testkit._ object EventBusSpec { class TestActorWrapperActor(testActor: ActorRef) extends Actor { @@ -168,7 +169,7 @@ object ActorEventBusSpec { class ActorEventBusSpec(conf: Config) extends EventBusSpec("ActorEventBus", conf) { import EventBusSpec.TestActorWrapperActor - import akka.event.ActorEventBusSpec._ + import org.apache.pekko.event.ActorEventBusSpec._ def this() = this(ConfigFactory.parseString("akka.actor.debug.event-stream = on").withFallback(AkkaSpec.testConf)) @@ -293,7 +294,7 @@ object ScanningEventBusSpec { type Classifier = String protected def compareClassifiers(a: Classifier, b: Classifier): Int = a.compareTo(b) - protected def compareSubscribers(a: Subscriber, b: Subscriber): Int = akka.util.Helpers.compareIdentityHash(a, b) + protected def compareSubscribers(a: Subscriber, b: Subscriber): Int = pekko.util.Helpers.compareIdentityHash(a, b) protected def matches(classifier: Classifier, event: Event): Boolean = event.toString == classifier @@ -325,7 +326,7 @@ object LookupEventBusSpec { override protected def classify(event: Int): String = event.toString override protected def compareSubscribers(a: Procedure[Int], b: Procedure[Int]): Int = - akka.util.Helpers.compareIdentityHash(a, b) + pekko.util.Helpers.compareIdentityHash(a, b) override protected def mapSize() = 32 override protected def publish(event: Int, subscriber: Procedure[Int]): Unit = subscriber(event) diff --git a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala index 5cac228b3e..ad0f48e1eb 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory -import akka.actor._ -import akka.testkit.{ AkkaSpec, TestProbe } +import org.apache.pekko +import pekko.actor._ +import pekko.testkit.{ AkkaSpec, TestProbe } object EventStreamSpec { @@ -17,7 +18,7 @@ object EventStreamSpec { akka { stdout-loglevel = WARNING loglevel = INFO - loggers = ["akka.event.EventStreamSpec$MyLog", "%s"] + loggers = ["org.apache.pekko.event.EventStreamSpec$MyLog", "%s"] } """.format(Logging.StandardOutLogger.getClass.getName)) @@ -397,7 +398,7 @@ class EventStreamSpec extends AkkaSpec(EventStreamSpec.config) { fishForDebugMessage(a1, s"watching ${a2.ref}") // the unsubscriber "starts to watch" each time, as watching is idempotent es.unsubscribe(a2.ref, classOf[A]) should equal(true) - fishForDebugMessage(a1, s"unsubscribing ${a2.ref} from channel class akka.event.EventStreamSpec$$A") + fishForDebugMessage(a1, s"unsubscribing ${a2.ref} from channel class org.apache.pekko.event.EventStreamSpec$$A") a1.expectNoMessage(1.second) es.unsubscribe(a2.ref, classOf[T]) should equal(true) @@ -406,7 +407,8 @@ class EventStreamSpec extends AkkaSpec(EventStreamSpec.config) { case Logging.Debug(_, _, msg: String) => msg } debugLogEntries.exists( - _.startsWith(s"unsubscribing ${a2.ref} from channel interface akka.event.EventStreamSpec$$T")) should ===( + _.startsWith( + s"unsubscribing ${a2.ref} from channel interface org.apache.pekko.event.EventStreamSpec$$T")) should ===( true) debugLogEntries.exists(_.startsWith(s"unwatching ${a2.ref}, since has no subscriptions")) should ===(true) a1.expectNoMessage(1.second) diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala index 054307318b..de751ae33f 100644 --- a/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import java.nio.charset.StandardCharsets import java.text.SimpleDateFormat @@ -17,13 +17,14 @@ import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor._ -import akka.event.Logging._ -import akka.event.Logging.InitializeLogger -import akka.event.Logging.Warning -import akka.serialization.SerializationExtension -import akka.testkit._ -import akka.util.Helpers +import org.apache.pekko +import pekko.actor._ +import pekko.event.Logging._ +import pekko.event.Logging.InitializeLogger +import pekko.event.Logging.Warning +import pekko.serialization.SerializationExtension +import pekko.testkit._ +import pekko.util.Helpers object LoggerSpec { @@ -31,7 +32,7 @@ object LoggerSpec { akka { stdout-loglevel = "WARNING" loglevel = "DEBUG" # test verifies debug - loggers = ["akka.event.LoggerSpec$TestLogger1"] + loggers = ["org.apache.pekko.event.LoggerSpec$TestLogger1"] } """).withFallback(AkkaSpec.testConf) @@ -39,7 +40,7 @@ object LoggerSpec { akka { stdout-loglevel = "ERROR" loglevel = "ERROR" - loggers = ["akka.event.LoggerSpec$SlowLogger"] + loggers = ["org.apache.pekko.event.LoggerSpec$SlowLogger"] } """).withFallback(AkkaSpec.testConf) @@ -47,7 +48,7 @@ object LoggerSpec { akka { stdout-loglevel = "OFF" loglevel = "OFF" - loggers = ["akka.event.LoggerSpec$TestLogger1"] + loggers = ["org.apache.pekko.event.LoggerSpec$TestLogger1"] } """).withFallback(AkkaSpec.testConf) @@ -56,7 +57,7 @@ object LoggerSpec { akka { stdout-loglevel = "OFF" loglevel = "WARNING" - loggers = ["akka.event.LoggerSpec$TestLogger1", "akka.event.LoggerSpec$TestLogger2"] + loggers = ["org.apache.pekko.event.LoggerSpec$TestLogger1", "org.apache.pekko.event.LoggerSpec$TestLogger2"] } """).withFallback(AkkaSpec.testConf) @@ -64,12 +65,12 @@ object LoggerSpec { akka { stdout-loglevel = "WARNING" loglevel = "DEBUG" # test verifies debug - loggers = ["akka.event.LoggerSpec$$TestLogger1"] + loggers = ["org.apache.pekko.event.LoggerSpec$$TestLogger1"] actor { serialize-messages = on no-serialization-verification-needed-class-prefix = [] serialization-bindings { - "akka.event.Logging$$LogEvent" = bytes + "org.apache.pekko.event.Logging$$LogEvent" = bytes "java.io.Serializable" = java } } @@ -80,7 +81,7 @@ object LoggerSpec { akka { stdout-loglevel = "WARNING" loglevel = "WARNING" - loggers = ["akka.event.LoggerSpec$TestLogger1"] + loggers = ["org.apache.pekko.event.LoggerSpec$TestLogger1"] } """).withFallback(AkkaSpec.testConf) diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala index f62b277cb3..999a3c9a06 100644 --- a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import scala.annotation.tailrec import scala.concurrent.duration._ @@ -12,9 +12,10 @@ import language.postfixOps import org.scalatest.BeforeAndAfterAll import org.scalatest.wordspec.AnyWordSpec -import akka.actor._ -import akka.testkit._ -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.actor._ +import pekko.testkit._ +import pekko.util.ccompat.JavaConverters._ object LoggingReceiveSpec { class TestLogActor extends Actor { diff --git a/akka-actor-tests/src/test/scala/akka/event/MarkerLoggingSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala similarity index 91% rename from akka-actor-tests/src/test/scala/akka/event/MarkerLoggingSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala index 81d4b21f02..d7830e18b6 100644 --- a/akka-actor-tests/src/test/scala/akka/event/MarkerLoggingSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala @@ -2,10 +2,11 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event -import akka.event.Logging._ -import akka.testkit._ +import org.apache.pekko +import pekko.event.Logging._ +import pekko.testkit._ class MarkerLoggingSpec extends AkkaSpec with ImplicitSender { "A MarkerLoggerAdapter" should { diff --git a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/event/jul/JavaLoggerSpec.scala similarity index 89% rename from akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/event/jul/JavaLoggerSpec.scala index 3c9c2be932..4c42a31a14 100644 --- a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/event/jul/JavaLoggerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event.jul +package org.apache.pekko.event.jul import java.util.logging @@ -10,8 +10,9 @@ import scala.util.control.NoStackTrace import com.typesafe.config.ConfigFactory -import akka.actor.{ Actor, ActorLogging, Props } -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor.{ Actor, ActorLogging, Props } +import pekko.testkit.AkkaSpec @deprecated("Use SLF4J instead.", "2.6.0") object JavaLoggerSpec { @@ -19,8 +20,8 @@ object JavaLoggerSpec { val config = ConfigFactory.parseString(""" akka { loglevel = INFO - loggers = ["akka.event.jul.JavaLogger"] - logging-filter = "akka.event.jul.JavaLoggingFilter" + loggers = ["org.apache.pekko.event.jul.JavaLogger"] + logging-filter = "org.apache.pekko.event.jul.JavaLoggingFilter" }""") class LogProducer extends Actor with ActorLogging { diff --git a/akka-actor-tests/src/test/scala/akka/io/CapacityLimitSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala similarity index 89% rename from akka-actor-tests/src/test/scala/akka/io/CapacityLimitSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala index 38e9e72223..0c29aeebe6 100644 --- a/akka-actor-tests/src/test/scala/akka/io/CapacityLimitSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala @@ -2,12 +2,13 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.io +package org.apache.pekko.io import Tcp._ -import akka.testkit.{ AkkaSpec, TestProbe } -import akka.testkit.SocketUtil.temporaryServerAddresses +import org.apache.pekko +import pekko.testkit.{ AkkaSpec, TestProbe } +import pekko.testkit.SocketUtil.temporaryServerAddresses class CapacityLimitSpec extends AkkaSpec(""" akka.loglevel = ERROR diff --git a/akka-actor-tests/src/test/scala/akka/io/InetAddressDnsResolverSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/InetAddressDnsResolverSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/io/InetAddressDnsResolverSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/InetAddressDnsResolverSpec.scala index 2b305f7f99..cd85691835 100644 --- a/akka-actor-tests/src/test/scala/akka/io/InetAddressDnsResolverSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/InetAddressDnsResolverSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.io +package org.apache.pekko.io import java.security.Security import java.util.concurrent.TimeUnit import scala.annotation.nowarn -import akka.actor.Props -import akka.testkit.{ AkkaSpec, TestActorRef } +import org.apache.pekko +import pekko.actor.Props +import pekko.testkit.{ AkkaSpec, TestActorRef } @nowarn class InetAddressDnsResolverSpec extends AkkaSpec(""" diff --git a/akka-actor-tests/src/test/scala/akka/io/SimpleDnsCacheSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala similarity index 92% rename from akka-actor-tests/src/test/scala/akka/io/SimpleDnsCacheSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala index 4187970dce..7405208e61 100644 --- a/akka-actor-tests/src/test/scala/akka/io/SimpleDnsCacheSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io +package org.apache.pekko.io import java.net.InetAddress import java.util.concurrent.atomic.AtomicLong @@ -13,10 +13,11 @@ import scala.concurrent.duration._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.io.dns.ARecord -import akka.io.dns.CachePolicy.Ttl -import akka.io.dns.DnsProtocol -import akka.io.dns.DnsProtocol.Ip +import org.apache.pekko +import pekko.io.dns.ARecord +import pekko.io.dns.CachePolicy.Ttl +import pekko.io.dns.DnsProtocol +import pekko.io.dns.DnsProtocol.Ip class SimpleDnsCacheSpec extends AnyWordSpec with Matchers { "Cache" should { diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala index c92285bd1b..c9482c3732 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.io +package org.apache.pekko.io import java.io.IOException import java.net.{ InetSocketAddress, ServerSocket } @@ -24,14 +24,15 @@ import com.google.common.jimfs.{ Configuration, Jimfs } import com.typesafe.config.ConfigFactory import org.scalatest.matchers._ -import akka.actor._ -import akka.io.Inet.SocketOption -import akka.io.SelectionHandler._ -import akka.io.Tcp._ -import akka.testkit.{ AkkaSpec, EventFilter, SocketUtil, TestActorRef, TestProbe } -import akka.testkit.SocketUtil.temporaryServerAddress -import akka.testkit.WithLogCapturing -import akka.util.{ ByteString, Helpers } +import org.apache.pekko +import pekko.actor._ +import pekko.io.Inet.SocketOption +import pekko.io.SelectionHandler._ +import pekko.io.Tcp._ +import pekko.testkit.{ AkkaSpec, EventFilter, SocketUtil, TestActorRef, TestProbe } +import pekko.testkit.SocketUtil.temporaryServerAddress +import pekko.testkit.WithLogCapturing +import pekko.util.{ ByteString, Helpers } object TcpConnectionSpec { case class Ack(i: Int) extends Event @@ -41,7 +42,7 @@ object TcpConnectionSpec { class TcpConnectionSpec extends AkkaSpec(""" akka.loglevel = DEBUG - akka.loggers = ["akka.testkit.SilenceAllTestEventListener"] + akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"] akka.io.tcp.trace-logging = on akka.io.tcp.register-timeout = 500ms """) with WithLogCapturing { thisSpecs => diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala index 2e988e8164..6b0f7dcf15 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.io +package org.apache.pekko.io import java.io.IOException import java.net.{ InetSocketAddress, ServerSocket } @@ -12,15 +12,16 @@ import scala.language.postfixOps import org.scalatest.concurrent.TimeLimits -import akka.actor.{ ActorRef, PoisonPill } -import akka.io.Tcp._ -import akka.testkit.{ AkkaSpec, TestProbe } -import akka.testkit.WithLogCapturing -import akka.util.ByteString +import org.apache.pekko +import pekko.actor.{ ActorRef, PoisonPill } +import pekko.io.Tcp._ +import pekko.testkit.{ AkkaSpec, TestProbe } +import pekko.testkit.WithLogCapturing +import pekko.util.ByteString class TcpIntegrationSpec extends AkkaSpec(""" akka.loglevel = debug - akka.loggers = ["akka.testkit.SilenceAllTestEventListener"] + akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"] akka.io.tcp.trace-logging = on """) with TcpIntegrationSpecSupport with TimeLimits with WithLogCapturing { diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala similarity index 89% rename from akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala index 436d1b9353..6efa7b3a8a 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.io +package org.apache.pekko.io import scala.annotation.tailrec import scala.collection.immutable import Tcp._ -import akka.actor.ActorRef -import akka.actor.ActorSystem -import akka.dispatch.ExecutionContexts -import akka.io.Inet.SocketOption -import akka.testkit.{ AkkaSpec, TestProbe } -import akka.testkit.SocketUtil.temporaryServerAddress +import org.apache.pekko +import pekko.actor.ActorRef +import pekko.actor.ActorSystem +import pekko.dispatch.ExecutionContexts +import pekko.io.Inet.SocketOption +import pekko.testkit.{ AkkaSpec, TestProbe } +import pekko.testkit.SocketUtil.temporaryServerAddress trait TcpIntegrationSpecSupport { this: AkkaSpec => diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala index a25dd0352d..03912f1307 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.io +package org.apache.pekko.io import java.net.Socket import java.nio.channels.{ SelectableChannel, SocketChannel } @@ -12,12 +12,13 @@ import scala.concurrent.duration._ import Tcp._ -import akka.actor._ -import akka.io.SelectionHandler._ -import akka.io.TcpListener.{ FailedRegisterIncoming, RegisterIncoming } -import akka.io.TcpListenerSpec.RegisterChannel -import akka.testkit.{ AkkaSpec, EventFilter, TestActorRef, TestProbe } -import akka.testkit.SocketUtil +import org.apache.pekko +import pekko.actor._ +import pekko.io.SelectionHandler._ +import pekko.io.TcpListener.{ FailedRegisterIncoming, RegisterIncoming } +import pekko.io.TcpListenerSpec.RegisterChannel +import pekko.testkit.{ AkkaSpec, EventFilter, TestActorRef, TestProbe } +import pekko.testkit.SocketUtil class TcpListenerSpec extends AkkaSpec(""" akka.io.tcp.batch-accept-limit = 2 diff --git a/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala similarity index 93% rename from akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala index ff0fd29de7..0c432e5ad1 100644 --- a/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.io +package org.apache.pekko.io import java.net.InetSocketAddress import scala.concurrent.duration._ -import akka.actor.ActorRef -import akka.testkit.AkkaSpec -import akka.testkit.ImplicitSender -import akka.testkit.SocketUtil.temporaryServerAddresses -import akka.testkit.TestProbe -import akka.testkit.WithLogCapturing -import akka.util.ByteString +import org.apache.pekko +import pekko.actor.ActorRef +import pekko.testkit.AkkaSpec +import pekko.testkit.ImplicitSender +import pekko.testkit.SocketUtil.temporaryServerAddresses +import pekko.testkit.TestProbe +import pekko.testkit.WithLogCapturing +import pekko.util.ByteString class UdpConnectedIntegrationSpec extends AkkaSpec(""" akka.loglevel = DEBUG @@ -24,7 +25,7 @@ class UdpConnectedIntegrationSpec extends AkkaSpec(""" # issues with dns resolution of non existent host hanging with the # Java native host resolution akka.io.dns.resolver = async-dns - akka.loggers = ["akka.testkit.SilenceAllTestEventListener"] + akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"] """) with ImplicitSender with WithLogCapturing { val addresses = temporaryServerAddresses(5, udp = true) diff --git a/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala index ce3192e269..d97050433f 100644 --- a/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.io +package org.apache.pekko.io import java.net.DatagramSocket import java.net.InetSocketAddress -import akka.actor.ActorRef -import akka.io.Inet._ -import akka.io.Udp._ -import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } -import akka.testkit.SocketUtil.temporaryServerAddresses -import akka.util.ByteString +import org.apache.pekko +import pekko.actor.ActorRef +import pekko.io.Inet._ +import pekko.io.Udp._ +import pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe } +import pekko.testkit.SocketUtil.temporaryServerAddresses +import pekko.util.ByteString class UdpIntegrationSpec extends AkkaSpec(""" akka.loglevel = INFO diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala similarity index 95% rename from akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala index 0e3b844020..95baa5f2db 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns +package org.apache.pekko.io.dns import java.net.InetAddress @@ -13,13 +13,14 @@ import org.scalatest.time.Millis import org.scalatest.time.Span import CachePolicy.Ttl -import akka.io.{ Dns, IO } -import akka.io.dns.DnsProtocol.{ Ip, RequestType, Srv } -import akka.pattern.ask -import akka.testkit.SocketUtil -import akka.testkit.SocketUtil.Both -import akka.testkit.WithLogCapturing -import akka.util.Timeout +import org.apache.pekko +import pekko.io.{ Dns, IO } +import pekko.io.dns.DnsProtocol.{ Ip, RequestType, Srv } +import pekko.pattern.ask +import pekko.testkit.SocketUtil +import pekko.testkit.SocketUtil.Both +import pekko.testkit.WithLogCapturing +import pekko.util.Timeout /** * These tests rely on a DNS server with 2 zones configured, foo.test and bar.example. @@ -33,7 +34,7 @@ object AsyncDnsResolverIntegrationSpec { implicit val defaultTimeout: Timeout = Timeout(10.seconds) def conf = ConfigFactory.parseString(s""" akka.loglevel = DEBUG - akka.loggers = ["akka.testkit.SilenceAllTestEventListener"] + akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"] akka.io.dns.resolver = async-dns akka.io.dns.async-dns.nameservers = ["localhost:${dockerDnsServerPort}"] akka.io.dns.async-dns.search-domains = ["foo.test", "test"] diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/DnsSettingsSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/io/dns/DnsSettingsSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala index b50e3854f0..cf14275d08 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/DnsSettingsSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns +package org.apache.pekko.io.dns import java.net.InetAddress @@ -10,8 +10,9 @@ import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory -import akka.actor.ExtendedActorSystem -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor.ExtendedActorSystem +import pekko.testkit.AkkaSpec class DnsSettingsSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala similarity index 95% rename from akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala index 56f2a5146a..eb725fba0d 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns +package org.apache.pekko.io.dns import scala.concurrent.duration._ import scala.util.Try @@ -14,8 +14,9 @@ import com.spotify.docker.client.DockerClient.{ ListContainersParam, LogsParam } import com.spotify.docker.client.messages.{ ContainerConfig, HostConfig, PortBinding } import org.scalatest.concurrent.Eventually -import akka.testkit.AkkaSpec -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.testkit.AkkaSpec +import pekko.util.ccompat.JavaConverters._ abstract class DockerBindDnsService(config: Config) extends AkkaSpec(config) with Eventually { val client = DefaultDockerClient.fromEnv().build() diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/NameserverAddressParserSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/NameserverAddressParserSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/io/dns/NameserverAddressParserSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/NameserverAddressParserSpec.scala index 35bb5f9294..c4e4367a2f 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/NameserverAddressParserSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/NameserverAddressParserSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns +package org.apache.pekko.io.dns import java.net.InetSocketAddress diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala similarity index 58% rename from akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala index e9e13da969..d49c4947e5 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns.internal +package org.apache.pekko.io.dns.internal import java.net.InetAddress @@ -10,18 +10,19 @@ import scala.collection.immutable.Seq import scala.annotation.nowarn -import akka.io.Dns -import akka.io.dns.AAAARecord -import akka.io.dns.CachePolicy.Ttl -import akka.io.dns.DnsProtocol.{ Resolve, Resolved } -import akka.testkit.{ AkkaSpec, ImplicitSender } -import akka.testkit.WithLogCapturing +import org.apache.pekko +import pekko.io.Dns +import pekko.io.dns.AAAARecord +import pekko.io.dns.CachePolicy.Ttl +import pekko.io.dns.DnsProtocol.{ Resolve, Resolved } +import pekko.testkit.{ AkkaSpec, ImplicitSender } +import pekko.testkit.WithLogCapturing // tests deprecated DNS API @nowarn("msg=deprecated") class AsyncDnsManagerSpec extends AkkaSpec(""" akka.loglevel = DEBUG - akka.loggers = ["akka.testkit.SilenceAllTestEventListener"] + akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"] akka.io.dns.resolver = async-dns akka.io.dns.async-dns.nameservers = default """) with ImplicitSender with WithLogCapturing { @@ -30,8 +31,8 @@ class AsyncDnsManagerSpec extends AkkaSpec(""" "Async DNS Manager" must { "adapt reply back to old protocol when old protocol Dns.Resolve is received" in { - dns ! akka.io.Dns.Resolve("127.0.0.1") // 127.0.0.1 will short circuit the resolution - val oldProtocolReply = akka.io.Dns.Resolved("127.0.0.1", InetAddress.getByName("127.0.0.1") :: Nil) + dns ! pekko.io.Dns.Resolve("127.0.0.1") // 127.0.0.1 will short circuit the resolution + val oldProtocolReply = pekko.io.Dns.Resolved("127.0.0.1", InetAddress.getByName("127.0.0.1") :: Nil) expectMsg(oldProtocolReply) } @@ -44,15 +45,15 @@ class AsyncDnsManagerSpec extends AkkaSpec(""" } "support ipv6 also using the old protocol" in { - dns ! akka.io.Dns.Resolve("::1") // ::1 will short circuit the resolution - val resolved = expectMsgType[akka.io.Dns.Resolved] + dns ! pekko.io.Dns.Resolve("::1") // ::1 will short circuit the resolution + val resolved = expectMsgType[pekko.io.Dns.Resolved] resolved.ipv4 should be(Nil) resolved.ipv6.length should be(1) } "provide access to cache" in { dns ! AsyncDnsManager.GetCache - ((expectMsgType[akka.io.SimpleDnsCache]: akka.io.SimpleDnsCache) should be).theSameInstanceAs(Dns(system).cache) + ((expectMsgType[pekko.io.SimpleDnsCache]: pekko.io.SimpleDnsCache) should be).theSameInstanceAs(Dns(system).cache) } } diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala similarity index 93% rename from akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala index e3649a0415..5d3e3f3e1c 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns.internal +package org.apache.pekko.io.dns.internal import java.net.{ Inet6Address, InetAddress } @@ -11,19 +11,20 @@ import scala.concurrent.duration._ import com.typesafe.config.{ Config, ConfigFactory, ConfigValueFactory } -import akka.actor.{ ActorRef, ExtendedActorSystem, Props } -import akka.actor.Status.Failure -import akka.io.SimpleDnsCache -import akka.io.dns.{ AAAARecord, ARecord, DnsSettings, SRVRecord } -import akka.io.dns.CachePolicy.Ttl -import akka.io.dns.DnsProtocol._ -import akka.io.dns.internal.AsyncDnsResolver.ResolveFailedException -import akka.io.dns.internal.DnsClient.{ Answer, Question4, Question6, SrvQuestion } -import akka.testkit.{ AkkaSpec, TestProbe, WithLogCapturing } +import org.apache.pekko +import pekko.actor.{ ActorRef, ExtendedActorSystem, Props } +import pekko.actor.Status.Failure +import pekko.io.SimpleDnsCache +import pekko.io.dns.{ AAAARecord, ARecord, DnsSettings, SRVRecord } +import pekko.io.dns.CachePolicy.Ttl +import pekko.io.dns.DnsProtocol._ +import pekko.io.dns.internal.AsyncDnsResolver.ResolveFailedException +import pekko.io.dns.internal.DnsClient.{ Answer, Question4, Question6, SrvQuestion } +import pekko.testkit.{ AkkaSpec, TestProbe, WithLogCapturing } class AsyncDnsResolverSpec extends AkkaSpec(""" akka.loglevel = DEBUG - akka.loggers = ["akka.testkit.SilenceAllTestEventListener"] + akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"] """) with WithLogCapturing { val defaultConfig = ConfigFactory.parseString(""" diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala similarity index 89% rename from akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala index 423f9675fd..cc7fe70921 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns.internal +package org.apache.pekko.io.dns.internal import java.net.InetSocketAddress import java.util.concurrent.atomic.AtomicBoolean import scala.collection.immutable.Seq -import akka.actor.Props -import akka.io.Udp -import akka.io.dns.{ RecordClass, RecordType } -import akka.io.dns.internal.DnsClient.{ Answer, Question4 } -import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } +import org.apache.pekko +import pekko.actor.Props +import pekko.io.Udp +import pekko.io.dns.{ RecordClass, RecordType } +import pekko.io.dns.internal.DnsClient.{ Answer, Question4 } +import pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe } class DnsClientSpec extends AkkaSpec with ImplicitSender { "The async DNS client" should { diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/MessageSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala similarity index 85% rename from akka-actor-tests/src/test/scala/akka/io/dns/internal/MessageSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala index 2aa47377fb..718bbfda30 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/MessageSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala @@ -2,13 +2,14 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns.internal +package org.apache.pekko.io.dns.internal import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.io.dns.{ RecordClass, RecordType } -import akka.util.ByteString +import org.apache.pekko +import pekko.io.dns.{ RecordClass, RecordType } +import pekko.util.ByteString class MessageSpec extends AnyWordSpec with Matchers { "The Message" should { diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/ResolvConfParserSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/ResolvConfParserSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/io/dns/internal/ResolvConfParserSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/ResolvConfParserSpec.scala index 0d016175a6..06c8b4cf13 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/ResolvConfParserSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/ResolvConfParserSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns.internal +package org.apache.pekko.io.dns.internal import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala similarity index 91% rename from akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala index cc8dfcc34f..4694a2e37d 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.io.dns.internal +package org.apache.pekko.io.dns.internal import java.net.InetSocketAddress import scala.collection.immutable.Seq -import akka.actor.Props -import akka.io.Tcp -import akka.io.Tcp.{ Connected, PeerClosed, Register } -import akka.io.dns.{ RecordClass, RecordType } -import akka.io.dns.internal.DnsClient.Answer -import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } +import org.apache.pekko +import pekko.actor.Props +import pekko.io.Tcp +import pekko.io.Tcp.{ Connected, PeerClosed, Register } +import pekko.io.dns.{ RecordClass, RecordType } +import pekko.io.dns.internal.DnsClient.Answer +import pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe } class TcpDnsClientSpec extends AkkaSpec with ImplicitSender { import TcpDnsClient._ diff --git a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala index 8eca542fc4..1f9c66549e 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import scala.concurrent.Await import scala.concurrent.duration._ @@ -11,15 +11,16 @@ import scala.annotation.nowarn import language.postfixOps -import akka.actor._ -import akka.testkit.{ AkkaSpec, TestProbe } -import akka.testkit.WithLogCapturing -import akka.util.Timeout +import org.apache.pekko +import pekko.actor._ +import pekko.testkit.{ AkkaSpec, TestProbe } +import pekko.testkit.WithLogCapturing +import pekko.util.Timeout @nowarn class AskSpec extends AkkaSpec(""" akka.loglevel = DEBUG - akka.loggers = ["akka.testkit.SilenceAllTestEventListener"] + akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"] """) with WithLogCapturing { "The “ask” pattern" must { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala index 1edf230500..b7d3aba18a 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import java.util.concurrent.{ CountDownLatch, TimeUnit } @@ -11,10 +11,11 @@ import scala.language.postfixOps import scala.annotation.nowarn -import akka.actor._ -import akka.pattern.TestActor.NormalException -import akka.testkit.{ filterException, AkkaSpec, ImplicitSender, TestProbe } -import akka.testkit.WithLogCapturing +import org.apache.pekko +import pekko.actor._ +import pekko.pattern.TestActor.NormalException +import pekko.testkit.{ filterException, AkkaSpec, ImplicitSender, TestProbe } +import pekko.testkit.WithLogCapturing object TestActor { @@ -55,7 +56,7 @@ class TestParentActor(probe: ActorRef, supervisorProps: Props) extends Actor { class BackoffOnRestartSupervisorSpec extends AkkaSpec(""" akka.loglevel = DEBUG - akka.loggers = ["akka.testkit.SilenceAllTestEventListener"] + akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"] """) with WithLogCapturing with ImplicitSender { def supervisorProps(probeRef: ActorRef) = { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala index f3f0026036..2a000abc0d 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import scala.concurrent.duration._ import scala.util.control.NoStackTrace @@ -10,8 +10,9 @@ import scala.util.control.NoStackTrace import org.scalatest.concurrent.Eventually import org.scalatest.prop.TableDrivenPropertyChecks._ -import akka.actor._ -import akka.testkit._ +import org.apache.pekko +import pekko.actor._ +import pekko.testkit._ object BackoffSupervisorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala index ac0b67e822..66bda8cf3f 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala @@ -2,14 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import scala.collection.immutable import scala.concurrent.{ Await, Future } import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration._ -import akka.testkit._ +import org.apache.pekko.testkit._ class CircuitBreakerMTSpec extends AkkaSpec { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala index 9a30642c30..01207e23d1 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import scala.concurrent.Await import scala.concurrent.ExecutionContext @@ -14,8 +14,9 @@ import scala.language.postfixOps import scala.util.Failure import scala.util.Success import scala.util.Try -import akka.actor.{ ActorSystem, ExtendedActorSystem } -import akka.testkit._ +import org.apache.pekko +import pekko.actor.{ ActorSystem, ExtendedActorSystem } +import pekko.testkit._ object CircuitBreakerSpec { @@ -89,7 +90,7 @@ class CircuitBreakerSpec extends AkkaSpec(""" call-timeout = 100 ms reset-timeout = 200 ms exception-allowlist = [ - "akka.pattern.CircuitBreakerSpec$AllowException" + "org.apache.pekko.pattern.CircuitBreakerSpec$AllowException" ] } } diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala similarity index 90% rename from akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala index 9c915d8ea9..e8f89eeefb 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.TimeoutException @@ -10,12 +10,13 @@ import java.util.concurrent.TimeoutException import scala.concurrent.Promise import scala.concurrent.duration._ -import akka.actor.Actor -import akka.actor.ActorLogging -import akka.actor.Props -import akka.actor.Status.Failure -import akka.testkit.AkkaSpec -import akka.testkit.ImplicitSender +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.ActorLogging +import pekko.actor.Props +import pekko.actor.Status.Failure +import pekko.testkit.AkkaSpec +import pekko.testkit.ImplicitSender object CircuitBreakerStressSpec { case object JobDone diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala similarity index 85% rename from akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala index e57c1eb9fe..e944eadafc 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import scala.concurrent.{ Await, Future, Promise } import scala.concurrent.ExecutionContextExecutor @@ -10,8 +10,9 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.actor.{ Actor, Props } -import akka.testkit.{ AkkaSpec, TestLatch } +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.testkit.{ AkkaSpec, TestLatch } object PatternSpec { final case class Work(duration: Duration) @@ -53,7 +54,7 @@ class PatternSpec extends AkkaSpec { "pattern.after" must { "be completed successfully eventually" in { // TODO after is unfortunately shadowed by ScalaTest, fix as part of #3759 - val f = akka.pattern.after(1 second, using = system.scheduler)(Future.successful(5)) + val f = pekko.pattern.after(1 second, using = system.scheduler)(Future.successful(5)) val r = Future.firstCompletedOf(Seq(Promise[Int]().future, f)) Await.result(r, remainingOrDefault) should ===(5) @@ -61,7 +62,8 @@ class PatternSpec extends AkkaSpec { "be completed abnormally eventually" in { // TODO after is unfortunately shadowed by ScalaTest, fix as part of #3759 - val f = akka.pattern.after(1 second, using = system.scheduler)(Future.failed(new IllegalStateException("Mexico"))) + val f = + pekko.pattern.after(1 second, using = system.scheduler)(Future.failed(new IllegalStateException("Mexico"))) val r = Future.firstCompletedOf(Seq(Promise[Int]().future, f)) intercept[IllegalStateException] { Await.result(r, remainingOrDefault) }.getMessage should ===("Mexico") diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PipeToSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala similarity index 93% rename from akka-actor-tests/src/test/scala/akka/pattern/PipeToSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala index 1ccc98ffef..19d48ceade 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PipeToSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import scala.concurrent.Future -import akka.actor.Status -import akka.testkit.AkkaSpec -import akka.testkit.TestProbe +import org.apache.pekko +import pekko.actor.Status +import pekko.testkit.AkkaSpec +import pekko.testkit.TestProbe class PipeToSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala similarity index 91% rename from akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala index 58ab8f1e24..f0dda848e5 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import scala.concurrent.{ Await, Promise } import scala.concurrent.duration._ -import akka.actor._ -import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } +import org.apache.pekko +import pekko.actor._ +import pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe } object PromiseRefSpec { case class Request(replyTo: ActorRef) @@ -21,7 +22,7 @@ object PromiseRefSpec { class PromiseRefSpec extends AkkaSpec with ImplicitSender { import PromiseRefSpec._ - import akka.pattern._ + import pekko.pattern._ "The PromiseRef" must { "complete promise with received message" in { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala index d934b34ce8..ce6f719b4e 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import scala.concurrent.{ Await, ExecutionContextExecutor, Future } import scala.concurrent.duration._ import language.postfixOps -import akka.actor.Scheduler -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor.Scheduler +import pekko.testkit.AkkaSpec class RetrySpec extends AkkaSpec with RetrySupport { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-actor-tests/src/test/scala/akka/pattern/StatusReplySpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala similarity index 93% rename from akka-actor-tests/src/test/scala/akka/pattern/StatusReplySpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala index c28940b616..0370d19466 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/StatusReplySpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.pattern +package org.apache.pekko.pattern import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ import org.scalatest.concurrent.ScalaFutures -import akka.Done -import akka.testkit.AkkaSpec -import akka.testkit.TestException -import akka.testkit.TestProbe -import akka.util.Timeout +import org.apache.pekko +import pekko.Done +import pekko.testkit.AkkaSpec +import pekko.testkit.TestException +import pekko.testkit.TestProbe +import pekko.util.Timeout class StatusReplySpec extends AkkaSpec with ScalaFutures { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala similarity index 90% rename from akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala index 0dead180c3..ed8a784ca4 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern.extended +package org.apache.pekko.pattern.extended import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor._ -import akka.testkit.AkkaSpec -import akka.util.Timeout +import org.apache.pekko +import pekko.actor._ +import pekko.testkit.AkkaSpec +import pekko.util.Timeout object ExplicitAskSpec { case class Request(respondTo: ActorRef) diff --git a/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala similarity index 95% rename from akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala index beb821bade..0589b616d0 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import java.net.URLEncoder import java.util.concurrent.atomic.AtomicInteger @@ -10,13 +10,14 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.{ Await, Future, Promise } import scala.concurrent.duration._ -import akka.actor.{ Actor, ActorLogging, ActorRef, PoisonPill, Props } -import akka.testkit.AkkaSpec -import akka.testkit.ImplicitSender -import akka.testkit.TestLatch +import org.apache.pekko +import pekko.actor.{ Actor, ActorLogging, ActorRef, PoisonPill, Props } +import pekko.testkit.AkkaSpec +import pekko.testkit.ImplicitSender +import pekko.testkit.TestLatch import org.scalatest.BeforeAndAfterEach -import akka.testkit.TestProbe +import pekko.testkit.TestProbe object BalancingSpec { val counter = new AtomicInteger(1) diff --git a/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala similarity index 91% rename from akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala index 6348ece2de..a154bef611 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await -import akka.actor.{ Actor, Props } -import akka.pattern.ask -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.pattern.ask +import pekko.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } object BroadcastSpec { class TestActor extends Actor { diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala similarity index 90% rename from akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala index aad9fbef2c..f5b7144945 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import scala.collection.immutable import scala.concurrent.Await @@ -12,16 +12,17 @@ import scala.annotation.nowarn import com.typesafe.config.Config import language.postfixOps -import akka.ConfigurationException -import akka.actor.{ Actor, ActorRef, Deploy, Props } -import akka.actor.ActorPath -import akka.actor.ActorSystem -import akka.actor.ExtendedActorSystem -import akka.actor.UnstartedCell -import akka.pattern.gracefulStop -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender } -import akka.testkit.TestActors.echoActorProps -import akka.testkit.TestProbe +import org.apache.pekko +import pekko.ConfigurationException +import pekko.actor.{ Actor, ActorRef, Deploy, Props } +import pekko.actor.ActorPath +import pekko.actor.ActorSystem +import pekko.actor.ExtendedActorSystem +import pekko.actor.UnstartedCell +import pekko.pattern.gracefulStop +import pekko.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender } +import pekko.testkit.TestActors.echoActorProps +import pekko.testkit.TestProbe object ConfiguredLocalRoutingSpec { val config = """ @@ -56,7 +57,7 @@ object ConfiguredLocalRoutingSpec { nr-of-instances = 2 } /myrouter { - router = "akka.routing.ConfiguredLocalRoutingSpec$MyRouter" + router = "org.apache.pekko.routing.ConfiguredLocalRoutingSpec$MyRouter" foo = bar } /sys-parent/round { @@ -108,7 +109,7 @@ class ConfiguredLocalRoutingSpec with ImplicitSender { import ConfiguredLocalRoutingSpec._ - def routerConfig(ref: ActorRef): akka.routing.RouterConfig = ref match { + def routerConfig(ref: ActorRef): pekko.routing.RouterConfig = ref match { case r: RoutedActorRef => r.underlying match { case c: RoutedActorCell => c.routerConfig diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala similarity index 88% rename from akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala index 05aa0887bd..a0b787d857 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala @@ -2,20 +2,21 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import scala.concurrent.Await import scala.concurrent.ExecutionContextExecutor -import akka.actor.Actor -import akka.actor.ActorRef -import akka.actor.Props -import akka.pattern.ask -import akka.routing.ConsistentHashingRouter.ConsistentHashMapping -import akka.routing.ConsistentHashingRouter.ConsistentHashable -import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope -import akka.testkit._ -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.ActorRef +import pekko.actor.Props +import pekko.pattern.ask +import pekko.routing.ConsistentHashingRouter.ConsistentHashMapping +import pekko.routing.ConsistentHashingRouter.ConsistentHashable +import pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope +import pekko.testkit._ +import pekko.testkit.AkkaSpec object ConsistentHashingRouterSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala index be75223493..9a849df65a 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import java.time.LocalDateTime @@ -13,11 +13,12 @@ import scala.util.{ Random, Try } import MetricsBasedResizerSpec._ import OptimalSizeExploringResizer._ -import akka.actor._ -import akka.pattern.ask -import akka.testkit._ -import akka.testkit.TestEvent._ -import akka.util.Timeout +import org.apache.pekko +import pekko.actor._ +import pekko.pattern.ask +import pekko.testkit._ +import pekko.testkit.TestEvent._ +import pekko.util.Timeout object MetricsBasedResizerSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala similarity index 90% rename from akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala index e6f29ab459..240ebd1566 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import java.util.concurrent.atomic.AtomicInteger @@ -11,9 +11,10 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.actor.{ Actor, Props } -import akka.pattern.ask -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.pattern.ask +import pekko.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { @@ -74,7 +75,7 @@ class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { counter.get should ===(connectionCount) - actor ! akka.routing.Broadcast("end") + actor ! pekko.routing.Broadcast("end") Await.ready(doneLatch, 5 seconds) replies.values.foreach { _ should be > 0 } @@ -95,7 +96,7 @@ class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { } })), "random-broadcast") - actor ! akka.routing.Broadcast("hello") + actor ! pekko.routing.Broadcast("hello") Await.ready(helloLatch, 5 seconds) system.stop(actor) diff --git a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala index 50c7f90179..6862070128 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import scala.concurrent.Await import scala.concurrent.duration._ @@ -10,10 +10,11 @@ import scala.concurrent.duration._ import com.typesafe.config.{ Config, ConfigFactory } import language.postfixOps -import akka.actor.{ Actor, ActorRef, ActorSystem, Props } -import akka.pattern.ask -import akka.testkit._ -import akka.testkit.TestEvent._ +import org.apache.pekko +import pekko.actor.{ Actor, ActorRef, ActorSystem, Props } +import pekko.pattern.ask +import pekko.testkit._ +import pekko.testkit.TestEvent._ object ResizerSpec { @@ -39,7 +40,7 @@ object ResizerSpec { class ResizerSpec extends AkkaSpec(ResizerSpec.config) with DefaultTimeout with ImplicitSender { - import akka.routing.ResizerSpec._ + import pekko.routing.ResizerSpec._ override def atStartup(): Unit = { // when shutting down some Resize messages might hang around diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala similarity index 93% rename from akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala index 3e75e2322e..3a69962adf 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import java.util.concurrent.atomic.AtomicInteger @@ -11,12 +11,13 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.actor.Actor -import akka.actor.ActorRef -import akka.actor.Props -import akka.actor.Terminated -import akka.pattern.ask -import akka.testkit._ +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.ActorRef +import pekko.actor.Props +import pekko.actor.Terminated +import pekko.pattern.ask +import pekko.testkit._ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { @@ -73,7 +74,7 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { counter.get should ===(connectionCount) - actor ! akka.routing.Broadcast("end") + actor ! pekko.routing.Broadcast("end") Await.ready(doneLatch, 5 seconds) replies.values.foreach { _ should ===(iterationCount) } @@ -93,7 +94,7 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { } })), "round-robin-broadcast") - actor ! akka.routing.Broadcast("hello") + actor ! pekko.routing.Broadcast("hello") Await.ready(helloLatch, 5 seconds) system.stop(actor) @@ -145,7 +146,7 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { replies += (id -> (replies(id) + 1)) } - actor ! akka.routing.Broadcast("end") + actor ! pekko.routing.Broadcast("end") Await.ready(doneLatch, 5 seconds) replies.values.foreach { _ should ===(iterationCount) } @@ -194,7 +195,7 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { } watch(actor) - actor ! akka.routing.Broadcast("end") + actor ! pekko.routing.Broadcast("end") expectTerminated(actor) replies.values.foreach { _ should ===(iterationCount) } diff --git a/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala similarity index 85% rename from akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala index f4b5e5ca09..20e6871ff1 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import scala.concurrent.duration._ -import akka.actor.Actor -import akka.actor.ActorIdentity -import akka.actor.Identify -import akka.actor.Props -import akka.testkit.AkkaSpec +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.ActorIdentity +import pekko.actor.Identify +import pekko.actor.Props +import pekko.testkit.AkkaSpec class RouteeCreationSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala index 7677b9b85e..0fa506f52f 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import scala.collection.immutable import scala.concurrent.Await @@ -12,10 +12,11 @@ import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import language.postfixOps -import akka.ConfigurationException -import akka.actor._ -import akka.pattern.{ ask, pipe } -import akka.testkit._ +import org.apache.pekko +import pekko.ConfigurationException +import pekko.actor._ +import pekko.pattern.{ ask, pipe } +import pekko.testkit._ object RoutingSpec { @@ -52,7 +53,7 @@ class RoutingSpec extends AkkaSpec(RoutingSpec.config) with DefaultTimeout with implicit val ec: ExecutionContextExecutor = system.dispatcher import RoutingSpec._ - muteDeadLetters(classOf[akka.dispatch.sysmsg.DeathWatchNotification])(system) + muteDeadLetters(classOf[pekko.dispatch.sysmsg.DeathWatchNotification])(system) "routers in general" must { diff --git a/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala similarity index 91% rename from akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala index ca072c495b..2fcf8d1a6c 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.AtomicInteger @@ -10,12 +10,13 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.{ Actor, Props } -import akka.actor.ActorSystem -import akka.actor.Status -import akka.pattern.ask -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } -import akka.testkit.TestProbe +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.actor.ActorSystem +import pekko.actor.Status +import pekko.pattern.ask +import pekko.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } +import pekko.testkit.TestProbe object ScatterGatherFirstCompletedSpec { class TestActor extends Actor { diff --git a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala similarity index 91% rename from akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala index a2109b2cf9..0bd276ffb1 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import java.util.concurrent.ConcurrentHashMap import scala.concurrent.Await -import akka.actor.{ Actor, Props } -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } +import org.apache.pekko +import pekko.actor.{ Actor, Props } +import pekko.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } class SmallestMailboxSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { diff --git a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala index ccd0dd7428..f293321259 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala @@ -2,17 +2,18 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.routing +package org.apache.pekko.routing import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.{ Actor, ActorRef, ActorSystem, Props } -import akka.actor.Status.Failure -import akka.pattern.{ ask, AskTimeoutException } -import akka.testkit._ +import org.apache.pekko +import pekko.actor.{ Actor, ActorRef, ActorSystem, Props } +import pekko.actor.Status.Failure +import pekko.pattern.{ ask, AskTimeoutException } +import pekko.testkit._ object TailChoppingSpec { def newActor(id: Int, sleepTime: Duration)(implicit system: ActorSystem) = diff --git a/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala similarity index 85% rename from akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala index 25591476e0..961b78c909 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.serialization +package org.apache.pekko.serialization import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletionStage import scala.concurrent.Future import com.typesafe.config.ConfigFactory -import akka.actor.ExtendedActorSystem -import akka.testkit.{ AkkaSpec, EventFilter } +import org.apache.pekko +import pekko.actor.ExtendedActorSystem +import pekko.testkit.{ AkkaSpec, EventFilter } object AsyncSerializeSpec { @@ -22,15 +23,15 @@ object AsyncSerializeSpec { akka { actor { serializers { - async = "akka.serialization.AsyncSerializeSpec$$TestAsyncSerializer" - asyncCS = "akka.serialization.AsyncSerializeSpec$$TestAsyncSerializerCS" + async = "org.apache.pekko.serialization.AsyncSerializeSpec$$TestAsyncSerializer" + asyncCS = "org.apache.pekko.serialization.AsyncSerializeSpec$$TestAsyncSerializerCS" } serialization-bindings = { - "akka.serialization.AsyncSerializeSpec$$Message1" = async - "akka.serialization.AsyncSerializeSpec$$Message2" = async - "akka.serialization.AsyncSerializeSpec$$Message3" = asyncCS - "akka.serialization.AsyncSerializeSpec$$Message4" = asyncCS + "org.apache.pekko.serialization.AsyncSerializeSpec$$Message1" = async + "org.apache.pekko.serialization.AsyncSerializeSpec$$Message2" = async + "org.apache.pekko.serialization.AsyncSerializeSpec$$Message3" = asyncCS + "org.apache.pekko.serialization.AsyncSerializeSpec$$Message4" = asyncCS } } } diff --git a/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala similarity index 90% rename from akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala index 1b2b0f5712..0fb681b914 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.serialization +package org.apache.pekko.serialization import java.nio.{ ByteBuffer, ByteOrder } import scala.concurrent.duration._ -import akka.actor.ExtendedActorSystem -import akka.testkit._ +import org.apache.pekko +import pekko.actor.ExtendedActorSystem +import pekko.testkit._ object DisabledJavaSerializerWarningSpec { final case class Msg(s: String) @@ -41,7 +42,7 @@ class DisabledJavaSerializerWarningSpec extends AkkaSpec(""" "be skipped for well known local messages" in { EventFilter.warning(start = "Outgoing message attempted to use Java Serialization", occurrences = 0).intercept { val echo = system.actorOf(TestActors.echoActorProps) - echo ! Msg("a") // Msg is in the akka package + echo ! Msg("a") // Msg is in the org.apache.pekko package expectMsg(Msg("a")) } } diff --git a/akka-actor-tests/src/test/scala/akka/serialization/NoVerification.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/NoVerification.scala similarity index 74% rename from akka-actor-tests/src/test/scala/akka/serialization/NoVerification.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/serialization/NoVerification.scala index b0ff3815a6..7b0cfa9b54 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/NoVerification.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/NoVerification.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package test.akka.serialization +package test.org.apache.pekko.serialization -import akka.actor.NoSerializationVerificationNeeded +import org.apache.pekko.actor.NoSerializationVerificationNeeded /** * This is currently used in NoSerializationVerificationNeeded test cases in SerializeSpec, - * as they needed a serializable class whose top package is not akka. + * as they needed a serializable class whose top package is not pekko. */ class NoVerification extends NoSerializationVerificationNeeded with java.io.Serializable {} diff --git a/akka-actor-tests/src/test/scala/akka/serialization/PrimitivesSerializationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/serialization/PrimitivesSerializationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala index 65b99a9d4e..35b74b2177 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/PrimitivesSerializationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.serialization +package org.apache.pekko.serialization import java.nio.ByteBuffer import java.nio.ByteOrder @@ -11,8 +11,9 @@ import scala.util.Random import com.typesafe.config.ConfigFactory -import akka.testkit.AkkaSpec -import akka.util.ByteString +import org.apache.pekko +import pekko.testkit.AkkaSpec +import pekko.util.ByteString object PrimitivesSerializationSpec { val serializationTestOverrides = "" diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala index 0055cf7439..174b0467da 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.serialization +package org.apache.pekko.serialization import java.util.{ BitSet => ProgrammaticJavaDummy } import java.util.{ Date => SerializableDummy } @@ -11,9 +11,10 @@ import java.util.concurrent.atomic.AtomicInteger import com.typesafe.config.ConfigFactory -import akka.actor.{ ActorSystem, BootstrapSetup, ExtendedActorSystem } -import akka.actor.setup.ActorSystemSetup -import akka.testkit.{ AkkaSpec, TestKit } +import org.apache.pekko +import pekko.actor.{ ActorSystem, BootstrapSetup, ExtendedActorSystem } +import pekko.actor.setup.ActorSystemSetup +import pekko.testkit.{ AkkaSpec, TestKit } class ConfigurationDummy class ProgrammaticDummy @@ -62,7 +63,7 @@ object SerializationSetupSpec { warn-about-java-serializer-usage = on serialization-bindings { - "akka.serialization.ConfigurationDummy" = test + "org.apache.pekko.serialization.ConfigurationDummy" = test } } } diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala similarity index 89% rename from akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala index 6ed0363e66..fd2b9848ea 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.serialization +package org.apache.pekko.serialization import java.io._ import java.nio.ByteBuffer @@ -15,14 +15,15 @@ import SerializationTests._ import scala.annotation.nowarn import com.typesafe.config._ import language.postfixOps -import test.akka.serialization.NoVerification +import test.org.apache.pekko.serialization.NoVerification -import akka.actor._ -import akka.actor.dungeon.SerializationCheckFailedException -import akka.pattern.ask -import akka.testkit.{ AkkaSpec, EventFilter } -import akka.util.{ unused, Timeout } -import akka.util.ByteString +import org.apache.pekko +import pekko.actor._ +import pekko.actor.dungeon.SerializationCheckFailedException +import pekko.pattern.ask +import pekko.testkit.{ AkkaSpec, EventFilter } +import pekko.util.{ unused, Timeout } +import pekko.util.ByteString object SerializationTests { @@ -30,21 +31,21 @@ object SerializationTests { akka { actor { serializers { - test = "akka.serialization.NoopSerializer" - test2 = "akka.serialization.NoopSerializer2" + test = "org.apache.pekko.serialization.NoopSerializer" + test2 = "org.apache.pekko.serialization.NoopSerializer2" other = "other.SerializerOutsideAkkaPackage" } serialization-bindings { - "akka.serialization.SerializationTests$$Person" = java - "akka.serialization.SerializationTests$$Address" = java - "akka.serialization.SerializationTests$$Marker" = test - "akka.serialization.SerializationTests$$PlainMessage" = test - "akka.serialization.SerializationTests$$A" = java - "akka.serialization.SerializationTests$$B" = test - "akka.serialization.SerializationTests$$D" = test - "akka.serialization.SerializationTests$$Marker2" = test2 - "akka.serialization.SerializationTests$$AbstractOther" = other + "org.apache.pekko.serialization.SerializationTests$$Person" = java + "org.apache.pekko.serialization.SerializationTests$$Address" = java + "org.apache.pekko.serialization.SerializationTests$$Marker" = test + "org.apache.pekko.serialization.SerializationTests$$PlainMessage" = test + "org.apache.pekko.serialization.SerializationTests$$A" = java + "org.apache.pekko.serialization.SerializationTests$$B" = test + "org.apache.pekko.serialization.SerializationTests$$D" = test + "org.apache.pekko.serialization.SerializationTests$$Marker2" = test2 + "org.apache.pekko.serialization.SerializationTests$$AbstractOther" = other } } } @@ -56,8 +57,8 @@ object SerializationTests { final case class Record(id: Int, person: Person) - protected[akka] trait Marker - protected[akka] trait Marker2 + protected[pekko] trait Marker + protected[pekko] trait Marker2 @nowarn // can't use unused otherwise case class below gets a deprecated class SimpleMessage(s: String) extends Marker @@ -139,11 +140,11 @@ object SerializationTests { akka { actor { serializers { - test = "akka.serialization.NoopSerializer" + test = "org.apache.pekko.serialization.NoopSerializer" } serialization-bindings { - "akka.dispatch.sysmsg.SystemMessage" = test + "org.apache.pekko.dispatch.sysmsg.SystemMessage" = test } } } @@ -266,7 +267,7 @@ class SerializeSpec extends AkkaSpec(SerializationTests.serializeConf) { } "log warning if non-Akka serializer is configured for Akka message" in { - EventFilter.warning(pattern = ".*not implemented by Akka.*", occurrences = 1).intercept { + EventFilter.warning(pattern = ".*not implemented by Pekko.*", occurrences = 1).intercept { ser.serialize(new Other).get } } @@ -279,13 +280,13 @@ class SerializeSpec extends AkkaSpec(SerializationTests.serializeConf) { akka { actor { serializers { - test = "akka.serialization.NoopSerializer" - test-same = "akka.serialization.NoopSerializerSameId" + test = "org.apache.pekko.serialization.NoopSerializer" + test-same = "org.apache.pekko.serialization.NoopSerializerSameId" } serialization-bindings { - "akka.serialization.SerializationTests$$Person" = test - "akka.serialization.SerializationTests$$Address" = test-same + "org.apache.pekko.serialization.SerializationTests$$Person" = test + "org.apache.pekko.serialization.SerializationTests$$Address" = test-same } } } @@ -319,7 +320,7 @@ class VerifySerializabilitySpec extends AkkaSpec(SerializationTests.verifySerial "not verify akka creators" in { EventFilter.warning(start = "ok", occurrences = 1).intercept { - // ActorSystem is not possible to serialize, but ok since it starts with "akka." + // ActorSystem is not possible to serialize, but ok since it starts with "org.apache.pekko." val a = system.actorOf(Props(classOf[NonSerializableActor], system)) // to verify that nothing is logged system.log.warning("ok") @@ -342,7 +343,7 @@ class VerifySerializabilitySpec extends AkkaSpec(SerializationTests.verifySerial "not verify akka messages" in { val a = system.actorOf(Props[FooActor]()) EventFilter.warning(start = "ok", occurrences = 1).intercept { - // ActorSystem is not possible to serialize, but ok since it starts with "akka." + // ActorSystem is not possible to serialize, but ok since it starts with "org.apache.pekko." val message = system Await.result(a ? message, timeout.duration) should ===(message) // to verify that nothing is logged @@ -566,7 +567,7 @@ class SerializerDeadlockSpec extends AkkaSpec { actor { creation-timeout = 1s serializers { - test = "akka.serialization.DeadlockSerializer" + test = "org.apache.pekko.serialization.DeadlockSerializer" } } } @@ -577,7 +578,7 @@ class SerializerDeadlockSpec extends AkkaSpec { } } -protected[akka] class NoopSerializer extends Serializer { +protected[pekko] class NoopSerializer extends Serializer { def includeManifest: Boolean = false def identifier = 9999 @@ -589,7 +590,7 @@ protected[akka] class NoopSerializer extends Serializer { def fromBinary(bytes: Array[Byte], clazz: Option[Class[_]]): AnyRef = null } -protected[akka] class NoopSerializer2 extends Serializer { +protected[pekko] class NoopSerializer2 extends Serializer { def includeManifest: Boolean = false def identifier = 10000 @@ -601,10 +602,10 @@ protected[akka] class NoopSerializer2 extends Serializer { def fromBinary(bytes: Array[Byte], clazz: Option[Class[_]]): AnyRef = null } -protected[akka] class NoopSerializerSameId extends NoopSerializer +protected[pekko] class NoopSerializerSameId extends NoopSerializer @SerialVersionUID(1) -protected[akka] final case class FakeThrowable(msg: String) extends Throwable(msg) with Serializable { +protected[pekko] final case class FakeThrowable(msg: String) extends Throwable(msg) with Serializable { override def fillInStackTrace = null } diff --git a/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala similarity index 81% rename from akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala index e278ba90a1..95ab182515 100644 --- a/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.testkit +package org.apache.pekko.testkit import java.util.concurrent.atomic.AtomicInteger import com.typesafe.config.Config -import akka.actor.dispatch.ActorModelSpec -import akka.dispatch.DispatcherPrerequisites -import akka.dispatch.MessageDispatcher -import akka.dispatch.MessageDispatcherConfigurator +import org.apache.pekko +import pekko.actor.dispatch.ActorModelSpec +import pekko.dispatch.DispatcherPrerequisites +import pekko.dispatch.MessageDispatcher +import pekko.dispatch.MessageDispatcherConfigurator object CallingThreadDispatcherModelSpec { import ActorModelSpec._ @@ -27,7 +28,7 @@ object CallingThreadDispatcherModelSpec { (for (n <- 1 to 30) yield """ test-calling-thread-%s { - type = "akka.testkit.CallingThreadDispatcherModelSpec$CallingThreadDispatcherInterceptorConfigurator" + type = "org.apache.pekko.testkit.CallingThreadDispatcherModelSpec$CallingThreadDispatcherInterceptorConfigurator" }""".format(n)).mkString } diff --git a/akka-actor-tests/src/test/scala/akka/util/AsciiStringCopySpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/AsciiStringCopySpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/util/AsciiStringCopySpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/AsciiStringCopySpec.scala index 1b80cfabec..4cd1e9e9d1 100644 --- a/akka-actor-tests/src/test/scala/akka/util/AsciiStringCopySpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/AsciiStringCopySpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.nio.charset.StandardCharsets import org.scalatest.matchers.should.Matchers diff --git a/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala index 141689c693..ef9becc09e 100644 --- a/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.util import java.util.concurrent._ @@ -21,9 +21,10 @@ import org.scalatest.time.Span import org.scalatest.time.SpanSugar._ import org.scalatest.wordspec.AnyWordSpec -import akka.testkit.TimingTest -import akka.util.DefaultExecutionContext._ -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.testkit.TimingTest +import pekko.util.DefaultExecutionContext._ +import pekko.util.ccompat.JavaConverters._ class BoundedBlockingQueueSpec extends AnyWordSpec @@ -766,7 +767,7 @@ object QueueTestEvents { trait QueueSetupHelper { import java.util.Date - import akka.util.QueueTestEvents._ + import pekko.util.QueueTestEvents._ case class TestContext( queue: BoundedBlockingQueue[String], diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteIteratorSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteIteratorSpec.scala similarity index 93% rename from akka-actor-tests/src/test/scala/akka/util/ByteIteratorSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteIteratorSpec.scala index 14ffb4aabe..ccfdba4757 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ByteIteratorSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteIteratorSpec.scala @@ -2,12 +2,12 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.util.ByteIterator.ByteArrayIterator +import org.apache.pekko.util.ByteIterator.ByteArrayIterator class ByteIteratorSpec extends AnyWordSpec with Matchers { "A ByteIterator" should { diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringInitializationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInitializationSpec.scala similarity index 91% rename from akka-actor-tests/src/test/scala/akka/util/ByteStringInitializationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInitializationSpec.scala index ae42e611c3..40a1554bb7 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ByteStringInitializationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInitializationSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.io.InputStream @@ -21,7 +21,7 @@ class ByteStringInitializationSpec extends AnyWordSpec with Matchers { val outerCl = ByteStringInitializationSpec.this.getClass.getClassLoader val buffer = new Array[Byte](1000000) override def loadClass(name: String): Class[_] = - if (!name.startsWith("akka")) outerCl.loadClass(name) + if (!name.startsWith("org.apache.pekko")) outerCl.loadClass(name) else { val classFile = name.replace(".", "/") + ".class" val is = outerCl.getResourceAsStream(classFile) @@ -40,7 +40,7 @@ class ByteStringInitializationSpec extends AnyWordSpec with Matchers { import scala.language.reflectiveCalls type WithRun = { def run(): Unit } cleanCl - .loadClass("akka.util.ByteStringInitTest") + .loadClass("org.apache.pekko.util.ByteStringInitTest") .getDeclaredConstructor() .newInstance() .asInstanceOf[WithRun] diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala index 29d9ccb1ca..ece58f8757 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, ObjectInputStream, ObjectOutputStream } import java.lang.Double.doubleToRawLongBits @@ -20,7 +20,8 @@ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import org.scalatestplus.scalacheck.Checkers -import akka.util.ByteString.{ ByteString1, ByteString1C, ByteStrings } +import org.apache.pekko +import pekko.util.ByteString.{ ByteString1, ByteString1C, ByteStrings } class ByteStringSpec extends AnyWordSpec with Matchers with Checkers { @@ -829,7 +830,7 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers { a.asByteBuffers.forall(_.isReadOnly) } check { (a: ByteString) => - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ a.asByteBuffers.zip(a.getByteBuffers().asScala).forall(x => x._1 == x._2) } } @@ -986,7 +987,7 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers { if (util.Properties.versionNumberString.startsWith("2.12")) { "parsing regular ByteString1C as compat" in { val oldSerd = - "aced000573720021616b6b612e7574696c2e42797465537472696e672442797465537472696e67314336e9eed0afcfe4a40200015b000562797465737400025b427872001b616b6b612e7574696c2e436f6d7061637442797465537472696e67fa2925150f93468f0200007870757200025b42acf317f8060854e002000078700000000a74657374737472696e67" + "aced00057372002d6f72672e6170616368652e70656b6b6f2e7574696c2e42797465537472696e672442797465537472696e67314336e9eed0afcfe4a40200015b000562797465737400025b42787200276f72672e6170616368652e70656b6b6f2e7574696c2e436f6d7061637442797465537472696e67c819c2e689ed6cad0200007870757200025b42acf317f8060854e002000078700000000a74657374737472696e67" val bs = ByteString("teststring", "UTF8") val str = hexFromSer(bs) diff --git a/akka-actor-tests/src/test/scala/akka/util/DoubleLinkedListSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/DoubleLinkedListSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/DoubleLinkedListSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/DoubleLinkedListSpec.scala index cb62cda932..e0557aa933 100644 --- a/akka-actor-tests/src/test/scala/akka/util/DoubleLinkedListSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/DoubleLinkedListSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/DurationSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/DurationSpec.scala index db9bc2725c..703da93ee1 100644 --- a/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/DurationSpec.scala @@ -2,13 +2,13 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import scala.concurrent.duration._ import language.postfixOps -import akka.testkit.AkkaSpec +import org.apache.pekko.testkit.AkkaSpec class DurationSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/util/FrequencyListSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencyListSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/FrequencyListSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencyListSpec.scala index 94d9d9e945..1857d0961a 100644 --- a/akka-actor-tests/src/test/scala/akka/util/FrequencyListSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencyListSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/FrequencySketchSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencySketchSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/FrequencySketchSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencySketchSpec.scala index 5d0c31992e..61c84ca9c4 100644 --- a/akka-actor-tests/src/test/scala/akka/util/FrequencySketchSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencySketchSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2021-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/ImmutableIntMapSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ImmutableIntMapSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/ImmutableIntMapSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/ImmutableIntMapSpec.scala index 74969d8d65..cb56fae6ed 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ImmutableIntMapSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ImmutableIntMapSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import scala.util.Random diff --git a/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala index 835d4dd5be..b80350dc92 100644 --- a/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.util.Comparator @@ -13,8 +13,9 @@ import scala.util.Random import org.scalatest.matchers.should.Matchers -import akka.testkit.AkkaSpec -import akka.testkit.DefaultTimeout +import org.apache.pekko +import pekko.testkit.AkkaSpec +import pekko.testkit.DefaultTimeout class IndexSpec extends AkkaSpec with Matchers with DefaultTimeout { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-actor-tests/src/test/scala/akka/util/LineNumberSpecCodeForScala.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/LineNumberSpecCodeForScala.scala similarity index 94% rename from akka-actor-tests/src/test/scala/akka/util/LineNumberSpecCodeForScala.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/LineNumberSpecCodeForScala.scala index e743e7269a..1b21c709c6 100644 --- a/akka-actor-tests/src/test/scala/akka/util/LineNumberSpecCodeForScala.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/LineNumberSpecCodeForScala.scala @@ -2,7 +2,7 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util /* * IMPORTANT: do not change this file, the line numbers are verified in LineNumberSpec! diff --git a/akka-actor-tests/src/test/scala/akka/util/ManifestInfoSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ManifestInfoSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/util/ManifestInfoSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/ManifestInfoSpec.scala index 0da4723f01..be8b5c27b0 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ManifestInfoSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ManifestInfoSpec.scala @@ -2,9 +2,9 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util -import akka.testkit.AkkaSpec +import org.apache.pekko.testkit.AkkaSpec class ManifestInfoSpec extends AkkaSpec { "ManifestInfo" should { diff --git a/akka-actor-tests/src/test/scala/akka/util/MessageBufferSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/MessageBufferSpec.scala similarity index 96% rename from akka-actor-tests/src/test/scala/akka/util/MessageBufferSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/MessageBufferSpec.scala index 41e47762e6..54f2989686 100644 --- a/akka-actor-tests/src/test/scala/akka/util/MessageBufferSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/MessageBufferSpec.scala @@ -2,12 +2,12 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.{ ActorPath, ActorRef, ActorRefProvider, MinimalActorRef } +import org.apache.pekko.actor.{ ActorPath, ActorRef, ActorRefProvider, MinimalActorRef } class MessageBufferSpec extends AnyWordSpec with Matchers { @@ -169,7 +169,7 @@ class MessageBufferSpec extends AnyWordSpec with Matchers { } object MessageBufferSpec { - final private[akka] class DummyActorRef(val id: String) extends MinimalActorRef { + final private[pekko] class DummyActorRef(val id: String) extends MinimalActorRef { override def toString: String = id diff --git a/akka-actor-tests/src/test/scala/akka/util/PrettyDurationSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/PrettyDurationSpec.scala similarity index 93% rename from akka-actor-tests/src/test/scala/akka/util/PrettyDurationSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/PrettyDurationSpec.scala index 68d3da0dc5..d830bb68e4 100644 --- a/akka-actor-tests/src/test/scala/akka/util/PrettyDurationSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/PrettyDurationSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec @@ -11,7 +11,7 @@ class PrettyDurationSpec extends AnyWordSpec with Matchers { import scala.concurrent.duration._ - import akka.util.PrettyDuration._ + import org.apache.pekko.util.PrettyDuration._ val cases: Seq[(Duration, String)] = 9.nanos -> "9.000 ns" :: diff --git a/akka-actor-tests/src/test/scala/akka/util/RecencyListSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/RecencyListSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/RecencyListSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/RecencyListSpec.scala index 8580c397c6..aed5adf28a 100644 --- a/akka-actor-tests/src/test/scala/akka/util/RecencyListSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/RecencyListSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ReflectSpec.scala similarity index 95% rename from akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/ReflectSpec.scala index 3bd911f07d..1b0afbc120 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ReflectSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import scala.collection.immutable @@ -24,7 +24,7 @@ object ReflectSpec { class ReflectSpec extends AnyWordSpec with Matchers { - import akka.util.ReflectSpec._ + import org.apache.pekko.util.ReflectSpec._ "Reflect#findConstructor" must { diff --git a/akka-actor-tests/src/test/scala/akka/util/SegmentedRecencyListSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/SegmentedRecencyListSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/SegmentedRecencyListSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/SegmentedRecencyListSpec.scala index 264df51689..d8d544add8 100644 --- a/akka-actor-tests/src/test/scala/akka/util/SegmentedRecencyListSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/SegmentedRecencyListSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/SwitchSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/SwitchSpec.scala index 848e957404..5f49ac0ff1 100644 --- a/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/SwitchSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit diff --git a/akka-actor-tests/src/test/scala/akka/util/TokenBucketSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/TokenBucketSpec.scala similarity index 98% rename from akka-actor-tests/src/test/scala/akka/util/TokenBucketSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/TokenBucketSpec.scala index 01bb6c1e72..528903ff16 100644 --- a/akka-actor-tests/src/test/scala/akka/util/TokenBucketSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/TokenBucketSpec.scala @@ -2,11 +2,11 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import scala.util.Random -import akka.testkit.AkkaSpec +import org.apache.pekko.testkit.AkkaSpec class TokenBucketSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/util/VersionSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/VersionSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/VersionSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/VersionSpec.scala index e1e920dd49..cee32b3659 100644 --- a/akka-actor-tests/src/test/scala/akka/util/VersionSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/VersionSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/WildcardIndexSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/WildcardIndexSpec.scala similarity index 99% rename from akka-actor-tests/src/test/scala/akka/util/WildcardIndexSpec.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/WildcardIndexSpec.scala index b3704df093..917bfa3aeb 100644 --- a/akka-actor-tests/src/test/scala/akka/util/WildcardIndexSpec.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/WildcardIndexSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/ZipfianGenerator.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ZipfianGenerator.scala similarity index 97% rename from akka-actor-tests/src/test/scala/akka/util/ZipfianGenerator.scala rename to akka-actor-tests/src/test/scala/org/apache/pekko/util/ZipfianGenerator.scala index 93df4e1be3..fc5552939c 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ZipfianGenerator.scala +++ b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ZipfianGenerator.scala @@ -2,7 +2,7 @@ * Copyright (C) 2021-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util /** * Zipfian generator algorithm from: diff --git a/akka-actor-tests/src/test/scala/other/SerializerOutsideAkkaPackage.scala b/akka-actor-tests/src/test/scala/other/SerializerOutsideAkkaPackage.scala index 6e0d258754..c946248e73 100644 --- a/akka-actor-tests/src/test/scala/other/SerializerOutsideAkkaPackage.scala +++ b/akka-actor-tests/src/test/scala/other/SerializerOutsideAkkaPackage.scala @@ -6,7 +6,7 @@ package other import java.nio.charset.StandardCharsets -import akka.serialization.SerializerWithStringManifest +import org.apache.pekko.serialization.SerializerWithStringManifest class SerializerOutsideAkkaPackage extends SerializerWithStringManifest { override def identifier: Int = 999 diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/Aggregator.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java similarity index 88% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/Aggregator.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java index 930de0b3ff..939fce8e68 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/Aggregator.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java @@ -2,15 +2,15 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; // #behavior -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; import java.time.Duration; import java.util.ArrayList; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/AggregatorTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java similarity index 89% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/AggregatorTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java index 733753ef74..0eaa9db310 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/AggregatorTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java @@ -2,17 +2,17 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -27,9 +27,9 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; -import static jdocs.akka.typed.AggregatorTest.IllustrateUsage.HotelCustomer; -import static jdocs.akka.typed.AggregatorTest.IllustrateUsage.Hotel1; -import static jdocs.akka.typed.AggregatorTest.IllustrateUsage.Hotel2; +import static jdocs.org.apache.pekko.typed.AggregatorTest.IllustrateUsage.HotelCustomer; +import static jdocs.org.apache.pekko.typed.AggregatorTest.IllustrateUsage.Hotel1; +import static jdocs.org.apache.pekko.typed.AggregatorTest.IllustrateUsage.Hotel2; import static org.junit.Assert.assertEquals; public class AggregatorTest extends JUnitSuite { diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSample.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSample.java similarity index 88% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSample.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSample.java index a62ea049e1..40fc63fac5 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSample.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSample.java @@ -2,19 +2,19 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import akka.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.ActorSystem; // #bubbling-example -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.DeathPactException; -import akka.actor.typed.SupervisorStrategy; -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.DeathPactException; +import org.apache.pekko.actor.typed.SupervisorStrategy; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; // #bubbling-example diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSampleTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java similarity index 73% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSampleTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java index ab89f9ff7c..41fcd70ae6 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSampleTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java @@ -2,12 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.ActorRef; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -15,8 +15,8 @@ import org.scalatestplus.junit.JUnitSuite; import java.time.Duration; -import static jdocs.akka.typed.BubblingSample.Boss; -import static jdocs.akka.typed.BubblingSample.Protocol; +import static jdocs.org.apache.pekko.typed.BubblingSample.Boss; +import static jdocs.org.apache.pekko.typed.BubblingSample.Protocol; public class BubblingSampleTest extends JUnitSuite { diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/DispatchersDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java similarity index 78% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/DispatchersDocTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java index c386ae461b..725fe46a7c 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/DispatchersDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java @@ -2,11 +2,11 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.*; -import akka.actor.typed.DispatcherSelector; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.*; +import org.apache.pekko.actor.typed.DispatcherSelector; public class DispatchersDocTest { diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/FSMDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java similarity index 95% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/FSMDocTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java index 6c465c6bbf..798ae8acdd 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/FSMDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java @@ -2,11 +2,11 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import java.time.Duration; import java.util.ArrayList; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java similarity index 92% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java index d1492b602a..dc6a01bc4a 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java @@ -2,24 +2,24 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; // #imports import java.util.concurrent.TimeUnit; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.Behavior; -import akka.actor.typed.PostStop; -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.PostStop; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; // #imports -import akka.actor.typed.ActorRef; -import akka.actor.typed.Terminated; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Terminated; interface GracefulStopDocTest { diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsAskWithStatusTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java similarity index 95% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsAskWithStatusTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java index 884d6ea91a..6e5fe5d401 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsAskWithStatusTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java @@ -2,17 +2,17 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.typed.ActorRef; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.*; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.*; // #actor-ask-with-status -import akka.pattern.StatusReply; +import org.apache.pekko.pattern.StatusReply; // #actor-ask-with-status import org.junit.ClassRule; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java similarity index 98% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java index d313975733..70262ca5e7 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import akka.Done; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.typed.ActorRef; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.*; -import akka.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.Done; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.*; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -24,7 +24,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; -import static jdocs.akka.typed.InteractionPatternsTest.Samples.*; +import static jdocs.org.apache.pekko.typed.InteractionPatternsTest.Samples.*; import static org.junit.Assert.assertEquals; public class InteractionPatternsTest extends JUnitSuite { diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java similarity index 95% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java index a8db1b3122..ad3945b931 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java @@ -2,22 +2,22 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; // #imports -import akka.actor.typed.ActorRef; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; // #imports -import akka.actor.typed.Terminated; -import akka.actor.typed.Props; -import akka.actor.typed.DispatcherSelector; +import org.apache.pekko.actor.typed.Terminated; +import org.apache.pekko.actor.typed.Props; +import org.apache.pekko.actor.typed.DispatcherSelector; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java similarity index 92% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java index 9b5c142ff2..02e91d84ba 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java @@ -2,17 +2,17 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; -import akka.actor.typed.*; -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.typed.*; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,7 @@ import org.slf4j.event.Level; // #logMessages // #test-logging -import akka.actor.testkit.typed.javadsl.LoggingTestKit; +import org.apache.pekko.actor.testkit.typed.javadsl.LoggingTestKit; // #test-logging diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/MailboxDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java similarity index 73% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/MailboxDocTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java index 420d977b16..73a00cfb2c 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/MailboxDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import akka.Done; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.MailboxSelector; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.Done; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.MailboxSelector; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Rule; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/OOIntroTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java similarity index 93% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/OOIntroTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java index c40d39e7e1..e7b18147a4 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/OOIntroTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java @@ -2,21 +2,21 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; // #imports -import akka.actor.typed.ActorRef; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; -import akka.actor.typed.javadsl.ReceiveBuilder; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.typed.javadsl.ReceiveBuilder; // #imports -import akka.actor.typed.Terminated; +import org.apache.pekko.actor.typed.Terminated; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java similarity index 89% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java index bcb02a17dc..64c0ac5bf0 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java @@ -2,27 +2,27 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; /* * Copyright (C) 2009-2019 Lightbend Inc. */ -import akka.actor.typed.ActorSystem; -import akka.actor.typed.DispatcherSelector; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.DispatcherSelector; // #pool -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.SupervisorStrategy; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.GroupRouter; -import akka.actor.typed.javadsl.PoolRouter; -import akka.actor.typed.javadsl.Routers; -import akka.actor.typed.receptionist.Receptionist; -import akka.actor.typed.receptionist.ServiceKey; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.SupervisorStrategy; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.GroupRouter; +import org.apache.pekko.actor.typed.javadsl.PoolRouter; +import org.apache.pekko.actor.typed.javadsl.Routers; +import org.apache.pekko.actor.typed.receptionist.Receptionist; +import org.apache.pekko.actor.typed.receptionist.ServiceKey; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; import org.junit.ClassRule; import org.junit.Test; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/SpawnProtocolDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/SpawnProtocolDocTest.java similarity index 82% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/SpawnProtocolDocTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/SpawnProtocolDocTest.java index 938f8a5812..2edbc323b1 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/SpawnProtocolDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/SpawnProtocolDocTest.java @@ -2,25 +2,25 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import jdocs.akka.typed.IntroTest.HelloWorld; +import jdocs.org.apache.pekko.typed.IntroTest.HelloWorld; import java.time.Duration; import java.util.concurrent.CompletionStage; // #imports1 -import akka.actor.typed.Behavior; -import akka.actor.typed.SpawnProtocol; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.SpawnProtocol; +import org.apache.pekko.actor.typed.javadsl.Behaviors; // #imports1 // #imports2 -import akka.actor.typed.ActorRef; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.Props; -import akka.actor.typed.javadsl.AskPattern; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.Props; +import org.apache.pekko.actor.typed.javadsl.AskPattern; // #imports2 diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocSample.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java similarity index 93% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocSample.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java index 63b4e11388..cdad2e3147 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocSample.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java @@ -2,15 +2,15 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; // #import -import akka.Done; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.StashBuffer; +import org.apache.pekko.Done; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.StashBuffer; import java.util.concurrent.CompletionStage; // #import diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java similarity index 77% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java index e4b9101484..295ede4699 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java @@ -2,13 +2,13 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; -import akka.Done; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.ActorRef; +import org.apache.pekko.Done; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -17,8 +17,8 @@ import org.scalatestplus.junit.JUnitSuite; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import static jdocs.akka.typed.StashDocSample.DB; -import static jdocs.akka.typed.StashDocSample.DataAccess; +import static jdocs.org.apache.pekko.typed.StashDocSample.DB; +import static jdocs.org.apache.pekko.typed.StashDocSample.DataAccess; public class StashDocTest extends JUnitSuite { diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java similarity index 97% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java index 7874635692..4a06ba426d 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java @@ -2,22 +2,22 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; // #oo-style // #fun-style -import akka.actor.typed.Behavior; -import akka.actor.typed.SupervisorStrategy; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.SupervisorStrategy; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; // #fun-style -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.Receive; // #oo-style -import akka.actor.typed.ActorRef; -import akka.actor.typed.javadsl.TimerScheduler; -import akka.Done; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.javadsl.TimerScheduler; +import org.apache.pekko.Done; import java.time.Duration; interface StyleGuideDocExamples { diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/TailChopping.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java similarity index 88% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/TailChopping.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java index 9617edb40c..f0b55515ca 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/TailChopping.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java @@ -2,16 +2,16 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.typed; +package jdocs.org.apache.pekko.typed; // #behavior -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; -import akka.actor.typed.javadsl.TimerScheduler; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.typed.javadsl.TimerScheduler; import java.time.Duration; import java.util.function.BiFunction; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/ClassicWatchingTypedTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java similarity index 65% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/ClassicWatchingTypedTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java index 0e770a373b..d468b91e38 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/ClassicWatchingTypedTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java @@ -2,34 +2,34 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package jdocs.akka.typed.coexistence; +package jdocs.org.apache.pekko.typed.coexistence; -import akka.actor.AbstractActor; -import akka.actor.typed.ActorRef; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.Behaviors; // #adapter-import // In java use the static methods on Adapter to convert from typed to classic -import akka.actor.typed.javadsl.Adapter; +import org.apache.pekko.actor.typed.javadsl.Adapter; // #adapter-import -import akka.testkit.TestProbe; -import akka.testkit.javadsl.TestKit; +import org.apache.pekko.testkit.TestProbe; +import org.apache.pekko.testkit.javadsl.TestKit; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.duration.Duration; -import static akka.actor.typed.javadsl.Behaviors.same; +import static org.apache.pekko.actor.typed.javadsl.Behaviors.same; public class ClassicWatchingTypedTest extends JUnitSuite { // #classic-watch public static class Classic extends AbstractActor { - public static akka.actor.Props props() { - return akka.actor.Props.create(Classic.class); + public static org.apache.pekko.actor.Props props() { + return org.apache.pekko.actor.Props.create(Classic.class); } - private final akka.actor.typed.ActorRef second = + private final org.apache.pekko.actor.typed.ActorRef second = Adapter.spawn(getContext(), Typed.behavior(), "second"); @Override @@ -47,7 +47,7 @@ public class ClassicWatchingTypedTest extends JUnitSuite { Adapter.stop(getContext(), second); }) .match( - akka.actor.Terminated.class, + org.apache.pekko.actor.Terminated.class, t -> { getContext().stop(getSelf()); }) @@ -61,7 +61,7 @@ public class ClassicWatchingTypedTest extends JUnitSuite { interface Command {} public static class Ping implements Command { - public final akka.actor.typed.ActorRef replyTo; + public final org.apache.pekko.actor.typed.ActorRef replyTo; public Ping(ActorRef replyTo) { this.replyTo = replyTo; @@ -86,8 +86,8 @@ public class ClassicWatchingTypedTest extends JUnitSuite { @Test public void testItWorks() { // #create-classic - akka.actor.ActorSystem as = akka.actor.ActorSystem.create(); - akka.actor.ActorRef classic = as.actorOf(Classic.props()); + org.apache.pekko.actor.ActorSystem as = org.apache.pekko.actor.ActorSystem.create(); + org.apache.pekko.actor.ActorRef classic = as.actorOf(Classic.props()); // #create-classic TestProbe probe = new TestProbe(as); probe.watch(classic); @@ -98,7 +98,8 @@ public class ClassicWatchingTypedTest extends JUnitSuite { @Test public void testConversionFromClassicSystemToTyped() { // #convert-classic - akka.actor.ActorSystem classicActorSystem = akka.actor.ActorSystem.create(); + org.apache.pekko.actor.ActorSystem classicActorSystem = + org.apache.pekko.actor.ActorSystem.create(); ActorSystem typedActorSystem = Adapter.toTyped(classicActorSystem); // #convert-classic TestKit.shutdownActorSystem(classicActorSystem); diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingClassicTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java similarity index 62% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingClassicTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java index 34f43aefc9..3e36f2b3d7 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingClassicTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java @@ -2,21 +2,21 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package jdocs.akka.typed.coexistence; +package jdocs.org.apache.pekko.typed.coexistence; -import akka.actor.AbstractActor; -import akka.actor.ActorSystem; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.ActorSystem; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; // #adapter-import // in Java use the static methods on Adapter to convert from classic to typed -import akka.actor.typed.javadsl.Adapter; +import org.apache.pekko.actor.typed.javadsl.Adapter; // #adapter-import -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; -import akka.testkit.javadsl.TestKit; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; +import org.apache.pekko.testkit.javadsl.TestKit; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; @@ -26,7 +26,7 @@ public class TypedWatchingClassicTest extends JUnitSuite { public static class Typed extends AbstractBehavior { public static class Ping { - public final akka.actor.typed.ActorRef replyTo; + public final org.apache.pekko.actor.typed.ActorRef replyTo; public Ping(ActorRef replyTo) { this.replyTo = replyTo; @@ -39,17 +39,18 @@ public class TypedWatchingClassicTest extends JUnitSuite { INSTANCE } - private final akka.actor.ActorRef second; + private final org.apache.pekko.actor.ActorRef second; - private Typed(ActorContext context, akka.actor.ActorRef second) { + private Typed(ActorContext context, org.apache.pekko.actor.ActorRef second) { super(context); this.second = second; } public static Behavior create() { - return akka.actor.typed.javadsl.Behaviors.setup( + return org.apache.pekko.actor.typed.javadsl.Behaviors.setup( context -> { - akka.actor.ActorRef second = Adapter.actorOf(context, Classic.props(), "second"); + org.apache.pekko.actor.ActorRef second = + Adapter.actorOf(context, Classic.props(), "second"); Adapter.watch(context, second); @@ -64,7 +65,7 @@ public class TypedWatchingClassicTest extends JUnitSuite { public Receive createReceive() { return newReceiveBuilder() .onMessage(Typed.Pong.class, message -> onPong()) - .onSignal(akka.actor.typed.Terminated.class, sig -> Behaviors.stopped()) + .onSignal(org.apache.pekko.actor.typed.Terminated.class, sig -> Behaviors.stopped()) .build(); } @@ -77,8 +78,8 @@ public class TypedWatchingClassicTest extends JUnitSuite { // #classic public static class Classic extends AbstractActor { - public static akka.actor.Props props() { - return akka.actor.Props.create(Classic.class); + public static org.apache.pekko.actor.Props props() { + return org.apache.pekko.actor.Props.create(Classic.class); } @Override diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/extensions/ExtensionDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java similarity index 84% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/extensions/ExtensionDocTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java index ad253b1117..9b3fd7ee49 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/extensions/ExtensionDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java @@ -2,14 +2,14 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.typed.extensions; +package jdocs.org.apache.pekko.typed.extensions; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.Behavior; -import akka.actor.typed.Extension; -import akka.actor.typed.ExtensionId; -import akka.actor.typed.javadsl.Behaviors; -import docs.akka.typed.extensions.DatabasePool; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.Extension; +import org.apache.pekko.actor.typed.ExtensionId; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import docs.org.apache.pekko.typed.extensions.DatabasePool; import java.util.concurrent.CompletionStage; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/fromclassic/ClassicSample.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/ClassicSample.java similarity index 82% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/fromclassic/ClassicSample.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/ClassicSample.java index 2d55849beb..983fb8cffb 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/fromclassic/ClassicSample.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/ClassicSample.java @@ -2,13 +2,13 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.typed.fromclassic; +package jdocs.org.apache.pekko.typed.fromclassic; // #hello-world-actor -import akka.actor.AbstractActor; -import akka.actor.Props; -import akka.event.Logging; -import akka.event.LoggingAdapter; +import org.apache.pekko.actor.AbstractActor; +import org.apache.pekko.actor.Props; +import org.apache.pekko.event.Logging; +import org.apache.pekko.event.LoggingAdapter; // #hello-world-actor diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/fromclassic/TypedSample.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java similarity index 89% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/fromclassic/TypedSample.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java index a6c79d706a..91c0c8b2e1 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/fromclassic/TypedSample.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java @@ -2,15 +2,15 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package jdocs.akka.typed.fromclassic; +package jdocs.org.apache.pekko.typed.fromclassic; // #hello-world-actor -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.AbstractBehavior; -import akka.actor.typed.javadsl.ActorContext; -import akka.actor.typed.javadsl.Behaviors; -import akka.actor.typed.javadsl.Receive; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.AbstractBehavior; +import org.apache.pekko.actor.typed.javadsl.ActorContext; +import org.apache.pekko.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.javadsl.Receive; import java.util.HashMap; import java.util.Map; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/pubsub/PubSubExample.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java similarity index 79% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/pubsub/PubSubExample.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java index dedee442a0..b49449b78c 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/pubsub/PubSubExample.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java @@ -2,14 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package jdocs.akka.typed.pubsub; +package jdocs.org.apache.pekko.typed.pubsub; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.javadsl.Behaviors; // #start-topic -import akka.actor.typed.pubsub.Topic; +import org.apache.pekko.actor.typed.pubsub.Topic; // #start-topic diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java similarity index 97% rename from akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java rename to akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java index 0847f2c3fc..b23ccd344c 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java @@ -2,10 +2,10 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package jdocs.akka.typed.supervision; +package jdocs.org.apache.pekko.typed.supervision; -import akka.actor.typed.*; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.*; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import java.time.Duration; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ActorSystemTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java similarity index 88% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/ActorSystemTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java index 668c22623d..f1ef67bf32 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ActorSystemTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java @@ -2,10 +2,10 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed; +package org.apache.pekko.actor.typed; -import akka.Done; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.Done; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/DispatcherSelectorTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/DispatcherSelectorTest.java similarity index 91% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/DispatcherSelectorTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/DispatcherSelectorTest.java index 9208d23016..887c4ea9bf 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/DispatcherSelectorTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/DispatcherSelectorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed; +package org.apache.pekko.actor.typed; public class DispatcherSelectorTest { // Compile time only test to verify diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java similarity index 91% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java index 686865fda0..39046694df 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java @@ -2,10 +2,10 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed; +package org.apache.pekko.actor.typed; -import akka.actor.setup.ActorSystemSetup; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.setup.ActorSystemSetup; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.Test; @@ -52,7 +52,7 @@ public class ExtensionsTest extends JUnitSuite { public void loadJavaExtensionsFromConfig() { Config cfg = ConfigFactory.parseString( - "akka.actor.typed.extensions += \"akka.actor.typed.ExtensionsTest$MyExtension\"") + "akka.actor.typed.extensions += \"org.apache.pekko.actor.typed.ExtensionsTest$MyExtension\"") .resolve(); final ActorSystem system = ActorSystem.create(Behaviors.empty(), "loadJavaExtensionsFromConfig", cfg); diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/MailboxSelectorTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/MailboxSelectorTest.java similarity index 91% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/MailboxSelectorTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/MailboxSelectorTest.java index 790f71257f..67b50f0e7c 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/MailboxSelectorTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/MailboxSelectorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed; +package org.apache.pekko.actor.typed; public class MailboxSelectorTest { // Compile time only test to verify diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/SchedulerTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/SchedulerTest.java similarity index 94% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/SchedulerTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/SchedulerTest.java index 1064e5ffa2..080b7a3f88 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/SchedulerTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/SchedulerTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed; +package org.apache.pekko.actor.typed; import java.time.Duration; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/eventstream/EventStreamTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamTest.java similarity index 69% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/eventstream/EventStreamTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamTest.java index 9242f8b982..1f4cf91356 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/eventstream/EventStreamTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamTest.java @@ -2,10 +2,10 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.eventstream; +package org.apache.pekko.actor.typed.eventstream; -import akka.actor.typed.ActorRef; -import akka.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.ActorSystem; public class EventStreamTest { diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorCompile.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java similarity index 97% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorCompile.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java index 1249b6b148..ddc8dd3a6a 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorCompile.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java @@ -2,17 +2,17 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; -import akka.actor.typed.*; -import akka.actor.typed.TypedActorContext; +import org.apache.pekko.actor.typed.*; +import org.apache.pekko.actor.typed.TypedActorContext; import java.math.BigDecimal; import java.math.BigInteger; import java.time.Duration; import java.util.concurrent.CompletionStage; -import static akka.actor.typed.javadsl.Behaviors.*; +import static org.apache.pekko.actor.typed.javadsl.Behaviors.*; @SuppressWarnings("unused") public class ActorCompile { diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java similarity index 87% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java index 8dac328d10..eeefff2f0b 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java @@ -2,16 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; -import akka.actor.testkit.typed.TestException; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.pattern.StatusReply; -import akka.testkit.AkkaSpec; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.testkit.typed.TestException; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.pattern.StatusReply; +import org.apache.pekko.testkit.AkkaSpec; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -147,7 +147,7 @@ public class ActorContextAskTest extends JUnitSuite { ActorRef> replyTo = probe.expectMessageClass(PingWithStatus.class).replyTo; replyTo.tell(StatusReply.error("boho")); - probe.expectMessage("got error: akka.pattern.StatusReply$ErrorMessage, boho"); + probe.expectMessage("got error: org.apache.pekko.pattern.StatusReply$ErrorMessage, boho"); } @Test @@ -158,6 +158,6 @@ public class ActorContextAskTest extends JUnitSuite { // with custom exception replyTo.tell(StatusReply.error(new TestException("boho"))); - probe.expectMessage("got error: akka.actor.testkit.typed.TestException, boho"); + probe.expectMessage("got error: org.apache.pekko.actor.testkit.typed.TestException, boho"); } } diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextPipeToSelfTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java similarity index 91% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextPipeToSelfTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java index 03c176a21c..b0fb6a9b77 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextPipeToSelfTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java @@ -2,15 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.LoggingTestKit; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.Props; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.LoggingTestKit; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.Props; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Rule; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java similarity index 86% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java index b28bed421f..e8e9ebd76c 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java @@ -2,15 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.event.Logging; -import akka.japi.pf.PFBuilder; -import akka.testkit.CustomEventFilter; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.event.Logging; +import org.apache.pekko.japi.pf.PFBuilder; +import org.apache.pekko.testkit.CustomEventFilter; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Rule; @@ -28,7 +28,8 @@ public class ActorLoggingTest extends JUnitSuite { public static final TestKitJunitResource testKit = new TestKitJunitResource( ConfigFactory.parseString( - "akka.loglevel = INFO\n" + "akka.loggers = [\"akka.testkit.TestEventListener\"]")); + "akka.loglevel = INFO\n" + + "akka.loggers = [\"org.apache.pekko.testkit.TestEventListener\"]")); interface Protocol { String getTransactionId(); diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java similarity index 68% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java index 8e3b0fc87f..60471f9551 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java @@ -2,10 +2,10 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.typed.internal.adapter.SchedulerAdapter; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.typed.internal.adapter.SchedulerAdapter; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -13,26 +13,26 @@ import org.scalatestplus.junit.JUnitSuite; import java.time.Duration; -import akka.actor.ActorSystem; -import akka.testkit.AkkaJUnitActorSystemResource; -import akka.testkit.AkkaSpec; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.Signal; -import akka.actor.typed.Terminated; -import akka.testkit.javadsl.TestKit; -import akka.actor.SupervisorStrategy; -import static akka.actor.typed.javadsl.Behaviors.*; +import org.apache.pekko.actor.ActorSystem; +import org.apache.pekko.testkit.AkkaJUnitActorSystemResource; +import org.apache.pekko.testkit.AkkaSpec; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.Signal; +import org.apache.pekko.actor.typed.Terminated; +import org.apache.pekko.testkit.javadsl.TestKit; +import org.apache.pekko.actor.SupervisorStrategy; +import static org.apache.pekko.actor.typed.javadsl.Behaviors.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; public class AdapterTest extends JUnitSuite { - static akka.actor.Props classic1() { - return akka.actor.Props.create(Classic1.class, () -> new Classic1()); + static org.apache.pekko.actor.Props classic1() { + return org.apache.pekko.actor.Props.create(Classic1.class, () -> new Classic1()); } - static class Classic1 extends akka.actor.AbstractActor { + static class Classic1 extends org.apache.pekko.actor.AbstractActor { @Override public Receive createReceive() { return receiveBuilder() @@ -47,29 +47,30 @@ public class AdapterTest extends JUnitSuite { } static class Typed1 { - private final akka.actor.ActorRef ref; - private final akka.actor.ActorRef probe; + private final org.apache.pekko.actor.ActorRef ref; + private final org.apache.pekko.actor.ActorRef probe; - private Typed1(akka.actor.ActorRef ref, akka.actor.ActorRef probe) { + private Typed1(org.apache.pekko.actor.ActorRef ref, org.apache.pekko.actor.ActorRef probe) { this.ref = ref; this.probe = probe; } - static Behavior create(akka.actor.ActorRef ref, akka.actor.ActorRef probe) { + static Behavior create( + org.apache.pekko.actor.ActorRef ref, org.apache.pekko.actor.ActorRef probe) { Typed1 logic = new Typed1(ref, probe); return receive(logic::onMessage, logic::onSignal); } Behavior onMessage(ActorContext context, String message) { if (message.equals("send")) { - akka.actor.ActorRef replyTo = Adapter.toClassic(context.getSelf()); + org.apache.pekko.actor.ActorRef replyTo = Adapter.toClassic(context.getSelf()); ref.tell("ping", replyTo); return same(); } else if (message.equals("pong")) { - probe.tell("ok", akka.actor.ActorRef.noSender()); + probe.tell("ok", org.apache.pekko.actor.ActorRef.noSender()); return same(); } else if (message.equals("actorOf")) { - akka.actor.ActorRef child = Adapter.actorOf(context, classic1()); + org.apache.pekko.actor.ActorRef child = Adapter.actorOf(context, classic1()); child.tell("ping", Adapter.toClassic(context.getSelf())); return same(); } else if (message.equals("watch")) { @@ -77,13 +78,13 @@ public class AdapterTest extends JUnitSuite { return same(); } else if (message.equals("supervise-restart")) { // restart is the default, otherwise an intermediate is required - akka.actor.ActorRef child = Adapter.actorOf(context, classic1()); + org.apache.pekko.actor.ActorRef child = Adapter.actorOf(context, classic1()); Adapter.watch(context, child); child.tell(new ThrowIt3(), Adapter.toClassic(context.getSelf())); child.tell("ping", Adapter.toClassic(context.getSelf())); return same(); } else if (message.equals("stop-child")) { - akka.actor.ActorRef child = Adapter.actorOf(context, classic1()); + org.apache.pekko.actor.ActorRef child = Adapter.actorOf(context, classic1()); Adapter.watch(context, child); Adapter.stop(context, child); return same(); @@ -91,7 +92,7 @@ public class AdapterTest extends JUnitSuite { try { context.stop(context.getSelf()); } catch (Exception e) { - probe.tell(e, akka.actor.ActorRef.noSender()); + probe.tell(e, org.apache.pekko.actor.ActorRef.noSender()); } return same(); } else { @@ -101,7 +102,7 @@ public class AdapterTest extends JUnitSuite { Behavior onSignal(ActorContext context, Signal sig) { if (sig instanceof Terminated) { - probe.tell("terminated", akka.actor.ActorRef.noSender()); + probe.tell("terminated", org.apache.pekko.actor.ActorRef.noSender()); return same(); } else { return unhandled(); @@ -129,16 +130,17 @@ public class AdapterTest extends JUnitSuite { static class ThrowIt3 extends ThrowIt {} - static akka.actor.Props classic2(ActorRef ref, akka.actor.ActorRef probe) { - return akka.actor.Props.create(Classic2.class, () -> new Classic2(ref, probe)); + static org.apache.pekko.actor.Props classic2( + ActorRef ref, org.apache.pekko.actor.ActorRef probe) { + return org.apache.pekko.actor.Props.create(Classic2.class, () -> new Classic2(ref, probe)); } - static class Classic2 extends akka.actor.AbstractActor { + static class Classic2 extends org.apache.pekko.actor.AbstractActor { private final ActorRef ref; - private final akka.actor.ActorRef probe; + private final org.apache.pekko.actor.ActorRef probe; private final SupervisorStrategy strategy; - Classic2(ActorRef ref, akka.actor.ActorRef probe) { + Classic2(ActorRef ref, org.apache.pekko.actor.ActorRef probe) { this.ref = ref; this.probe = probe; this.strategy = strategy(); @@ -164,11 +166,13 @@ public class AdapterTest extends JUnitSuite { "actorOf-props", s -> { // this is how Cluster Sharding can be used - akka.actor.ActorRef child = getContext().actorOf(typed2Props()); - child.tell(new Ping(Adapter.toTyped(getSelf())), akka.actor.ActorRef.noSender()); + org.apache.pekko.actor.ActorRef child = getContext().actorOf(typed2Props()); + child.tell( + new Ping(Adapter.toTyped(getSelf())), + org.apache.pekko.actor.ActorRef.noSender()); }) .matchEquals("watch", s -> Adapter.watch(getContext(), ref)) - .match(akka.actor.Terminated.class, t -> probe.tell("terminated", getSelf())) + .match(org.apache.pekko.actor.Terminated.class, t -> probe.tell("terminated", getSelf())) .matchEquals("supervise-stop", s -> testSupervice(new ThrowIt1())) .matchEquals("supervise-resume", s -> testSupervice(new ThrowIt2())) .matchEquals("supervise-restart", s -> testSupervice(new ThrowIt3())) @@ -190,9 +194,9 @@ public class AdapterTest extends JUnitSuite { } private SupervisorStrategy strategy() { - return new akka.actor.OneForOneStrategy( + return new org.apache.pekko.actor.OneForOneStrategy( false, - akka.japi.pf.DeciderBuilder.match( + org.apache.pekko.japi.pf.DeciderBuilder.match( ThrowIt1.class, e -> { probe.tell("thrown-stop", getSelf()); @@ -237,7 +241,7 @@ public class AdapterTest extends JUnitSuite { }); } - static akka.actor.Props typed2Props() { + static org.apache.pekko.actor.Props typed2Props() { return Adapter.props(() -> typed2()); } @@ -252,7 +256,7 @@ public class AdapterTest extends JUnitSuite { @Test public void shouldSendMessageFromTypedToClassic() { TestKit probe = new TestKit(system); - akka.actor.ActorRef classicRef = system.actorOf(classic1()); + org.apache.pekko.actor.ActorRef classicRef = system.actorOf(classic1()); ActorRef typedRef = Adapter.spawnAnonymous(system, Typed1.create(classicRef, probe.getRef())); typedRef.tell("send"); @@ -263,8 +267,8 @@ public class AdapterTest extends JUnitSuite { public void shouldSendMessageFromClassicToTyped() { TestKit probe = new TestKit(system); ActorRef typedRef = Adapter.spawnAnonymous(system, typed2()).narrow(); - akka.actor.ActorRef classicRef = system.actorOf(classic2(typedRef, probe.getRef())); - classicRef.tell("send", akka.actor.ActorRef.noSender()); + org.apache.pekko.actor.ActorRef classicRef = system.actorOf(classic2(typedRef, probe.getRef())); + classicRef.tell("send", org.apache.pekko.actor.ActorRef.noSender()); probe.expectMsg("ok"); } @@ -272,8 +276,8 @@ public class AdapterTest extends JUnitSuite { public void shouldSpawnTypedChildFromClassicParent() { TestKit probe = new TestKit(system); ActorRef ignore = Adapter.spawnAnonymous(system, ignore()); - akka.actor.ActorRef classicRef = system.actorOf(classic2(ignore, probe.getRef())); - classicRef.tell("spawn", akka.actor.ActorRef.noSender()); + org.apache.pekko.actor.ActorRef classicRef = system.actorOf(classic2(ignore, probe.getRef())); + classicRef.tell("spawn", org.apache.pekko.actor.ActorRef.noSender()); probe.expectMsg("ok"); } @@ -281,15 +285,15 @@ public class AdapterTest extends JUnitSuite { public void shouldActorOfTypedChildViaPropsFromClassicParent() { TestKit probe = new TestKit(system); ActorRef ignore = Adapter.spawnAnonymous(system, ignore()); - akka.actor.ActorRef classicRef = system.actorOf(classic2(ignore, probe.getRef())); - classicRef.tell("actorOf-props", akka.actor.ActorRef.noSender()); + org.apache.pekko.actor.ActorRef classicRef = system.actorOf(classic2(ignore, probe.getRef())); + classicRef.tell("actorOf-props", org.apache.pekko.actor.ActorRef.noSender()); probe.expectMsg("ok"); } @Test public void shouldActorOfClassicChildFromTypedParent() { TestKit probe = new TestKit(system); - akka.actor.ActorRef ignore = system.actorOf(akka.actor.Props.empty()); + org.apache.pekko.actor.ActorRef ignore = system.actorOf(org.apache.pekko.actor.Props.empty()); ActorRef typedRef = Adapter.spawnAnonymous(system, Typed1.create(ignore, probe.getRef())); typedRef.tell("actorOf"); @@ -301,8 +305,9 @@ public class AdapterTest extends JUnitSuite { TestKit probe = new TestKit(system); ActorRef typedRef = Adapter.spawnAnonymous(system, typed2()); ActorRef typedRef2 = typedRef.narrow(); - akka.actor.ActorRef classicRef = system.actorOf(classic2(typedRef2, probe.getRef())); - classicRef.tell("watch", akka.actor.ActorRef.noSender()); + org.apache.pekko.actor.ActorRef classicRef = + system.actorOf(classic2(typedRef2, probe.getRef())); + classicRef.tell("watch", org.apache.pekko.actor.ActorRef.noSender()); typedRef.tell(new StopIt()); probe.expectMsg("terminated"); } @@ -310,18 +315,20 @@ public class AdapterTest extends JUnitSuite { @Test public void shouldWatchClassicFromTyped() { TestKit probe = new TestKit(system); - akka.actor.ActorRef classicRef = system.actorOf(classic1()); + org.apache.pekko.actor.ActorRef classicRef = system.actorOf(classic1()); ActorRef typedRef = Adapter.spawnAnonymous(system, Typed1.create(classicRef, probe.getRef())); typedRef.tell("watch"); - classicRef.tell(akka.actor.PoisonPill.getInstance(), akka.actor.ActorRef.noSender()); + classicRef.tell( + org.apache.pekko.actor.PoisonPill.getInstance(), + org.apache.pekko.actor.ActorRef.noSender()); probe.expectMsg("terminated"); } @Test public void shouldSuperviseClassicChildAsRestartFromTypedParent() { TestKit probe = new TestKit(system); - akka.actor.ActorRef ignore = system.actorOf(akka.actor.Props.empty()); + org.apache.pekko.actor.ActorRef ignore = system.actorOf(org.apache.pekko.actor.Props.empty()); ActorRef typedRef = Adapter.spawnAnonymous(system, Typed1.create(ignore, probe.getRef())); @@ -342,15 +349,15 @@ public class AdapterTest extends JUnitSuite { public void shouldStopTypedChildFromClassicParent() { TestKit probe = new TestKit(system); ActorRef ignore = Adapter.spawnAnonymous(system, ignore()); - akka.actor.ActorRef classicRef = system.actorOf(classic2(ignore, probe.getRef())); - classicRef.tell("stop-child", akka.actor.ActorRef.noSender()); + org.apache.pekko.actor.ActorRef classicRef = system.actorOf(classic2(ignore, probe.getRef())); + classicRef.tell("stop-child", org.apache.pekko.actor.ActorRef.noSender()); probe.expectMsg("terminated"); } @Test public void shouldStopClassicChildFromTypedParent() { TestKit probe = new TestKit(system); - akka.actor.ActorRef ignore = system.actorOf(akka.actor.Props.empty()); + org.apache.pekko.actor.ActorRef ignore = system.actorOf(org.apache.pekko.actor.Props.empty()); ActorRef typedRef = Adapter.spawnAnonymous(system, Typed1.create(ignore, probe.getRef())); typedRef.tell("stop-child"); @@ -360,7 +367,7 @@ public class AdapterTest extends JUnitSuite { @Test public void stopSelfWillCauseError() { TestKit probe = new TestKit(system); - akka.actor.ActorRef ignore = system.actorOf(akka.actor.Props.empty()); + org.apache.pekko.actor.ActorRef ignore = system.actorOf(org.apache.pekko.actor.Props.empty()); ActorRef typedRef = Adapter.spawnAnonymous(system, Typed1.create(ignore, probe.getRef())); typedRef.tell("stop-self"); @@ -369,9 +376,9 @@ public class AdapterTest extends JUnitSuite { @Test public void shouldConvertScheduler() { - akka.actor.typed.Scheduler typedScheduler = Adapter.toTyped(system.scheduler()); + org.apache.pekko.actor.typed.Scheduler typedScheduler = Adapter.toTyped(system.scheduler()); assertEquals(SchedulerAdapter.class, typedScheduler.getClass()); - akka.actor.Scheduler classicScheduler = Adapter.toClassic(typedScheduler); + org.apache.pekko.actor.Scheduler classicScheduler = Adapter.toClassic(typedScheduler); assertSame(system.scheduler(), classicScheduler); } } diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/BehaviorBuilderTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java similarity index 90% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/BehaviorBuilderTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java index 91e33325d8..6e9ee44e5d 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/BehaviorBuilderTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java @@ -2,24 +2,24 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; -import akka.actor.typed.Behavior; -import akka.actor.typed.Terminated; -import akka.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.Terminated; +import org.apache.pekko.actor.typed.ActorRef; import java.util.ArrayList; -import static akka.actor.typed.javadsl.Behaviors.same; -import static akka.actor.typed.javadsl.Behaviors.stopped; +import static org.apache.pekko.actor.typed.javadsl.Behaviors.same; +import static org.apache.pekko.actor.typed.javadsl.Behaviors.stopped; import static org.junit.Assert.assertEquals; /** Test creating [[Behavior]]s using [[BehaviorBuilder]] */ diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/InterceptTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/InterceptTest.java similarity index 90% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/InterceptTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/InterceptTest.java index 081b728325..ff05669323 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/InterceptTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/InterceptTest.java @@ -2,13 +2,13 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.*; -import akka.testkit.AkkaSpec; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.*; +import org.apache.pekko.testkit.AkkaSpec; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ReceiveBuilderTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java similarity index 91% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ReceiveBuilderTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java index 499234cd9b..3f4bad831e 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ReceiveBuilderTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java @@ -2,21 +2,21 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.ActorRef; -import akka.actor.typed.PostStop; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.PostStop; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; -import akka.actor.typed.Behavior; +import org.apache.pekko.actor.typed.Behavior; -import static akka.actor.typed.javadsl.Behaviors.same; +import static org.apache.pekko.actor.typed.javadsl.Behaviors.same; /** Test creating [[MutableActor]]s using [[ReceiveBuilder]] */ public class ReceiveBuilderTest extends JUnitSuite { diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/RoutersTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java similarity index 80% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/RoutersTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java index 473c512904..44c6609c14 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/RoutersTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java @@ -2,17 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; import java.util.List; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; -import akka.actor.testkit.typed.javadsl.TestProbe; -import akka.actor.typed.ActorRef; -import akka.actor.typed.Behavior; -import akka.actor.typed.receptionist.ServiceKey; -import akka.testkit.AkkaSpec; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.Behavior; +import org.apache.pekko.actor.typed.receptionist.ServiceKey; +import org.apache.pekko.testkit.AkkaSpec; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/StashBufferTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java similarity index 86% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/StashBufferTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java index 725be49d5d..e5bc573d17 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/StashBufferTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java @@ -2,11 +2,11 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; -import akka.actor.testkit.typed.internal.StubbedActorContext; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.typed.internal.StashBufferImpl; +import org.apache.pekko.actor.testkit.typed.internal.StubbedActorContext; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.typed.internal.StashBufferImpl; import org.junit.Rule; import org.junit.Test; import org.scalatestplus.junit.JUnitSuite; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java similarity index 90% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java index 1e9de5de2f..2428584d57 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java @@ -2,25 +2,25 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl; +package org.apache.pekko.actor.typed.javadsl; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; -import akka.Done; -import akka.actor.testkit.typed.javadsl.LogCapturing; -import akka.actor.testkit.typed.javadsl.TestKitJunitResource; +import org.apache.pekko.Done; +import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing; +import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource; import org.junit.ClassRule; import org.junit.Rule; import org.scalatestplus.junit.JUnitSuite; import org.junit.Test; -import akka.actor.typed.*; +import org.apache.pekko.actor.typed.*; import java.time.Duration; -import static akka.Done.done; -import static akka.actor.typed.javadsl.Behaviors.*; +import static org.apache.pekko.Done.done; +import static org.apache.pekko.actor.typed.javadsl.Behaviors.*; public class WatchTest extends JUnitSuite { diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/receptionist/ReceptionistApiTest.java b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java similarity index 93% rename from akka-actor-typed-tests/src/test/java/akka/actor/typed/receptionist/ReceptionistApiTest.java rename to akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java index 9f70042078..5256185b8c 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/receptionist/ReceptionistApiTest.java +++ b/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java @@ -2,12 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.receptionist; +package org.apache.pekko.actor.typed.receptionist; -import akka.actor.typed.ActorRef; -import akka.actor.typed.ActorSystem; -import akka.actor.typed.javadsl.AskPattern; -import akka.actor.typed.javadsl.Behaviors; +import org.apache.pekko.actor.typed.ActorRef; +import org.apache.pekko.actor.typed.ActorSystem; +import org.apache.pekko.actor.typed.javadsl.AskPattern; +import org.apache.pekko.actor.typed.javadsl.Behaviors; import java.time.Duration; import java.util.Set; diff --git a/akka-actor-typed-tests/src/test/resources/logback-doc-test.xml b/akka-actor-typed-tests/src/test/resources/logback-doc-test.xml index 71c3c2fefe..0b8a4517f9 100644 --- a/akka-actor-typed-tests/src/test/resources/logback-doc-test.xml +++ b/akka-actor-typed-tests/src/test/resources/logback-doc-test.xml @@ -13,16 +13,16 @@ - + - + diff --git a/akka-actor-typed-tests/src/test/resources/logback-test.xml b/akka-actor-typed-tests/src/test/resources/logback-test.xml index f2e0d8c016..5fdb45f230 100644 --- a/akka-actor-typed-tests/src/test/resources/logback-test.xml +++ b/akka-actor-typed-tests/src/test/resources/logback-test.xml @@ -12,16 +12,16 @@ - + - + diff --git a/akka-actor-typed-tests/src/test/resources/mailbox-config-sample.conf b/akka-actor-typed-tests/src/test/resources/mailbox-config-sample.conf index 0a9594b650..ff2a831288 100644 --- a/akka-actor-typed-tests/src/test/resources/mailbox-config-sample.conf +++ b/akka-actor-typed-tests/src/test/resources/mailbox-config-sample.conf @@ -1,5 +1,5 @@ my-app { my-special-mailbox { - mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox" } } \ No newline at end of file diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/Aggregator.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/Aggregator.scala similarity index 89% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/Aggregator.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/Aggregator.scala index b1e6cfcd3f..d62302055b 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/Aggregator.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/Aggregator.scala @@ -2,16 +2,17 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed //#behavior import scala.collection.immutable import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.Behaviors object Aggregator { diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/AggregatorSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/AggregatorSpec.scala similarity index 92% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/AggregatorSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/AggregatorSpec.scala index 444e4de0f1..b22efde060 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/AggregatorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/AggregatorSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed import scala.concurrent.duration._ -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.Behaviors import org.scalatest.wordspec.AnyWordSpecLike object AggregatorSpec { diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/DispatchersDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/DispatchersDocSpec.scala similarity index 82% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/DispatchersDocSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/DispatchersDocSpec.scala index 5f34f92542..6e204368bf 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/DispatchersDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/DispatchersDocSpec.scala @@ -2,20 +2,21 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.scaladsl.AskPattern._ -import akka.actor.typed.SpawnProtocol.Spawn -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.{ ActorRef, Behavior, DispatcherSelector, Props, SpawnProtocol } -import akka.dispatch.Dispatcher +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.scaladsl.AskPattern._ +import pekko.actor.typed.SpawnProtocol.Spawn +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.{ ActorRef, Behavior, DispatcherSelector, Props, SpawnProtocol } +import pekko.dispatch.Dispatcher import DispatchersDocSpec._ -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike import scala.concurrent.Future -import akka.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LogCapturing object DispatchersDocSpec { @@ -43,7 +44,7 @@ object DispatchersDocSpec { val example = Behaviors.receive[Any] { (context, _) => // #spawn-dispatcher - import akka.actor.typed.DispatcherSelector + import org.apache.pekko.actor.typed.DispatcherSelector context.spawn(yourBehavior, "DefaultDispatcher") context.spawn(yourBehavior, "ExplicitDefaultDispatcher", DispatcherSelector.default()) diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala similarity index 88% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala index b094f36bd2..feb167a668 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.{ ActorRef, Behavior } +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.{ ActorRef, Behavior } import scala.collection.immutable import scala.concurrent.duration._ -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing import org.scalatest.wordspec.AnyWordSpecLike object FSMDocSpec { diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FaultToleranceDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FaultToleranceDocSpec.scala similarity index 89% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/FaultToleranceDocSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FaultToleranceDocSpec.scala index 56c520616c..7c416f45cc 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FaultToleranceDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FaultToleranceDocSpec.scala @@ -2,20 +2,21 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed import scala.concurrent.duration._ -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import scala.annotation.nowarn import org.scalatest.wordspec.AnyWordSpecLike object FaultToleranceDocSpec { // #bubbling-example - import akka.actor.typed.ActorRef - import akka.actor.typed.Behavior - import akka.actor.typed.DeathPactException - import akka.actor.typed.SupervisorStrategy - import akka.actor.typed.scaladsl.Behaviors + import org.apache.pekko + import pekko.actor.typed.ActorRef + import pekko.actor.typed.Behavior + import pekko.actor.typed.DeathPactException + import pekko.actor.typed.SupervisorStrategy + import pekko.actor.typed.scaladsl.Behaviors object Protocol { sealed trait Command diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala similarity index 92% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala index 4c023cec2e..bc53972256 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala @@ -2,23 +2,24 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed //#imports -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.{ ActorSystem, PostStop } +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.{ ActorSystem, PostStop } //#imports -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.ActorRef +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed.ActorRef import scala.concurrent.duration._ import scala.concurrent.Await import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.typed.Terminated +import pekko.actor.typed.Terminated -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit object GracefulStopDocSpec { diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala similarity index 96% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala index 5a36eee90b..7efd4ac513 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed import java.net.URI @@ -10,17 +10,18 @@ import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success -import akka.Done -import akka.NotUsed -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.LoggerOps -import akka.actor.typed.scaladsl.TimerScheduler -import akka.pattern.StatusReply +import org.apache.pekko +import pekko.Done +import pekko.NotUsed +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.LoggerOps +import pekko.actor.typed.scaladsl.TimerScheduler +import pekko.pattern.StatusReply import org.scalatest.wordspec.AnyWordSpecLike class InteractionPatternsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { @@ -227,7 +228,7 @@ class InteractionPatternsSpec extends ScalaTestWithActorTestKit with AnyWordSpec } "contain a sample for ask" in { - import akka.util.Timeout + import pekko.util.Timeout // #actor-ask object Hal { @@ -294,7 +295,7 @@ class InteractionPatternsSpec extends ScalaTestWithActorTestKit with AnyWordSpec } "contain a sample for outside ask with status" in { - import akka.util.Timeout + import pekko.util.Timeout // #actor-ask-with-status object Hal { @@ -478,8 +479,9 @@ class InteractionPatternsSpec extends ScalaTestWithActorTestKit with AnyWordSpec // #standalone-ask - import akka.actor.typed.scaladsl.AskPattern._ - import akka.util.Timeout + import org.apache.pekko + import pekko.actor.typed.scaladsl.AskPattern._ + import pekko.util.Timeout // asking someone requires a timeout if the timeout hits without response // the ask is failed with a TimeoutException @@ -542,8 +544,9 @@ class InteractionPatternsSpec extends ScalaTestWithActorTestKit with AnyWordSpec // #standalone-ask-with-status - import akka.actor.typed.scaladsl.AskPattern._ - import akka.util.Timeout + import org.apache.pekko + import pekko.actor.typed.scaladsl.AskPattern._ + import pekko.util.Timeout // asking someone requires a timeout if the timeout hits without response // the ask is failed with a TimeoutException diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala similarity index 94% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala index 257f69d342..8fae32e43a 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala @@ -2,24 +2,25 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed //#fiddle_code //#imports -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.LoggerOps -import akka.actor.typed.{ ActorRef, ActorSystem, Behavior } +import org.apache.pekko +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.LoggerOps +import pekko.actor.typed.{ ActorRef, ActorSystem, Behavior } //#imports //#fiddle_code -import akka.NotUsed -import akka.Done -import akka.actor.typed.{ DispatcherSelector, Terminated } -import akka.actor.testkit.typed.scaladsl.LogCapturing +import pekko.NotUsed +import pekko.Done +import pekko.actor.typed.{ DispatcherSelector, Terminated } +import pekko.actor.testkit.typed.scaladsl.LogCapturing import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.ActorTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.ActorTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import java.net.URLEncoder import java.nio.charset.StandardCharsets diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala similarity index 87% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala index d0d0f9eca4..5d945aa6f5 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala @@ -2,17 +2,18 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future import scala.util.Failure import scala.util.Success -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.ActorTags -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.ActorTags +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.Behaviors import org.slf4j.LoggerFactory object LoggingDocExamples { @@ -61,7 +62,7 @@ object LoggingDocExamples { def placeholders(): Unit = { // #info2 - import akka.actor.typed.scaladsl.LoggerOps + import org.apache.pekko.actor.typed.scaladsl.LoggerOps Behaviors.receive[String] { (context, message) => context.log.info2("{} received message: {}", context.self.path.name, message) @@ -70,7 +71,7 @@ object LoggingDocExamples { // #info2 // #infoN - import akka.actor.typed.scaladsl.LoggerOps + import org.apache.pekko.actor.typed.scaladsl.LoggerOps Behaviors.receive[String] { (context, message) => context.log.infoN( @@ -86,7 +87,7 @@ object LoggingDocExamples { def logMessages(): Unit = { // #logMessages - import akka.actor.typed.LogOptions + import org.apache.pekko.actor.typed.LogOptions import org.slf4j.event.Level Behaviors.logMessages(LogOptions().withLevel(Level.TRACE), BackendManager()) @@ -113,7 +114,7 @@ object LoggingDocExamples { val ref: ActorRef[Message] = ??? // #test-logging - import akka.actor.testkit.typed.scaladsl.LoggingTestKit + import org.apache.pekko.actor.testkit.typed.scaladsl.LoggingTestKit // implicit ActorSystem is needed, but that is given by ScalaTestWithActorTestKit // implicit val system: ActorSystem[_] diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/MailboxDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/MailboxDocSpec.scala similarity index 75% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/MailboxDocSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/MailboxDocSpec.scala index 8bce8597f3..fb09f6f505 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/MailboxDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/MailboxDocSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed -import akka.Done -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.Behavior -import akka.actor.typed.MailboxSelector -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.Done +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed.Behavior +import pekko.actor.typed.MailboxSelector +import pekko.actor.typed.scaladsl.Behaviors import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala similarity index 92% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala index 7d31984cbb..a37c5c99b7 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala @@ -2,22 +2,23 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed //#imports -import akka.Done -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.{ ActorRef, ActorSystem, Behavior } -import akka.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors, LoggerOps } +import org.apache.pekko +import pekko.Done +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed.{ ActorRef, ActorSystem, Behavior } +import pekko.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors, LoggerOps } //#imports -import akka.NotUsed -import akka.actor.typed.Terminated +import pekko.NotUsed +import pekko.actor.typed.Terminated import java.net.URLEncoder import java.nio.charset.StandardCharsets -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import org.scalatest.wordspec.AnyWordSpecLike object OOIntroSpec { diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala similarity index 94% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala index c9002d352a..21b8ce777b 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed -import akka.actor.typed.DispatcherSelector +import org.apache.pekko.actor.typed.DispatcherSelector // #pool -import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit } -import akka.actor.typed.{ ActorRef, Behavior, SupervisorStrategy } -import akka.actor.typed.receptionist.{ Receptionist, ServiceKey } -import akka.actor.typed.scaladsl.{ Behaviors, Routers } +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit } +import pekko.actor.typed.{ ActorRef, Behavior, SupervisorStrategy } +import pekko.actor.typed.receptionist.{ Receptionist, ServiceKey } +import pekko.actor.typed.scaladsl.{ Behaviors, Routers } // #pool import org.scalatest.wordspec.AnyWordSpecLike diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/SpawnProtocolDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/SpawnProtocolDocSpec.scala similarity index 74% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/SpawnProtocolDocSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/SpawnProtocolDocSpec.scala index 03429531bd..38cd772f3a 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/SpawnProtocolDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/SpawnProtocolDocSpec.scala @@ -2,31 +2,34 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed import scala.concurrent.ExecutionContext import scala.concurrent.Future import scala.concurrent.duration._ -import akka.actor.testkit.typed.scaladsl.ActorTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import docs.akka.typed.IntroSpec.HelloWorld +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.ActorTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import docs.org.apache.pekko.typed.IntroSpec.HelloWorld import org.scalatest.wordspec.AnyWordSpecLike import scala.annotation.nowarn //#imports1 -import akka.actor.typed.Behavior -import akka.actor.typed.SpawnProtocol -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.LoggerOps +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.SpawnProtocol +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.LoggerOps //#imports1 //#imports2 -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Props -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Props +import pekko.util.Timeout //#imports2 @@ -59,7 +62,7 @@ class SpawnProtocolDocSpec extends ScalaTestWithActorTestKit with AnyWordSpecLik ActorSystem(HelloWorldMain(), "hello") // needed in implicit scope for ask (?) - import akka.actor.typed.scaladsl.AskPattern._ + import pekko.actor.typed.scaladsl.AskPattern._ implicit val ec: ExecutionContext = system.executionContext implicit val timeout: Timeout = Timeout(3.seconds) diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StashDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StashDocSpec.scala similarity index 88% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/StashDocSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StashDocSpec.scala index 8311d815d9..248a12707d 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StashDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StashDocSpec.scala @@ -2,10 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing import org.scalatest.wordspec.AnyWordSpecLike object StashDocSpec { @@ -14,12 +15,13 @@ object StashDocSpec { import scala.util.Failure import scala.util.Success - import akka.Done - import akka.actor.typed.ActorRef - import akka.actor.typed.Behavior - import akka.actor.typed.scaladsl.ActorContext - import akka.actor.typed.scaladsl.Behaviors - import akka.actor.typed.scaladsl.StashBuffer + import org.apache.pekko + import pekko.Done + import pekko.actor.typed.ActorRef + import pekko.actor.typed.Behavior + import pekko.actor.typed.scaladsl.ActorContext + import pekko.actor.typed.scaladsl.Behaviors + import pekko.actor.typed.scaladsl.StashBuffer trait DB { def save(id: String, value: String): Future[Done] @@ -104,7 +106,7 @@ class StashDocSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with L import StashDocSpec.DB import StashDocSpec.DataAccess import scala.concurrent.Future - import akka.Done + import pekko.Done "Stashing docs" must { diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala similarity index 96% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala index 2bee8f5c71..47d7abeb65 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala @@ -2,28 +2,30 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed import scala.concurrent.duration._ import scala.concurrent.Future -import akka.actor.typed.ActorSystem -import akka.actor.typed.ActorRef -import akka.actor.typed.scaladsl.LoggerOps -import akka.actor.typed.scaladsl.TimerScheduler -import akka.actor.typed.SupervisorStrategy +import org.apache.pekko +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.ActorRef +import pekko.actor.typed.scaladsl.LoggerOps +import pekko.actor.typed.scaladsl.TimerScheduler +import pekko.actor.typed.SupervisorStrategy import scala.concurrent.duration.FiniteDuration -import akka.Done +import pekko.Done import scala.annotation.nowarn //#oo-style //#fun-style -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors //#fun-style -import akka.actor.typed.scaladsl.AbstractBehavior +import org.apache.pekko.actor.typed.scaladsl.AbstractBehavior import org.slf4j.Logger //#oo-style @@ -426,8 +428,9 @@ object StyleGuideDocExamples { implicit val system: ActorSystem[Nothing] = ??? // #ask-1 - import akka.actor.typed.scaladsl.AskPattern._ - import akka.util.Timeout + import org.apache.pekko + import pekko.actor.typed.scaladsl.AskPattern._ + import pekko.util.Timeout implicit val timeout: Timeout = Timeout(3.seconds) val counter: ActorRef[Command] = ??? diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/TailChopping.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/TailChopping.scala similarity index 90% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/TailChopping.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/TailChopping.scala index c9076d973f..13649fdcef 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/TailChopping.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/TailChopping.scala @@ -2,15 +2,16 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed //#behavior import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.Behaviors object TailChopping { diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala similarity index 81% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala index 267ef5cef9..5f32fc9714 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala @@ -2,20 +2,21 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package docs.akka.typed.coexistence +package docs.org.apache.pekko.typed.coexistence -import akka.actor.ActorLogging -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed._ -import akka.actor.typed.scaladsl.Behaviors -import akka.testkit.TestKit +import org.apache.pekko +import pekko.actor.ActorLogging +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.testkit.TestKit //#adapter-import // adds support for actors to a classic actor system and context -import akka.actor.typed.scaladsl.adapter._ +import org.apache.pekko.actor.typed.scaladsl.adapter._ //#adapter-import -import akka.testkit.TestProbe +import org.apache.pekko.testkit.TestProbe //#import-alias -import akka.{ actor => classic } +import org.apache.pekko.{ actor => classic } //#import-alias import org.scalatest.wordspec.AnyWordSpec @@ -36,8 +37,8 @@ object ClassicWatchingTypedSpec { context.watch(second) // self can be used as the `replyTo` parameter here because - // there is an implicit conversion from akka.actor.ActorRef to - // akka.actor.typed.ActorRef + // there is an implicit conversion from org.apache.pekko.actor.ActorRef to + // org.apache.pekko.actor.typed.ActorRef // An equal alternative would be `self.toTyped` second ! Typed.Ping(self) @@ -92,7 +93,7 @@ class ClassicWatchingTypedSpec extends AnyWordSpec with LogCapturing { "support converting a classic actor system to an actor system" in { // #convert-classic - val system = akka.actor.ActorSystem("ClassicToTypedSystem") + val system = pekko.actor.ActorSystem("ClassicToTypedSystem") val typedSystem: ActorSystem[Nothing] = system.toTyped // #convert-classic typedSystem.scheduler // remove compile warning diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala similarity index 80% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala index bb207dc425..54844ac95e 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala @@ -2,19 +2,20 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package docs.akka.typed.coexistence +package docs.org.apache.pekko.typed.coexistence -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed._ -import akka.actor.typed.scaladsl.Behaviors -import akka.testkit.TestKit +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.testkit.TestKit //#adapter-import // adds support for typed actors to a classic actor system and context -import akka.actor.typed.scaladsl.adapter._ +import org.apache.pekko.actor.typed.scaladsl.adapter._ //#adapter-import -import akka.testkit.TestProbe +import org.apache.pekko.testkit.TestProbe //#import-alias -import akka.{ actor => classic } +import org.apache.pekko.{ actor => classic } //#import-alias import org.scalatest.wordspec.AnyWordSpec import scala.concurrent.duration._ @@ -23,7 +24,7 @@ object TypedWatchingClassicSpec { // #typed object Typed { - final case class Ping(replyTo: akka.actor.typed.ActorRef[Pong.type]) + final case class Ping(replyTo: pekko.actor.typed.ActorRef[Pong.type]) sealed trait Command case object Pong extends Command @@ -47,7 +48,7 @@ object TypedWatchingClassicSpec { Behaviors.same } .receiveSignal { - case (_, akka.actor.typed.Terminated(_)) => + case (_, pekko.actor.typed.Terminated(_)) => Behaviors.stopped } } diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala similarity index 78% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala index c0c85f6604..ead888ab0b 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala @@ -2,13 +2,14 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package docs.akka.typed.extensions +package docs.org.apache.pekko.typed.extensions -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.Extension -import akka.actor.typed.ExtensionId -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.Extension +import pekko.actor.typed.ExtensionId +import pekko.actor.typed.scaladsl.Behaviors import scala.annotation.nowarn import com.typesafe.config.ConfigFactory @@ -45,7 +46,7 @@ class DatabasePool(system: ActorSystem[_]) extends Extension { object ExtensionDocSpec { val config = ConfigFactory.parseString(""" #config - akka.actor.typed.extensions = ["docs.akka.extensions.DatabasePool"] + akka.actor.typed.extensions = ["org.apache.pekko.akka.extensions.DatabasePool"] #config """) diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/ClassicSample.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/ClassicSample.scala similarity index 79% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/ClassicSample.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/ClassicSample.scala index 17607da53b..95e034c7aa 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/ClassicSample.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/ClassicSample.scala @@ -2,12 +2,13 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package docs.akka.typed.fromclassic +package docs.org.apache.pekko.typed.fromclassic // #hello-world-actor -import akka.actor.Actor -import akka.actor.ActorLogging -import akka.actor.Props +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.ActorLogging +import pekko.actor.Props // #hello-world-actor diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/TypedSample.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/TypedSample.scala similarity index 87% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/TypedSample.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/TypedSample.scala index 50a86e9664..ada8bd7476 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/TypedSample.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/TypedSample.scala @@ -2,14 +2,15 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package docs.akka.typed.fromclassic +package docs.org.apache.pekko.typed.fromclassic // #hello-world-actor -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.AbstractBehavior -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.AbstractBehavior +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors // #hello-world-actor diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/myapp/package.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/myapp/package.scala similarity index 77% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/myapp/package.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/myapp/package.scala index f6ac109266..46e7fe3cce 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/myapp/package.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/myapp/package.scala @@ -2,11 +2,11 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package docs.akka.typed +package docs.org.apache.pekko.typed //#loggerops-package-implicit import scala.language.implicitConversions -import akka.actor.typed.scaladsl.LoggerOps +import org.apache.pekko.actor.typed.scaladsl.LoggerOps import org.slf4j.Logger package object myapp { diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/pubsub/PubSubExample.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala similarity index 73% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/pubsub/PubSubExample.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala index ab612eab51..a0c5eeb72b 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/pubsub/PubSubExample.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala @@ -2,11 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package docs.akka.typed.pubsub +package docs.org.apache.pekko.typed.pubsub -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.Behaviors object PubSubExample { @@ -14,7 +15,7 @@ object PubSubExample { def example: Behavior[Any] = { // #start-topic - import akka.actor.typed.pubsub.Topic + import org.apache.pekko.actor.typed.pubsub.Topic Behaviors.setup { context => val topic = context.spawn(Topic[Message]("my-topic"), "MyTopic") diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala similarity index 93% rename from akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala rename to akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala index 384654087e..1cfd439c63 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala @@ -2,13 +2,14 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package docs.akka.typed.supervision +package docs.org.apache.pekko.typed.supervision -import akka.actor.typed.ActorRef -import akka.actor.typed.PostStop -import akka.actor.typed.PreRestart -import akka.actor.typed.{ Behavior, SupervisorStrategy } -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.PostStop +import pekko.actor.typed.PreRestart +import pekko.actor.typed.{ Behavior, SupervisorStrategy } +import pekko.actor.typed.scaladsl.Behaviors import scala.annotation.nowarn import scala.concurrent.duration._ diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala similarity index 98% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala index 9df2151734..73de97b41a 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala @@ -2,20 +2,21 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.concurrent.duration._ import scala.reflect.ClassTag import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.InvalidMessageException -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.InvalidMessageException +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.scaladsl.Behaviors object ActorSpecMessages { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefIgnoreSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala similarity index 93% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefIgnoreSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala index 1c7e211838..7d4bf25a7b 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefIgnoreSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.util.concurrent.TimeoutException @@ -12,11 +12,12 @@ import scala.util.{ Failure, Success } import org.scalatest.concurrent.PatienceConfiguration.{ Timeout => PatienceTimeout } import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } -import akka.actor.typed.scaladsl.AskPattern._ -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter._ -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import pekko.actor.typed.scaladsl.AskPattern._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.adapter._ +import pekko.util.Timeout class ActorRefIgnoreSpec extends ScalaTestWithActorTestKit() with AnyWordSpecLike { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefResolverSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala similarity index 77% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefResolverSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala index bff7ed05b0..7623158516 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefResolverSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.ActorPath -import akka.actor.ActorRefProvider -import akka.actor.ActorSystemImpl -import akka.actor.MinimalActorRef -import akka.actor.RootActorPath -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.ActorPath +import pekko.actor.ActorRefProvider +import pekko.actor.ActorSystemImpl +import pekko.actor.MinimalActorRef +import pekko.actor.RootActorPath +import pekko.actor.typed.scaladsl.Behaviors class ActorRefResolverSpec extends AnyWordSpec with ScalaFutures with Matchers { "ActorRefResolver" should { @@ -31,9 +32,9 @@ class ActorRefResolverSpec extends AnyWordSpec with ScalaFutures with Matchers { } // we can't detect that for MinimalActorRef - import akka.actor.typed.scaladsl.adapter._ + import org.apache.pekko.actor.typed.scaladsl.adapter._ - val minRef1: akka.actor.ActorRef = new MinimalActorRef { + val minRef1: pekko.actor.ActorRef = new MinimalActorRef { override def provider: ActorRefProvider = system1.toClassic.asInstanceOf[ActorSystemImpl].provider override def path: ActorPath = RootActorPath(system1.address) / "minRef1" } diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala similarity index 84% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala index 4d4a5848ed..1743013452 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.concurrent.ExecutionContext import scala.concurrent.Future @@ -10,17 +10,18 @@ import scala.concurrent.TimeoutException import scala.concurrent.duration._ import scala.util.Success import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.internal.adapter.ActorSystemAdapter -import akka.actor.typed.scaladsl.AskPattern._ -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.Behaviors._ -import akka.pattern.StatusReply -import akka.testkit.TestException -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.internal.adapter.ActorSystemAdapter +import pekko.actor.typed.scaladsl.AskPattern._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.Behaviors._ +import pekko.pattern.StatusReply +import pekko.testkit.TestException +import pekko.util.Timeout object AskSpec { sealed trait Msg @@ -89,7 +90,7 @@ class AskSpec extends ScalaTestWithActorTestKit(""" "fail the future if the actor doesn't exist" in { val noSuchActor: ActorRef[Msg] = system match { case adaptedSys: ActorSystemAdapter[_] => - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ adaptedSys.system.provider.resolveActorRef("/foo/bar") case _ => fail("this test must only run in an adapted actor system") @@ -109,31 +110,31 @@ class AskSpec extends ScalaTestWithActorTestKit(""" } } - "transform a replied akka.actor.Status.Failure to a failed future" in { + "transform a replied org.apache.pekko.actor.Status.Failure to a failed future" in { // It's unlikely but possible that this happens, since the receiving actor would // have to accept a message with an actoref that accepts AnyRef or be doing crazy casting // For completeness sake though - implicit val classicSystem = akka.actor.ActorSystem("AskSpec-classic-1") + implicit val classicSystem = pekko.actor.ActorSystem("AskSpec-classic-1") try { case class Ping(respondTo: ActorRef[AnyRef]) val ex = new RuntimeException("not good!") - class LegacyActor extends akka.actor.Actor { + class LegacyActor extends pekko.actor.Actor { def receive = { - case Ping(respondTo) => respondTo ! akka.actor.Status.Failure(ex) + case Ping(respondTo) => respondTo ! pekko.actor.Status.Failure(ex) } } - val legacyActor = classicSystem.actorOf(akka.actor.Props(new LegacyActor)) + val legacyActor = classicSystem.actorOf(pekko.actor.Props(new LegacyActor)) import scaladsl.AskPattern._ - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ implicit val timeout: Timeout = 3.seconds val typedLegacy: ActorRef[AnyRef] = legacyActor typedLegacy.ask(Ping.apply).failed.futureValue should ===(ex) } finally { - akka.testkit.TestKit.shutdownActorSystem(classicSystem) + pekko.testkit.TestKit.shutdownActorSystem(classicSystem) } } diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala similarity index 97% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala index 6e232ed956..570983a599 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.util.function.{ Function => F1 } @@ -11,14 +11,15 @@ import org.scalactic.TypeCheckedTripleEquals import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike -import akka.Done -import akka.actor.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox } -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.javadsl.{ Behaviors => JBehaviors } -import akka.actor.typed.scaladsl.{ AbstractBehavior => SAbstractBehavior } -import akka.actor.typed.scaladsl.{ Behaviors => SBehaviors } -import akka.japi.pf.{ FI, PFBuilder } +import org.apache.pekko +import pekko.Done +import pekko.actor.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox } +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.javadsl.{ Behaviors => JBehaviors } +import pekko.actor.typed.scaladsl.{ AbstractBehavior => SAbstractBehavior } +import pekko.actor.typed.scaladsl.{ Behaviors => SBehaviors } +import pekko.japi.pf.{ FI, PFBuilder } object BehaviorSpec { sealed trait Command { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala similarity index 94% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala index 2bc367f321..6fe01f322d 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.util.control.NoStackTrace import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } -import akka.actor.ActorInitializationException -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.scaladsl._ -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.ActorInitializationException +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.scaladsl._ +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.typed.scaladsl.Behaviors object DeferredSpec { sealed trait Command diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala similarity index 85% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala index 97f24818d8..3035ef42a6 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.util.concurrent.atomic.AtomicInteger @@ -11,13 +11,14 @@ import scala.concurrent.Future import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.BootstrapSetup -import akka.actor.setup.ActorSystemSetup -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.BootstrapSetup +import pekko.actor.setup.ActorSystemSetup +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.Behaviors class DummyExtension1 extends Extension object DummyExtension1 extends ExtensionId[DummyExtension1] { @@ -69,7 +70,7 @@ class AccessSystemFromConstructor(system: ActorSystem[_]) extends Extension { object ExtensionsSpec { val config = ConfigFactory.parseString(""" akka.actor.typed { - library-extensions += "akka.actor.typed.InstanceCountingExtension" + library-extensions += "org.apache.pekko.actor.typed.InstanceCountingExtension" } """).resolve() } @@ -114,7 +115,7 @@ class ExtensionsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with Some( ConfigFactory.parseString( """ - akka.actor.typed.extensions = ["akka.actor.typed.DummyExtension1$", "akka.actor.typed.SlowExtension$"] + akka.actor.typed.extensions = ["org.apache.pekko.actor.typed.DummyExtension1$", "org.apache.pekko.actor.typed.SlowExtension$"] """))) { sys => sys.hasExtension(DummyExtension1) should ===(true) sys.extension(DummyExtension1) shouldBe a[DummyExtension1] @@ -129,7 +130,7 @@ class ExtensionsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with Behaviors.empty[Any], "ExtensionsSpec04", ConfigFactory.parseString(""" - akka.actor.typed.extensions = ["akka.actor.typed.FailingToLoadExtension$"] + akka.actor.typed.extensions = ["org.apache.pekko.actor.typed.FailingToLoadExtension$"] """)) } @@ -166,8 +167,9 @@ class ExtensionsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with "ExtensionsSpec07", Some( ConfigFactory.parseString( - """akka.actor.typed.library-extensions += "akka.actor.typed.FailingToLoadExtension$""""))) { _ => - () + """akka.actor.typed.library-extensions += "org.apache.pekko.actor.typed.FailingToLoadExtension$""""))) { + _ => + () } } @@ -176,7 +178,7 @@ class ExtensionsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with withEmptyActorSystem( "ExtensionsSpec08", Some(ConfigFactory.parseString( - """akka.actor.typed.library-extensions += "akka.actor.typed.MissingExtension""""))) { _ => + """akka.actor.typed.library-extensions += "org.apache.pekko.actor.typed.MissingExtension""""))) { _ => () } } @@ -191,9 +193,9 @@ class ExtensionsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with } "load registered extensions eagerly even for classic system" in { - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ val beforeCreation = InstanceCountingExtension.createCount.get() - val classicSystem = akka.actor.ActorSystem("as", ExtensionsSpec.config) + val classicSystem = pekko.actor.ActorSystem("as", ExtensionsSpec.config) try { val before = InstanceCountingExtension.createCount.get() InstanceCountingExtension(classicSystem.toTyped) @@ -209,8 +211,8 @@ class ExtensionsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with } "not create an extension multiple times when using the ActorSystemAdapter" in { - import akka.actor.typed.scaladsl.adapter._ - val classicSystem = akka.actor.ActorSystem() + import pekko.actor.typed.scaladsl.adapter._ + val classicSystem = pekko.actor.ActorSystem() try { val ext1 = DummyExtension1(classicSystem.toTyped) val ext2 = DummyExtension1(classicSystem.toTyped) @@ -228,7 +230,7 @@ class ExtensionsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with Some( ConfigFactory.parseString( """ - akka.actor.typed.extensions = ["akka.actor.typed.DummyExtension1$", "akka.actor.typed.SlowExtension$"] + akka.actor.typed.extensions = ["org.apache.pekko.actor.typed.DummyExtension1$", "org.apache.pekko.actor.typed.SlowExtension$"] """)), Some(ActorSystemSetup(new DummyExtension1Setup(_ => new DummyExtension1ViaSetup)))) { sys => sys.hasExtension(DummyExtension1) should ===(true) @@ -246,7 +248,7 @@ class ExtensionsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with Some( ConfigFactory.parseString( """ - akka.actor.typed.extensions = ["akka.actor.typed.AccessSystemFromConstructorExtensionId$"] + akka.actor.typed.extensions = ["org.apache.pekko.actor.typed.AccessSystemFromConstructorExtensionId$"] """)), None) { sys => AccessSystemFromConstructorExtensionId(sys) // would throw if it couldn't diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala similarity index 97% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala index cb3472a8bd..9dd54906a9 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.util.concurrent.atomic.AtomicBoolean @@ -10,14 +10,15 @@ import scala.concurrent.duration._ import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.ActorInitializationException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.internal.PoisonPill -import akka.actor.typed.internal.PoisonPillInterceptor -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.ActorInitializationException +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.internal.PoisonPill +import pekko.actor.typed.internal.PoisonPillInterceptor +import pekko.actor.typed.scaladsl.Behaviors object InterceptSpec { final case class Msg(hello: String, replyTo: ActorRef[String]) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/LocalActorRefProviderLogMessagesSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala similarity index 78% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/LocalActorRefProviderLogMessagesSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala index 3d2d27ac93..e60b1abb8c 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/LocalActorRefProviderLogMessagesSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala @@ -2,10 +2,11 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed -import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, LogCapturing, LoggingTestKit, ScalaTestWithActorTestKit } -import akka.actor.typed.internal.adapter.ActorSystemAdapter +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.{ ActorTestKit, LogCapturing, LoggingTestKit, ScalaTestWithActorTestKit } +import pekko.actor.typed.internal.adapter.ActorSystemAdapter import org.scalatest.wordspec.AnyWordSpecLike object LocalActorRefProviderLogMessagesSpec { @@ -32,7 +33,7 @@ class LocalActorRefProviderLogMessagesSpec LoggingTestKit .debug("of unknown (invalid) path [dummy/path]") - .withLoggerName("akka.actor.LocalActorRefProvider.Deserialization") + .withLoggerName("org.apache.pekko.actor.LocalActorRefProvider.Deserialization") .expect { provider.resolveActorRef("dummy/path") } @@ -44,7 +45,7 @@ class LocalActorRefProviderLogMessagesSpec LoggingTestKit .debug("Resolve (deserialization) of path [user/invalid] doesn't match an active actor.") - .withLoggerName("akka.actor.LocalActorRefProvider.Deserialization") + .withLoggerName("org.apache.pekko.actor.LocalActorRefProvider.Deserialization") .expect { provider.resolveActorRef(invalidPath) } @@ -59,7 +60,7 @@ class LocalActorRefProviderLogMessagesSpec try { LoggingTestKit .debug("Resolve (deserialization) of foreign path [akka://otherSystem/user/foo]") - .withLoggerName("akka.actor.LocalActorRefProvider.Deserialization") + .withLoggerName("org.apache.pekko.actor.LocalActorRefProvider.Deserialization") .expect { provider.resolveActorRef(invalidPath) } diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/LogMessagesSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala similarity index 92% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/LogMessagesSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala index eebfee42b3..e48d939a2d 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/LogMessagesSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala @@ -2,17 +2,18 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import org.scalatest.wordspec.AnyWordSpecLike import org.slf4j.event.Level -import akka.actor -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter._ +import org.apache.pekko +import pekko.actor +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.adapter._ class LogMessagesSpec extends ScalaTestWithActorTestKit(""" akka.loglevel = DEBUG # test verifies debug diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala similarity index 79% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala index 6907f8590f..628ef91849 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala @@ -2,28 +2,29 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.ActorCell -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.internal.adapter.ActorContextAdapter -import akka.actor.typed.scaladsl.AskPattern._ -import akka.actor.typed.scaladsl.Behaviors -import akka.dispatch.BoundedMessageQueueSemantics -import akka.dispatch.BoundedNodeMessageQueue -import akka.dispatch.MessageQueue -import akka.dispatch.UnboundedMessageQueueSemantics +import org.apache.pekko +import pekko.actor.ActorCell +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.internal.adapter.ActorContextAdapter +import pekko.actor.typed.scaladsl.AskPattern._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.dispatch.BoundedMessageQueueSemantics +import pekko.dispatch.BoundedNodeMessageQueue +import pekko.dispatch.MessageQueue +import pekko.dispatch.UnboundedMessageQueueSemantics class MailboxSelectorSpec extends ScalaTestWithActorTestKit(""" specific-mailbox { - mailbox-type = "akka.dispatch.NonBlockingBoundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.NonBlockingBoundedMailbox" mailbox-capacity = 4 } """) with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MonitorSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala similarity index 84% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/MonitorSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala index 934d829f87..cade3cec64 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MonitorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.scaladsl.Behaviors class MonitorSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala similarity index 98% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala index 079100ddc1..32831d84f7 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.annotation.tailrec import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.testkit.typed.scaladsl._ -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl._ +import pekko.actor.typed.scaladsl.Behaviors /** * Background: Originally there was an `OrElseBehavior` that could compose two `Behavior`, but that diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/PropsSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/PropsSpec.scala similarity index 86% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/PropsSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/PropsSpec.scala index d3298f61e5..629852d6c7 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/PropsSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/PropsSpec.scala @@ -2,12 +2,12 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.testkit.typed.scaladsl.LogCapturing +import org.apache.pekko.actor.testkit.typed.scaladsl.LogCapturing class PropsSpec extends AnyWordSpec with Matchers with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SchedulerSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SchedulerSpec.scala similarity index 94% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/SchedulerSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SchedulerSpec.scala index 123b55ba5a..d594c05273 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SchedulerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SchedulerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.concurrent.duration._ diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SpawnProtocolSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala similarity index 93% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/SpawnProtocolSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala index ae27434e78..76a8a4ff97 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SpawnProtocolSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.concurrent.Future import scala.concurrent.duration._ @@ -10,10 +10,11 @@ import scala.concurrent.duration._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.scaladsl._ -import akka.actor.typed.scaladsl.Behaviors -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.scaladsl._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.util.Timeout object SpawnProtocolSpec { sealed trait Message @@ -48,7 +49,7 @@ class SpawnProtocolSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike w "have nice API for ask" in { val parent = spawn(SpawnProtocol(), "parent2") - import akka.actor.typed.scaladsl.AskPattern._ + import pekko.actor.typed.scaladsl.AskPattern._ implicit val timeout: Timeout = Timeout(5.seconds) val parentReply: Future[ActorRef[Ping]] = parent.ask(SpawnProtocol.Spawn(target, "child", Props.empty, _)) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala similarity index 98% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala index 6ded780d34..5ff088d619 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.io.IOException import java.util.concurrent.CountDownLatch @@ -10,16 +10,17 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicInteger -import akka.actor.ActorInitializationException -import akka.actor.Dropped -import akka.actor.testkit.typed._ -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl._ -import akka.actor.typed.SupervisorStrategy.Resume -import akka.actor.typed.scaladsl.AbstractBehavior -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.Behaviors._ +import org.apache.pekko +import pekko.actor.ActorInitializationException +import pekko.actor.Dropped +import pekko.actor.testkit.typed._ +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl._ +import pekko.actor.typed.SupervisorStrategy.Resume +import pekko.actor.typed.scaladsl.AbstractBehavior +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.Behaviors._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import org.scalatest.wordspec.AnyWordSpecLike @@ -819,7 +820,7 @@ class SupervisionSpec extends ScalaTestWithActorTestKit(""" } "publish dropped messages while backing off and stash is full" in { - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ val droppedMessagesProbe = createDroppedMessageProbe() val probe = TestProbe[Event]("evt") val startedProbe = TestProbe[Event]("started") @@ -850,7 +851,7 @@ class SupervisionSpec extends ScalaTestWithActorTestKit(""" } "restart after exponential backoff" in { - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ val droppedMessagesProbe = createDroppedMessageProbe() val probe = TestProbe[Event]("evt") val startedProbe = TestProbe[Event]("started") @@ -931,7 +932,7 @@ class SupervisionSpec extends ScalaTestWithActorTestKit(""" } "reset exponential backoff count after reset timeout" in { - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ val droppedMessagesProbe = createDroppedMessageProbe() val probe = TestProbe[Event]("evt") val minBackoff = 1.seconds @@ -1171,7 +1172,8 @@ class SupervisionSpec extends ScalaTestWithActorTestKit(""" val stacktrace = probe.expectMessageType[Vector[StackTraceElement]] // InterceptorImpl receive is used for every supervision instance, only wrapped in one supervisor for RuntimeException // and then the IllegalArgument one is kept since it has a different throwable - stacktrace.count(_.toString.startsWith("akka.actor.typed.internal.InterceptorImpl.receive")) should ===(2) + stacktrace.count( + _.toString.startsWith("org.apache.pekko.actor.typed.internal.InterceptorImpl.receive")) should ===(2) } "replace supervision when new returned behavior catches same exception nested in other behaviors" in { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TerminatedSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala similarity index 83% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/TerminatedSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala index 9b59770936..b8da370cfa 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TerminatedSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala @@ -2,13 +2,14 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.TestInbox +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.TestInbox class TerminatedSpec extends AnyWordSpec with Matchers with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala similarity index 97% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala index e794deaf62..d79037b942 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @@ -13,13 +13,14 @@ import scala.util.control.NoStackTrace import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.DeadLetter -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl._ -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.TimerScheduler -import akka.testkit.TimingTest +import org.apache.pekko +import pekko.actor.DeadLetter +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl._ +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.TimerScheduler +import pekko.testkit.TimingTest class TimerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TransformMessagesSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala similarity index 91% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/TransformMessagesSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala index c83973ff20..5ff82ff803 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TransformMessagesSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.util.concurrent.atomic.AtomicInteger @@ -10,14 +10,15 @@ import scala.concurrent.duration._ import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor -import akka.actor.ActorInitializationException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter._ +import org.apache.pekko +import pekko.actor +import pekko.actor.ActorInitializationException +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.adapter._ object TransformMessagesSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala similarity index 95% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala index 6d66dbd386..e146ca64db 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala @@ -2,23 +2,24 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.concurrent._ import scala.concurrent.duration._ import org.scalatest.wordspec.AnyWordSpecLike -import akka.Done -import akka.actor -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.scaladsl.AbstractBehavior -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter._ +import org.apache.pekko +import pekko.Done +import pekko.actor +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.scaladsl.AbstractBehavior +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.adapter._ object WatchSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala similarity index 91% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala index de39816143..ffeb1ed47d 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala @@ -2,19 +2,20 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.coexistence +package org.apache.pekko.actor.typed.coexistence import com.typesafe.config.ConfigFactory import org.scalatest.BeforeAndAfterAll import org.scalatest.wordspec.AnyWordSpecLike -import akka.{ actor => u } -import akka.actor.Actor -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed._ -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter._ -import akka.testkit.TestProbe +import org.apache.pekko +import pekko.{ actor => u } +import pekko.actor.Actor +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.adapter._ +import pekko.testkit.TestProbe object ProbedBehavior { def behavior(probe: u.ActorRef): Behavior[String] = { @@ -51,12 +52,12 @@ class ClassicSupervisingTypedSpec extends AnyWordSpecLike with LogCapturing with import ClassicSupervisingTypedSpec._ - val classicSystem = akka.actor.ActorSystem( + val classicSystem = pekko.actor.ActorSystem( "ClassicSupervisingTypedSpec", ConfigFactory.parseString(""" akka.actor.testkit.typed.expect-no-message-default = 50 ms """)) - val classicTestKit = new akka.testkit.TestKit(classicSystem) + val classicTestKit = new pekko.testkit.TestKit(classicSystem) implicit val classicSender: u.ActorRef = classicTestKit.testActor import classicTestKit._ diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/TypedSupervisingClassicSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala similarity index 79% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/TypedSupervisingClassicSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala index 4f8b0a8819..22744d1391 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/TypedSupervisingClassicSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala @@ -2,17 +2,18 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.coexistence +package org.apache.pekko.actor.typed.coexistence import org.scalatest.wordspec.AnyWordSpecLike -import akka.{ actor => classic } -import akka.actor.Actor -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.ActorRef -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter._ +import org.apache.pekko +import pekko.{ actor => classic } +import pekko.actor.Actor +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed.ActorRef +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.adapter._ object TypedSupervisingClassicSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala similarity index 98% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala index f00965c228..48517f326c 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.delivery.ConsumerController.DeliverThenStop -import akka.actor.typed.delivery.internal.ConsumerControllerImpl -import akka.actor.typed.delivery.internal.ProducerControllerImpl -import akka.serialization.SerializationExtension +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.delivery.ConsumerController.DeliverThenStop +import pekko.actor.typed.delivery.internal.ConsumerControllerImpl +import pekko.actor.typed.delivery.internal.ProducerControllerImpl +import pekko.serialization.SerializationExtension class ConsumerControllerSpec extends ScalaTestWithActorTestKit(ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerControllerSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala similarity index 96% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerControllerSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala index f36daa9dd7..e9ffc41f39 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerControllerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import java.util.concurrent.atomic.AtomicReference @@ -11,13 +11,14 @@ import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.delivery.DurableProducerQueue.MessageSent -import akka.actor.typed.delivery.ProducerController.MessageWithConfirmation -import akka.actor.typed.delivery.internal.ChunkedMessage -import akka.actor.typed.delivery.internal.ProducerControllerImpl -import akka.util.ByteString +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.delivery.DurableProducerQueue.MessageSent +import pekko.actor.typed.delivery.ProducerController.MessageWithConfirmation +import pekko.actor.typed.delivery.internal.ChunkedMessage +import pekko.actor.typed.delivery.internal.ProducerControllerImpl +import pekko.util.ByteString class DurableProducerControllerSpec extends ScalaTestWithActorTestKit( diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerQueueSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala similarity index 93% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerQueueSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala index 8b04b45005..62eac14f04 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerQueueSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import org.scalatest.TestSuite import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.typed.delivery.DurableProducerQueue.MessageSent -import akka.actor.typed.delivery.DurableProducerQueue.State -import akka.actor.typed.delivery.internal.ChunkedMessage -import akka.util.ByteString +import org.apache.pekko +import pekko.actor.typed.delivery.DurableProducerQueue.MessageSent +import pekko.actor.typed.delivery.DurableProducerQueue.State +import pekko.actor.typed.delivery.internal.ChunkedMessage +import pekko.util.ByteString class DurableProducerQueueSpec extends AnyWordSpec with TestSuite with Matchers { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableWorkPullingSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala similarity index 97% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableWorkPullingSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala index bc5a9db862..1decb1769f 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableWorkPullingSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import java.util.concurrent.atomic.AtomicReference @@ -11,13 +11,14 @@ import scala.concurrent.duration._ import DurableProducerQueue.MessageSent import org.scalatest.wordspec.AnyWordSpecLike -import akka.Done -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.ActorRef -import akka.actor.typed.delivery.internal.ProducerControllerImpl -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.receptionist.ServiceKey +import org.apache.pekko +import pekko.Done +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.ActorRef +import pekko.actor.typed.delivery.internal.ProducerControllerImpl +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.receptionist.ServiceKey class DurableWorkPullingSpec extends ScalaTestWithActorTestKit(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ProducerControllerSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala similarity index 97% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ProducerControllerSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala index 4ec8007319..6bec8535da 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ProducerControllerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.delivery.ProducerController.MessageWithConfirmation -import akka.actor.typed.delivery.internal.ChunkedMessage -import akka.actor.typed.delivery.internal.ProducerControllerImpl +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.delivery.ProducerController.MessageWithConfirmation +import pekko.actor.typed.delivery.internal.ChunkedMessage +import pekko.actor.typed.delivery.internal.ProducerControllerImpl class ProducerControllerSpec extends ScalaTestWithActorTestKit( diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliveryRandomSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala similarity index 93% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliveryRandomSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala index e08f128f69..03ea79aedc 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliveryRandomSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import java.util.concurrent.atomic.AtomicReference @@ -13,14 +13,15 @@ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.Behavior -import akka.actor.typed.BehaviorInterceptor -import akka.actor.typed.TypedActorContext -import akka.actor.typed.delivery.internal.ProducerControllerImpl -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.LoggerOps +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.Behavior +import pekko.actor.typed.BehaviorInterceptor +import pekko.actor.typed.TypedActorContext +import pekko.actor.typed.delivery.internal.ProducerControllerImpl +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.LoggerOps object ReliableDeliveryRandomSpec { val config: Config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliverySpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala similarity index 97% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliverySpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala index 442c7c7ed1..fa080f37f2 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliverySpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import scala.concurrent.duration._ @@ -10,8 +10,9 @@ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit object ReliableDeliverySpec { val config: Config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala similarity index 92% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala index 17ca1733d3..4d948ad636 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import java.nio.charset.StandardCharsets import scala.concurrent.duration.Duration @@ -10,13 +10,14 @@ import scala.concurrent.duration.FiniteDuration import scala.concurrent.duration._ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.delivery.ConsumerController.SequencedMessage -import akka.actor.typed.delivery.internal.ProducerControllerImpl -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors -import akka.serialization.SerializerWithStringManifest +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.delivery.ConsumerController.SequencedMessage +import pekko.actor.typed.delivery.internal.ProducerControllerImpl +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors +import pekko.serialization.SerializerWithStringManifest import java.io.NotSerializableException diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestDurableProducerQueue.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala similarity index 92% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestDurableProducerQueue.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala index 60d6496ece..0a33de77a0 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestDurableProducerQueue.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala @@ -2,18 +2,19 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import java.util.concurrent.atomic.AtomicReference import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration -import akka.actor.testkit.typed.TestException -import akka.actor.typed.Behavior -import akka.actor.typed.SupervisorStrategy -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.testkit.typed.TestException +import pekko.actor.typed.Behavior +import pekko.actor.typed.SupervisorStrategy +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors object TestDurableProducerQueue { import DurableProducerQueue._ diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducer.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala similarity index 90% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducer.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala index ad8e94c3d9..c2dabb4bed 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducer.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala @@ -2,16 +2,17 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import scala.concurrent.duration._ import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors object TestProducer { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWithAsk.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala similarity index 92% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWithAsk.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala index 9bfc044f79..e7c5033c50 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWithAsk.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala @@ -2,17 +2,18 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import scala.concurrent.duration.FiniteDuration import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.Behaviors +import pekko.util.Timeout object TestProducerWithAsk { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWorkPulling.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala similarity index 89% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWorkPulling.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala index 165060ed4d..a81b26305d 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWorkPulling.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala @@ -2,13 +2,14 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import scala.concurrent.duration.FiniteDuration -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.Behaviors object TestProducerWorkPulling { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/WorkPullingSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala similarity index 96% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/WorkPullingSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala index 34c33be43e..0994337fa4 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/WorkPullingSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala @@ -2,19 +2,20 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import scala.concurrent.duration._ import org.scalatest.wordspec.AnyWordSpecLike -import akka.Done -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.ActorRef -import akka.actor.typed.delivery.internal.ProducerControllerImpl -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.receptionist.ServiceKey +import org.apache.pekko +import pekko.Done +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.ActorRef +import pekko.actor.typed.delivery.internal.ProducerControllerImpl +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.receptionist.ServiceKey class WorkPullingSpec extends ScalaTestWithActorTestKit(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/eventstream/EventStreamSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala similarity index 93% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/eventstream/EventStreamSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala index 70ab3cf535..9cbbc09fd3 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/eventstream/EventStreamSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.eventstream +package org.apache.pekko.actor.typed.eventstream import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @@ -11,10 +11,11 @@ import scala.concurrent.duration._ import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.DeadLetter -import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.DeadLetter +import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed.scaladsl.Behaviors class EventStreamSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala similarity index 85% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala index 700fd094fd..a333f9a586 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.ActorRef -import akka.actor.typed.scaladsl.Behaviors -import akka.serialization.{ JavaSerializer, SerializationExtension } +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.ActorRef +import pekko.actor.typed.scaladsl.Behaviors +import pekko.serialization.{ JavaSerializer, SerializationExtension } object ActorRefSerializationSpec { def config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala similarity index 91% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala index 463a601fb1..af9f7d09db 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal import scala.concurrent.Future @@ -15,17 +15,18 @@ import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.Done -import akka.actor.dungeon.Dispatch -import akka.actor.{ Address, CoordinatedShutdown, InvalidMessageException } -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.TestInbox -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.Done +import pekko.actor.dungeon.Dispatch +import pekko.actor.{ Address, CoordinatedShutdown, InvalidMessageException } +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.TestInbox +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.scaladsl.Behaviors import com.typesafe.config.ConfigFactory import org.scalatest.time.Span -import akka.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.TestKitSettings class ActorSystemSpec extends AnyWordSpec @@ -194,7 +195,7 @@ class ActorSystemSpec props = MailboxSelector.bounded(5)) { implicit sys => val probe = TestProbe[String]() sys ! WhatsYourMailbox(probe.ref) - probe.expectMessage("akka.dispatch.BoundedMailbox$MessageQueue") + probe.expectMessage("org.apache.pekko.dispatch.BoundedMailbox$MessageQueue") } } } diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/adpater/PropsAdapterSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adpater/PropsAdapterSpec.scala similarity index 60% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/adpater/PropsAdapterSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adpater/PropsAdapterSpec.scala index d7bebcacf0..742ae6d5d5 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/adpater/PropsAdapterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adpater/PropsAdapterSpec.scala @@ -2,20 +2,21 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.internal.adpater +package org.apache.pekko.actor.typed.internal.adpater import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor -import akka.actor.typed.Props -import akka.actor.typed.internal.adapter.PropsAdapter -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor +import pekko.actor.typed.Props +import pekko.actor.typed.internal.adapter.PropsAdapter +import pekko.actor.typed.scaladsl.Behaviors class PropsAdapterSpec extends AnyWordSpec with Matchers { "PropsAdapter" should { - "default to akka.dispatch.SingleConsumerOnlyUnboundedMailbox" in { + "default to org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox" in { val props: Props = Props.empty val pa: actor.Props = PropsAdapter(() => Behaviors.empty, props, rethrowTypedFailure = false) pa.mailbox shouldEqual "akka.actor.typed.default-mailbox" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala similarity index 94% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala index 87b8bb26a0..8d17a6907f 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala @@ -2,24 +2,25 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist import scala.concurrent.Future import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } -import akka.actor.testkit.typed.scaladsl.BehaviorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestInbox -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed._ -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.receptionist.Receptionist._ -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.AskPattern._ -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.BehaviorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestInbox +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed._ +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.receptionist.Receptionist._ +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.AskPattern._ +import pekko.actor.typed.scaladsl.Behaviors object LocalReceptionistSpec { trait ServiceA diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala similarity index 70% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala index 033e3a1bd6..fe67f5d7c7 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.internal.ActorRefSerializationSpec -import akka.actor.typed.receptionist.ServiceKey -import akka.serialization.SerializationExtension +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.internal.ActorRefSerializationSpec +import pekko.actor.typed.receptionist.ServiceKey +import pekko.serialization.SerializationExtension class ServiceKeySerializationSpec extends ScalaTestWithActorTestKit(ActorRefSerializationSpec.config) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/PoolRouterSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala similarity index 83% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/PoolRouterSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala index d23ed3d571..1146349c0f 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/PoolRouterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala @@ -2,13 +2,14 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.internal.routing +package org.apache.pekko.actor.typed.internal.routing import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit } -import akka.actor.typed.{ ActorRef, Behavior, DispatcherSelector } -import akka.actor.typed.scaladsl.{ Behaviors, Routers } +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit } +import pekko.actor.typed.{ ActorRef, Behavior, DispatcherSelector } +import pekko.actor.typed.scaladsl.{ Behaviors, Routers } object PoolRouterSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/RoutingLogicSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala similarity index 95% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/RoutingLogicSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala index f1f3d70183..d5a307d508 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/RoutingLogicSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.routing +package org.apache.pekko.actor.typed.internal.routing import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.Address -import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit, TestProbe } -import akka.actor.typed.{ ActorSystem, Behavior } -import akka.actor.typed.internal.routing.RoutingLogics.ConsistentHashingLogic -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.Address +import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit, TestProbe } +import pekko.actor.typed.{ ActorSystem, Behavior } +import pekko.actor.typed.internal.routing.RoutingLogics.ConsistentHashingLogic +import pekko.actor.typed.scaladsl.Behaviors class RoutingLogicSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with Matchers with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala similarity index 88% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala index f51a4f8fee..e435e538ce 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala @@ -2,20 +2,21 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl import scala.concurrent.Promise import org.scalatest.wordspec.AnyWordSpecLike -import akka.Done -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.Behavior -import akka.actor.typed.MessageAdaptionFailure -import akka.actor.typed.PreRestart -import akka.actor.typed.Terminated +import org.apache.pekko +import pekko.Done +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.Behavior +import pekko.actor.typed.MessageAdaptionFailure +import pekko.actor.typed.PreRestart +import pekko.actor.typed.Terminated object AdaptationFailureSpec { def emptyAbstractBehavior: Behavior[Any] = Behaviors.setup(new EmptyAbstractBehavior(_)) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/pubsub/LocalPubSubSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala similarity index 96% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/pubsub/LocalPubSubSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala index 0ce80c746d..ce35c94e83 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/pubsub/LocalPubSubSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.pubsub +package org.apache.pekko.actor.typed.pubsub import scala.concurrent.duration._ import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit class LocalPubSubSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala similarity index 91% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala index e3215cda37..48afbf853c 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.receptionist +package org.apache.pekko.actor.typed.receptionist import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.Success -import akka.actor.typed.{ ActorRef, ActorSystem } -import akka.actor.typed.scaladsl.AskPattern._ -import akka.actor.typed.scaladsl.Behaviors -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.typed.{ ActorRef, ActorSystem } +import pekko.actor.typed.scaladsl.AskPattern._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.util.Timeout object ReceptionistApiSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala similarity index 92% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala index 1b6d3aef45..f29b3500c8 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl -import akka.actor.testkit.typed.TestException +import org.apache.pekko.actor.testkit.typed.TestException import scala.concurrent.TimeoutException import scala.concurrent.duration._ @@ -12,12 +12,13 @@ import scala.reflect.ClassTag import scala.util.{ Failure, Success } import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.{ ActorRef, PostStop, Props } -import akka.pattern.StatusReply +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.{ ActorRef, PostStop, Props } +import pekko.pattern.StatusReply object ActorContextAskSpec { val config = ConfigFactory.parseString(""" @@ -231,7 +232,7 @@ class ActorContextAskSpec val replyTo = probe.expectMessageType[Ping].ref replyTo ! StatusReply.Error("boho") - probe.expectMessage("got error: akka.pattern.StatusReply$ErrorMessage, boho") + probe.expectMessage("got error: org.apache.pekko.pattern.StatusReply$ErrorMessage, boho") } "unwrap error with custom exception StatusReply messages using askWithStatus" in { @@ -255,7 +256,7 @@ class ActorContextAskSpec val replyTo = probe.expectMessageType[Ping].ref replyTo ! StatusReply.Error(TestException("boho")) - probe.expectMessage("got error: akka.actor.testkit.typed.TestException, boho") + probe.expectMessage("got error: org.apache.pekko.actor.testkit.typed.TestException, boho") } } diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextDelegateSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala similarity index 90% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextDelegateSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala index c9f9074ed6..b194fe9d01 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextDelegateSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala @@ -2,12 +2,13 @@ * Copyright (C) 2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl -import akka.actor.UnhandledMessage -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.scaladsl.{ FishingOutcomes, LogCapturing, ScalaTestWithActorTestKit, TestProbe } -import akka.actor.typed.{ ActorRef, Behavior } +import org.apache.pekko +import pekko.actor.UnhandledMessage +import pekko.actor.testkit.typed.TestKitSettings +import pekko.actor.testkit.typed.scaladsl.{ FishingOutcomes, LogCapturing, ScalaTestWithActorTestKit, TestProbe } +import pekko.actor.typed.{ ActorRef, Behavior } import org.scalatest.wordspec.AnyWordSpecLike object ActorContextDelegateSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala similarity index 90% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala index ea514b005c..e23f4774fd 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import scala.concurrent.Future import scala.concurrent.Promise @@ -12,10 +12,11 @@ import scala.util.control.NoStackTrace import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.typed.Props +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.typed.Props object ActorContextPipeToSelfSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala similarity index 94% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala index 1914fd72bf..cf26e27354 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicReference @@ -13,23 +13,24 @@ import org.slf4j.LoggerFactory import org.slf4j.MDC import org.slf4j.helpers.BasicMarkerFactory -import akka.actor.ActorPath -import akka.actor.ActorSystem -import akka.actor.ExtendedActorSystem -import akka.actor.testkit.typed.LoggingEvent -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.ActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.ActorTags -import akka.actor.typed.Behavior -import akka.actor.typed.internal.ActorMdc -import akka.actor.typed.scaladsl.adapter._ -import akka.event.DefaultLoggingFilter -import akka.event.Logging.DefaultLogger -import akka.event.slf4j.Slf4jLogger -import akka.event.slf4j.Slf4jLoggingFilter +import org.apache.pekko +import pekko.actor.ActorPath +import pekko.actor.ActorSystem +import pekko.actor.ExtendedActorSystem +import pekko.actor.testkit.typed.LoggingEvent +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.ActorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.ActorTags +import pekko.actor.typed.Behavior +import pekko.actor.typed.internal.ActorMdc +import pekko.actor.typed.scaladsl.adapter._ +import pekko.event.DefaultLoggingFilter +import pekko.event.Logging.DefaultLogger +import pekko.event.slf4j.Slf4jLogger +import pekko.event.slf4j.Slf4jLoggingFilter class SomeClass @@ -280,9 +281,10 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit(""" } "SLF4J Settings" must { - import akka.actor.{ ActorSystem => ClassicActorSystem } - import akka.actor.ExtendedActorSystem - import akka.actor.typed.scaladsl.adapter._ + import org.apache.pekko + import pekko.actor.{ ActorSystem => ClassicActorSystem } + import pekko.actor.ExtendedActorSystem + import pekko.actor.typed.scaladsl.adapter._ "by default be amended to use Slf4jLogger" in { system.settings.config.getStringList("akka.loggers").size() should ===(1) @@ -294,7 +296,7 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit(""" } "by default be amended to use Slf4jLogger when starting classic ActorSystem" in { - val classicSys = akka.actor.ActorSystem(system.name) + val classicSys = pekko.actor.ActorSystem(system.name) try { classicSys.settings.config.getStringList("akka.loggers").size() should ===(1) classicSys.settings.config.getStringList("akka.loggers").get(0) should ===(classOf[Slf4jLogger].getName) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorThreadSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala similarity index 95% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorThreadSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala index b25be3a6f5..38640ffd39 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorThreadSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @@ -11,12 +11,13 @@ import scala.concurrent.Future import scala.util.Failure import scala.util.Success -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.ActorThreadSpec.Echo +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.scaladsl.ActorThreadSpec.Echo import org.scalatest.wordspec.AnyWordSpecLike object ActorThreadSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/AdaptationFailureSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala similarity index 89% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/AdaptationFailureSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala index fa0e472f0c..bab36e7915 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/AdaptationFailureSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala @@ -2,21 +2,22 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import scala.concurrent.Promise import org.scalatest.wordspec.AnyWordSpecLike -import akka.Done -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.Behavior -import akka.actor.typed.MessageAdaptionFailure -import akka.actor.typed.PreRestart -import akka.actor.typed.Signal -import akka.actor.typed.Terminated +import org.apache.pekko +import pekko.Done +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.Behavior +import pekko.actor.typed.MessageAdaptionFailure +import pekko.actor.typed.PreRestart +import pekko.actor.typed.Signal +import pekko.actor.typed.Terminated object AdaptationFailureSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/DispatcherSelectorSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala similarity index 85% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/DispatcherSelectorSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala index dae48efc66..75e6357171 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/DispatcherSelectorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala @@ -2,24 +2,25 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.BootstrapSetup -import akka.actor.setup.ActorSystemSetup -import akka.actor.testkit.typed.scaladsl.ActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.Props -import akka.actor.typed.SpawnProtocol +import org.apache.pekko +import pekko.actor.BootstrapSetup +import pekko.actor.setup.ActorSystemSetup +import pekko.actor.testkit.typed.scaladsl.ActorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.Props +import pekko.actor.typed.SpawnProtocol object DispatcherSelectorSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala similarity index 79% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala index c9575d3fc7..cae5b595f9 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package scaladsl import org.scalatest.wordspec.AnyWordSpecLike -import akka.Done -import akka.NotUsed -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe +import org.apache.pekko +import pekko.Done +import pekko.NotUsed +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe final class GracefulStopSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { @@ -21,7 +22,7 @@ final class GracefulStopSpec extends ScalaTestWithActorTestKit with AnyWordSpecL val probe = TestProbe[String]("probe") val behavior = - Behaviors.setup[akka.NotUsed] { context => + Behaviors.setup[pekko.NotUsed] { context => context.spawn[NotUsed](Behaviors.receiveSignal { case (_, PostStop) => probe.ref ! "child-done" @@ -51,7 +52,7 @@ final class GracefulStopSpec extends ScalaTestWithActorTestKit with AnyWordSpecL val probe = TestProbe[Done]("probe") val behavior = - Behaviors.setup[akka.NotUsed] { _ => + Behaviors.setup[pekko.NotUsed] { _ => // do not spawn any children Behaviors.stopped { () => // cleanup function body diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/LoggerOpsSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala similarity index 90% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/LoggerOpsSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala index 5f46705407..a7d55fbb6d 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/LoggerOpsSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import org.scalatest.wordspec.AnyWordSpecLike import org.slf4j.LoggerFactory -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit object LoggerOpsSpec { case class Value1(i: Int) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala similarity index 94% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala index fed724f49e..70b0f90f0b 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala @@ -2,24 +2,25 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike import org.slf4j.LoggerFactory -import akka.actor.DeadLetter -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.FishingOutcomes -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.PostStop -import akka.actor.typed.Props -import akka.actor.typed.internal.AdaptMessage +import org.apache.pekko +import pekko.actor.DeadLetter +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.FishingOutcomes +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.PostStop +import pekko.actor.typed.Props +import pekko.actor.typed.internal.AdaptMessage object MessageAdapterSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala similarity index 86% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala index 2e9e78a53e..f921888604 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package scaladsl import org.scalatest.wordspec.AnyWordSpecLike -import akka.Done -import akka.actor.testkit.typed.scaladsl.ActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe +import org.apache.pekko +import pekko.Done +import pekko.actor.testkit.typed.scaladsl.ActorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe final class OnSignalSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala similarity index 85% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala index 3b2b83162c..fe402fab8a 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala @@ -2,16 +2,17 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package scaladsl import scala.concurrent.ExecutionContextExecutor import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe +import org.apache.pekko +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe class ReceivePartialSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/RoutersSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala similarity index 93% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/RoutersSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala index b78e4ddab5..9f38e85639 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/RoutersSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala @@ -2,21 +2,22 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import java.util.concurrent.atomic.AtomicInteger import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.{ ActorPath, ActorSystem } -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.internal.routing.GroupRouterImpl -import akka.actor.typed.internal.routing.RoutingLogics -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.adapter._ +import org.apache.pekko +import pekko.actor.{ ActorPath, ActorSystem } +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.internal.routing.GroupRouterImpl +import pekko.actor.typed.internal.routing.RoutingLogics +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.adapter._ class RoutersSpec extends ScalaTestWithActorTestKit(""" akka.loglevel=debug diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala similarity index 95% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala index 5644dc5f8d..e745c731ae 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala @@ -2,15 +2,16 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.testkit.typed.internal.StubbedActorContext -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.TestInbox -import akka.actor.typed.Behavior +import org.apache.pekko +import pekko.actor.testkit.typed.internal.StubbedActorContext +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.TestInbox +import pekko.actor.typed.Behavior class StashBufferSpec extends AnyWordSpec with Matchers with LogCapturing { @@ -61,7 +62,7 @@ class StashBufferSpec extends AnyWordSpec with Matchers with LogCapturing { buffer.stash("m4") } // it's actually a javadsl.StashOverflowException - intercept[akka.actor.typed.javadsl.StashOverflowException] { + intercept[pekko.actor.typed.javadsl.StashOverflowException] { buffer.stash("m4") } buffer.size should ===(3) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala similarity index 98% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala index 0f88b986e4..0bb5420bb6 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package scaladsl import java.util.concurrent.CountDownLatch @@ -12,11 +12,12 @@ import scala.concurrent.duration._ import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe +import org.apache.pekko +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe object AbstractStashSpec { sealed trait Command diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala similarity index 84% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala index 8c4446aa01..eaa1bbb5a9 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala @@ -2,18 +2,19 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import org.scalatest.wordspec.AnyWordSpecLike -import akka.Done -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed -import akka.actor.typed.Behavior -import akka.actor.typed.BehaviorInterceptor -import akka.actor.typed.PostStop +import org.apache.pekko +import pekko.Done +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import pekko.actor.testkit.typed.scaladsl.TestProbe +import pekko.actor.typed +import pekko.actor.typed.Behavior +import pekko.actor.typed.BehaviorInterceptor +import pekko.actor.typed.PostStop class StopSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { import BehaviorInterceptor._ diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala similarity index 92% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala index 26fe75b9b6..8214720d1e 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl.adapter +package org.apache.pekko.actor.typed.scaladsl.adapter import scala.util.control.NoStackTrace @@ -10,22 +10,23 @@ import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.{ actor => classic } -import akka.Done -import akka.NotUsed -import akka.actor.ActorInitializationException -import akka.actor.InvalidMessageException -import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.Terminated -import akka.actor.typed.internal.adapter.SchedulerAdapter -import akka.actor.typed.scaladsl.Behaviors -import akka.serialization.SerializationExtension -import akka.testkit._ +import org.apache.pekko +import pekko.{ actor => classic } +import pekko.Done +import pekko.NotUsed +import pekko.actor.ActorInitializationException +import pekko.actor.InvalidMessageException +import pekko.actor.testkit.typed.TestException +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.testkit.typed.scaladsl.LoggingTestKit +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.Terminated +import pekko.actor.typed.internal.adapter.SchedulerAdapter +import pekko.actor.typed.scaladsl.Behaviors +import pekko.serialization.SerializationExtension +import pekko.testkit._ object AdapterSpec { val classic1: classic.Props = classic.Props(new Classic1) @@ -186,7 +187,7 @@ object AdapterSpec { class AdapterSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll with LogCapturing { import AdapterSpec._ - implicit val system: classic.ActorSystem = akka.actor.ActorSystem("AdapterSpec") + implicit val system: classic.ActorSystem = pekko.actor.ActorSystem("AdapterSpec") def typedSystem: ActorSystem[Nothing] = system.toTyped "ActorSystem adaption" must { @@ -199,7 +200,7 @@ class AdapterSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll with "not crash if guardian is stopped" in { for { _ <- 0 to 10 } { - var systemN: akka.actor.typed.ActorSystem[NotUsed] = null + var systemN: pekko.actor.typed.ActorSystem[NotUsed] = null try { systemN = ActorSystem.create( Behaviors.setup[NotUsed](_ => Behaviors.stopped[NotUsed]), @@ -210,7 +211,7 @@ class AdapterSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll with "not crash if guardian is stopped very quickly" in { for { _ <- 0 to 10 } { - var systemN: akka.actor.typed.ActorSystem[Done] = null + var systemN: pekko.actor.typed.ActorSystem[Done] = null try { systemN = ActorSystem.create(Behaviors.receive[Done] { (context, message) => context.self ! Done diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala similarity index 88% rename from akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala rename to akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala index 419a5dad3d..958061d697 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl.adapter +package org.apache.pekko.actor.typed.scaladsl.adapter import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @@ -11,11 +11,12 @@ import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import akka.actor.ActorSystemImpl -import akka.actor.testkit.typed.scaladsl.ActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.ActorSystem -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.ActorSystemImpl +import pekko.actor.testkit.typed.scaladsl.ActorTestKit +import pekko.actor.testkit.typed.scaladsl.LogCapturing +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.scaladsl.Behaviors class GuardianStartupSpec extends AnyWordSpec with Matchers with ScalaFutures with LogCapturing { diff --git a/akka-actor-typed/src/main/resources/reference.conf b/akka-actor-typed/src/main/resources/reference.conf index d34d52aeef..044330b8e0 100644 --- a/akka-actor-typed/src/main/resources/reference.conf +++ b/akka-actor-typed/src/main/resources/reference.conf @@ -1,6 +1,6 @@ akka.actor.typed { - # List FQCN of `akka.actor.typed.ExtensionId`s which shall be loaded at actor system startup. + # List FQCN of `org.apache.pekko.actor.typed.ExtensionId`s which shall be loaded at actor system startup. # Should be on the format: 'extensions = ["com.example.MyExtId1", "com.example.MyExtId2"]' etc. # See the Akka Documentation for more info about Extensions extensions = [] @@ -16,7 +16,7 @@ akka.actor.typed { library-extensions = ${?akka.actor.typed.library-extensions} [] # Receptionist is started eagerly to allow clustered receptionist to gather remote registrations early on. - library-extensions += "akka.actor.typed.receptionist.Receptionist$" + library-extensions += "org.apache.pekko.actor.typed.receptionist.Receptionist$" # While an actor is restarted (waiting for backoff to expire and children to stop) # incoming messages and signals are stashed, and delivered later to the newly restarted @@ -26,33 +26,33 @@ akka.actor.typed { # Typed mailbox defaults to the single consumber mailbox as balancing dispatcher is not supported default-mailbox { - mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox" } } # Load typed extensions by a classic extension. -akka.library-extensions += "akka.actor.typed.internal.adapter.ActorSystemAdapter$LoadTypedExtensions" +akka.library-extensions += "org.apache.pekko.actor.typed.internal.adapter.ActorSystemAdapter$LoadTypedExtensions" akka.actor { serializers { - typed-misc = "akka.actor.typed.internal.MiscMessageSerializer" - service-key = "akka.actor.typed.internal.receptionist.ServiceKeySerializer" + typed-misc = "org.apache.pekko.actor.typed.internal.MiscMessageSerializer" + service-key = "org.apache.pekko.actor.typed.internal.receptionist.ServiceKeySerializer" } serialization-identifiers { - "akka.actor.typed.internal.MiscMessageSerializer" = 24 - "akka.actor.typed.internal.receptionist.ServiceKeySerializer" = 26 + "org.apache.pekko.actor.typed.internal.MiscMessageSerializer" = 24 + "org.apache.pekko.actor.typed.internal.receptionist.ServiceKeySerializer" = 26 } serialization-bindings { - "akka.actor.typed.ActorRef" = typed-misc - "akka.actor.typed.internal.adapter.ActorRefAdapter" = typed-misc - "akka.actor.typed.internal.receptionist.DefaultServiceKey" = service-key + "org.apache.pekko.actor.typed.ActorRef" = typed-misc + "org.apache.pekko.actor.typed.internal.adapter.ActorRefAdapter" = typed-misc + "org.apache.pekko.actor.typed.internal.receptionist.DefaultServiceKey" = service-key } } # When using Akka Typed (having akka-actor-typed in classpath) the -# akka.event.slf4j.Slf4jLogger is enabled instead of the DefaultLogger +# org.apache.pekko.event.slf4j.Slf4jLogger is enabled instead of the DefaultLogger # even though it has not been explicitly defined in `akka.loggers` # configuration. # diff --git a/akka-actor-typed/src/main/scala-2.12/akka/actor/typed/internal/receptionist/Platform.scala b/akka-actor-typed/src/main/scala-2.12/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala similarity index 67% rename from akka-actor-typed/src/main/scala-2.12/akka/actor/typed/internal/receptionist/Platform.scala rename to akka-actor-typed/src/main/scala-2.12/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala index 355fc82be1..2b09ba303f 100644 --- a/akka-actor-typed/src/main/scala-2.12/akka/actor/typed/internal/receptionist/Platform.scala +++ b/akka-actor-typed/src/main/scala-2.12/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala @@ -2,10 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist -import akka.actor.typed.ActorRef -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.annotation.InternalApi /** * INTERNAL API diff --git a/akka-actor-typed/src/main/scala-2.13/akka/actor/typed/internal/receptionist/Platform.scala b/akka-actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala similarity index 67% rename from akka-actor-typed/src/main/scala-2.13/akka/actor/typed/internal/receptionist/Platform.scala rename to akka-actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala index 355fc82be1..2b09ba303f 100644 --- a/akka-actor-typed/src/main/scala-2.13/akka/actor/typed/internal/receptionist/Platform.scala +++ b/akka-actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala @@ -2,10 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist -import akka.actor.typed.ActorRef -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.annotation.InternalApi /** * INTERNAL API diff --git a/akka-actor-typed/src/main/scala-3/akka/actor/typed/internal/receptionist/Platform.scala b/akka-actor-typed/src/main/scala-3/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala similarity index 72% rename from akka-actor-typed/src/main/scala-3/akka/actor/typed/internal/receptionist/Platform.scala rename to akka-actor-typed/src/main/scala-3/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala index 9f49b0ea9a..b03b630f3e 100644 --- a/akka-actor-typed/src/main/scala-3/akka/actor/typed/internal/receptionist/Platform.scala +++ b/akka-actor-typed/src/main/scala-3/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala @@ -2,10 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist -import akka.actor.typed.ActorRef -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.annotation.InternalApi /** * INTERNAL API diff --git a/akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/Events.scala b/akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/Events.scala similarity index 98% rename from akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/Events.scala rename to akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/Events.scala index 625b3657f9..282751b4ab 100644 --- a/akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/Events.scala +++ b/akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/Events.scala @@ -2,7 +2,7 @@ * Copyright (C) extends Event 2009-2019 Lightbend Inc. */ -package akka.actor.typed.internal.jfr +package org.apache.pekko.actor.typed.internal.jfr import jdk.jfr.Category import jdk.jfr.Enabled @@ -10,7 +10,7 @@ import jdk.jfr.Event import jdk.jfr.Label import jdk.jfr.StackTrace -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi // requires jdk9+ to compile // for editing these in IntelliJ, open module settings, change JDK dependency to 11 for only this module diff --git a/akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/JFRActorFlightRecorder.scala b/akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala similarity index 88% rename from akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/JFRActorFlightRecorder.scala rename to akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala index 787148a0fb..117f4bcc75 100644 --- a/akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/JFRActorFlightRecorder.scala +++ b/akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala @@ -2,26 +2,27 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.jfr +package org.apache.pekko.actor.typed.internal.jfr -import akka.actor.ActorPath -import akka.actor.typed.ActorSystem -import akka.actor.typed.internal.ActorFlightRecorder -import akka.actor.typed.internal.DeliveryFlightRecorder -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.ActorPath +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.internal.ActorFlightRecorder +import pekko.actor.typed.internal.DeliveryFlightRecorder +import pekko.annotation.InternalApi /** * INTERNAL API */ @InternalApi -private[akka] final class JFRActorFlightRecorder() extends ActorFlightRecorder { +private[pekko] final class JFRActorFlightRecorder() extends ActorFlightRecorder { override val delivery: DeliveryFlightRecorder = new JFRDeliveryFlightRecorder } /** * INTERNAL API */ -@InternalApi private[akka] final class JFRDeliveryFlightRecorder extends DeliveryFlightRecorder { +@InternalApi private[pekko] final class JFRDeliveryFlightRecorder extends DeliveryFlightRecorder { override def producerCreated(producerId: String, path: ActorPath): Unit = new DeliveryProducerCreated(producerId, path.toString).commit() diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/DeliverySerializable.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/DeliverySerializable.scala deleted file mode 100644 index 040f7dacca..0000000000 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/DeliverySerializable.scala +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (C) 2020-2022 Lightbend Inc. - */ - -package akka.actor.typed.delivery.internal - -import akka.annotation.InternalApi - -/** - * INTERNAL API - */ -@InternalApi private[akka] trait DeliverySerializable diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/EventStreamExtension.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/EventStreamExtension.scala deleted file mode 100644 index 05c1e8bb55..0000000000 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/EventStreamExtension.scala +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2019-2022 Lightbend Inc. - */ - -package akka.actor.typed.internal - -import akka.actor.typed._ -import akka.actor.typed.eventstream.EventStream -import akka.actor.typed.internal.adapter.EventStreamAdapter -import akka.actor.typed.scaladsl.adapter._ -import akka.annotation.InternalApi - -/** - * INTERNAL API - * - * Exposes a typed actor that interacts with the [[akka.actor.ActorSystem.eventStream]]. - * - * It is used as an extension to ensure a single instance per actor system. - */ -@InternalApi private[akka] final class EventStreamExtension(actorSystem: ActorSystem[_]) extends Extension { - val ref: ActorRef[EventStream.Command] = - actorSystem.internalSystemActorOf(EventStreamAdapter.behavior, "eventstream", Props.empty) -} - -private[akka] object EventStreamExtension extends ExtensionId[EventStreamExtension] { - override def createExtension(system: ActorSystem[_]): EventStreamExtension = new EventStreamExtension(system) -} diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorRef.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala similarity index 81% rename from akka-actor-typed/src/main/scala/akka/actor/typed/ActorRef.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala index 3143616e56..493e6743b8 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorRef.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala @@ -2,13 +2,14 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.annotation.unchecked.uncheckedVariance -import akka.{ actor => classic } -import akka.actor.typed.internal.InternalRecipientRef -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.{ actor => classic } +import pekko.actor.typed.internal.InternalRecipientRef +import pekko.annotation.DoNotInherit /** * An ActorRef is the identity or address of an Actor instance. It is valid @@ -16,7 +17,7 @@ import akka.annotation.DoNotInherit * Actor instance. Sending a message to an Actor that has terminated before * receiving the message will lead to that message being discarded; such * messages are delivered to the [[DeadLetter]] channel of the - * [[akka.event.EventStream]] on a best effort basis + * [[pekko.event.EventStream]] on a best effort basis * (i.e. this delivery is not reliable). * * Not for user extension @@ -46,7 +47,7 @@ trait ActorRef[-T] extends RecipientRef[T] with java.lang.Comparable[ActorRef[_] /** * The hierarchical path name of the referenced Actor. The lifecycle of the - * ActorRef is fully contained within the lifecycle of the [[akka.actor.ActorPath]] + * ActorRef is fully contained within the lifecycle of the [[pekko.actor.ActorPath]] * and more than one Actor instance can exist with the same path at different * points in time, but not concurrently. */ @@ -71,14 +72,14 @@ object ActorRef { /** * INTERNAL API */ -private[akka] object SerializedActorRef { +private[pekko] object SerializedActorRef { def apply[T](actorRef: ActorRef[T]): SerializedActorRef[T] = { new SerializedActorRef(actorRef) } def toAddress[T](actorRef: ActorRef[T]) = { - import akka.actor.typed.scaladsl.adapter._ - import akka.serialization.JavaSerializer.currentSystem + import pekko.actor.typed.scaladsl.adapter._ + import pekko.serialization.JavaSerializer.currentSystem val resolver = ActorRefResolver(currentSystem.value.toTyped) resolver.toSerializationFormat(actorRef) } @@ -89,9 +90,9 @@ private[akka] object SerializedActorRef { * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class SerializedActorRef[T] private (address: String) { - import akka.actor.typed.scaladsl.adapter._ - import akka.serialization.JavaSerializer.currentSystem +private[pekko] final case class SerializedActorRef[T] private (address: String) { + import pekko.actor.typed.scaladsl.adapter._ + import pekko.serialization.JavaSerializer.currentSystem def this(actorRef: ActorRef[T]) = this(SerializedActorRef.toAddress(actorRef)) @@ -101,7 +102,7 @@ private[akka] final case class SerializedActorRef[T] private (address: String) { case null => throw new IllegalStateException( "Trying to deserialize a serialized typed ActorRef without an ActorSystem in scope." + - " Use 'akka.serialization.Serialization.currentSystem.withValue(system) { ... }'") + " Use 'org.apache.pekko.serialization.Serialization.currentSystem.withValue(system) { ... }'") case someSystem => val resolver = ActorRefResolver(someSystem.toTyped) resolver.resolveActorRef(address) diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorRefResolver.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala similarity index 88% rename from akka-actor-typed/src/main/scala/akka/actor/typed/ActorRefResolver.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala index e5e9f0d0f9..7e2f9da2e3 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorRefResolver.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala @@ -2,10 +2,11 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed -import akka.actor.{ ActorRefWithCell, ExtendedActorSystem } -import akka.annotation.{ DoNotInherit, InternalApi } +import org.apache.pekko +import pekko.actor.{ ActorRefWithCell, ExtendedActorSystem } +import pekko.annotation.{ DoNotInherit, InternalApi } object ActorRefResolver extends ExtensionId[ActorRefResolver] { def get(system: ActorSystem[_]): ActorRefResolver = apply(system) @@ -43,8 +44,8 @@ abstract class ActorRefResolver extends Extension { /** * INTERNAL API */ -@InternalApi private[akka] class ActorRefResolverImpl(system: ActorSystem[_]) extends ActorRefResolver { - import akka.actor.typed.scaladsl.adapter._ +@InternalApi private[pekko] class ActorRefResolverImpl(system: ActorSystem[_]) extends ActorRefResolver { + import pekko.actor.typed.scaladsl.adapter._ private val classicSystem = system.toClassic.asInstanceOf[ExtendedActorSystem] @@ -89,7 +90,7 @@ object ActorRefResolverSetup { } /** - * Can be used in [[akka.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] + * Can be used in [[pekko.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] * to replace the default implementation of the [[ActorRefResolver]] extension. Intended * for tests that need to replace extension with stub/mock implementations. */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala similarity index 90% rename from akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala index b86929b1df..87413c1a90 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala @@ -2,7 +2,7 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.util.concurrent.{ CompletionStage, ThreadFactory } @@ -11,15 +11,16 @@ import scala.concurrent.{ ExecutionContextExecutor, Future } import com.typesafe.config.{ Config, ConfigFactory } import org.slf4j.Logger -import akka.{ actor => classic, Done } -import akka.actor.{ Address, BootstrapSetup, ClassicActorSystemProvider } -import akka.actor.setup.ActorSystemSetup -import akka.actor.typed.eventstream.EventStream -import akka.actor.typed.internal.{ EventStreamExtension, InternalRecipientRef } -import akka.actor.typed.internal.adapter.{ ActorSystemAdapter, GuardianStartupBehavior, PropsAdapter } -import akka.actor.typed.receptionist.Receptionist -import akka.annotation.DoNotInherit -import akka.util.Helpers.Requiring +import org.apache.pekko +import pekko.{ actor => classic, Done } +import pekko.actor.{ Address, BootstrapSetup, ClassicActorSystemProvider } +import pekko.actor.setup.ActorSystemSetup +import pekko.actor.typed.eventstream.EventStream +import pekko.actor.typed.internal.{ EventStreamExtension, InternalRecipientRef } +import pekko.actor.typed.internal.adapter.{ ActorSystemAdapter, GuardianStartupBehavior, PropsAdapter } +import pekko.actor.typed.receptionist.Receptionist +import pekko.annotation.DoNotInherit +import pekko.util.Helpers.Requiring /** * An ActorSystem is home to a hierarchy of Actors. It is created using @@ -100,8 +101,8 @@ abstract class ActorSystem[-T] extends ActorRef[T] with Extensions with ClassicA implicit def executionContext: ExecutionContextExecutor /** - * Terminates this actor system by running [[akka.actor.CoordinatedShutdown]] with reason - * [[akka.actor.CoordinatedShutdown.ActorSystemTerminateReason]]. + * Terminates this actor system by running [[pekko.actor.CoordinatedShutdown]] with reason + * [[pekko.actor.CoordinatedShutdown.ActorSystemTerminateReason]]. * * If `akka.coordinated-shutdown.run-by-actor-system-terminate` is configured to `off` * it will not run `CoordinatedShutdown`, but the `ActorSystem` and its actors @@ -165,14 +166,14 @@ abstract class ActorSystem[-T] extends ActorRef[T] with Extensions with ClassicA def systemActorOf[U](behavior: Behavior[U], name: String, props: Props = Props.empty): ActorRef[U] /** - * Return a reference to this system’s [[akka.actor.typed.receptionist.Receptionist]]. + * Return a reference to this system’s [[pekko.actor.typed.receptionist.Receptionist]]. */ def receptionist: ActorRef[Receptionist.Command] = Receptionist(this).ref /** * Main event bus of this actor system, used for example for logging. - * Accepts [[akka.actor.typed.eventstream.EventStream.Command]]. + * Accepts [[pekko.actor.typed.eventstream.EventStream.Command]]. */ def eventStream: ActorRef[EventStream.Command] = EventStreamExtension(this).ref @@ -261,7 +262,7 @@ object ActorSystem { create(guardianBehavior, name, ActorSystemSetup.create(bootstrapSetup)) /** - * Create an ActorSystem based on the classic [[akka.actor.ActorSystem]] + * Create an ActorSystem based on the classic [[pekko.actor.ActorSystem]] * which runs Akka Typed [[Behavior]] on an emulation layer. In this * system typed and classic actors can coexist. */ @@ -275,7 +276,7 @@ object ActorSystem { require(Behavior.isAlive(guardianBehavior)) val bootstrapSettings = setup.get[BootstrapSetup] - val cl = bootstrapSettings.flatMap(_.classLoader).getOrElse(akka.actor.ActorSystem.findClassLoader()) + val cl = bootstrapSettings.flatMap(_.classLoader).getOrElse(pekko.actor.ActorSystem.findClassLoader()) val appConfig = bootstrapSettings.flatMap(_.config).getOrElse(ConfigFactory.load(cl)) val executionContext = bootstrapSettings.flatMap(_.defaultExecutionContext) @@ -294,7 +295,7 @@ object ActorSystem { } /** - * Wrap a classic [[akka.actor.ActorSystem]] such that it can be used from + * Wrap a classic [[pekko.actor.ActorSystem]] such that it can be used from * Akka Typed [[Behavior]]. */ def wrap(system: classic.ActorSystem): ActorSystem[Nothing] = diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala similarity index 92% rename from akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala index 6efee5a7d1..6e4c0b4060 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala @@ -2,20 +2,21 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.annotation.switch import scala.annotation.tailrec import scala.reflect.ClassTag -import akka.actor.InvalidMessageException -import akka.actor.typed.internal.BehaviorImpl -import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior -import akka.actor.typed.internal.BehaviorImpl.StoppedBehavior -import akka.actor.typed.internal.BehaviorTags -import akka.actor.typed.internal.InterceptorImpl -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.InvalidMessageException +import pekko.actor.typed.internal.BehaviorImpl +import pekko.actor.typed.internal.BehaviorImpl.DeferredBehavior +import pekko.actor.typed.internal.BehaviorImpl.StoppedBehavior +import pekko.actor.typed.internal.BehaviorTags +import pekko.actor.typed.internal.InterceptorImpl +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi /** * The behavior of an actor defines how it reacts to the messages that it @@ -25,7 +26,7 @@ import akka.annotation.InternalApi * its child actors. * * Behaviors can be formulated in a number of different ways, either by - * using the DSLs in [[akka.actor.typed.scaladsl.Behaviors]] and [[akka.actor.typed.javadsl.Behaviors]] + * using the DSLs in [[pekko.actor.typed.scaladsl.Behaviors]] and [[pekko.actor.typed.javadsl.Behaviors]] * or extending the abstract [[ExtensibleBehavior]] class. * * Closing over ActorContext makes a Behavior immobile: it cannot be moved to @@ -38,7 +39,7 @@ import akka.annotation.InternalApi * Not for user extension. */ @DoNotInherit -abstract class Behavior[T](private[akka] val _tag: Int) { behavior => +abstract class Behavior[T](private[pekko] val _tag: Int) { behavior => /** * Narrow the type of this Behavior, which is always a safe operation. This @@ -57,13 +58,13 @@ abstract class Behavior[T](private[akka] val _tag: Int) { behavior => * Use it with caution, it may lead to a [[ClassCastException]] when you send a message * to the resulting [[Behavior[U]]]. */ - @InternalApi private[akka] final def unsafeCast[U]: Behavior[U] = this.asInstanceOf[Behavior[U]] + @InternalApi private[pekko] final def unsafeCast[U]: Behavior[U] = this.asInstanceOf[Behavior[U]] } /** * Extension point for implementing custom behaviors in addition to the existing - * set of behaviors available through the DSLs in [[akka.actor.typed.scaladsl.Behaviors]] and [[akka.actor.typed.javadsl.Behaviors]] + * set of behaviors available through the DSLs in [[pekko.actor.typed.scaladsl.Behaviors]] and [[pekko.actor.typed.javadsl.Behaviors]] * * Note that behaviors that keep an inner behavior, and intercepts messages for it should not be implemented as * an extensible behavior but should instead use the [[BehaviorInterceptor]] diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/BehaviorInterceptor.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala similarity index 96% rename from akka-actor-typed/src/main/scala/akka/actor/typed/BehaviorInterceptor.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala index 884db7fcf8..8ec14c319f 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/BehaviorInterceptor.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala @@ -2,12 +2,13 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.reflect.ClassTag -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.util.BoxedType +import org.apache.pekko +import pekko.annotation.{ DoNotInherit, InternalApi } +import pekko.util.BoxedType /** * A behavior interceptor allows for intercepting message and signal reception and perform arbitrary logic - @@ -113,7 +114,7 @@ object BehaviorInterceptor { * is taking place. */ @InternalApi - private[akka] def signalRestart(ctx: TypedActorContext[_]): Unit + private[pekko] def signalRestart(ctx: TypedActorContext[_]): Unit } /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Dispatchers.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Dispatchers.scala similarity index 88% rename from akka-actor-typed/src/main/scala/akka/actor/typed/Dispatchers.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Dispatchers.scala index 5797b88573..eb28f67e53 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Dispatchers.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Dispatchers.scala @@ -2,11 +2,11 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.concurrent.ExecutionContextExecutor -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi object Dispatchers { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala similarity index 93% rename from akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala index 424f0e3acd..6a8f42eff3 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala @@ -2,10 +2,11 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed -import akka.actor.setup.Setup -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.actor.setup.Setup +import pekko.annotation.DoNotInherit /** * Marker trait/interface for extensions. An extension can be registered in the ActorSystem and is guaranteed to only @@ -99,7 +100,7 @@ trait Extension * }}} * * For testing purposes extensions typically provide a concrete [[ExtensionSetup]] - * that can be used in [[akka.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] + * that can be used in [[pekko.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] * to replace the default implementation of the extension. * * @tparam T The concrete extension type @@ -158,7 +159,7 @@ trait Extensions { /** * Each extension typically provide a concrete `ExtensionSetup` that can be used in - * [[akka.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] to replace the default + * [[pekko.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] to replace the default * implementation of the extension. Intended for tests that need to replace * extension with stub/mock implementations. */ @@ -169,7 +170,7 @@ abstract class ExtensionSetup[T <: Extension]( /** * Scala 2.11 API: Each extension typically provide a concrete `ExtensionSetup` that can be used in - * [[akka.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] to replace the default + * [[pekko.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] to replace the default * implementation of the extension. Intended for tests that need to replace * extension with stub/mock implementations. */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/LogOptions.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/LogOptions.scala similarity index 90% rename from akka-actor-typed/src/main/scala/akka/actor/typed/LogOptions.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/LogOptions.scala index a97c97198a..fb46d29d59 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/LogOptions.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/LogOptions.scala @@ -2,14 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import java.util.Optional import org.slf4j.Logger import org.slf4j.event.Level -import akka.annotation.{ DoNotInherit, InternalApi } +import org.apache.pekko.annotation.{ DoNotInherit, InternalApi } /** * Logging options when using `Behaviors.logMessages`. @@ -50,7 +50,7 @@ object LogOptions { * INTERNAL API */ @InternalApi - private[akka] final case class LogOptionsImpl(enabled: Boolean, level: Level, logger: Option[Logger]) + private[pekko] final case class LogOptionsImpl(enabled: Boolean, level: Level, logger: Option[Logger]) extends LogOptions { /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/MessageAndSignals.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala similarity index 95% rename from akka-actor-typed/src/main/scala/akka/actor/typed/MessageAndSignals.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala index df75244433..202c2e8c2f 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/MessageAndSignals.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala @@ -2,9 +2,10 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.annotation.DoNotInherit /** * Exception that an actor fails with if it does not handle a Terminated message. @@ -58,7 +59,7 @@ object Terminated { /** * Lifecycle signal that is fired when an Actor that was watched has terminated. * Watching is performed by invoking the - * [[akka.actor.typed.scaladsl.ActorContext.watch]]. The DeathWatch service is + * [[pekko.actor.typed.scaladsl.ActorContext.watch]]. The DeathWatch service is * idempotent, meaning that registering twice has the same effect as registering * once. Registration does not need to happen before the Actor terminates, a * notification is guaranteed to arrive after both registration and termination diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Props.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala similarity index 92% rename from akka-actor-typed/src/main/scala/akka/actor/typed/Props.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala index 4a69ac753c..9ef5f67c02 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Props.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala @@ -2,16 +2,17 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.annotation.tailrec import scala.annotation.varargs import scala.reflect.ClassTag -import akka.actor.typed.internal.PropsImpl._ -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.actor.typed.internal.PropsImpl._ +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi +import pekko.util.ccompat.JavaConverters._ object Props { @@ -35,7 +36,7 @@ object Props { * Not for user extension. */ @DoNotInherit -abstract class Props private[akka] () extends Product with Serializable { +abstract class Props private[pekko] () extends Product with Serializable { /** * Reference to the tail of this Props list. @@ -47,7 +48,7 @@ abstract class Props private[akka] () extends Product with Serializable { * INTERNAL API */ @InternalApi - private[akka] def next: Props + private[pekko] def next: Props /** * Create a copy of this Props node with its `next` reference @@ -57,7 +58,7 @@ abstract class Props private[akka] () extends Product with Serializable { * INTERNAL API */ @InternalApi - private[akka] def withNext(next: Props): Props + private[pekko] def withNext(next: Props): Props /** * Prepend a selection of the [[ActorSystem]] default executor to this Props. @@ -83,7 +84,7 @@ abstract class Props private[akka] () extends Product with Serializable { * INTERNAL API */ @InternalApi - private[akka] def firstOrElse[T <: Props: ClassTag](default: T): T = { + private[pekko] def firstOrElse[T <: Props: ClassTag](default: T): T = { @tailrec def rec(d: Props): T = { d match { case EmptyProps => default @@ -102,7 +103,7 @@ abstract class Props private[akka] () extends Product with Serializable { * INTERNAL API */ @InternalApi - private[akka] def allOf[T <: Props: ClassTag]: List[Props] = { + private[pekko] def allOf[T <: Props: ClassTag]: List[Props] = { @tailrec def select(d: Props, acc: List[Props]): List[Props] = d match { case EmptyProps => acc.reverse @@ -117,7 +118,7 @@ abstract class Props private[akka] () extends Product with Serializable { * Props. */ @InternalApi - private[akka] def filterNot[T <: Props: ClassTag]: Props = { + private[pekko] def filterNot[T <: Props: ClassTag]: Props = { @tailrec def select(d: Props, acc: List[Props]): List[Props] = d match { case EmptyProps => acc diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala similarity index 98% rename from akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala index 7e1e687282..070be7c963 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.concurrent.ExecutionContext import scala.concurrent.duration.FiniteDuration -import akka.actor.Cancellable -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.actor.Cancellable +import pekko.annotation.DoNotInherit /** * The ActorSystem facility for scheduling tasks. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/SpawnProtocol.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala similarity index 91% rename from akka-actor-typed/src/main/scala/akka/actor/typed/SpawnProtocol.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala index 86ade16822..875a9a130b 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/SpawnProtocol.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala @@ -2,12 +2,13 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.annotation.tailrec -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.DoNotInherit /** * A message protocol for actors that support spawning a child actor when receiving a [[SpawnProtocol#Spawn]] @@ -17,7 +18,7 @@ import akka.annotation.DoNotInherit * The typical usage of this is to use it as the guardian actor of the [[ActorSystem]], possibly combined with * `Behaviors.setup` to starts some initial tasks or actors. Child actors can then be started from the outside * by telling or asking [[SpawnProtocol#Spawn]] to the actor reference of the system. When using `ask` this is - * similar to how [[akka.actor.ActorSystem#actorOf]] can be used in classic actors with the difference that + * similar to how [[pekko.actor.ActorSystem#actorOf]] can be used in classic actors with the difference that * a `Future` / `CompletionStage` of the `ActorRef` is returned. * * Stopping children is done through specific support in the protocol of the children, or stopping the entire diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/SupervisorStrategy.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala similarity index 95% rename from akka-actor-typed/src/main/scala/akka/actor/typed/SupervisorStrategy.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala index 0224b9dc3a..858c58dff5 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/SupervisorStrategy.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala @@ -2,16 +2,17 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration import org.slf4j.event.Level -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi -import akka.util.JavaDurationConverters._ +import org.apache.pekko +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi +import pekko.util.JavaDurationConverters._ object SupervisorStrategy { @@ -112,7 +113,7 @@ object SupervisorStrategy { /** * INTERNAL API */ - @InternalApi private[akka] case class Resume(loggingEnabled: Boolean, logLevel: Level) extends SupervisorStrategy { + @InternalApi private[pekko] case class Resume(loggingEnabled: Boolean, logLevel: Level) extends SupervisorStrategy { override def withLoggingEnabled(enabled: Boolean): SupervisorStrategy = copy(loggingEnabled = enabled) override def withLogLevel(level: Level): SupervisorStrategy = @@ -122,7 +123,7 @@ object SupervisorStrategy { /** * INTERNAL API */ - @InternalApi private[akka] case class Stop(loggingEnabled: Boolean, logLevel: Level) extends SupervisorStrategy { + @InternalApi private[pekko] case class Stop(loggingEnabled: Boolean, logLevel: Level) extends SupervisorStrategy { override def withLoggingEnabled(enabled: Boolean) = copy(loggingEnabled = enabled) override def withLogLevel(level: Level): SupervisorStrategy = @@ -132,7 +133,7 @@ object SupervisorStrategy { /** * INTERNAL API */ - @InternalApi private[akka] sealed trait RestartOrBackoff extends SupervisorStrategy { + @InternalApi private[pekko] sealed trait RestartOrBackoff extends SupervisorStrategy { def maxRestarts: Int def stopChildren: Boolean def stashCapacity: Int @@ -144,7 +145,7 @@ object SupervisorStrategy { /** * INTERNAL API */ - @InternalApi private[akka] final case class Restart( + @InternalApi private[pekko] final case class Restart( maxRestarts: Int, withinTimeRange: FiniteDuration, loggingEnabled: Boolean = true, @@ -176,7 +177,7 @@ object SupervisorStrategy { /** * INTERNAL API */ - @InternalApi private[akka] final case class Backoff( + @InternalApi private[pekko] final case class Backoff( minBackoff: FiniteDuration, maxBackoff: FiniteDuration, randomFactor: Double, diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/TypedActorContext.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/TypedActorContext.scala similarity index 86% rename from akka-actor-typed/src/main/scala/akka/actor/typed/TypedActorContext.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/TypedActorContext.scala index 13c0e7f7fc..c1a25b163b 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/TypedActorContext.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/TypedActorContext.scala @@ -2,9 +2,9 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed -import akka.annotation.DoNotInherit +import org.apache.pekko.annotation.DoNotInherit /** * This trait is not meant to be extended by user code. If you do so, you may diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ConsumerController.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala similarity index 89% rename from akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ConsumerController.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala index 23b03c6d73..639bf570c1 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ConsumerController.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import java.time.{ Duration => JavaDuration } @@ -10,20 +10,21 @@ import scala.concurrent.duration._ import com.typesafe.config.Config -import akka.actor.DeadLetterSuppression -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.delivery.internal.ChunkedMessage -import akka.actor.typed.delivery.internal.ConsumerControllerImpl -import akka.actor.typed.delivery.internal.DeliverySerializable -import akka.actor.typed.delivery.internal.ProducerControllerImpl -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.ApiMayChange -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi -import akka.util.JavaDurationConverters._ +import org.apache.pekko +import pekko.actor.DeadLetterSuppression +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.delivery.internal.ChunkedMessage +import pekko.actor.typed.delivery.internal.ConsumerControllerImpl +import pekko.actor.typed.delivery.internal.DeliverySerializable +import pekko.actor.typed.delivery.internal.ProducerControllerImpl +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.ApiMayChange +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi +import pekko.util.JavaDurationConverters._ /** * `ConsumerController` and [[ProducerController]] or [[WorkPullingProducerController]] are used @@ -135,7 +136,7 @@ object ConsumerController { /** * INTERNAL API */ - @InternalApi private[akka] def fromChunked[A]( + @InternalApi private[pekko] def fromChunked[A]( producerId: String, seqNr: SeqNr, chunk: ChunkedMessage, @@ -161,17 +162,18 @@ object ConsumerController { seqNr: SeqNr, message: SequencedMessage.MessageOrChunk, first: Boolean, - ack: Boolean)(@InternalApi private[akka] val producerController: ActorRef[ProducerControllerImpl.InternalCommand]) + ack: Boolean)( + @InternalApi private[pekko] val producerController: ActorRef[ProducerControllerImpl.InternalCommand]) extends Command[A] with DeliverySerializable with DeadLetterSuppression { /** INTERNAL API */ - @InternalApi private[akka] def asFirst: SequencedMessage[A] = + @InternalApi private[pekko] def asFirst: SequencedMessage[A] = copy(first = true)(producerController) /** INTERNAL API */ - @InternalApi private[akka] def isFirstChunk: Boolean = { + @InternalApi private[pekko] def isFirstChunk: Boolean = { message match { case c: ChunkedMessage => c.firstChunk case _ => true @@ -179,7 +181,7 @@ object ConsumerController { } /** INTERNAL API */ - @InternalApi private[akka] def isLastChunk: Boolean = { + @InternalApi private[pekko] def isLastChunk: Boolean = { message match { case c: ChunkedMessage => c.lastChunk case _ => true @@ -289,7 +291,7 @@ object ConsumerController { /** * To be used with [[WorkPullingProducerController]]. It will register itself to the - * [[akka.actor.typed.receptionist.Receptionist]] with the given `serviceKey`, and the + * [[pekko.actor.typed.receptionist.Receptionist]] with the given `serviceKey`, and the * `WorkPullingProducerController` subscribes to the same key to find active workers. */ def apply[A](serviceKey: ServiceKey[Command[A]]): Behavior[Command[A]] = @@ -303,7 +305,7 @@ object ConsumerController { /** * INTERNAL API */ - @InternalApi private[akka] def apply[A]( + @InternalApi private[pekko] def apply[A]( serviceKey: Option[ServiceKey[Command[A]]], settings: Settings): Behavior[Command[A]] = { ConsumerControllerImpl(serviceKey, settings) @@ -323,7 +325,7 @@ object ConsumerController { /** * Java API: To be used with [[WorkPullingProducerController]]. It will register itself to the - * [[akka.actor.typed.receptionist.Receptionist]] with the given `serviceKey`, and the + * [[pekko.actor.typed.receptionist.Receptionist]] with the given `serviceKey`, and the * `WorkPullingProducerController` subscribes to the same key to find active workers. */ def create[A](serviceKey: ServiceKey[Command[A]]): Behavior[Command[A]] = diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/DurableProducerQueue.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala similarity index 88% rename from akka-actor-typed/src/main/scala/akka/actor/typed/delivery/DurableProducerQueue.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala index 3d4d805f22..cbdcdcb9c6 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/DurableProducerQueue.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala @@ -2,22 +2,23 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import scala.collection.immutable -import akka.actor.typed.ActorRef -import akka.actor.typed.delivery.internal.ChunkedMessage -import akka.actor.typed.delivery.internal.DeliverySerializable -import akka.annotation.ApiMayChange -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.delivery.internal.ChunkedMessage +import pekko.actor.typed.delivery.internal.DeliverySerializable +import pekko.annotation.ApiMayChange +import pekko.annotation.InternalApi /** - * Actor message protocol for storing and confirming reliable delivery of messages. A [[akka.actor.typed.Behavior]] + * Actor message protocol for storing and confirming reliable delivery of messages. A [[pekko.actor.typed.Behavior]] * implementation of this protocol can optionally be used with [[ProducerController]] when messages shall survive * a crash of the producer side. * - * An implementation of this exists in `akka.persistence.typed.delivery.EventSourcedProducerQueue`. + * An implementation of this exists in `org.apache.pekko.persistence.typed.delivery.EventSourcedProducerQueue`. */ @ApiMayChange // TODO #28719 when removing ApiMayChange consider removing `case class` for some of the messages object DurableProducerQueue { @@ -126,7 +127,7 @@ object DurableProducerQueue { /** * INTERNAL API */ - @InternalApi private[akka] sealed trait Event extends DeliverySerializable + @InternalApi private[pekko] sealed trait Event extends DeliverySerializable /** * The fact (event) that a message has been sent. @@ -140,7 +141,7 @@ object DurableProducerQueue { extends Event { /** INTERNAL API */ - @InternalApi private[akka] def isFirstChunk: Boolean = { + @InternalApi private[pekko] def isFirstChunk: Boolean = { message match { case c: ChunkedMessage => c.firstChunk case _ => true @@ -148,7 +149,7 @@ object DurableProducerQueue { } /** INTERNAL API */ - @InternalApi private[akka] def isLastChunk: Boolean = { + @InternalApi private[pekko] def isLastChunk: Boolean = { message match { case c: ChunkedMessage => c.lastChunk case _ => true @@ -194,7 +195,7 @@ object DurableProducerQueue { /** * INTERNAL API */ - @InternalApi private[akka] def fromChunked[A]( + @InternalApi private[pekko] def fromChunked[A]( seqNr: SeqNr, chunkedMessage: ChunkedMessage, ack: Boolean, @@ -205,7 +206,7 @@ object DurableProducerQueue { /** * INTERNAL API */ - @InternalApi private[akka] def fromMessageOrChunked[A]( + @InternalApi private[pekko] def fromMessageOrChunked[A]( seqNr: SeqNr, message: MessageOrChunk, ack: Boolean, @@ -221,7 +222,7 @@ object DurableProducerQueue { /** * INTERNAL API: The fact (event) that a message has been confirmed to be delivered and processed. */ - @InternalApi private[akka] final case class Confirmed( + @InternalApi private[pekko] final case class Confirmed( seqNr: SeqNr, confirmationQualifier: ConfirmationQualifier, timestampMillis: TimestampMillis) @@ -230,6 +231,6 @@ object DurableProducerQueue { /** * INTERNAL API: Remove entries related to the confirmationQualifiers that haven't been used for a while. */ - @InternalApi private[akka] final case class Cleanup(confirmationQualifiers: Set[String]) extends Event + @InternalApi private[pekko] final case class Cleanup(confirmationQualifiers: Set[String]) extends Event } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ProducerController.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala similarity index 95% rename from akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ProducerController.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala index f5a8e6be48..088a86fd3e 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ProducerController.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import java.time.{ Duration => JavaDuration } import java.util.Optional @@ -13,17 +13,18 @@ import scala.reflect.ClassTag import com.typesafe.config.Config -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.delivery.internal.DeliverySerializable -import akka.actor.typed.delivery.internal.ProducerControllerImpl -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.ApiMayChange -import akka.annotation.InternalApi -import akka.util.Helpers.toRootLowerCase -import akka.util.Helpers.Requiring -import akka.util.JavaDurationConverters._ +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.delivery.internal.DeliverySerializable +import pekko.actor.typed.delivery.internal.ProducerControllerImpl +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.ApiMayChange +import pekko.annotation.InternalApi +import pekko.util.Helpers.toRootLowerCase +import pekko.util.Helpers.Requiring +import pekko.util.JavaDurationConverters._ /** * Point-to-point reliable delivery between a single producer actor sending messages and a single consumer @@ -269,7 +270,7 @@ object ProducerController { * wrap it or send it in other ways when building higher level abstractions that are using the `ProducerController`. * That is used by `ShardingProducerController`. */ - @InternalApi private[akka] def apply[A: ClassTag]( + @InternalApi private[pekko] def apply[A: ClassTag]( producerId: String, durableQueueBehavior: Option[Behavior[DurableProducerQueue.Command[A]]], settings: Settings, diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/WorkPullingProducerController.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala similarity index 95% rename from akka-actor-typed/src/main/scala/akka/actor/typed/delivery/WorkPullingProducerController.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala index bc7a097436..cc6198df2d 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/WorkPullingProducerController.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery +package org.apache.pekko.actor.typed.delivery import java.util.Optional @@ -12,15 +12,16 @@ import scala.reflect.ClassTag import com.typesafe.config.Config -import akka.Done -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.delivery.internal.WorkPullingProducerControllerImpl -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.ApiMayChange -import akka.util.JavaDurationConverters._ +import org.apache.pekko +import pekko.Done +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.delivery.internal.WorkPullingProducerControllerImpl +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.ApiMayChange +import pekko.util.JavaDurationConverters._ /** * Work pulling is a pattern where several worker actors pull tasks in their own pace from @@ -36,7 +37,7 @@ import akka.util.JavaDurationConverters._ * * A worker actor (consumer) and its `ConsumerController` is dynamically registered to the * `WorkPullingProducerController` via a [[ServiceKey]]. It will register itself to the - * * [[akka.actor.typed.receptionist.Receptionist]], and the `WorkPullingProducerController` + * * [[pekko.actor.typed.receptionist.Receptionist]], and the `WorkPullingProducerController` * subscribes to the same key to find active workers. In this way workers can be dynamically * added or removed from any node in the cluster. * diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ChunkedMessage.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala similarity index 63% rename from akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ChunkedMessage.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala index 0439b9b8b4..b654a794c1 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ChunkedMessage.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala @@ -2,15 +2,16 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.actor.typed.delivery.internal +package org.apache.pekko.actor.typed.delivery.internal -import akka.annotation.InternalApi -import akka.util.ByteString +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.util.ByteString /** * INTERNAL API */ -@InternalApi private[akka] final case class ChunkedMessage( +@InternalApi private[pekko] final case class ChunkedMessage( serialized: ByteString, firstChunk: Boolean, lastChunk: Boolean, diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ConsumerControllerImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala similarity index 96% rename from akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ConsumerControllerImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala index eb9cbc3beb..8a3c16ab2c 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ConsumerControllerImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala @@ -2,28 +2,29 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery.internal +package org.apache.pekko.actor.typed.delivery.internal import scala.concurrent.duration.FiniteDuration -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.PostStop -import akka.actor.typed.delivery.ConsumerController -import akka.actor.typed.delivery.ConsumerController.DeliverThenStop -import akka.actor.typed.delivery.ProducerController -import akka.actor.typed.internal.ActorFlightRecorder -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.LoggerOps -import akka.actor.typed.scaladsl.StashBuffer -import akka.actor.typed.scaladsl.TimerScheduler -import akka.annotation.InternalApi -import akka.serialization.SerializationExtension -import akka.util.ByteString -import akka.util.ConstantFun.scalaIdentityFunction +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.PostStop +import pekko.actor.typed.delivery.ConsumerController +import pekko.actor.typed.delivery.ConsumerController.DeliverThenStop +import pekko.actor.typed.delivery.ProducerController +import pekko.actor.typed.internal.ActorFlightRecorder +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.LoggerOps +import pekko.actor.typed.scaladsl.StashBuffer +import pekko.actor.typed.scaladsl.TimerScheduler +import pekko.annotation.InternalApi +import pekko.serialization.SerializationExtension +import pekko.util.ByteString +import pekko.util.ConstantFun.scalaIdentityFunction /** * INTERNAL API @@ -65,7 +66,7 @@ import akka.util.ConstantFun.scalaIdentityFunction * it sends [[ProducerControllerImpl.Resend]] to the `ProducerController` and will ignore all messages until * the expected sequence number arrives. */ -@InternalApi private[akka] object ConsumerControllerImpl { +@InternalApi private[pekko] object ConsumerControllerImpl { import ConsumerController.Command import ConsumerController.RegisterToProducerController import ConsumerController.SeqNr @@ -120,7 +121,7 @@ import akka.util.ConstantFun.scalaIdentityFunction val flightRecorder = ActorFlightRecorder(context.system).delivery flightRecorder.consumerCreated(context.self.path) Behaviors.withMdc(msg => mdcForMessage(msg)) { - context.setLoggerName("akka.actor.typed.delivery.ConsumerController") + context.setLoggerName("org.apache.pekko.actor.typed.delivery.ConsumerController") serviceKey.foreach { key => context.system.receptionist ! Receptionist.Register(key, context.self) } diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/DeliverySerializable.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/DeliverySerializable.scala new file mode 100644 index 0000000000..068ba6ae5d --- /dev/null +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/DeliverySerializable.scala @@ -0,0 +1,12 @@ +/* + * Copyright (C) 2020-2022 Lightbend Inc. + */ + +package org.apache.pekko.actor.typed.delivery.internal + +import org.apache.pekko.annotation.InternalApi + +/** + * INTERNAL API + */ +@InternalApi private[pekko] trait DeliverySerializable diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ProducerControllerImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala similarity index 96% rename from akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ProducerControllerImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala index 9a2ce8f60c..af6af19451 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ProducerControllerImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery.internal +package org.apache.pekko.actor.typed.delivery.internal import java.util.concurrent.TimeoutException @@ -11,24 +11,25 @@ import scala.reflect.ClassTag import scala.util.Failure import scala.util.Success -import akka.actor.DeadLetterSuppression -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.DispatcherSelector -import akka.actor.typed.delivery.ConsumerController -import akka.actor.typed.delivery.ConsumerController.SequencedMessage -import akka.actor.typed.delivery.DurableProducerQueue -import akka.actor.typed.delivery.ProducerController -import akka.actor.typed.internal.ActorFlightRecorder -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.LoggerOps -import akka.actor.typed.scaladsl.TimerScheduler -import akka.serialization.Serialization -import akka.serialization.SerializationExtension -import akka.serialization.Serializers -import akka.util.ByteString -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.DeadLetterSuppression +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.DispatcherSelector +import pekko.actor.typed.delivery.ConsumerController +import pekko.actor.typed.delivery.ConsumerController.SequencedMessage +import pekko.actor.typed.delivery.DurableProducerQueue +import pekko.actor.typed.delivery.ProducerController +import pekko.actor.typed.internal.ActorFlightRecorder +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.LoggerOps +import pekko.actor.typed.scaladsl.TimerScheduler +import pekko.serialization.Serialization +import pekko.serialization.SerializationExtension +import pekko.serialization.Serializers +import pekko.util.ByteString +import pekko.util.Timeout /** * INTERNAL API @@ -138,7 +139,7 @@ object ProducerControllerImpl { .setup[InternalCommand] { context => ActorFlightRecorder(context.system).delivery.producerCreated(producerId, context.self.path) Behaviors.withMdc(staticMdc = Map("producerId" -> producerId)) { - context.setLoggerName("akka.actor.typed.delivery.ProducerController") + context.setLoggerName("org.apache.pekko.actor.typed.delivery.ProducerController") val durableQueue = askLoadState(context, durableQueueBehavior, settings) waitingForInitialization[A]( context, @@ -172,7 +173,7 @@ object ProducerControllerImpl { .setup[InternalCommand] { context => ActorFlightRecorder(context.system).delivery.producerCreated(producerId, context.self.path) Behaviors.withMdc(staticMdc = Map("producerId" -> producerId)) { - context.setLoggerName("akka.actor.typed.delivery.ProducerController") + context.setLoggerName("org.apache.pekko.actor.typed.delivery.ProducerController") val durableQueue = askLoadState(context, durableQueueBehavior, settings) // ConsumerController not used here waitingForInitialization[A]( diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala similarity index 96% rename from akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala index 0012d31b8d..68e6819a62 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.delivery.internal +package org.apache.pekko.actor.typed.delivery.internal import java.util.UUID import java.util.concurrent.ThreadLocalRandom @@ -12,29 +12,30 @@ import scala.reflect.ClassTag import scala.util.Failure import scala.util.Success -import akka.Done -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.DispatcherSelector -import akka.actor.typed.delivery.ConsumerController -import akka.actor.typed.delivery.DurableProducerQueue -import akka.actor.typed.delivery.DurableProducerQueue.ConfirmationQualifier -import akka.actor.typed.delivery.DurableProducerQueue.SeqNr -import akka.actor.typed.delivery.ProducerController -import akka.actor.typed.delivery.WorkPullingProducerController -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.LoggerOps -import akka.actor.typed.scaladsl.StashBuffer -import akka.annotation.InternalApi -import akka.util.Timeout +import org.apache.pekko +import pekko.Done +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.DispatcherSelector +import pekko.actor.typed.delivery.ConsumerController +import pekko.actor.typed.delivery.DurableProducerQueue +import pekko.actor.typed.delivery.DurableProducerQueue.ConfirmationQualifier +import pekko.actor.typed.delivery.DurableProducerQueue.SeqNr +import pekko.actor.typed.delivery.ProducerController +import pekko.actor.typed.delivery.WorkPullingProducerController +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.LoggerOps +import pekko.actor.typed.scaladsl.StashBuffer +import pekko.annotation.InternalApi +import pekko.util.Timeout /** * INTERNAL API */ -@InternalApi private[akka] object WorkPullingProducerControllerImpl { +@InternalApi private[pekko] object WorkPullingProducerControllerImpl { import WorkPullingProducerController.Command import WorkPullingProducerController.RequestNext @@ -119,7 +120,7 @@ import akka.util.Timeout .withStash[InternalCommand](settings.bufferSize) { stashBuffer => Behaviors.setup[InternalCommand] { context => Behaviors.withMdc(staticMdc = Map("producerId" -> producerId)) { - context.setLoggerName("akka.actor.typed.delivery.WorkPullingProducerController") + context.setLoggerName("org.apache.pekko.actor.typed.delivery.WorkPullingProducerController") val listingAdapter = context.messageAdapter[Receptionist.Listing](listing => CurrentWorkers[A](listing.allServiceInstances(workerServiceKey))) context.system.receptionist ! Receptionist.Subscribe(workerServiceKey, listingAdapter) diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala similarity index 70% rename from akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala index 731e546012..f9092c5cc0 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala @@ -2,18 +2,18 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.eventstream - -import akka.actor.InvalidMessageException +package org.apache.pekko.actor.typed.eventstream import scala.reflect.ClassTag -import akka.actor.typed.ActorRef -import akka.annotation.{ DoNotInherit, InternalApi } +import org.apache.pekko +import pekko.actor.InvalidMessageException +import pekko.actor.typed.ActorRef +import pekko.annotation.{ DoNotInherit, InternalApi } object EventStream { /** - * The set of commands accepted by the [[akka.actor.typed.ActorSystem.eventStream]]. + * The set of commands accepted by the [[pekko.actor.typed.ActorSystem.eventStream]]. * * Not for user Extension */ @@ -21,7 +21,7 @@ object EventStream { /** * Publish an event of type E by sending this command to - * the [[akka.actor.typed.ActorSystem.eventStream]]. + * the [[pekko.actor.typed.ActorSystem.eventStream]]. */ final case class Publish[E](event: E) extends Command { if (event == null) @@ -30,7 +30,7 @@ object EventStream { /** * Subscribe a typed actor to listen for types or subtypes of E - * by sending this command to the [[akka.actor.typed.ActorSystem.eventStream]]. + * by sending this command to the [[pekko.actor.typed.ActorSystem.eventStream]]. * * ==Simple example== * {{{ @@ -54,12 +54,12 @@ object EventStream { /** * INTERNAL API */ - @InternalApi private[akka] def topic: Class[_] = classTag.runtimeClass + @InternalApi private[pekko] def topic: Class[_] = classTag.runtimeClass } /** * Unsubscribe an actor ref from the event stream - * by sending this command to the [[akka.actor.typed.ActorSystem.eventStream]]. + * by sending this command to the [[pekko.actor.typed.ActorSystem.eventStream]]. */ final case class Unsubscribe[E](subscriber: ActorRef[E]) extends Command diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala similarity index 83% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala index 1cc966cc04..c9b2ad2944 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal import java.time.Duration @@ -15,15 +15,16 @@ import scala.util.Try import scala.annotation.{ nowarn, switch } import org.slf4j.Logger import org.slf4j.LoggerFactory -import akka.actor.Address -import akka.actor.typed.internal.adapter.ActorSystemAdapter -import akka.annotation.InternalApi -import akka.dispatch.ExecutionContexts -import akka.pattern.StatusReply -import akka.util.BoxedType -import akka.util.JavaDurationConverters._ -import akka.util.OptionVal -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.Address +import pekko.actor.typed.internal.adapter.ActorSystemAdapter +import pekko.annotation.InternalApi +import pekko.dispatch.ExecutionContexts +import pekko.pattern.StatusReply +import pekko.util.BoxedType +import pekko.util.JavaDurationConverters._ +import pekko.util.OptionVal +import pekko.util.Timeout import scala.util.Failure import scala.util.Success @@ -31,7 +32,7 @@ import scala.util.Success /** * INTERNAL API */ -@InternalApi private[akka] object ActorContextImpl { +@InternalApi private[pekko] object ActorContextImpl { // single context for logging as there are a few things that are initialized // together that we can cache as long as the actor is alive @@ -82,7 +83,7 @@ import scala.util.Success /** * INTERNAL API */ -@InternalApi private[akka] trait ActorContextImpl[T] +@InternalApi private[pekko] trait ActorContextImpl[T] extends TypedActorContext[T] with javadsl.ActorContext[T] with scaladsl.ActorContext[T] { @@ -113,9 +114,9 @@ import scala.util.Success protected[this] def mkTimer(): TimerSchedulerCrossDslSupport[T] = new TimerSchedulerImpl[T](this) - override private[akka] def hasTimer: Boolean = _timer.isDefined + override private[pekko] def hasTimer: Boolean = _timer.isDefined - override private[akka] def cancelAllTimers(): Unit = { + override private[pekko] def cancelAllTimers(): Unit = { if (hasTimer) timer.cancelAll() } @@ -141,10 +142,10 @@ import scala.util.Success override def getExecutionContext: ExecutionContextExecutor = executionContext - override def getSelf: akka.actor.typed.ActorRef[T] = + override def getSelf: pekko.actor.typed.ActorRef[T] = self - override def getSystem: akka.actor.typed.ActorSystem[Void] = + override def getSystem: pekko.actor.typed.ActorSystem[Void] = system.asInstanceOf[ActorSystem[Void]] private def loggingContext(): LoggingContext = { @@ -180,7 +181,7 @@ import scala.util.Success def hasCustomLoggerName: Boolean = loggingContext().hasCustomName // MDC is cleared (if used) from aroundReceive in ActorAdapter after processing each message - override private[akka] def clearMdc(): Unit = { + override private[pekko] def clearMdc(): Unit = { // avoid access to MDC ThreadLocal if not needed, see details in LoggingContext _logging match { case OptionVal.Some(ctx) if ctx.mdcUsed => @@ -193,13 +194,13 @@ import scala.util.Success override def setReceiveTimeout(duration: java.time.Duration, msg: T): Unit = setReceiveTimeout(duration.asScala, msg) - override def scheduleOnce[U](delay: java.time.Duration, target: ActorRef[U], msg: U): akka.actor.Cancellable = + override def scheduleOnce[U](delay: java.time.Duration, target: ActorRef[U], msg: U): pekko.actor.Cancellable = scheduleOnce(delay.asScala, target, msg) - override def spawn[U](behavior: akka.actor.typed.Behavior[U], name: String): akka.actor.typed.ActorRef[U] = + override def spawn[U](behavior: pekko.actor.typed.Behavior[U], name: String): pekko.actor.typed.ActorRef[U] = spawn(behavior, name, Props.empty) - override def spawnAnonymous[U](behavior: akka.actor.typed.Behavior[U]): akka.actor.typed.ActorRef[U] = + override def spawnAnonymous[U](behavior: pekko.actor.typed.Behavior[U]): pekko.actor.typed.ActorRef[U] = spawnAnonymous(behavior, Props.empty) def delegate(delegator: Behavior[T], msg: T): Behavior[T] = { @@ -217,7 +218,7 @@ import scala.util.Success // Scala API impl override def ask[Req, Res](target: RecipientRef[Req], createRequest: ActorRef[Res] => Req)( mapResponse: Try[Res] => T)(implicit responseTimeout: Timeout, classTag: ClassTag[Res]): Unit = { - import akka.actor.typed.scaladsl.AskPattern._ + import pekko.actor.typed.scaladsl.AskPattern._ pipeToSelf(target.ask(createRequest)(responseTimeout, system.scheduler))(mapResponse) } @@ -236,9 +237,9 @@ import scala.util.Success resClass: Class[Res], target: RecipientRef[Req], responseTimeout: Duration, - createRequest: akka.japi.function.Function[ActorRef[Res], Req], - applyToResponse: akka.japi.function.Function2[Res, Throwable, T]): Unit = { - import akka.actor.typed.javadsl.AskPattern + createRequest: pekko.japi.function.Function[ActorRef[Res], Req], + applyToResponse: pekko.japi.function.Function2[Res, Throwable, T]): Unit = { + import pekko.actor.typed.javadsl.AskPattern pipeToSelf[Res]( AskPattern.ask(target, ref => createRequest(ref), responseTimeout, system.scheduler), applyToResponse) @@ -248,8 +249,8 @@ import scala.util.Success resClass: Class[Res], target: RecipientRef[Req], responseTimeout: Duration, - createRequest: akka.japi.function.Function[ActorRef[StatusReply[Res]], Req], - applyToResponse: akka.japi.function.Function2[Res, Throwable, T]): Unit = { + createRequest: pekko.japi.function.Function[ActorRef[StatusReply[Res]], Req], + applyToResponse: pekko.japi.function.Function2[Res, Throwable, T]): Unit = { implicit val classTag: ClassTag[Res] = ClassTag(resClass) ask[Req, StatusReply[Res]]( classOf[StatusReply[Res]], @@ -273,7 +274,7 @@ import scala.util.Success // Java API impl def pipeToSelf[Value]( future: CompletionStage[Value], - applyToResult: akka.japi.function.Function2[Value, Throwable, T]): Unit = { + applyToResult: pekko.japi.function.Function2[Value, Throwable, T]): Unit = { future.whenComplete { (value, ex) => if (ex != null) self.unsafeUpcast ! AdaptMessage(ex, applyToResult.apply(null.asInstanceOf[Value], _: Throwable)) @@ -281,24 +282,24 @@ import scala.util.Success } } - private[akka] override def spawnMessageAdapter[U](f: U => T, name: String): ActorRef[U] = + private[pekko] override def spawnMessageAdapter[U](f: U => T, name: String): ActorRef[U] = internalSpawnMessageAdapter(f, name) - private[akka] override def spawnMessageAdapter[U](f: U => T): ActorRef[U] = + private[pekko] override def spawnMessageAdapter[U](f: U => T): ActorRef[U] = internalSpawnMessageAdapter(f, name = "") /** * INTERNAL API: Needed to make Scala 2.12 compiler happy if spawnMessageAdapter is overloaded for scaladsl/javadsl. * Otherwise "ambiguous reference to overloaded definition" because Function is lambda. */ - @InternalApi private[akka] def internalSpawnMessageAdapter[U](f: U => T, name: String): ActorRef[U] + @InternalApi private[pekko] def internalSpawnMessageAdapter[U](f: U => T, name: String): ActorRef[U] override def messageAdapter[U: ClassTag](f: U => T): ActorRef[U] = { val messageClass = implicitly[ClassTag[U]].runtimeClass.asInstanceOf[Class[U]] internalMessageAdapter(messageClass, f) } - override def messageAdapter[U](messageClass: Class[U], f: akka.japi.function.Function[U, T]): ActorRef[U] = + override def messageAdapter[U](messageClass: Class[U], f: pekko.japi.function.Function[U, T]): ActorRef[U] = internalMessageAdapter(messageClass, f.apply) private def internalMessageAdapter[U](messageClass: Class[U], f: U => T): ActorRef[U] = { @@ -323,12 +324,12 @@ import scala.util.Success /** * INTERNAL API */ - @InternalApi private[akka] def messageAdapters: List[(Class[_], Any => T)] = _messageAdapters + @InternalApi private[pekko] def messageAdapters: List[(Class[_], Any => T)] = _messageAdapters /** * INTERNAL API */ - @InternalApi private[akka] def setCurrentActorThread(): Unit = { + @InternalApi private[pekko] def setCurrentActorThread(): Unit = { _currentActorThread match { case OptionVal.Some(t) => throw new IllegalStateException( @@ -342,14 +343,14 @@ import scala.util.Success /** * INTERNAL API */ - @InternalApi private[akka] def clearCurrentActorThread(): Unit = { + @InternalApi private[pekko] def clearCurrentActorThread(): Unit = { _currentActorThread = OptionVal.None } /** * INTERNAL API */ - @InternalApi private[akka] def checkCurrentActorThread(): Unit = { + @InternalApi private[pekko] def checkCurrentActorThread(): Unit = { val callerThread = Thread.currentThread() _currentActorThread match { case OptionVal.Some(t) => diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorFlightRecorder.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala similarity index 86% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorFlightRecorder.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala index 3593089af0..5fde84b3b4 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorFlightRecorder.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala @@ -2,12 +2,13 @@ * Copyright (C) 2020-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal -import akka.actor.ActorPath -import akka.actor.typed.{ ActorSystem, Extension, ExtensionId } -import akka.annotation.InternalApi -import akka.util.FlightRecorderLoader +import org.apache.pekko +import pekko.actor.ActorPath +import pekko.actor.typed.{ ActorSystem, Extension, ExtensionId } +import pekko.annotation.InternalApi +import pekko.util.FlightRecorderLoader /** * INTERNAL API @@ -18,7 +19,7 @@ object ActorFlightRecorder extends ExtensionId[ActorFlightRecorder] { override def createExtension(system: ActorSystem[_]): ActorFlightRecorder = FlightRecorderLoader.load[ActorFlightRecorder]( system, - "akka.actor.typed.internal.jfr.JFRActorFlightRecorder", + "org.apache.pekko.actor.typed.internal.jfr.JFRActorFlightRecorder", NoOpActorFlightRecorder) } @@ -26,14 +27,14 @@ object ActorFlightRecorder extends ExtensionId[ActorFlightRecorder] { * INTERNAL API */ @InternalApi -private[akka] trait ActorFlightRecorder extends Extension { +private[pekko] trait ActorFlightRecorder extends Extension { val delivery: DeliveryFlightRecorder } /** * INTERNAL API */ -@InternalApi private[akka] trait DeliveryFlightRecorder { +@InternalApi private[pekko] trait DeliveryFlightRecorder { def producerCreated(producerId: String, path: ActorPath): Unit def producerStarted(producerId: String, path: ActorPath): Unit @@ -66,14 +67,14 @@ private[akka] trait ActorFlightRecorder extends Extension { * INTERNAL */ @InternalApi -private[akka] case object NoOpActorFlightRecorder extends ActorFlightRecorder { +private[pekko] case object NoOpActorFlightRecorder extends ActorFlightRecorder { override val delivery: DeliveryFlightRecorder = NoOpDeliveryFlightRecorder } /** * INTERNAL API */ -@InternalApi private[akka] object NoOpDeliveryFlightRecorder extends DeliveryFlightRecorder { +@InternalApi private[pekko] object NoOpDeliveryFlightRecorder extends DeliveryFlightRecorder { override def producerCreated(producerId: String, path: ActorPath): Unit = () override def producerStarted(producerId: String, path: ActorPath): Unit = () diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorMdc.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorMdc.scala similarity index 87% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorMdc.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorMdc.scala index afaa0beeec..7cba7655e3 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorMdc.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorMdc.scala @@ -2,16 +2,16 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal import org.slf4j.MDC -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] object ActorMdc { +@InternalApi private[pekko] object ActorMdc { val SourceActorSystemKey = "sourceActorSystem" val AkkaSourceKey = "akkaSource" val AkkaTagsKey = "akkaTags" diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorRefImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala similarity index 91% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorRefImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala index 493e57cf83..257566642b 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorRefImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal import scala.annotation.unchecked.uncheckedVariance @@ -13,7 +13,7 @@ import scala.annotation.unchecked.uncheckedVariance * available in the package object, enabling `ref.toImpl` (or `ref.toImplN` * for `ActorRef[Nothing]`—Scala refuses to infer `Nothing` as a type parameter). */ -private[akka] trait ActorRefImpl[-T] extends ActorRef[T] { this: InternalRecipientRef[T] => +private[pekko] trait ActorRefImpl[-T] extends ActorRef[T] { this: InternalRecipientRef[T] => def sendSystem(signal: SystemMessage): Unit def isLocal: Boolean diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/BehaviorImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala similarity index 91% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/BehaviorImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala index 283d83a6a1..4ca1295f23 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/BehaviorImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala @@ -2,13 +2,14 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal -import akka.actor.typed.scaladsl.{ ActorContext => SAC } -import akka.actor.typed.{ TypedActorContext => AC } -import akka.annotation.InternalApi -import akka.util.{ LineNumbers, OptionVal } +import org.apache.pekko +import pekko.actor.typed.scaladsl.{ ActorContext => SAC } +import pekko.actor.typed.{ TypedActorContext => AC } +import pekko.annotation.InternalApi +import pekko.util.{ LineNumbers, OptionVal } import scala.reflect.ClassTag @@ -16,7 +17,7 @@ import scala.reflect.ClassTag * INTERNAL API */ @InternalApi -private[akka] object BehaviorTags { +private[pekko] object BehaviorTags { // optimization - by keeping an identifier for each concrete subtype of behavior // without gaps we can do table switches instead of instance of checks when interpreting @@ -35,7 +36,7 @@ private[akka] object BehaviorTags { /** * INTERNAL API */ -@InternalApi private[akka] object BehaviorImpl { +@InternalApi private[pekko] object BehaviorImpl { implicit class ContextAs[T](val ctx: AC[T]) extends AnyVal { def as[U]: AC[U] = ctx.asInstanceOf[AC[U]] @@ -91,7 +92,7 @@ private[akka] object BehaviorTags { * When the cell is stopping this behavior is used, so * that PostStop can be sent to previous behavior from `finishTerminate`. */ - private[akka] final class StoppedBehavior[T](val postStop: OptionVal[TypedActorContext[T] => Unit]) + private[pekko] final class StoppedBehavior[T](val postStop: OptionVal[TypedActorContext[T] => Unit]) extends Behavior[T](BehaviorTags.StoppedBehavior) { def onPostStop(ctx: TypedActorContext[T]): Unit = { @@ -161,7 +162,7 @@ private[akka] object BehaviorTags { } /** - * Intercept messages and signals for a `behavior` by first passing them to a [[akka.actor.typed.BehaviorInterceptor]] + * Intercept messages and signals for a `behavior` by first passing them to a [[pekko.actor.typed.BehaviorInterceptor]] * * When a behavior returns a new behavior as a result of processing a signal or message and that behavior already contains * the same interceptor (defined by the `isSame` method on the `BehaviorInterceptor`) only the innermost interceptor diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala new file mode 100644 index 0000000000..d0b6f2d29d --- /dev/null +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2019-2022 Lightbend Inc. + */ + +package org.apache.pekko.actor.typed.internal + +import org.apache.pekko +import pekko.actor.typed._ +import pekko.actor.typed.eventstream.EventStream +import pekko.actor.typed.internal.adapter.EventStreamAdapter +import pekko.actor.typed.scaladsl.adapter._ +import pekko.annotation.InternalApi + +/** + * INTERNAL API + * + * Exposes a typed actor that interacts with the [[pekko.actor.ActorSystem.eventStream]]. + * + * It is used as an extension to ensure a single instance per actor system. + */ +@InternalApi private[pekko] final class EventStreamExtension(actorSystem: ActorSystem[_]) extends Extension { + val ref: ActorRef[EventStream.Command] = + actorSystem.internalSystemActorOf(EventStreamAdapter.behavior, "eventstream", Props.empty) +} + +private[pekko] object EventStreamExtension extends ExtensionId[EventStreamExtension] { + override def createExtension(system: ActorSystem[_]): EventStreamExtension = new EventStreamExtension(system) +} diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala similarity index 92% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala index 407ad6804b..6eb8463ce4 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala @@ -2,17 +2,18 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal import java.util.concurrent.{ ConcurrentHashMap, CountDownLatch } import scala.annotation.tailrec import scala.util.{ Failure, Success, Try } -import akka.actor.typed.{ ActorSystem, Extension, ExtensionId, Extensions } -import akka.actor.typed.ExtensionSetup -import akka.annotation.InternalApi -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.actor.typed.{ ActorSystem, Extension, ExtensionId, Extensions } +import pekko.actor.typed.ExtensionSetup +import pekko.annotation.InternalApi +import pekko.util.ccompat.JavaConverters._ /** * INTERNAL API @@ -20,7 +21,7 @@ import akka.util.ccompat.JavaConverters._ * Actor system extensions registry */ @InternalApi -private[akka] trait ExtensionsImpl extends Extensions { self: ActorSystem[_] with InternalRecipientRef[_] => +private[pekko] trait ExtensionsImpl extends Extensions { self: ActorSystem[_] with InternalRecipientRef[_] => private val extensions = new ConcurrentHashMap[ExtensionId[_], AnyRef] diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala similarity index 90% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala index dd7540e377..2e12a47846 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal import scala.reflect.ClassTag import org.slf4j.LoggerFactory import org.slf4j.event.Level -import akka.actor.typed -import akka.actor.typed._ -import akka.actor.typed.LogOptions -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.InternalApi -import akka.util.LineNumbers +import org.apache.pekko +import pekko.actor.typed +import pekko.actor.typed._ +import pekko.actor.typed.LogOptions +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.InternalApi +import pekko.util.LineNumbers /** * Provides the impl of any behavior that could nest another behavior @@ -22,7 +23,7 @@ import akka.util.LineNumbers * INTERNAL API */ @InternalApi -private[akka] object InterceptorImpl { +private[pekko] object InterceptorImpl { def apply[O, I](interceptor: () => BehaviorInterceptor[O, I], nestedBehavior: Behavior[I]): Behavior[O] = { BehaviorImpl.DeferredBehavior[O] { ctx => @@ -38,7 +39,7 @@ private[akka] object InterceptorImpl { * INTERNAL API */ @InternalApi -private[akka] final class InterceptorImpl[O, I]( +private[pekko] final class InterceptorImpl[O, I]( val interceptor: BehaviorInterceptor[O, I], val nestedBehavior: Behavior[I]) extends ExtensibleBehavior[O] { @@ -121,7 +122,7 @@ private[akka] final class InterceptorImpl[O, I]( * INTERNAL API */ @InternalApi -private[akka] final case class MonitorInterceptor[T: ClassTag](actorRef: ActorRef[T]) +private[pekko] final case class MonitorInterceptor[T: ClassTag](actorRef: ActorRef[T]) extends BehaviorInterceptor[T, T] { import BehaviorInterceptor._ @@ -141,7 +142,7 @@ private[akka] final case class MonitorInterceptor[T: ClassTag](actorRef: ActorRe /** * INTERNAL API */ -@InternalApi private[akka] object LogMessagesInterceptor { +@InternalApi private[pekko] object LogMessagesInterceptor { def apply[T](opts: LogOptions): BehaviorInterceptor[T, T] = { new LogMessagesInterceptor(opts).asInstanceOf[BehaviorInterceptor[T, T]] } @@ -156,7 +157,7 @@ private[akka] final case class MonitorInterceptor[T: ClassTag](actorRef: ActorRe * INTERNAL API */ @InternalApi -private[akka] final class LogMessagesInterceptor(val opts: LogOptions) extends BehaviorInterceptor[Any, Any] { +private[pekko] final class LogMessagesInterceptor(val opts: LogOptions) extends BehaviorInterceptor[Any, Any] { import BehaviorInterceptor._ import LogMessagesInterceptor._ @@ -197,7 +198,7 @@ private[akka] final class LogMessagesInterceptor(val opts: LogOptions) extends B * INTERNAL API */ @InternalApi -private[akka] object TransformMessagesInterceptor { +private[pekko] object TransformMessagesInterceptor { private final val _notMatchIndicator: Any = new AnyRef private final val _any2NotMatchIndicator = (_: Any) => _notMatchIndicator @@ -208,7 +209,7 @@ private[akka] object TransformMessagesInterceptor { * INTERNAL API */ @InternalApi -private[akka] final case class TransformMessagesInterceptor[O: ClassTag, I](matcher: PartialFunction[O, I]) +private[pekko] final case class TransformMessagesInterceptor[O: ClassTag, I](matcher: PartialFunction[O, I]) extends BehaviorInterceptor[O, I] { import BehaviorInterceptor._ import TransformMessagesInterceptor._ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InternalMessage.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala similarity index 59% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/InternalMessage.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala index 3257cf95ef..1c9c1390a3 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InternalMessage.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala @@ -2,28 +2,29 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal -import akka.actor.WrappedMessage -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.WrappedMessage +import pekko.annotation.InternalApi /** * A marker trait for internal messages. */ -@InternalApi private[akka] sealed trait InternalMessage +@InternalApi private[pekko] sealed trait InternalMessage /** * INTERNAL API: Wrapping of messages that should be adapted by * adapters registered with `ActorContext.messageAdapter`. */ -@InternalApi private[akka] final case class AdaptWithRegisteredMessageAdapter[U](msg: U) extends InternalMessage +@InternalApi private[pekko] final case class AdaptWithRegisteredMessageAdapter[U](msg: U) extends InternalMessage /** * INTERNAL API: Wrapping of messages that should be adapted by the included * function. Used by `ActorContext.spawnMessageAdapter` and `ActorContext.ask` so that the function is * applied in the "parent" actor (for better thread safety).. */ -@InternalApi private[akka] final case class AdaptMessage[U, T](message: U, adapter: U => T) +@InternalApi private[pekko] final case class AdaptMessage[U, T](message: U, adapter: U => T) extends InternalMessage with WrappedMessage { def adapt(): T = adapter(message) diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InternalRecipientRef.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala similarity index 60% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/InternalRecipientRef.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala index 11893e3aff..f97fc727e0 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InternalRecipientRef.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala @@ -2,16 +2,17 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal -import akka.actor.ActorRefProvider -import akka.actor.typed.RecipientRef -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.ActorRefProvider +import pekko.actor.typed.RecipientRef +import pekko.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] trait InternalRecipientRef[-T] extends RecipientRef[T] { +@InternalApi private[pekko] trait InternalRecipientRef[-T] extends RecipientRef[T] { /** * Get a reference to the actor ref provider which created this ref. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/LoggerClass.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala similarity index 84% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/LoggerClass.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala index 32d223b34a..70a694a3cb 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/LoggerClass.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala @@ -2,25 +2,26 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal import scala.util.control.NonFatal -import akka.annotation.InternalApi -import akka.util.OptionVal +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.util.OptionVal /** * INTERNAL API */ @InternalApi -private[akka] object LoggerClass { +private[pekko] object LoggerClass { // just to get access to the class context private final class TrickySecurityManager extends SecurityManager { def getClassStack: Array[Class[_]] = getClassContext } - private val defaultPrefixesToSkip = List("scala.runtime", "akka.actor.typed.internal") + private val defaultPrefixesToSkip = List("scala.runtime", "org.apache.pekko.actor.typed.internal") /** * Try to extract a logger class from the call stack, if not possible the provided default is used diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/MiscMessageSerializer.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala similarity index 77% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/MiscMessageSerializer.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala index a179e9a940..c8fc7693b8 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/MiscMessageSerializer.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala @@ -2,20 +2,21 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal import java.io.NotSerializableException import java.nio.charset.StandardCharsets -import akka.actor.typed.{ ActorRef, ActorRefResolver } -import akka.actor.typed.scaladsl.adapter._ -import akka.annotation.InternalApi -import akka.serialization.{ BaseSerializer, SerializerWithStringManifest } +import org.apache.pekko +import pekko.actor.typed.{ ActorRef, ActorRefResolver } +import pekko.actor.typed.scaladsl.adapter._ +import pekko.annotation.InternalApi +import pekko.serialization.{ BaseSerializer, SerializerWithStringManifest } /** * INTERNAL API */ -@InternalApi private[akka] final class MiscMessageSerializer(val system: akka.actor.ExtendedActorSystem) +@InternalApi private[pekko] final class MiscMessageSerializer(val system: pekko.actor.ExtendedActorSystem) extends SerializerWithStringManifest with BaseSerializer { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PoisonPill.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala similarity index 69% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/PoisonPill.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala index d557adc81d..52707992f8 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PoisonPill.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala @@ -2,14 +2,15 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal -import akka.actor.typed.Behavior -import akka.actor.typed.BehaviorInterceptor -import akka.actor.typed.BehaviorSignalInterceptor -import akka.actor.typed.Signal -import akka.actor.typed.TypedActorContext -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.BehaviorInterceptor +import pekko.actor.typed.BehaviorSignalInterceptor +import pekko.actor.typed.Signal +import pekko.actor.typed.TypedActorContext +import pekko.annotation.InternalApi /** * INTERNAL API @@ -17,12 +18,12 @@ import akka.annotation.InternalApi * Note that this is a `Signal` poison pill, not a universal poison pill like the classic actor one. * This requires special handling on the receiving side where it is used (for example with the interceptor below). */ -@InternalApi private[akka] sealed abstract class PoisonPill extends Signal +@InternalApi private[pekko] sealed abstract class PoisonPill extends Signal /** * INTERNAL API */ -@InternalApi private[akka] case object PoisonPill extends PoisonPill { +@InternalApi private[pekko] case object PoisonPill extends PoisonPill { def instance: PoisonPill = this } @@ -34,7 +35,7 @@ import akka.annotation.InternalApi * application protocol. Persistent actors handle `PoisonPill` and run side effects after persist * and process stashed messages before stopping. */ -@InternalApi private[akka] final class PoisonPillInterceptor[M] extends BehaviorSignalInterceptor[M] { +@InternalApi private[pekko] final class PoisonPillInterceptor[M] extends BehaviorSignalInterceptor[M] { override def aroundSignal( ctx: TypedActorContext[M], diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PropsImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala similarity index 88% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/PropsImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala index a32cd63709..03c5f55477 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PropsImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala @@ -2,16 +2,17 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal -import akka.actor.typed.{ DispatcherSelector, MailboxSelector, Props } -import akka.actor.typed.ActorTags -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.{ DispatcherSelector, MailboxSelector, Props } +import pekko.actor.typed.ActorTags +import pekko.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] object PropsImpl { +@InternalApi private[pekko] object PropsImpl { /** * The empty configuration node, used as a terminator for the internally linked diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala similarity index 88% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala index b2036560a9..d05883719f 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala @@ -2,21 +2,22 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal import scala.annotation.tailrec import scala.util.control.NonFatal -import akka.actor.DeadLetter -import akka.actor.typed.Behavior -import akka.actor.typed.Signal -import akka.actor.typed.TypedActorContext -import akka.actor.typed.javadsl -import akka.actor.typed.scaladsl -import akka.actor.typed.scaladsl.ActorContext -import akka.annotation.{ InternalApi, InternalStableApi } -import akka.japi.function.Procedure -import akka.util.{ unused, ConstantFun } -import akka.util.OptionVal +import org.apache.pekko +import pekko.actor.DeadLetter +import pekko.actor.typed.Behavior +import pekko.actor.typed.Signal +import pekko.actor.typed.TypedActorContext +import pekko.actor.typed.javadsl +import pekko.actor.typed.scaladsl +import pekko.actor.typed.scaladsl.ActorContext +import pekko.annotation.{ InternalApi, InternalStableApi } +import pekko.japi.function.Procedure +import pekko.util.{ unused, ConstantFun } +import pekko.util.OptionVal import java.util.function.{ Function => JFunction } import java.util.function.Predicate @@ -24,8 +25,8 @@ import java.util.function.Predicate /** * INTERNAL API */ -@InternalApi private[akka] object StashBufferImpl { - private[akka] final class Node[T](var next: Node[T], val message: T) { +@InternalApi private[pekko] object StashBufferImpl { + private[pekko] final class Node[T](var next: Node[T], val message: T) { def apply(f: T => Unit): Unit = f(message) } @@ -36,7 +37,7 @@ import java.util.function.Predicate /** * INTERNAL API */ -@InternalApi private[akka] final class StashBufferImpl[T] private ( +@InternalApi private[pekko] final class StashBufferImpl[T] private ( ctx: ActorContext[T], val capacity: Int, private var _first: StashBufferImpl.Node[T], @@ -235,7 +236,7 @@ import java.util.function.Predicate private def unstashRestToDeadLetters(ctx: TypedActorContext[T], messages: Iterator[Node[T]], wrap: T => T): Unit = { val scalaCtx = ctx.asScala - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ val classicDeadLetters = scalaCtx.system.deadLetters.toClassic messages.foreach(node => scalaCtx.system.deadLetters ! DeadLetter(wrap(node.message), classicDeadLetters, ctx.asScala.self.toClassic)) @@ -248,7 +249,7 @@ import java.util.function.Predicate s"StashBuffer($size/$capacity)" @InternalStableApi - private[akka] def unstashed(@unused ctx: ActorContext[T], @unused node: Node[T]): Unit = () + private[pekko] def unstashed(@unused ctx: ActorContext[T], @unused node: Node[T]): Unit = () @InternalStableApi private def stashCleared(@unused ctx: ActorContext[T]): Unit = () @@ -258,7 +259,7 @@ import java.util.function.Predicate /** * INTERNAL API */ -@InternalApi private[akka] object UnstashException { +@InternalApi private[pekko] object UnstashException { def unwrap(t: Throwable): Throwable = t match { case UnstashException(e, _) => e case _ => t @@ -273,5 +274,5 @@ import java.util.function.Predicate * and ActorAdapter need the behavior that threw. It will use the behavior in the `UnstashException` * to emit the PreRestart and PostStop to the right behavior and install the latest behavior for resume strategy. */ -@InternalApi private[akka] final case class UnstashException[T](cause: Throwable, behavior: Behavior[T]) +@InternalApi private[pekko] final case class UnstashException[T](cause: Throwable, behavior: Behavior[T]) extends RuntimeException(s"[$cause] when unstashing in [$behavior]", cause) diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala similarity index 95% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala index 5c463bf0ea..980900fdc6 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal import java.util.concurrent.ThreadLocalRandom @@ -13,25 +13,26 @@ import scala.reflect.ClassTag import scala.util.control.Exception.Catcher import scala.util.control.NonFatal import org.slf4j.event.Level -import akka.actor.DeadLetterSuppression -import akka.actor.Dropped -import akka.actor.typed.BehaviorInterceptor.PreStartTarget -import akka.actor.typed.BehaviorInterceptor.ReceiveTarget -import akka.actor.typed.BehaviorInterceptor.SignalTarget -import akka.actor.typed.SupervisorStrategy._ -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.StashBuffer -import akka.annotation.InternalApi -import akka.event.Logging -import akka.util.OptionVal -import akka.util.unused +import org.apache.pekko +import pekko.actor.DeadLetterSuppression +import pekko.actor.Dropped +import pekko.actor.typed.BehaviorInterceptor.PreStartTarget +import pekko.actor.typed.BehaviorInterceptor.ReceiveTarget +import pekko.actor.typed.BehaviorInterceptor.SignalTarget +import pekko.actor.typed.SupervisorStrategy._ +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.StashBuffer +import pekko.annotation.InternalApi +import pekko.event.Logging +import pekko.util.OptionVal +import pekko.util.unused import scala.util.Try /** * INTERNAL API */ -@InternalApi private[akka] object Supervisor { +@InternalApi private[pekko] object Supervisor { def apply[T, Thr <: Throwable: ClassTag](initialBehavior: Behavior[T], strategy: SupervisorStrategy): Behavior[T] = { if (initialBehavior.isInstanceOf[scaladsl.AbstractBehavior[_]] || initialBehavior .isInstanceOf[javadsl.AbstractBehavior[_]]) { @@ -108,7 +109,7 @@ private abstract class AbstractSupervisor[I, Thr <: Throwable](strategy: Supervi } def dropped(ctx: TypedActorContext[_], signalOrMessage: Any): Unit = { - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ ctx.asScala.system.toClassic.eventStream .publish(Dropped(signalOrMessage, s"Stash is full in [${getClass.getSimpleName}]", ctx.asScala.self.toClassic)) } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/SystemMessage.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/SystemMessage.scala similarity index 91% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/SystemMessage.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/SystemMessage.scala index daaf3bab61..ed2780905a 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/SystemMessage.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/SystemMessage.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal import scala.annotation.tailrec @@ -182,7 +182,7 @@ private[typed] class EarliestFirstSystemMessageList(val head: SystemMessage) ext * * NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS */ -private[akka] sealed trait SystemMessage extends Serializable { +private[pekko] sealed trait SystemMessage extends Serializable { // Next fields are only modifiable via the SystemMessageList value class @transient private[internal] var next: SystemMessage = _ @@ -196,35 +196,35 @@ private[akka] sealed trait SystemMessage extends Serializable { * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Create() extends SystemMessage +private[pekko] final case class Create() extends SystemMessage /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Terminate() extends SystemMessage +private[pekko] final case class Terminate() extends SystemMessage /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Watch(watchee: ActorRef[Nothing], watcher: ActorRef[Nothing]) extends SystemMessage +private[pekko] final case class Watch(watchee: ActorRef[Nothing], watcher: ActorRef[Nothing]) extends SystemMessage /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Unwatch(watchee: ActorRef[Nothing], watcher: ActorRef[Nothing]) extends SystemMessage +private[pekko] final case class Unwatch(watchee: ActorRef[Nothing], watcher: ActorRef[Nothing]) extends SystemMessage /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class DeathWatchNotification(actor: ActorRef[Nothing], failureCause: Throwable) +private[pekko] final case class DeathWatchNotification(actor: ActorRef[Nothing], failureCause: Throwable) extends SystemMessage /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] case object NoMessage extends SystemMessage // switched into the mailbox to signal termination +private[pekko] case object NoMessage extends SystemMessage // switched into the mailbox to signal termination diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala similarity index 92% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala index 3c2ca13ba3..a00bc7f7da 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala @@ -2,16 +2,17 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal import java.time.Duration -import akka.actor.{ Cancellable, NotInfluenceReceiveTimeout } -import akka.actor.typed.scaladsl.{ ActorContext, LoggerOps } -import akka.annotation.InternalApi -import akka.dispatch.ExecutionContexts -import akka.util.OptionVal +import org.apache.pekko +import pekko.actor.{ Cancellable, NotInfluenceReceiveTimeout } +import pekko.actor.typed.scaladsl.{ ActorContext, LoggerOps } +import pekko.annotation.InternalApi +import pekko.dispatch.ExecutionContexts +import pekko.util.OptionVal import org.slf4j.Logger import scala.concurrent.duration.FiniteDuration @@ -19,7 +20,7 @@ import scala.concurrent.duration.FiniteDuration /** * INTERNAL API */ -@InternalApi private[akka] object TimerSchedulerImpl { +@InternalApi private[pekko] object TimerSchedulerImpl { final case class Timer[T](key: Any, msg: T, repeat: Boolean, generation: Int, task: Cancellable) sealed class TimerMsg(val key: Any, val generation: Int, val owner: AnyRef) { override def toString = s"TimerMsg(key=$key, generation=$generation, owner=$owner)" @@ -51,10 +52,10 @@ import scala.concurrent.duration.FiniteDuration } } -@InternalApi private[akka] trait TimerSchedulerCrossDslSupport[T] +@InternalApi private[pekko] trait TimerSchedulerCrossDslSupport[T] extends scaladsl.TimerScheduler[T] with javadsl.TimerScheduler[T] { - import akka.util.JavaDurationConverters._ + import pekko.util.JavaDurationConverters._ override final def startTimerWithFixedDelay(key: Any, msg: T, delay: Duration): Unit = startTimerWithFixedDelay(key, msg, delay.asScala) @@ -80,7 +81,7 @@ import scala.concurrent.duration.FiniteDuration /** * INTERNAL API */ -@InternalApi private[akka] class TimerSchedulerImpl[T](ctx: ActorContext[T]) +@InternalApi private[pekko] class TimerSchedulerImpl[T](ctx: ActorContext[T]) extends scaladsl.TimerScheduler[T] with TimerSchedulerCrossDslSupport[T] { import TimerSchedulerImpl._ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/WithMdcBehaviorInterceptor.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala similarity index 89% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/WithMdcBehaviorInterceptor.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala index fe2da18f8c..50263e448e 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/WithMdcBehaviorInterceptor.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal +package org.apache.pekko.actor.typed.internal import scala.reflect.ClassTag import org.slf4j.MDC -import akka.actor.typed.{ Behavior, BehaviorInterceptor, Signal, TypedActorContext } -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.{ Behavior, BehaviorInterceptor, Signal, TypedActorContext } +import pekko.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] object WithMdcBehaviorInterceptor { +@InternalApi private[pekko] object WithMdcBehaviorInterceptor { val noMdcPerMessage = (_: Any) => Map.empty[String, String] def apply[T: ClassTag]( @@ -31,7 +32,7 @@ import akka.annotation.InternalApi * * INTERNAL API */ -@InternalApi private[akka] final class WithMdcBehaviorInterceptor[T: ClassTag] private ( +@InternalApi private[pekko] final class WithMdcBehaviorInterceptor[T: ClassTag] private ( staticMdc: Map[String, String], mdcForMessage: T => Map[String, String]) extends BehaviorInterceptor[T, T] { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala similarity index 93% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala index 8904863b56..c0e1fef7fa 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal package adapter @@ -13,15 +13,16 @@ import scala.annotation.tailrec import scala.util.control.Exception.Catcher import scala.util.control.NonFatal -import akka.{ actor => classic } -import akka.actor.ActorInitializationException -import akka.actor.ActorRefWithCell -import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior -import akka.actor.typed.internal.BehaviorImpl.StoppedBehavior -import akka.actor.typed.internal.TimerSchedulerImpl.TimerMsg -import akka.actor.typed.internal.adapter.ActorAdapter.TypedActorFailedException -import akka.annotation.InternalApi -import akka.util.OptionVal +import org.apache.pekko +import pekko.{ actor => classic } +import pekko.actor.ActorInitializationException +import pekko.actor.ActorRefWithCell +import pekko.actor.typed.internal.BehaviorImpl.DeferredBehavior +import pekko.actor.typed.internal.BehaviorImpl.StoppedBehavior +import pekko.actor.typed.internal.TimerSchedulerImpl.TimerMsg +import pekko.actor.typed.internal.adapter.ActorAdapter.TypedActorFailedException +import pekko.annotation.InternalApi +import pekko.util.OptionVal /** * INTERNAL API @@ -74,7 +75,7 @@ import akka.util.OptionVal def receive: Receive = ActorAdapter.DummyReceive - override protected[akka] def aroundReceive(receive: Receive, msg: Any): Unit = { + override protected[pekko] def aroundReceive(receive: Receive, msg: Any): Unit = { ctx.setCurrentActorThread() try { // as we know we never become in "normal" typed actors, it is just the current behavior that @@ -262,25 +263,25 @@ import akka.util.OptionVal } } - override protected[akka] def aroundPreStart(): Unit = { + override protected[pekko] def aroundPreStart(): Unit = { ctx.setCurrentActorThread() try super.aroundPreStart() finally ctx.clearCurrentActorThread() } - override protected[akka] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = { + override protected[pekko] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = { ctx.setCurrentActorThread() try super.aroundPreRestart(reason, message) finally ctx.clearCurrentActorThread() } - override protected[akka] def aroundPostRestart(reason: Throwable): Unit = { + override protected[pekko] def aroundPostRestart(reason: Throwable): Unit = { ctx.setCurrentActorThread() try super.aroundPostRestart(reason) finally ctx.clearCurrentActorThread() } - override protected[akka] def aroundPostStop(): Unit = { + override protected[pekko] def aroundPostStop(): Unit = { ctx.setCurrentActorThread() try super.aroundPostStop() finally ctx.clearCurrentActorThread() diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorContextAdapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala similarity index 84% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorContextAdapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala index 2be854c543..0d6319aa34 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorContextAdapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala @@ -2,18 +2,19 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal package adapter import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration._ -import akka.{ actor => classic } -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.{ actor => classic } +import pekko.annotation.InternalApi @InternalApi -private[akka] object ActorContextAdapter { +private[pekko] object ActorContextAdapter { private def toClassicImp[U](context: TypedActorContext[_]): classic.ActorContext = context match { @@ -32,20 +33,20 @@ private[akka] object ActorContextAdapter { } /** - * INTERNAL API. Wrapping an [[akka.actor.ActorContext]] as an [[TypedActorContext]]. + * INTERNAL API. Wrapping an [[pekko.actor.ActorContext]] as an [[TypedActorContext]]. */ -@InternalApi private[akka] final class ActorContextAdapter[T]( +@InternalApi private[pekko] final class ActorContextAdapter[T]( val classicContext: classic.ActorContext, adapter: ActorAdapter[T]) extends ActorContextImpl[T] { import ActorRefAdapter.toClassic - private[akka] override def currentBehavior: Behavior[T] = adapter.currentBehavior + private[pekko] override def currentBehavior: Behavior[T] = adapter.currentBehavior final override val self = ActorRefAdapter(classicContext.self) final override val system = ActorSystemAdapter(classicContext.system) - private[akka] def classicActorContext = classicContext + private[pekko] def classicActorContext = classicContext override def children: Iterable[ActorRef[Nothing]] = { checkCurrentActorThread() classicContext.children.map(ActorRefAdapter(_)) @@ -68,8 +69,8 @@ private[akka] object ActorContextAdapter { checkCurrentActorThread() if (child.path.parent == self.path) { // only if a direct child toClassic(child) match { - case f: akka.actor.FunctionRef => - val cell = classicContext.asInstanceOf[akka.actor.ActorCell] + case f: pekko.actor.FunctionRef => + val cell = classicContext.asInstanceOf[pekko.actor.ActorCell] cell.removeFunctionRef(f) case c => classicContext.child(child.path.name) match { @@ -122,8 +123,8 @@ private[akka] object ActorContextAdapter { import classicContext.dispatcher classicContext.system.scheduler.scheduleOnce(delay, toClassic(target), msg) } - override private[akka] def internalSpawnMessageAdapter[U](f: U => T, _name: String): ActorRef[U] = { - val cell = classicContext.asInstanceOf[akka.actor.ActorCell] + override private[pekko] def internalSpawnMessageAdapter[U](f: U => T, _name: String): ActorRef[U] = { + val cell = classicContext.asInstanceOf[pekko.actor.ActorCell] // apply the function inside the actor by wrapping the msg and f, handled by ActorAdapter val ref = cell.addFunctionRef((_, msg) => classicContext.self ! AdaptMessage[U, T](msg.asInstanceOf[U], f), _name) ActorRefAdapter[U](ref) @@ -133,5 +134,5 @@ private[akka] object ActorContextAdapter { * Made accessible to allow stash to deal with unhandled messages as though they were interpreted by * the adapter itself, even though the unstashing occurs inside the behavior stack. */ - private[akka] override def onUnhandled(msg: T): Unit = adapter.unhandled(msg) + private[pekko] override def onUnhandled(msg: T): Unit = adapter.unhandled(msg) } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefAdapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala similarity index 83% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefAdapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala index 4fb94c97ae..e06c3f3696 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefAdapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala @@ -2,15 +2,16 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package internal package adapter -import akka.{ actor => classic } -import akka.actor.ActorRefProvider -import akka.actor.InvalidMessageException -import akka.annotation.InternalApi -import akka.dispatch.sysmsg +import org.apache.pekko +import pekko.{ actor => classic } +import pekko.actor.ActorRefProvider +import pekko.actor.InvalidMessageException +import pekko.annotation.InternalApi +import pekko.dispatch.sysmsg /** * INTERNAL API @@ -44,10 +45,10 @@ import akka.dispatch.sysmsg private def writeReplace(): AnyRef = SerializedActorRef[T](this) } -private[akka] object ActorRefAdapter { +private[pekko] object ActorRefAdapter { def apply[T](ref: classic.ActorRef): ActorRef[T] = new ActorRefAdapter(ref.asInstanceOf[classic.InternalActorRef]) - def toClassic[U](ref: ActorRef[U]): akka.actor.InternalActorRef = + def toClassic[U](ref: ActorRef[U]): pekko.actor.InternalActorRef = ref match { case adapter: ActorRefAdapter[_] => adapter.classicRef case adapter: ActorSystemAdapter[_] => adapter.system.guardian @@ -57,7 +58,7 @@ private[akka] object ActorRefAdapter { s"($ref of class ${ref.getClass.getName})") } - def sendSystemMessage(classicRef: akka.actor.InternalActorRef, signal: internal.SystemMessage): Unit = + def sendSystemMessage(classicRef: pekko.actor.InternalActorRef, signal: internal.SystemMessage): Unit = signal match { case internal.Create() => throw new IllegalStateException("WAT? No, seriously.") case internal.Terminate() => classicRef.stop() diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala similarity index 80% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala index 1b043a0625..e51084733b 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala @@ -2,12 +2,13 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.internal.adapter +package org.apache.pekko.actor.typed.internal.adapter -import akka.ConfigurationException -import akka.actor.typed._ -import akka.annotation.InternalApi -import akka.util.ErrorMessages +import org.apache.pekko +import pekko.ConfigurationException +import pekko.actor.typed._ +import pekko.annotation.InternalApi +import pekko.util.ErrorMessages /** * INTERNAL API @@ -16,7 +17,7 @@ import akka.util.ErrorMessages private val remoteDeploymentNotAllowed = "Remote deployment not allowed for typed actors" def spawnAnonymous[T]( - context: akka.actor.ActorRefFactory, + context: pekko.actor.ActorRefFactory, behavior: Behavior[T], props: Props, rethrowTypedFailure: Boolean): ActorRef[T] = { @@ -29,7 +30,7 @@ import akka.util.ErrorMessages } def spawn[T]( - actorRefFactory: akka.actor.ActorRefFactory, + actorRefFactory: pekko.actor.ActorRefFactory, behavior: Behavior[T], name: String, props: Props, diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorSystemAdapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala similarity index 78% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorSystemAdapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala index c07b6ade90..fd42d56dda 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorSystemAdapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed.internal.adapter +package org.apache.pekko.actor.typed.internal.adapter import java.util.concurrent.CompletionStage @@ -11,28 +11,29 @@ import scala.concurrent.ExecutionContextExecutor import org.slf4j.{ Logger, LoggerFactory } -import akka.{ actor => classic } -import akka.Done -import akka.actor -import akka.actor.{ ActorRefProvider, Address, ExtendedActorSystem, InvalidMessageException } -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.DispatcherSelector -import akka.actor.typed.Dispatchers -import akka.actor.typed.Props -import akka.actor.typed.Scheduler -import akka.actor.typed.Settings -import akka.actor.typed.SupervisorStrategy -import akka.actor.typed.internal.ActorRefImpl -import akka.actor.typed.internal.ExtensionsImpl -import akka.actor.typed.internal.InternalRecipientRef -import akka.actor.typed.internal.PropsImpl.DispatcherDefault -import akka.actor.typed.internal.PropsImpl.DispatcherFromConfig -import akka.actor.typed.internal.PropsImpl.DispatcherSameAsParent -import akka.actor.typed.internal.SystemMessage -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.{ actor => classic } +import pekko.Done +import pekko.actor +import pekko.actor.{ ActorRefProvider, Address, ExtendedActorSystem, InvalidMessageException } +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.DispatcherSelector +import pekko.actor.typed.Dispatchers +import pekko.actor.typed.Props +import pekko.actor.typed.Scheduler +import pekko.actor.typed.Settings +import pekko.actor.typed.SupervisorStrategy +import pekko.actor.typed.internal.ActorRefImpl +import pekko.actor.typed.internal.ExtensionsImpl +import pekko.actor.typed.internal.InternalRecipientRef +import pekko.actor.typed.internal.PropsImpl.DispatcherDefault +import pekko.actor.typed.internal.PropsImpl.DispatcherFromConfig +import pekko.actor.typed.internal.PropsImpl.DispatcherSameAsParent +import pekko.actor.typed.internal.SystemMessage +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.InternalApi /** * INTERNAL API. Lightweight wrapper for presenting a classic ActorSystem to a Behavior (via the context). @@ -41,7 +42,7 @@ import akka.annotation.InternalApi * a longer time; in all other cases the wrapper will just be spawned for a single call in * most circumstances. */ -@InternalApi private[akka] class ActorSystemAdapter[-T](val system: classic.ActorSystemImpl) +@InternalApi private[pekko] class ActorSystemAdapter[-T](val system: classic.ActorSystemImpl) extends ActorSystem[T] with ActorRef[T] with ActorRefImpl[T] @@ -55,7 +56,7 @@ import akka.annotation.InternalApi override def classicSystem: classic.ActorSystem = system - // Members declared in akka.actor.typed.ActorRef + // Members declared in org.apache.pekko.actor.typed.ActorRef override def tell(msg: T): Unit = { if (msg == null) throw InvalidMessageException("[null] is not an allowed message") system.guardian ! msg @@ -76,7 +77,7 @@ import akka.annotation.InternalApi override def toString: String = system.toString - // Members declared in akka.actor.typed.ActorSystem + // Members declared in org.apache.pekko.actor.typed.ActorSystem override def deadLetters[U]: ActorRef[U] = ActorRefAdapter(system.deadLetters) private val cachedIgnoreRef: ActorRef[Nothing] = ActorRefAdapter(provider.ignoreRef) @@ -104,12 +105,12 @@ import akka.annotation.InternalApi override def uptime: Long = classicSystem.uptime override def printTree: String = system.printTree - import akka.dispatch.ExecutionContexts.parasitic + import org.apache.pekko.dispatch.ExecutionContexts.parasitic override def terminate(): Unit = system.terminate() - override lazy val whenTerminated: scala.concurrent.Future[akka.Done] = + override lazy val whenTerminated: scala.concurrent.Future[pekko.Done] = system.whenTerminated.map(_ => Done)(parasitic) - override lazy val getWhenTerminated: CompletionStage[akka.Done] = + override lazy val getWhenTerminated: CompletionStage[pekko.Done] = FutureConverters.toJava(whenTerminated) override def systemActorOf[U](behavior: Behavior[U], name: String, props: Props): ActorRef[U] = { @@ -128,7 +129,7 @@ import akka.annotation.InternalApi } -private[akka] object ActorSystemAdapter { +private[pekko] object ActorSystemAdapter { def apply(system: classic.ActorSystem): ActorSystem[Nothing] = AdapterExtension(system).adapter // to make sure we do never create more than one adapter for the same actor system diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/AdapterExtension.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala similarity index 51% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/AdapterExtension.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala index ae1700f160..2d7288c82b 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/AdapterExtension.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala @@ -2,23 +2,24 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.adapter +package org.apache.pekko.actor.typed.internal.adapter -import akka.actor.ExtendedActorSystem -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.ExtendedActorSystem +import pekko.annotation.InternalApi /** * Internal API * * To not create a new adapter for every `toTyped` call we create one instance and keep in an extension */ -@InternalApi private[akka] class AdapterExtension(sys: akka.actor.ActorSystem) extends akka.actor.Extension { +@InternalApi private[pekko] class AdapterExtension(sys: pekko.actor.ActorSystem) extends pekko.actor.Extension { val adapter = ActorSystemAdapter(sys) } /** * Internal API */ -@InternalApi object AdapterExtension extends akka.actor.ExtensionId[AdapterExtension] { +@InternalApi object AdapterExtension extends pekko.actor.ExtensionId[AdapterExtension] { def createExtension(sys: ExtendedActorSystem): AdapterExtension = new AdapterExtension(sys) } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/EventStreamAdapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala similarity index 52% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/EventStreamAdapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala index 665086e4f6..9baae1822e 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/EventStreamAdapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala @@ -2,27 +2,28 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.internal.adapter +package org.apache.pekko.actor.typed.internal.adapter -import akka.actor.typed.Behavior -import akka.actor.typed.eventstream.EventStream -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter._ -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.eventstream.EventStream +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.adapter._ +import pekko.annotation.InternalApi /** * INTERNAL API - * Encapsulates the [[akka.actor.ActorSystem.eventStream]] in a [[Behavior]] + * Encapsulates the [[pekko.actor.ActorSystem.eventStream]] in a [[Behavior]] */ -@InternalApi private[akka] object EventStreamAdapter { +@InternalApi private[pekko] object EventStreamAdapter { - private[akka] val behavior: Behavior[EventStream.Command] = + private[pekko] val behavior: Behavior[EventStream.Command] = Behaviors.setup { ctx => val eventStream = ctx.system.toClassic.eventStream eventStreamBehavior(eventStream) } - private def eventStreamBehavior(eventStream: akka.event.EventStream): Behavior[EventStream.Command] = + private def eventStreamBehavior(eventStream: pekko.event.EventStream): Behavior[EventStream.Command] = Behaviors.receiveMessage { case EventStream.Publish(event) => eventStream.publish(event) diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/GuardianStartupBehavior.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala similarity index 82% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/GuardianStartupBehavior.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala index 761ed6db92..7f59db2e31 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/GuardianStartupBehavior.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.adapter +package org.apache.pekko.actor.typed.internal.adapter -import akka.actor.typed.Behavior -import akka.actor.typed.BehaviorInterceptor -import akka.actor.typed.Signal -import akka.actor.typed.TypedActorContext -import akka.actor.typed.scaladsl.{ Behaviors, StashOverflowException } -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.BehaviorInterceptor +import pekko.actor.typed.Signal +import pekko.actor.typed.TypedActorContext +import pekko.actor.typed.scaladsl.{ Behaviors, StashOverflowException } +import pekko.annotation.InternalApi /** * INTERNAL API @@ -19,7 +20,7 @@ import akka.annotation.InternalApi * system, and we know that the bootstrap is completed and the actor context can be accessed. */ @InternalApi -private[akka] object GuardianStartupBehavior { +private[pekko] object GuardianStartupBehavior { case object Start private val StashCapacity = 1000 @@ -51,7 +52,7 @@ private[akka] object GuardianStartupBehavior { * as part of that we must intercept when the guardian is stopped and call ActorSystem.terminate() * explicitly. */ -@InternalApi private[akka] final class GuardianStopInterceptor extends BehaviorInterceptor[Any, Any] { +@InternalApi private[pekko] final class GuardianStopInterceptor extends BehaviorInterceptor[Any, Any] { override def aroundReceive( ctx: TypedActorContext[Any], msg: Any, diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/PropsAdapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala similarity index 71% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/PropsAdapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala index ac602cbb98..d2c00fc019 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/PropsAdapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala @@ -2,24 +2,25 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.internal.adapter +package org.apache.pekko.actor.typed.internal.adapter -import akka.actor.Deploy -import akka.actor.typed.ActorTags -import akka.actor.typed.Behavior -import akka.actor.typed.DispatcherSelector -import akka.actor.typed.MailboxSelector -import akka.actor.typed.Props -import akka.actor.typed.internal.PropsImpl._ -import akka.annotation.InternalApi -import akka.dispatch.Mailboxes +import org.apache.pekko +import pekko.actor.Deploy +import pekko.actor.typed.ActorTags +import pekko.actor.typed.Behavior +import pekko.actor.typed.DispatcherSelector +import pekko.actor.typed.MailboxSelector +import pekko.actor.typed.Props +import pekko.actor.typed.internal.PropsImpl._ +import pekko.annotation.InternalApi +import pekko.dispatch.Mailboxes /** * INTERNAL API */ -@InternalApi private[akka] object PropsAdapter { - def apply[T](behavior: () => Behavior[T], props: Props, rethrowTypedFailure: Boolean): akka.actor.Props = { - val classicProps = akka.actor.Props(new ActorAdapter(behavior(), rethrowTypedFailure)) +@InternalApi private[pekko] object PropsAdapter { + def apply[T](behavior: () => Behavior[T], props: Props, rethrowTypedFailure: Boolean): pekko.actor.Props = { + val classicProps = pekko.actor.Props(new ActorAdapter(behavior(), rethrowTypedFailure)) val dispatcherProps = (props.firstOrElse[DispatcherSelector](DispatcherDefault.empty) match { case _: DispatcherDefault => classicProps diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/SchedulerAdapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala similarity index 81% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/SchedulerAdapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala index ba00c695e9..899483e848 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/SchedulerAdapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala @@ -2,22 +2,23 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.adapter +package org.apache.pekko.actor.typed.internal.adapter import java.time.Duration import scala.concurrent.ExecutionContext import scala.concurrent.duration.FiniteDuration -import akka.actor.Cancellable -import akka.actor.typed.Scheduler -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.Cancellable +import pekko.actor.typed.Scheduler +import pekko.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] object SchedulerAdapter { - def toClassic(scheduler: Scheduler): akka.actor.Scheduler = +@InternalApi private[pekko] object SchedulerAdapter { + def toClassic(scheduler: Scheduler): pekko.actor.Scheduler = scheduler match { case s: SchedulerAdapter => s.classicScheduler case _ => @@ -31,7 +32,8 @@ import akka.annotation.InternalApi * INTERNAL API */ @InternalApi -private[akka] final class SchedulerAdapter(private[akka] val classicScheduler: akka.actor.Scheduler) extends Scheduler { +private[pekko] final class SchedulerAdapter( + private[pekko] val classicScheduler: pekko.actor.Scheduler) extends Scheduler { override def scheduleOnce(delay: FiniteDuration, runnable: Runnable)( implicit executor: ExecutionContext): Cancellable = classicScheduler.scheduleOnce(delay, runnable) diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/pubsub/TopicImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala similarity index 89% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/pubsub/TopicImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala index e991e0beea..4d6fcd0b41 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/pubsub/TopicImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala @@ -2,28 +2,29 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.pubsub +package org.apache.pekko.actor.typed.internal.pubsub import scala.reflect.ClassTag -import akka.actor.Dropped -import akka.actor.InvalidMessageException -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.pubsub.Topic -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.AbstractBehavior -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.LoggerOps -import akka.actor.typed.scaladsl.adapter._ -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.Dropped +import pekko.actor.InvalidMessageException +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.pubsub.Topic +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.AbstractBehavior +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.LoggerOps +import pekko.actor.typed.scaladsl.adapter._ +import pekko.annotation.InternalApi /** * INTERNAL API */ @InternalApi -private[akka] object TopicImpl { +private[pekko] object TopicImpl { trait Command[T] @@ -47,7 +48,7 @@ private[akka] object TopicImpl { * INTERNAL API */ @InternalApi -private[akka] final class TopicImpl[T](topicName: String, context: ActorContext[TopicImpl.Command[T]])( +private[pekko] final class TopicImpl[T](topicName: String, context: ActorContext[TopicImpl.Command[T]])( implicit classTag: ClassTag[T]) extends AbstractBehavior[TopicImpl.Command[T]](context) { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/LocalReceptionist.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala similarity index 93% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/LocalReceptionist.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala index 0f1d8fe0a4..e9fcb055db 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/LocalReceptionist.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala @@ -2,17 +2,18 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.receptionist.Receptionist._ -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.LoggerOps -import akka.annotation.InternalApi -import akka.util.TypedMultiMap +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.receptionist.Receptionist._ +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.ActorContext +import pekko.actor.typed.scaladsl.Behaviors +import pekko.actor.typed.scaladsl.LoggerOps +import pekko.annotation.InternalApi +import pekko.util.TypedMultiMap /** * Marker interface to use with dynamic access @@ -20,7 +21,7 @@ import akka.util.TypedMultiMap * INTERNAL API */ @InternalApi -private[akka] trait ReceptionistBehaviorProvider { +private[pekko] trait ReceptionistBehaviorProvider { def name: String def behavior: Behavior[Command] } @@ -28,11 +29,11 @@ private[akka] trait ReceptionistBehaviorProvider { // just to provide a log class /** INTERNAL API */ @InternalApi -private[akka] final class LocalReceptionist +private[pekko] final class LocalReceptionist /** INTERNAL API */ @InternalApi -private[akka] object LocalReceptionist extends ReceptionistBehaviorProvider { +private[pekko] object LocalReceptionist extends ReceptionistBehaviorProvider { override val name = "localReceptionist" diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala similarity index 57% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala index c38407d03d..063d2fd3ab 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala @@ -2,25 +2,27 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Dispatchers -import akka.actor.typed.Props -import akka.actor.typed.receptionist.Receptionist -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Dispatchers +import pekko.actor.typed.Props +import pekko.actor.typed.receptionist.Receptionist +import pekko.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] class ReceptionistImpl(system: ActorSystem[_]) extends Receptionist { +@InternalApi private[pekko] class ReceptionistImpl(system: ActorSystem[_]) extends Receptionist { override val ref: ActorRef[Receptionist.Command] = { val provider: ReceptionistBehaviorProvider = if (system.settings.classicSettings.ProviderSelectionType.hasCluster) { system.dynamicAccess - .getObjectFor[ReceptionistBehaviorProvider]("akka.cluster.typed.internal.receptionist.ClusterReceptionist") + .getObjectFor[ReceptionistBehaviorProvider]( + "org.apache.pekko.cluster.typed.internal.receptionist.ClusterReceptionist") .recover { case e => throw new RuntimeException( @@ -31,7 +33,7 @@ import akka.annotation.InternalApi .get } else LocalReceptionist - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ system.internalSystemActorOf( provider.behavior, provider.name, diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistMessages.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala similarity index 74% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistMessages.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala index 83950c7016..da2287cb68 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistMessages.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist -import akka.actor.typed.ActorRef -import akka.actor.typed.receptionist.{ Receptionist, ServiceKey } -import akka.actor.typed.receptionist.Receptionist.Command -import akka.annotation.InternalApi -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.receptionist.{ Receptionist, ServiceKey } +import pekko.actor.typed.receptionist.Receptionist.Command +import pekko.annotation.InternalApi +import pekko.util.ccompat.JavaConverters._ /** * Internal API @@ -16,24 +17,24 @@ import akka.util.ccompat.JavaConverters._ * Shared message implementations for local and cluster receptionist */ @InternalApi -private[akka] object ReceptionistMessages { +private[pekko] object ReceptionistMessages { // some trixery here to provide a nice _and_ safe API in the face // of type erasure, more type safe factory methods for each message // is the user API below while still hiding the type parameter so that // users don't incorrectly match against it - final case class Register[T] private[akka] ( + final case class Register[T] private[pekko] ( key: ServiceKey[T], serviceInstance: ActorRef[T], replyTo: Option[ActorRef[Receptionist.Registered]]) extends Command - final case class Deregister[T] private[akka] ( + final case class Deregister[T] private[pekko] ( key: ServiceKey[T], serviceInstance: ActorRef[T], replyTo: Option[ActorRef[Receptionist.Deregistered]]) extends Command - final case class Registered[T] private[akka] (key: ServiceKey[T], _serviceInstance: ActorRef[T]) + final case class Registered[T] private[pekko] (key: ServiceKey[T], _serviceInstance: ActorRef[T]) extends Receptionist.Registered { def isForKey(key: ServiceKey[_]): Boolean = key == this.key def serviceInstance[M](key: ServiceKey[M]): ActorRef[M] = { @@ -46,7 +47,7 @@ private[akka] object ReceptionistMessages { serviceInstance(key) } - final case class Deregistered[T] private[akka] (key: ServiceKey[T], _serviceInstance: ActorRef[T]) + final case class Deregistered[T] private[pekko] (key: ServiceKey[T], _serviceInstance: ActorRef[T]) extends Receptionist.Deregistered { def isForKey(key: ServiceKey[_]): Boolean = key == this.key def serviceInstance[M](key: ServiceKey[M]): ActorRef[M] = { @@ -59,9 +60,9 @@ private[akka] object ReceptionistMessages { serviceInstance(key) } - final case class Find[T] private[akka] (key: ServiceKey[T], replyTo: ActorRef[Receptionist.Listing]) extends Command + final case class Find[T] private[pekko] (key: ServiceKey[T], replyTo: ActorRef[Receptionist.Listing]) extends Command - final case class Listing[T] private[akka] ( + final case class Listing[T] private[pekko] ( key: ServiceKey[T], _serviceInstances: Set[ActorRef[T]], _allServiceInstances: Set[ActorRef[T]], @@ -89,7 +90,7 @@ private[akka] object ReceptionistMessages { allServiceInstances(key).asJava } - final case class Subscribe[T] private[akka] (key: ServiceKey[T], subscriber: ActorRef[Receptionist.Listing]) + final case class Subscribe[T] private[pekko] (key: ServiceKey[T], subscriber: ActorRef[Receptionist.Listing]) extends Command } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ServiceKey.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala similarity index 73% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ServiceKey.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala index bb08745ed9..50e121a5ca 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ServiceKey.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala @@ -2,10 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist -import akka.actor.typed.receptionist.ServiceKey -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.typed.receptionist.ServiceKey +import pekko.annotation.InternalApi /** * Internal representation of [[ServiceKey]] which is needed @@ -15,7 +16,7 @@ import akka.annotation.InternalApi * Internal API */ @InternalApi -private[akka] abstract class AbstractServiceKey { +private[pekko] abstract class AbstractServiceKey { type Protocol /** Type-safe down-cast */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializer.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala similarity index 73% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializer.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala index 05c729fe1f..c9bce2263e 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializer.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.receptionist +package org.apache.pekko.actor.typed.internal.receptionist import java.nio.charset.StandardCharsets -import akka.actor.typed.receptionist.ServiceKey -import akka.annotation.InternalApi -import akka.serialization.{ BaseSerializer, SerializerWithStringManifest } +import org.apache.pekko +import pekko.actor.typed.receptionist.ServiceKey +import pekko.annotation.InternalApi +import pekko.serialization.{ BaseSerializer, SerializerWithStringManifest } /** * Internal API */ @InternalApi -final class ServiceKeySerializer(val system: akka.actor.ExtendedActorSystem) +final class ServiceKeySerializer(val system: pekko.actor.ExtendedActorSystem) extends SerializerWithStringManifest with BaseSerializer { def manifest(o: AnyRef): String = o match { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/GroupRouterImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala similarity index 88% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/GroupRouterImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala index 30cc0c2302..63ba64d621 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/GroupRouterImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala @@ -2,17 +2,18 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.routing +package org.apache.pekko.actor.typed.internal.routing import java.util.function -import akka.actor.Dropped -import akka.actor.typed._ -import akka.actor.typed.eventstream.EventStream -import akka.actor.typed.receptionist.Receptionist -import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, StashBuffer } -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.Dropped +import pekko.actor.typed._ +import pekko.actor.typed.eventstream.EventStream +import pekko.actor.typed.receptionist.Receptionist +import pekko.actor.typed.receptionist.ServiceKey +import pekko.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, StashBuffer } +import pekko.annotation.InternalApi /** * Provides builder style configuration options for group routers while still being a behavior that can be spawned @@ -20,7 +21,7 @@ import akka.annotation.InternalApi * INTERNAL API */ @InternalApi -private[akka] final case class GroupRouterBuilder[T] private[akka] ( +private[pekko] final case class GroupRouterBuilder[T] private[pekko] ( key: ServiceKey[T], preferLocalRoutees: Boolean = false, logicFactory: ActorSystem[_] => RoutingLogic[T] = (_: ActorSystem[_]) => new RoutingLogics.RandomLogic[T]()) @@ -83,7 +84,7 @@ private final class InitialGroupRouterImpl[T]( new GroupRouterImpl[T](context, serviceKey, preferLocalRoutees, routingLogic, update.isEmpty) stash.unstashAll(activeGroupRouter) case msg: T @unchecked => - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ if (!stash.isFull) stash.stash(msg) else context.system.eventStream ! EventStream.Publish(Dropped( @@ -111,7 +112,7 @@ private[routing] object GroupRouterHelper { * INTERNAL API */ @InternalApi -private[akka] final class GroupRouterImpl[T]( +private[pekko] final class GroupRouterImpl[T]( ctx: ActorContext[T], serviceKey: ServiceKey[T], preferLocalRoutees: Boolean, @@ -136,7 +137,7 @@ private[akka] final class GroupRouterImpl[T]( routingLogic.routeesUpdated(routees) this case msg: T @unchecked => - import akka.actor.typed.scaladsl.adapter._ + import pekko.actor.typed.scaladsl.adapter._ if (!routeesEmpty) routingLogic.selectRoutee(msg) ! msg else context.system.eventStream ! EventStream.Publish( diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/PoolRouterImpl.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala similarity index 91% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/PoolRouterImpl.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala index 55682ecf62..c5b78036c6 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/PoolRouterImpl.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.routing +package org.apache.pekko.actor.typed.internal.routing -import akka.actor.typed._ -import akka.actor.typed.javadsl.PoolRouter -import akka.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors } -import akka.annotation.InternalApi -import akka.util.ConstantFun +import org.apache.pekko +import pekko.actor.typed._ +import pekko.actor.typed.javadsl.PoolRouter +import pekko.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors } +import pekko.annotation.InternalApi +import pekko.util.ConstantFun import java.util.function import java.util.function.Predicate @@ -17,7 +18,7 @@ import java.util.function.Predicate * INTERNAL API */ @InternalApi -private[akka] final case class PoolRouterBuilder[T]( +private[pekko] final case class PoolRouterBuilder[T]( poolSize: Int, behavior: Behavior[T], logicFactory: ActorSystem[_] => RoutingLogic[T] = (_: ActorSystem[_]) => new RoutingLogics.RoundRobinLogic[T], diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/RoutingLogic.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala similarity index 92% rename from akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/RoutingLogic.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala index ca3bc94d3b..773773e667 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/routing/RoutingLogic.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.internal.routing +package org.apache.pekko.actor.typed.internal.routing import java.util.concurrent.ThreadLocalRandom -import akka.actor.Address -import akka.actor.typed.ActorRef -import akka.annotation.InternalApi -import akka.routing.ConsistentHash +import org.apache.pekko +import pekko.actor.Address +import pekko.actor.typed.ActorRef +import pekko.annotation.InternalApi +import pekko.routing.ConsistentHash /** * Kept in the behavior, not shared between instances, meant to be stateful. @@ -17,7 +18,7 @@ import akka.routing.ConsistentHash * INTERNAL API */ @InternalApi -sealed private[akka] trait RoutingLogic[T] { +sealed private[pekko] trait RoutingLogic[T] { def selectRoutee(msg: T): ActorRef[T] @@ -37,7 +38,7 @@ sealed private[akka] trait RoutingLogic[T] { * INTERNAL API */ @InternalApi -private[akka] object RoutingLogics { +private[pekko] object RoutingLogics { final class RoundRobinLogic[T] extends RoutingLogic[T] { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AbstractBehavior.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala similarity index 94% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AbstractBehavior.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala index e9d56b037f..ea9278b205 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AbstractBehavior.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala @@ -2,10 +2,11 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl -import akka.actor.typed.{ Behavior, ExtensibleBehavior, Signal, TypedActorContext } -import akka.util.OptionVal +import org.apache.pekko +import pekko.actor.typed.{ Behavior, ExtensibleBehavior, Signal, TypedActorContext } +import pekko.util.OptionVal /** * An actor `Behavior` can be implemented by extending this class and implement the diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala similarity index 87% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala index cd166cf0a7..96eab339de 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl import java.time.Duration import java.util.Optional @@ -10,10 +10,11 @@ import java.util.concurrent.CompletionStage import scala.concurrent.ExecutionContextExecutor import org.slf4j.Logger -import akka.actor.ClassicActorContextProvider -import akka.actor.typed._ -import akka.annotation.DoNotInherit -import akka.pattern.StatusReply +import org.apache.pekko +import pekko.actor.ClassicActorContextProvider +import pekko.actor.typed._ +import pekko.annotation.DoNotInherit +import pekko.pattern.StatusReply /** * An Actor is given by the combination of a [[Behavior]] and a context in @@ -45,7 +46,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi * This method is thread-safe and can be called from other threads than the ordinary * actor message processing thread, such as [[java.util.concurrent.CompletionStage]] callbacks. */ - def asScala: akka.actor.typed.scaladsl.ActorContext[T] + def asScala: pekko.actor.typed.scaladsl.ActorContext[T] /** * The identity of this Actor, bound to the lifecycle of this Actor instance. @@ -113,7 +114,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi def getChild(name: String): Optional[ActorRef[Void]] /** - * Create a child Actor from the given [[akka.actor.typed.Behavior]] under a randomly chosen name. + * Create a child Actor from the given [[pekko.actor.typed.Behavior]] under a randomly chosen name. * It is good practice to name Actors wherever practical. * * *Warning*: This method is not thread-safe and must not be accessed from threads other @@ -122,7 +123,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi def spawnAnonymous[U](behavior: Behavior[U]): ActorRef[U] /** - * Create a child Actor from the given [[akka.actor.typed.Behavior]] under a randomly chosen name. + * Create a child Actor from the given [[pekko.actor.typed.Behavior]] under a randomly chosen name. * It is good practice to name Actors wherever practical. * * *Warning*: This method is not thread-safe and must not be accessed from threads other @@ -131,7 +132,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi def spawnAnonymous[U](behavior: Behavior[U], props: Props): ActorRef[U] /** - * Create a child Actor from the given [[akka.actor.typed.Behavior]] and with the given name. + * Create a child Actor from the given [[pekko.actor.typed.Behavior]] and with the given name. * * *Warning*: This method is not thread-safe and must not be accessed from threads other * than the ordinary actor message processing thread, such as [[java.util.concurrent.CompletionStage]] callbacks. @@ -139,7 +140,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi def spawn[U](behavior: Behavior[U], name: String): ActorRef[U] /** - * Create a child Actor from the given [[akka.actor.typed.Behavior]] and with the given name. + * Create a child Actor from the given [[pekko.actor.typed.Behavior]] and with the given name. * * *Warning*: This method is not thread-safe and must not be accessed from threads other * than the ordinary actor message processing thread, such as [[java.util.concurrent.CompletionStage]] callbacks. @@ -147,11 +148,11 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi def spawn[U](behavior: Behavior[U], name: String, props: Props): ActorRef[U] /** - * Delegate message and signal's execution by given [[akka.actor.typed.Behavior]] + * Delegate message and signal's execution by given [[pekko.actor.typed.Behavior]] * using [[Behavior.interpretMessage]] or [[Behavior.interpretSignal]] * - * note: if given [[akka.actor.typed.Behavior]] resulting [[Behaviors.same]] that will cause context switching to the given behavior - * and if result is [[Behaviors.unhandled]] that will trigger the [[akka.actor.typed.scaladsl.ActorContext.onUnhandled]] + * note: if given [[pekko.actor.typed.Behavior]] resulting [[Behaviors.same]] that will cause context switching to the given behavior + * and if result is [[Behaviors.unhandled]] that will trigger the [[pekko.actor.typed.scaladsl.ActorContext.onUnhandled]] * then switching to the given behavior. */ def delegate(delegator: Behavior[T], msg: T): Behavior[T] @@ -228,7 +229,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi /** * Schedule the sending of the given message to the given target Actor after * the given time period has elapsed. The scheduled action can be cancelled - * by invoking [[akka.actor.Cancellable#cancel]] on the returned + * by invoking [[pekko.actor.Cancellable#cancel]] on the returned * handle. * * For scheduling messages to the actor itself, use [[Behaviors.withTimers]] @@ -236,7 +237,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi * This method is thread-safe and can be called from other threads than the ordinary * actor message processing thread, such as [[java.util.concurrent.CompletionStage]] callbacks. */ - def scheduleOnce[U](delay: Duration, target: ActorRef[U], msg: U): akka.actor.Cancellable + def scheduleOnce[U](delay: Duration, target: ActorRef[U], msg: U): pekko.actor.Cancellable /** * This Actor’s execution context. It can be used to run asynchronous tasks @@ -273,7 +274,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi * *Warning*: This method is not thread-safe and must not be accessed from threads other * than the ordinary actor message processing thread, such as [[java.util.concurrent.CompletionStage]] callbacks. */ - def messageAdapter[U](messageClass: Class[U], f: akka.japi.function.Function[U, T]): ActorRef[U] + def messageAdapter[U](messageClass: Class[U], f: pekko.japi.function.Function[U, T]): ActorRef[U] /** * Perform a single request-response message interaction with another actor, and transform the messages back to @@ -292,7 +293,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi * @param applyToResponse Transforms the response from the `target` into a message this actor understands. * Will be invoked with either the response message or an AskTimeoutException failed or * potentially another exception if the remote actor is classic and sent a - * [[akka.actor.Status.Failure]] as response. The returned message of type `T` is then + * [[pekko.actor.Status.Failure]] as response. The returned message of type `T` is then * fed into this actor as a message. Should be a pure function but is executed inside * the actor when the response arrives so can safely touch the actor internals. If this * function throws an exception it is just as if the normal message receiving logic would @@ -305,21 +306,21 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi resClass: Class[Res], target: RecipientRef[Req], responseTimeout: Duration, - createRequest: akka.japi.function.Function[ActorRef[Res], Req], - applyToResponse: akka.japi.function.Function2[Res, Throwable, T]): Unit + createRequest: pekko.japi.function.Function[ActorRef[Res], Req], + applyToResponse: pekko.japi.function.Function2[Res, Throwable, T]): Unit /** - * The same as [[ask]] but only for requests that result in a response of type [[akka.pattern.StatusReply]]. - * If the response is a [[akka.pattern.StatusReply#success]] the returned future is completed successfully with the wrapped response. - * If the status response is a [[akka.pattern.StatusReply#error]] the returned future will be failed with the - * exception in the error (normally a [[akka.pattern.StatusReply.ErrorMessage]]). + * The same as [[ask]] but only for requests that result in a response of type [[pekko.pattern.StatusReply]]. + * If the response is a [[pekko.pattern.StatusReply#success]] the returned future is completed successfully with the wrapped response. + * If the status response is a [[pekko.pattern.StatusReply#error]] the returned future will be failed with the + * exception in the error (normally a [[pekko.pattern.StatusReply.ErrorMessage]]). */ def askWithStatus[Req, Res]( resClass: Class[Res], target: RecipientRef[Req], responseTimeout: Duration, - createRequest: akka.japi.function.Function[ActorRef[StatusReply[Res]], Req], - applyToResponse: akka.japi.function.Function2[Res, Throwable, T]): Unit + createRequest: pekko.japi.function.Function[ActorRef[StatusReply[Res]], Req], + applyToResponse: pekko.japi.function.Function2[Res, Throwable, T]): Unit /** * Sends the result of the given `CompletionStage` to this Actor (“`self`”), after adapted it with @@ -330,6 +331,6 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi */ def pipeToSelf[Value]( future: CompletionStage[Value], - applyToResult: akka.japi.function.Function2[Value, Throwable, T]): Unit + applyToResult: pekko.japi.function.Function2[Value, Throwable, T]): Unit } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Adapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala similarity index 57% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Adapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala index 91f1ebdc31..e970e29a8c 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Adapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala @@ -2,23 +2,24 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl -import akka.actor -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.Behavior -import akka.actor.typed.Props -import akka.actor.typed.Scheduler -import akka.actor.typed.SupervisorStrategy -import akka.actor.typed.internal.adapter.ActorContextAdapter -import akka.actor.typed.scaladsl.adapter._ -import akka.japi.Creator +import org.apache.pekko +import pekko.actor +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.Behavior +import pekko.actor.typed.Props +import pekko.actor.typed.Scheduler +import pekko.actor.typed.SupervisorStrategy +import pekko.actor.typed.internal.adapter.ActorContextAdapter +import pekko.actor.typed.scaladsl.adapter._ +import pekko.japi.Creator /** * Adapters between typed and classic actors and actor systems. - * The underlying `ActorSystem` is the classic [[akka.actor.ActorSystem]] - * which runs Akka [[akka.actor.typed.Behavior]] on an emulation layer. In this + * The underlying `ActorSystem` is the classic [[pekko.actor.ActorSystem]] + * which runs Akka [[pekko.actor.typed.Behavior]] on an emulation layer. In this * system typed and classic actors can coexist. * * These methods make it possible to create a child actor from classic @@ -26,8 +27,8 @@ import akka.japi.Creator * `watch` is also supported in both directions. * * There are also converters (`toTyped`, `toClassic`) between classic - * [[akka.actor.ActorRef]] and [[akka.actor.typed.ActorRef]], and between classic - * [[akka.actor.ActorSystem]] and [[akka.actor.typed.ActorSystem]]. + * [[pekko.actor.ActorRef]] and [[pekko.actor.typed.ActorRef]], and between classic + * [[pekko.actor.ActorSystem]] and [[pekko.actor.typed.ActorSystem]]. */ object Adapter { @@ -36,7 +37,7 @@ object Adapter { * Actor default supervision strategy is to stop. Can be overridden with * `Behaviors.supervise`. */ - def spawnAnonymous[T](sys: akka.actor.ActorSystem, behavior: Behavior[T]): ActorRef[T] = + def spawnAnonymous[T](sys: pekko.actor.ActorSystem, behavior: Behavior[T]): ActorRef[T] = spawnAnonymous(sys, behavior, Props.empty) /** @@ -44,7 +45,7 @@ object Adapter { * Actor default supervision strategy is to stop. Can be overridden with * `Behaviors.supervise`. */ - def spawnAnonymous[T](sys: akka.actor.ActorSystem, behavior: Behavior[T], props: Props): ActorRef[T] = + def spawnAnonymous[T](sys: pekko.actor.ActorSystem, behavior: Behavior[T], props: Props): ActorRef[T] = sys.spawnAnonymous(behavior, props) /** @@ -52,7 +53,7 @@ object Adapter { * Actor default supervision strategy is to stop. Can be overridden with * `Behaviors.supervise`. */ - def spawn[T](sys: akka.actor.ActorSystem, behavior: Behavior[T], name: String): ActorRef[T] = + def spawn[T](sys: pekko.actor.ActorSystem, behavior: Behavior[T], name: String): ActorRef[T] = spawn(sys, behavior, name, Props.empty) /** @@ -60,7 +61,7 @@ object Adapter { * Actor default supervision strategy is to stop. Can be overridden with * `Behaviors.supervise`. */ - def spawn[T](sys: akka.actor.ActorSystem, behavior: Behavior[T], name: String, props: Props): ActorRef[T] = + def spawn[T](sys: pekko.actor.ActorSystem, behavior: Behavior[T], name: String, props: Props): ActorRef[T] = sys.spawn(behavior, name, props) /** @@ -68,7 +69,7 @@ object Adapter { * Actor default supervision strategy is to stop. Can be overridden with * `Behaviors.supervise`. */ - def spawnAnonymous[T](ctx: akka.actor.ActorContext, behavior: Behavior[T]): ActorRef[T] = + def spawnAnonymous[T](ctx: pekko.actor.ActorContext, behavior: Behavior[T]): ActorRef[T] = spawnAnonymous(ctx, behavior, Props.empty) /** @@ -76,7 +77,7 @@ object Adapter { * Actor default supervision strategy is to stop. Can be overridden with * `Behaviors.supervise`. */ - def spawnAnonymous[T](ctx: akka.actor.ActorContext, behavior: Behavior[T], props: Props): ActorRef[T] = + def spawnAnonymous[T](ctx: pekko.actor.ActorContext, behavior: Behavior[T], props: Props): ActorRef[T] = ctx.spawnAnonymous(behavior, props) /** @@ -84,7 +85,7 @@ object Adapter { * Actor default supervision strategy is to stop. Can be overridden with * `Behaviors.supervise`. */ - def spawn[T](ctx: akka.actor.ActorContext, behavior: Behavior[T], name: String): ActorRef[T] = + def spawn[T](ctx: pekko.actor.ActorContext, behavior: Behavior[T], name: String): ActorRef[T] = spawn(ctx, behavior, name, Props.empty) /** @@ -92,78 +93,78 @@ object Adapter { * Actor default supervision strategy is to stop. Can be overridden with * `Behaviors.supervise`. */ - def spawn[T](ctx: akka.actor.ActorContext, behavior: Behavior[T], name: String, props: Props): ActorRef[T] = + def spawn[T](ctx: pekko.actor.ActorContext, behavior: Behavior[T], name: String, props: Props): ActorRef[T] = ctx.spawn(behavior, name, props) - def toTyped(sys: akka.actor.ActorSystem): ActorSystem[Void] = + def toTyped(sys: pekko.actor.ActorSystem): ActorSystem[Void] = sys.toTyped.asInstanceOf[ActorSystem[Void]] - def toClassic(sys: ActorSystem[_]): akka.actor.ActorSystem = + def toClassic(sys: ActorSystem[_]): pekko.actor.ActorSystem = sys.toClassic def toClassic(ctx: ActorContext[_]): actor.ActorContext = ActorContextAdapter.toClassic(ctx) - def watch[U](ctx: akka.actor.ActorContext, other: ActorRef[U]): Unit = + def watch[U](ctx: pekko.actor.ActorContext, other: ActorRef[U]): Unit = ctx.watch(other) - def unwatch[U](ctx: akka.actor.ActorContext, other: ActorRef[U]): Unit = + def unwatch[U](ctx: pekko.actor.ActorContext, other: ActorRef[U]): Unit = ctx.unwatch(other) - def stop(ctx: akka.actor.ActorContext, child: ActorRef[_]): Unit = + def stop(ctx: pekko.actor.ActorContext, child: ActorRef[_]): Unit = ctx.stop(child) - def watch[U](ctx: ActorContext[_], other: akka.actor.ActorRef): Unit = + def watch[U](ctx: ActorContext[_], other: pekko.actor.ActorRef): Unit = ctx.watch(other) - def unwatch[U](ctx: ActorContext[_], other: akka.actor.ActorRef): Unit = + def unwatch[U](ctx: ActorContext[_], other: pekko.actor.ActorRef): Unit = ctx.unwatch(other) - def stop(ctx: ActorContext[_], child: akka.actor.ActorRef): Unit = + def stop(ctx: ActorContext[_], child: pekko.actor.ActorRef): Unit = ctx.stop(child) - def actorOf(ctx: ActorContext[_], props: akka.actor.Props): akka.actor.ActorRef = + def actorOf(ctx: ActorContext[_], props: pekko.actor.Props): pekko.actor.ActorRef = ActorContextAdapter.toClassic(ctx).actorOf(props) - def actorOf(ctx: ActorContext[_], props: akka.actor.Props, name: String): akka.actor.ActorRef = + def actorOf(ctx: ActorContext[_], props: pekko.actor.Props, name: String): pekko.actor.ActorRef = ActorContextAdapter.toClassic(ctx).actorOf(props, name) - def toClassic(ref: ActorRef[_]): akka.actor.ActorRef = + def toClassic(ref: ActorRef[_]): pekko.actor.ActorRef = ref.toClassic - def toTyped[T](ref: akka.actor.ActorRef): ActorRef[T] = + def toTyped[T](ref: pekko.actor.ActorRef): ActorRef[T] = ref /** - * Wrap [[akka.actor.typed.Behavior]] in a classic [[akka.actor.Props]], i.e. when + * Wrap [[pekko.actor.typed.Behavior]] in a classic [[pekko.actor.Props]], i.e. when * spawning a typed child actor from a classic parent actor. * This is normally not needed because you can use the extension methods * `spawn` and `spawnAnonymous` with a classic `ActorContext`, but it's needed * when using typed actors with an existing library/tool that provides an API that - * takes a classic [[akka.actor.Props]] parameter. Cluster Sharding is an + * takes a classic [[pekko.actor.Props]] parameter. Cluster Sharding is an * example of that. */ - def props[T](behavior: Creator[Behavior[T]], deploy: Props): akka.actor.Props = - akka.actor.typed.internal.adapter.PropsAdapter( + def props[T](behavior: Creator[Behavior[T]], deploy: Props): pekko.actor.Props = + pekko.actor.typed.internal.adapter.PropsAdapter( () => Behaviors.supervise(behavior.create()).onFailure(SupervisorStrategy.stop), deploy, rethrowTypedFailure = false) /** - * Wrap [[akka.actor.typed.Behavior]] in a classic [[akka.actor.Props]], i.e. when + * Wrap [[pekko.actor.typed.Behavior]] in a classic [[pekko.actor.Props]], i.e. when * spawning a typed child actor from a classic parent actor. * This is normally not needed because you can use the extension methods * `spawn` and `spawnAnonymous` with a classic `ActorContext`, but it's needed * when using typed actors with an existing library/tool that provides an API that - * takes a classic [[akka.actor.Props]] parameter. Cluster Sharding is an + * takes a classic [[pekko.actor.Props]] parameter. Cluster Sharding is an * example of that. */ - def props[T](behavior: Creator[Behavior[T]]): akka.actor.Props = + def props[T](behavior: Creator[Behavior[T]]): pekko.actor.Props = props(behavior, Props.empty) - def toClassic(scheduler: Scheduler): akka.actor.Scheduler = + def toClassic(scheduler: Scheduler): pekko.actor.Scheduler = scheduler.toClassic - def toTyped[T](scheduler: akka.actor.Scheduler): Scheduler = + def toTyped[T](scheduler: pekko.actor.Scheduler): Scheduler = scheduler.toTyped } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala similarity index 71% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala index 4010991804..29cf63a7f0 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala @@ -2,18 +2,19 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package javadsl import java.time.Duration import java.util.concurrent.CompletionStage import scala.compat.java8.FutureConverters._ -import akka.actor.typed.Scheduler -import akka.actor.typed.scaladsl.AskPattern._ -import akka.japi.function.{ Function => JFunction } -import akka.pattern.StatusReply -import akka.util.JavaDurationConverters._ +import org.apache.pekko +import pekko.actor.typed.Scheduler +import pekko.actor.typed.scaladsl.AskPattern._ +import pekko.japi.function.{ Function => JFunction } +import pekko.pattern.StatusReply +import pekko.util.JavaDurationConverters._ /** * The ask-pattern implements the initiator side of a request–reply protocol. @@ -42,10 +43,10 @@ object AskPattern { actor.ask(messageFactory.apply)(timeout.asScala, scheduler).toJava /** - * The same as [[ask]] but only for requests that result in a response of type [[akka.pattern.StatusReply]]. - * If the response is a [[akka.pattern.StatusReply#success]] the returned future is completed successfully with the wrapped response. - * If the status response is a [[akka.pattern.StatusReply#error]] the returned future will be failed with the - * exception in the error (normally a [[akka.pattern.StatusReply.ErrorMessage]]). + * The same as [[ask]] but only for requests that result in a response of type [[pekko.pattern.StatusReply]]. + * If the response is a [[pekko.pattern.StatusReply#success]] the returned future is completed successfully with the wrapped response. + * If the status response is a [[pekko.pattern.StatusReply#error]] the returned future will be failed with the + * exception in the error (normally a [[pekko.pattern.StatusReply.ErrorMessage]]). */ def askWithStatus[Req, Res]( actor: RecipientRef[Req], diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/BehaviorBuilder.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala similarity index 93% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/BehaviorBuilder.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala index 477c22869d..aa1d13e153 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/BehaviorBuilder.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala @@ -2,21 +2,22 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl import scala.annotation.tailrec import BehaviorBuilder._ -import akka.actor.typed.Behavior -import akka.actor.typed.ExtensibleBehavior -import akka.actor.typed.Signal -import akka.actor.typed.TypedActorContext -import akka.annotation.InternalApi -import akka.japi.function.{ Function => JFunction } -import akka.japi.function.{ Predicate => JPredicate } -import akka.japi.function.Creator -import akka.util.OptionVal +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.ExtensibleBehavior +import pekko.actor.typed.Signal +import pekko.actor.typed.TypedActorContext +import pekko.annotation.InternalApi +import pekko.japi.function.{ Function => JFunction } +import pekko.japi.function.{ Predicate => JPredicate } +import pekko.japi.function.Creator +import pekko.util.OptionVal /** * Immutable builder used for creating a [[Behavior]] by 'chaining' message and signal handlers. @@ -24,7 +25,7 @@ import akka.util.OptionVal * When handling a message or signal, this [[Behavior]] will consider all handlers in the order they were added, * looking for the first handler for which both the type and the (optional) predicate match. * - * Akka `akka.japi.function` lambda types are used throughout to allow handlers to throw checked exceptions + * Akka `org.apache.pekko.japi.function` lambda types are used throughout to allow handlers to throw checked exceptions * (which will fail the actor). * * @tparam T the common superclass of all supported messages. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala similarity index 90% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala index ada286b3b6..2c2a00bf30 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala @@ -2,28 +2,29 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl import java.util.Collections import java.util.function.{ Function => JFunction, Supplier } import scala.reflect.ClassTag -import akka.actor.typed._ -import akka.actor.typed.internal.{ +import org.apache.pekko +import pekko.actor.typed._ +import pekko.actor.typed.internal.{ BehaviorImpl, StashBufferImpl, Supervisor, TimerSchedulerImpl, WithMdcBehaviorInterceptor } -import akka.japi.function.{ Effect, Function2 => JapiFunction2 } -import akka.japi.pf.PFBuilder -import akka.util.ccompat.JavaConverters._ -import akka.util.unused +import pekko.japi.function.{ Effect, Function2 => JapiFunction2 } +import pekko.japi.pf.PFBuilder +import pekko.util.ccompat.JavaConverters._ +import pekko.util.unused /** - * Factories for [[akka.actor.typed.Behavior]]. + * Factories for [[pekko.actor.typed.Behavior]]. */ object Behaviors { @@ -43,7 +44,7 @@ object Behaviors { * case it will be started immediately after it is returned, i.e. next message will be * processed by the started behavior. */ - def setup[T](factory: akka.japi.function.Function[ActorContext[T], Behavior[T]]): Behavior[T] = + def setup[T](factory: pekko.japi.function.Function[ActorContext[T], Behavior[T]]): Behavior[T] = BehaviorImpl.DeferredBehavior(ctx => factory.apply(ctx.asJava)) /** @@ -108,7 +109,7 @@ object Behaviors { /** * Construct an actor behavior that can react to incoming messages but not to * lifecycle signals. After spawning this actor from another actor (or as the - * guardian of an [[akka.actor.typed.ActorSystem]]) it will be executed within an + * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed within an * [[ActorContext]] that allows access to the system, spawning and watching * other actors, etc. * @@ -127,7 +128,7 @@ object Behaviors { * * Construct an actor behavior that can react to incoming messages but not to * lifecycle signals. After spawning this actor from another actor (or as the - * guardian of an [[akka.actor.typed.ActorSystem]]) it will be executed within an + * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed within an * [[ActorContext]] that allows access to the system, spawning and watching * other actors, etc. * @@ -136,13 +137,13 @@ object Behaviors { * that can potentially be different from this one. State is maintained by returning * a new behavior that holds the new immutable state. */ - def receiveMessage[T](onMessage: akka.japi.Function[T, Behavior[T]]): Behavior[T] = + def receiveMessage[T](onMessage: pekko.japi.Function[T, Behavior[T]]): Behavior[T] = new BehaviorImpl.ReceiveBehavior((_, msg) => onMessage.apply(msg)) /** * Construct an actor behavior that can react to both incoming messages and * lifecycle signals. After spawning this actor from another actor (or as the - * guardian of an [[akka.actor.typed.ActorSystem]]) it will be executed within an + * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed within an * [[ActorContext]] that allows access to the system, spawning and watching * other actors, etc. * @@ -182,10 +183,10 @@ object Behaviors { } /** - * Intercept messages and signals for a `behavior` by first passing them to a [[akka.actor.typed.BehaviorInterceptor]] + * Intercept messages and signals for a `behavior` by first passing them to a [[pekko.actor.typed.BehaviorInterceptor]] * * When a behavior returns a new behavior as a result of processing a signal or message and that behavior already contains - * the same interceptor (defined by the [[akka.actor.typed.BehaviorInterceptor#isSame]] method) only the innermost interceptor + * the same interceptor (defined by the [[pekko.actor.typed.BehaviorInterceptor#isSame]] method) only the innermost interceptor * is kept. This is to protect against stack overflow when recursively defining behaviors. * * The interceptor is created with a factory function in case it has state and should not be shared. @@ -197,7 +198,7 @@ object Behaviors { /** * Behavior decorator that copies all received message to the designated - * monitor [[akka.actor.typed.ActorRef]] before invoking the wrapped behavior. The + * monitor [[pekko.actor.typed.ActorRef]] before invoking the wrapped behavior. The * wrapped behavior can evolve (i.e. return different behavior) without needing to be * wrapped in a `monitor` call again. * @@ -211,16 +212,16 @@ object Behaviors { scaladsl.Behaviors.monitor(monitor, behavior)(ClassTag(interceptMessageClass)) /** - * Behavior decorator that logs all messages to the [[akka.actor.typed.Behavior]] using the provided - * [[akka.actor.typed.LogOptions]] default configuration before invoking the wrapped behavior. + * Behavior decorator that logs all messages to the [[pekko.actor.typed.Behavior]] using the provided + * [[pekko.actor.typed.LogOptions]] default configuration before invoking the wrapped behavior. * To include an MDC context then first wrap `logMessages` with `withMDC`. */ def logMessages[T](behavior: Behavior[T]): Behavior[T] = scaladsl.Behaviors.logMessages(behavior) /** - * Behavior decorator that logs all messages to the [[akka.actor.typed.Behavior]] using the provided - * [[akka.actor.typed.LogOptions]] configuration before invoking the wrapped behavior. + * Behavior decorator that logs all messages to the [[pekko.actor.typed.Behavior]] using the provided + * [[pekko.actor.typed.LogOptions]] configuration before invoking the wrapped behavior. * To include an MDC context then first wrap `logMessages` with `withMDC`. */ def logMessages[T](logOptions: LogOptions, behavior: Behavior[T]): Behavior[T] = @@ -254,7 +255,7 @@ object Behaviors { def supervise[T](wrapped: Behavior[T]): Supervise[T] = new Supervise[T](wrapped) - final class Supervise[T] private[akka] (wrapped: Behavior[T]) { + final class Supervise[T] private[pekko] (wrapped: Behavior[T]) { /** * Specify the [[SupervisorStrategy]] to be invoked when the wrapped behavior throws. @@ -315,7 +316,7 @@ object Behaviors { * * @see [[TimerScheduler]] */ - def withTimers[T](factory: akka.japi.function.Function[TimerScheduler[T], Behavior[T]]): Behavior[T] = + def withTimers[T](factory: pekko.japi.function.Function[TimerScheduler[T], Behavior[T]]): Behavior[T] = TimerSchedulerImpl.withTimers(timers => factory.apply(timers)) /** @@ -331,7 +332,7 @@ object Behaviors { */ def withMdc[T]( interceptMessageClass: Class[T], - mdcForMessage: akka.japi.function.Function[T, java.util.Map[String, String]], + mdcForMessage: pekko.japi.function.Function[T, java.util.Map[String, String]], behavior: Behavior[T]): Behavior[T] = withMdc(interceptMessageClass, Collections.emptyMap[String, String], mdcForMessage, behavior) @@ -372,7 +373,7 @@ object Behaviors { def withMdc[T]( interceptMessageClass: Class[T], staticMdc: java.util.Map[String, String], - mdcForMessage: akka.japi.function.Function[T, java.util.Map[String, String]], + mdcForMessage: pekko.japi.function.Function[T, java.util.Map[String, String]], behavior: Behavior[T]): Behavior[T] = { def asScalaMap(m: java.util.Map[String, String]): Map[String, String] = { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Receive.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala similarity index 83% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Receive.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala index e68ee3dec0..adbf2bd036 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Receive.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala @@ -2,13 +2,14 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl -import akka.actor.typed.Behavior -import akka.actor.typed.ExtensibleBehavior -import akka.actor.typed.Signal -import akka.actor.typed.TypedActorContext -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.ExtensibleBehavior +import pekko.actor.typed.Signal +import pekko.actor.typed.TypedActorContext +import pekko.annotation.DoNotInherit /** * A specialized "receive" behavior that is implemented using message matching builders, @@ -33,7 +34,7 @@ abstract class Receive[T] extends ExtensibleBehavior[T] { def receiveMessage(msg: T): Behavior[T] /** - * Process an incoming [[akka.actor.typed.Signal]] and return the next behavior. This means + * Process an incoming [[pekko.actor.typed.Signal]] and return the next behavior. This means * that all lifecycle hooks, ReceiveTimeout, Terminated and Failed messages * can initiate a behavior change. * diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala similarity index 96% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala index f54d6c6928..211c5cdca3 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala @@ -2,12 +2,13 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl -import akka.actor.typed.{ Behavior, MessageAdaptionFailure, Signal } -import akka.annotation.InternalApi -import akka.japi.function.{ Creator, Function => JFunction, Predicate => JPredicate } -import akka.util.OptionVal +import org.apache.pekko +import pekko.actor.typed.{ Behavior, MessageAdaptionFailure, Signal } +import pekko.annotation.InternalApi +import pekko.japi.function.{ Creator, Function => JFunction, Predicate => JPredicate } +import pekko.util.OptionVal import scala.annotation.tailrec diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Routers.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala similarity index 95% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Routers.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala index 30531ecf18..1fa6027b34 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Routers.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala @@ -2,20 +2,21 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl -import akka.actor.typed.{ Behavior, Props } -import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior -import akka.actor.typed.internal.routing.{ GroupRouterBuilder, PoolRouterBuilder } -import akka.actor.typed.receptionist.ServiceKey -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.actor.typed.{ Behavior, Props } +import pekko.actor.typed.internal.BehaviorImpl.DeferredBehavior +import pekko.actor.typed.internal.routing.{ GroupRouterBuilder, PoolRouterBuilder } +import pekko.actor.typed.receptionist.ServiceKey +import pekko.annotation.DoNotInherit import java.util.function.Predicate object Routers { /** - * A router that will keep track of the available routees registered to the [[akka.actor.typed.receptionist.Receptionist]] + * A router that will keep track of the available routees registered to the [[pekko.actor.typed.receptionist.Receptionist]] * and route over those by random selection. * * In a clustered app this means the routees could live on any node in the cluster. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala similarity index 96% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala index 6cc5ee722c..7c28067c98 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala @@ -2,11 +2,12 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl -import akka.actor.typed.{ scaladsl, Behavior } -import akka.annotation.DoNotInherit -import akka.japi.function.Procedure +import org.apache.pekko +import pekko.actor.typed.{ scaladsl, Behavior } +import pekko.annotation.DoNotInherit +import pekko.japi.function.Procedure import java.util.function.{ Function => JFunction, Predicate } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/TimerScheduler.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/TimerScheduler.scala similarity index 99% rename from akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/TimerScheduler.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/TimerScheduler.scala index ff345929a5..2266304db3 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/TimerScheduler.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/TimerScheduler.scala @@ -2,11 +2,11 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.javadsl +package org.apache.pekko.actor.typed.javadsl import java.time.Duration -import akka.annotation.DoNotInherit +import org.apache.pekko.annotation.DoNotInherit /** * Support for scheduled `self` messages in an actor. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/pubsub/Topic.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala similarity index 91% rename from akka-actor-typed/src/main/scala/akka/actor/typed/pubsub/Topic.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala index a7d0d37315..786d589821 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/pubsub/Topic.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.pubsub +package org.apache.pekko.actor.typed.pubsub import scala.reflect.ClassTag -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior -import akka.actor.typed.internal.pubsub.TopicImpl -import akka.actor.typed.scaladsl.Behaviors -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.Behavior +import pekko.actor.typed.internal.pubsub.TopicImpl +import pekko.actor.typed.scaladsl.Behaviors +import pekko.annotation.DoNotInherit /** * A pub sub topic is an actor that handles subscribing to a topic and publishing messages to all subscribed actors. @@ -22,7 +23,7 @@ import akka.annotation.DoNotInherit * each publish and if there are no subscribers on a node, no message is sent to it. Note that the list of subscribers * is eventually consistent and there are no delivery guarantees built in. * - * Each topic results in a [[akka.actor.typed.receptionist.ServiceKey]] in the [[akka.actor.typed.receptionist.Receptionist]] + * Each topic results in a [[pekko.actor.typed.receptionist.ServiceKey]] in the [[pekko.actor.typed.receptionist.Receptionist]] * so the same scaling recommendation holds for topics, see docs: * https://doc.akka.io/docs/akka/current/typed/actor-discovery.html#receptionist-scalability */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala similarity index 94% rename from akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala index 6a295c5dcd..47cd116abb 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.receptionist +package org.apache.pekko.actor.typed.receptionist import scala.reflect.ClassTag -import akka.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId, ExtensionSetup } -import akka.actor.typed.internal.receptionist._ -import akka.annotation.DoNotInherit -import akka.util.ccompat.JavaConverters._ +import org.apache.pekko +import pekko.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId, ExtensionSetup } +import pekko.actor.typed.internal.receptionist._ +import pekko.annotation.DoNotInherit +import pekko.util.ccompat.JavaConverters._ /** * Register and discover actors that implement a service with a protocol defined by a [[ServiceKey]]. @@ -105,7 +106,7 @@ object Receptionist extends ExtensionId[Receptionist] { @DoNotInherit abstract class Command /** - * `Register` message. Associate the given [[akka.actor.typed.ActorRef]] with the given [[ServiceKey]] + * `Register` message. Associate the given [[pekko.actor.typed.ActorRef]] with the given [[ServiceKey]] * by sending this command to the [[Receptionist.ref]]. * * Multiple registrations can be made for the same key. De-registration is implied by @@ -131,7 +132,7 @@ object Receptionist extends ExtensionId[Receptionist] { /** * Java API: A Register message without Ack that the service was registered. - * Associate the given [[akka.actor.typed.ActorRef]] with the given [[ServiceKey]] + * Associate the given [[pekko.actor.typed.ActorRef]] with the given [[ServiceKey]] * by sending this command to the [[Receptionist.ref]]. * * Multiple registrations can be made for the same key. De-registration is implied by @@ -141,7 +142,7 @@ object Receptionist extends ExtensionId[Receptionist] { /** * Java API: A `Register` message with Ack that the service was registered. - * Associate the given [[akka.actor.typed.ActorRef]] with the given [[ServiceKey]] + * Associate the given [[pekko.actor.typed.ActorRef]] with the given [[ServiceKey]] * by sending this command to the [[Receptionist.ref]]. * * Multiple registrations can be made for the same key. De-registration is implied by @@ -153,7 +154,7 @@ object Receptionist extends ExtensionId[Receptionist] { Register(key, service, replyTo) /** - * Confirmation that the given [[akka.actor.typed.ActorRef]] has been associated with the [[ServiceKey]]. + * Confirmation that the given [[pekko.actor.typed.ActorRef]] has been associated with the [[ServiceKey]]. * * You can use `key.Registered` for type-safe pattern matching. * @@ -201,7 +202,7 @@ object Receptionist extends ExtensionId[Receptionist] { Registered(key, serviceInstance) /** - * Remove association between the given [[akka.actor.typed.ActorRef]] and the given [[ServiceKey]]. + * Remove association between the given [[pekko.actor.typed.ActorRef]] and the given [[ServiceKey]]. * * Deregistration can be acknowledged with the [[Deregistered]] message if the deregister message is created with a * `replyTo` actor. @@ -237,7 +238,7 @@ object Receptionist extends ExtensionId[Receptionist] { Deregister(key, service, replyTo) /** - * Confirmation that the given [[akka.actor.typed.ActorRef]] no more associated with the [[ServiceKey]] in the local receptionist. + * Confirmation that the given [[pekko.actor.typed.ActorRef]] no more associated with the [[ServiceKey]] in the local receptionist. * Note that this does not guarantee that subscribers has yet seen that the service is deregistered. * * Not for user extension @@ -459,7 +460,7 @@ object ReceptionistSetup { } /** - * Can be used in [[akka.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] + * Can be used in [[pekko.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]] * to replace the default implementation of the [[Receptionist]] extension. Intended * for tests that need to replace extension with stub/mock implementations. */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala similarity index 92% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala index ee357720bb..a0c0a823ba 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala @@ -2,10 +2,11 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl -import akka.actor.typed.{ Behavior, ExtensibleBehavior, Signal, TypedActorContext } -import akka.actor.typed.MessageAdaptionFailure +import org.apache.pekko +import pekko.actor.typed.{ Behavior, ExtensibleBehavior, Signal, TypedActorContext } +import pekko.actor.typed.MessageAdaptionFailure /** * An actor `Behavior` can be implemented by extending this class and implement the @@ -54,7 +55,7 @@ abstract class AbstractBehavior[T](protected val context: ActorContext[T]) exten def onMessage(msg: T): Behavior[T] /** - * Override this method to process an incoming [[akka.actor.typed.Signal]] and return the next behavior. + * Override this method to process an incoming [[pekko.actor.typed.Signal]] and return the next behavior. * This means that all lifecycle hooks, ReceiveTimeout, Terminated and Failed messages * can initiate a behavior change. * diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/ActorContext.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala similarity index 88% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/ActorContext.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala index 27eb97341a..3ceed2617a 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/ActorContext.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala @@ -2,19 +2,20 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import scala.concurrent.{ ExecutionContextExecutor, Future } import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag import scala.util.Try import org.slf4j.Logger -import akka.actor.ClassicActorContextProvider -import akka.actor.typed._ -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi -import akka.pattern.StatusReply -import akka.util.Timeout +import org.apache.pekko +import pekko.actor.ClassicActorContextProvider +import pekko.actor.typed._ +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi +import pekko.pattern.StatusReply +import pekko.util.Timeout /** * An Actor is given by the combination of a [[Behavior]] and a context in @@ -45,7 +46,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi * This method is thread-safe and can be called from other threads than the ordinary * actor message processing thread, such as [[scala.concurrent.Future]] callbacks. */ - def asJava: akka.actor.typed.javadsl.ActorContext[T] + def asJava: pekko.actor.typed.javadsl.ActorContext[T] /** * The identity of this Actor, bound to the lifecycle of this Actor instance. @@ -113,7 +114,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi def child(name: String): Option[ActorRef[Nothing]] /** - * Create a child Actor from the given [[akka.actor.typed.Behavior]] under a randomly chosen name. + * Create a child Actor from the given [[pekko.actor.typed.Behavior]] under a randomly chosen name. * It is good practice to name Actors wherever practical. * * *Warning*: This method is not thread-safe and must not be accessed from threads other @@ -122,7 +123,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi def spawnAnonymous[U](behavior: Behavior[U], props: Props = Props.empty): ActorRef[U] /** - * Create a child Actor from the given [[akka.actor.typed.Behavior]] and with the given name. + * Create a child Actor from the given [[pekko.actor.typed.Behavior]] and with the given name. * * *Warning*: This method is not thread-safe and must not be accessed from threads other * than the ordinary actor message processing thread, such as [[scala.concurrent.Future]] callbacks. @@ -130,11 +131,11 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi def spawn[U](behavior: Behavior[U], name: String, props: Props = Props.empty): ActorRef[U] /** - * Delegate message and signal's execution by given [[akka.actor.typed.Behavior]] + * Delegate message and signal's execution by given [[pekko.actor.typed.Behavior]] * using [[Behavior.interpretMessage]] or [[Behavior.interpretSignal]] * - * note: if given [[akka.actor.typed.Behavior]] resulting [[Behaviors.same]] that will cause context switching to the given behavior - * and if result is [[Behaviors.unhandled]] that will trigger the [[akka.actor.typed.scaladsl.ActorContext.onUnhandled]] + * note: if given [[pekko.actor.typed.Behavior]] resulting [[Behaviors.same]] that will cause context switching to the given behavior + * and if result is [[Behaviors.unhandled]] that will trigger the [[pekko.actor.typed.scaladsl.ActorContext.onUnhandled]] * then switching to the given behavior. */ def delegate(delegator: Behavior[T], msg: T): Behavior[T] @@ -151,7 +152,7 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi def stop[U](child: ActorRef[U]): Unit /** - * Register for [[akka.actor.typed.Terminated]] notification once the Actor identified by the + * Register for [[pekko.actor.typed.Terminated]] notification once the Actor identified by the * given [[ActorRef]] terminates. This message is also sent when the watched actor * is on a node that has been removed from the cluster when using Akka Cluster. * @@ -211,13 +212,13 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi /** * Schedule the sending of the given message to the given target Actor after * the given time period has elapsed. The scheduled action can be cancelled - * by invoking [[akka.actor.Cancellable#cancel]] on the returned + * by invoking [[pekko.actor.Cancellable#cancel]] on the returned * handle. * * This method is thread-safe and can be called from other threads than the ordinary * actor message processing thread, such as [[scala.concurrent.Future]] callbacks. */ - def scheduleOnce[U](delay: FiniteDuration, target: ActorRef[U], msg: U): akka.actor.Cancellable + def scheduleOnce[U](delay: FiniteDuration, target: ActorRef[U], msg: U): pekko.actor.Cancellable /** * This Actor’s execution context. It can be used to run asynchronous tasks @@ -246,12 +247,12 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi * The function is applied inside the "parent" actor and can safely access * state of the "parent". */ - @InternalApi private[akka] def spawnMessageAdapter[U](f: U => T, name: String): ActorRef[U] + @InternalApi private[pekko] def spawnMessageAdapter[U](f: U => T, name: String): ActorRef[U] /** * INTERNAL API: See `spawnMessageAdapter` with name parameter */ - @InternalApi private[akka] def spawnMessageAdapter[U](f: U => T): ActorRef[U] + @InternalApi private[pekko] def spawnMessageAdapter[U](f: U => T): ActorRef[U] /** * Create a message adapter that will convert or wrap messages such that other Actor’s @@ -308,10 +309,10 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi mapResponse: Try[Res] => T)(implicit responseTimeout: Timeout, classTag: ClassTag[Res]): Unit /** - * The same as [[ask]] but only for requests that result in a response of type [[akka.pattern.StatusReply]]. - * If the response is a [[akka.pattern.StatusReply.Success]] the returned future is completed successfully with the wrapped response. - * If the status response is a [[akka.pattern.StatusReply.Error]] the returned future will be failed with the - * exception in the error (normally a [[akka.pattern.StatusReply.ErrorMessage]]). + * The same as [[ask]] but only for requests that result in a response of type [[pekko.pattern.StatusReply]]. + * If the response is a [[pekko.pattern.StatusReply.Success]] the returned future is completed successfully with the wrapped response. + * If the status response is a [[pekko.pattern.StatusReply.Error]] the returned future will be failed with the + * exception in the error (normally a [[pekko.pattern.StatusReply.ErrorMessage]]). */ def askWithStatus[Req, Res](target: RecipientRef[Req], createRequest: ActorRef[StatusReply[Res]] => Req)( mapResponse: Try[Res] => T)(implicit responseTimeout: Timeout, classTag: ClassTag[Res]): Unit @@ -329,45 +330,45 @@ trait ActorContext[T] extends TypedActorContext[T] with ClassicActorContextProvi * INTERNAL API */ @InternalApi - private[akka] def onUnhandled(msg: T): Unit + private[pekko] def onUnhandled(msg: T): Unit /** * INTERNAL API */ @InternalApi - private[akka] def currentBehavior: Behavior[T] + private[pekko] def currentBehavior: Behavior[T] /** * INTERNAL API */ @InternalApi - private[akka] def hasTimer: Boolean + private[pekko] def hasTimer: Boolean /** * INTERNAL API */ @InternalApi - private[akka] def cancelAllTimers(): Unit + private[pekko] def cancelAllTimers(): Unit /** * INTERNAL API */ @InternalApi - private[akka] def clearMdc(): Unit + private[pekko] def clearMdc(): Unit /** * INTERNAL API */ - @InternalApi private[akka] def setCurrentActorThread(): Unit + @InternalApi private[pekko] def setCurrentActorThread(): Unit /** * INTERNAL API */ - @InternalApi private[akka] def clearCurrentActorThread(): Unit + @InternalApi private[pekko] def clearCurrentActorThread(): Unit /** * INTERNAL API */ - @InternalApi private[akka] def checkCurrentActorThread(): Unit + @InternalApi private[pekko] def checkCurrentActorThread(): Unit } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AskPattern.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala similarity index 86% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AskPattern.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala index 6abd24f417..14e8ce9335 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AskPattern.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala @@ -2,22 +2,23 @@ * Copyright (C) 2014-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl import java.util.concurrent.TimeoutException import scala.concurrent.Future import scala.annotation.nowarn -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorSystem -import akka.actor.typed.RecipientRef -import akka.actor.typed.Scheduler -import akka.actor.typed.internal.{ adapter => adapt } -import akka.actor.typed.internal.InternalRecipientRef -import akka.annotation.InternalStableApi -import akka.pattern.PromiseActorRef -import akka.pattern.StatusReply -import akka.util.{ unused, Timeout } +import org.apache.pekko +import pekko.actor.typed.ActorRef +import pekko.actor.typed.ActorSystem +import pekko.actor.typed.RecipientRef +import pekko.actor.typed.Scheduler +import pekko.actor.typed.internal.{ adapter => adapt } +import pekko.actor.typed.internal.InternalRecipientRef +import pekko.annotation.InternalStableApi +import pekko.pattern.PromiseActorRef +import pekko.pattern.StatusReply +import pekko.util.{ unused, Timeout } /** * The ask-pattern implements the initiator side of a request–reply protocol. @@ -117,10 +118,10 @@ object AskPattern { } /** - * The same as [[ask]] but only for requests that result in a response of type [[akka.pattern.StatusReply]]. - * If the response is a [[akka.pattern.StatusReply.Success]] the returned future is completed successfully with the wrapped response. - * If the status response is a [[akka.pattern.StatusReply.Error]] the returned future will be failed with the - * exception in the error (normally a [[akka.pattern.StatusReply.ErrorMessage]]). + * The same as [[ask]] but only for requests that result in a response of type [[pekko.pattern.StatusReply]]. + * If the response is a [[pekko.pattern.StatusReply.Success]] the returned future is completed successfully with the wrapped response. + * If the status response is a [[pekko.pattern.StatusReply.Error]] the returned future will be failed with the + * exception in the error (normally a [[pekko.pattern.StatusReply.ErrorMessage]]). */ def askWithStatus[Res]( replyTo: ActorRef[StatusReply[Res]] => Req)(implicit timeout: Timeout, scheduler: Scheduler): Future[Res] = @@ -157,7 +158,7 @@ object AskPattern { val promiseRef: PromiseActorRef = _promiseRef @InternalStableApi - private[akka] def ask[T](target: InternalRecipientRef[T], message: T, @unused timeout: Timeout): Future[U] = { + private[pekko] def ask[T](target: InternalRecipientRef[T], message: T, @unused timeout: Timeout): Future[U] = { target ! message future } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala similarity index 92% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala index db1ef0a62b..ee7bc2d7c1 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala @@ -2,16 +2,17 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package scaladsl import scala.reflect.ClassTag -import akka.actor.typed.internal._ -import akka.annotation.{ DoNotInherit, InternalApi } +import org.apache.pekko +import pekko.actor.typed.internal._ +import pekko.annotation.{ DoNotInherit, InternalApi } /** - * Factories for [[akka.actor.typed.Behavior]]. + * Factories for [[pekko.actor.typed.Behavior]]. */ object Behaviors { @@ -92,7 +93,7 @@ object Behaviors { /** * Construct an actor behavior that can react to both incoming messages and * lifecycle signals. After spawning this actor from another actor (or as the - * guardian of an [[akka.actor.typed.ActorSystem]]) it will be executed within an + * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed within an * [[ActorContext]] that allows access to the system, spawning and watching * other actors, etc. * @@ -111,7 +112,7 @@ object Behaviors { * * Construct an actor behavior that can react to both incoming messages and * lifecycle signals. After spawning this actor from another actor (or as the - * guardian of an [[akka.actor.typed.ActorSystem]]) it will be executed within an + * guardian of an [[pekko.actor.typed.ActorSystem]]) it will be executed within an * [[ActorContext]] that allows access to the system, spawning and watching * other actors, etc. * @@ -146,7 +147,7 @@ object Behaviors { receive[T]((_, _) => same).receiveSignal(handler) /** - * Intercept messages and signals for a `behavior` by first passing them to a [[akka.actor.typed.BehaviorInterceptor]] + * Intercept messages and signals for a `behavior` by first passing them to a [[pekko.actor.typed.BehaviorInterceptor]] * * When a behavior returns a new behavior as a result of processing a signal or message and that behavior already contains * the same interceptor (defined by the `isSame` method on the `BehaviorInterceptor`) only the innermost interceptor @@ -161,7 +162,7 @@ object Behaviors { /** * Behavior decorator that copies all received message to the designated - * monitor [[akka.actor.typed.ActorRef]] before invoking the wrapped behavior. The + * monitor [[pekko.actor.typed.ActorRef]] before invoking the wrapped behavior. The * wrapped behavior can evolve (i.e. return different behavior) without needing to be * wrapped in a `monitor` call again. * @@ -176,16 +177,16 @@ object Behaviors { BehaviorImpl.intercept(() => new MonitorInterceptor[T](monitor))(behavior) /** - * Behavior decorator that logs all messages to the [[akka.actor.typed.Behavior]] using the provided - * [[akka.actor.typed.LogOptions]] default configuration before invoking the wrapped behavior. + * Behavior decorator that logs all messages to the [[pekko.actor.typed.Behavior]] using the provided + * [[pekko.actor.typed.LogOptions]] default configuration before invoking the wrapped behavior. * To include an MDC context then first wrap `logMessages` with `withMDC`. */ def logMessages[T](behavior: Behavior[T]): Behavior[T] = BehaviorImpl.intercept(() => LogMessagesInterceptor[T](LogOptions()))(behavior) /** - * Behavior decorator that logs all messages to the [[akka.actor.typed.Behavior]] using the provided - * [[akka.actor.typed.LogOptions]] configuration before invoking the wrapped behavior. + * Behavior decorator that logs all messages to the [[pekko.actor.typed.Behavior]] using the provided + * [[pekko.actor.typed.LogOptions]] configuration before invoking the wrapped behavior. * To include an MDC context then first wrap `logMessages` with `withMDC`. */ def logMessages[T](logOptions: LogOptions, behavior: Behavior[T]): Behavior[T] = @@ -219,7 +220,7 @@ object Behaviors { new Supervise[T](wrapped) private final val ThrowableClassTag = ClassTag(classOf[Throwable]) - final class Supervise[T] private[akka] (val wrapped: Behavior[T]) extends AnyVal { + final class Supervise[T] private[pekko] (val wrapped: Behavior[T]) extends AnyVal { /** Specify the [[SupervisorStrategy]] to be invoked when the wrapped behavior throws. */ def onFailure[Thr <: Throwable](strategy: SupervisorStrategy)( @@ -301,7 +302,7 @@ object Behaviors { } @InternalApi - private[akka] final class ReceiveImpl[T](onMessage: (ActorContext[T], T) => Behavior[T]) + private[pekko] final class ReceiveImpl[T](onMessage: (ActorContext[T], T) => Behavior[T]) extends BehaviorImpl.ReceiveBehavior[T](onMessage) with Receive[T] { @@ -309,7 +310,7 @@ object Behaviors { new BehaviorImpl.ReceiveBehavior(onMessage, onSignal) } @InternalApi - private[akka] final class ReceiveMessageImpl[T](onMessage: T => Behavior[T]) + private[pekko] final class ReceiveMessageImpl[T](onMessage: T => Behavior[T]) extends BehaviorImpl.ReceiveMessageBehavior[T](onMessage) with Receive[T] { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Routers.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala similarity index 96% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Routers.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala index 80349b40f3..53f1758c93 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Routers.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala @@ -2,16 +2,17 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl -import akka.actor.typed.{ Behavior, Props } -import akka.actor.typed.internal.routing.{ GroupRouterBuilder, PoolRouterBuilder } -import akka.actor.typed.receptionist.ServiceKey -import akka.annotation.DoNotInherit +package org.apache.pekko.actor.typed.scaladsl +import org.apache.pekko +import pekko.actor.typed.{ Behavior, Props } +import pekko.actor.typed.internal.routing.{ GroupRouterBuilder, PoolRouterBuilder } +import pekko.actor.typed.receptionist.ServiceKey +import pekko.annotation.DoNotInherit object Routers { /** - * A router that will keep track of the available routees registered to the [[akka.actor.typed.receptionist.Receptionist]] + * A router that will keep track of the available routees registered to the [[pekko.actor.typed.receptionist.Receptionist]] * and route over those by random selection. * * In a clustered app this means the routees could live on any node in the cluster. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/StashBuffer.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala similarity index 93% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/StashBuffer.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala index 7777b70f45..f8a9d6137b 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/StashBuffer.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala @@ -2,16 +2,17 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl -import akka.actor.typed.Behavior -import akka.actor.typed.internal.StashBufferImpl -import akka.annotation.{ DoNotInherit, InternalApi } +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.internal.StashBufferImpl +import pekko.annotation.{ DoNotInherit, InternalApi } /** * INTERNAL API */ -@InternalApi private[akka] object StashBuffer { +@InternalApi private[pekko] object StashBuffer { /** * INTERNAL API @@ -20,7 +21,7 @@ import akka.annotation.{ DoNotInherit, InternalApi } * @param capacity the buffer can hold at most this number of messages * @return an empty message buffer */ - @InternalApi private[akka] def apply[T](ctx: ActorContext[T], capacity: Int): StashBuffer[T] = + @InternalApi private[pekko] def apply[T](ctx: ActorContext[T], capacity: Int): StashBuffer[T] = StashBufferImpl[T](ctx, capacity) } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/TimerScheduler.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/TimerScheduler.scala similarity index 99% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/TimerScheduler.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/TimerScheduler.scala index f18fffe70b..f76b6b44f2 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/TimerScheduler.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/TimerScheduler.scala @@ -2,9 +2,9 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl +package org.apache.pekko.actor.typed.scaladsl -import akka.annotation.DoNotInherit +import org.apache.pekko.annotation.DoNotInherit import scala.concurrent.duration.FiniteDuration diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/adapter/PropsAdapter.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala similarity index 56% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/adapter/PropsAdapter.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala index 82ce39c5a7..c4390bd53d 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/adapter/PropsAdapter.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala @@ -2,25 +2,26 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor.typed.scaladsl.adapter +package org.apache.pekko.actor.typed.scaladsl.adapter -import akka.actor.typed.Behavior -import akka.actor.typed.Props -import akka.actor.typed.SupervisorStrategy -import akka.actor.typed.scaladsl.Behaviors +import org.apache.pekko +import pekko.actor.typed.Behavior +import pekko.actor.typed.Props +import pekko.actor.typed.SupervisorStrategy +import pekko.actor.typed.scaladsl.Behaviors /** - * Wrap [[akka.actor.typed.Behavior]] in a classic [[akka.actor.Props]], i.e. when + * Wrap [[pekko.actor.typed.Behavior]] in a classic [[pekko.actor.Props]], i.e. when * spawning a typed child actor from a classic parent actor. * This is normally not needed because you can use the extension methods * `spawn` and `spawnAnonymous` on a classic `ActorContext`, but it's needed * when using typed actors with an existing library/tool that provides an API that - * takes a classic [[akka.actor.Props]] parameter. Cluster Sharding is an + * takes a classic [[pekko.actor.Props]] parameter. Cluster Sharding is an * example of that. */ object PropsAdapter { - def apply[T](behavior: => Behavior[T], deploy: Props = Props.empty): akka.actor.Props = - akka.actor.typed.internal.adapter.PropsAdapter( + def apply[T](behavior: => Behavior[T], deploy: Props = Props.empty): pekko.actor.Props = + pekko.actor.typed.internal.adapter.PropsAdapter( () => Behaviors.supervise(behavior).onFailure(SupervisorStrategy.stop), deploy, rethrowTypedFailure = false) diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/adapter/package.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala similarity index 62% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/adapter/package.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala index 136b4d39af..dab98dfe2f 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/adapter/package.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala @@ -2,41 +2,42 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed package scaladsl -import akka.actor.ExtendedActorSystem -import akka.actor.typed.internal.adapter.{ PropsAdapter => _, _ } -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.actor.ExtendedActorSystem +import pekko.actor.typed.internal.adapter.{ PropsAdapter => _, _ } +import pekko.annotation.InternalApi /** * Adapters between typed and classic actors and actor systems. - * The underlying `ActorSystem` is the classic [[akka.actor.ActorSystem]] - * which runs Akka Typed [[akka.actor.typed.Behavior]] on an emulation layer. In this + * The underlying `ActorSystem` is the classic [[pekko.actor.ActorSystem]] + * which runs Akka Typed [[pekko.actor.typed.Behavior]] on an emulation layer. In this * system typed and classic actors can coexist. * - * Use these adapters with `import akka.actor.typed.scaladsl.adapter._`. + * Use these adapters with `import org.apache.pekko.actor.typed.scaladsl.adapter._`. * * Implicit extension methods are added to classic and typed `ActorSystem`, * `ActorContext`. Such methods make it possible to create typed child actor * from classic parent actor, and the opposite classic child from typed parent. * `watch` is also supported in both directions. * - * There is an implicit conversion from classic [[akka.actor.ActorRef]] to - * typed [[akka.actor.typed.ActorRef]]. + * There is an implicit conversion from classic [[pekko.actor.ActorRef]] to + * typed [[pekko.actor.typed.ActorRef]]. * * There are also converters (`toTyped`, `toClassic`) from typed - * [[akka.actor.typed.ActorRef]] to classic [[akka.actor.ActorRef]], and between classic - * [[akka.actor.ActorSystem]] and typed [[akka.actor.typed.ActorSystem]]. + * [[pekko.actor.typed.ActorRef]] to classic [[pekko.actor.ActorRef]], and between classic + * [[pekko.actor.ActorSystem]] and typed [[pekko.actor.typed.ActorSystem]]. */ package object adapter { import language.implicitConversions /** - * Extension methods added to [[akka.actor.ActorSystem]]. + * Extension methods added to [[pekko.actor.ActorSystem]]. */ - implicit class ClassicActorSystemOps(val sys: akka.actor.ActorSystem) extends AnyVal { + implicit class ClassicActorSystemOps(val sys: pekko.actor.ActorSystem) extends AnyVal { /** * Spawn the given behavior as a child of the user actor in a classic ActorSystem. @@ -71,15 +72,15 @@ package object adapter { } /** - * Extension methods added to [[akka.actor.typed.ActorSystem]]. + * Extension methods added to [[pekko.actor.typed.ActorSystem]]. */ implicit class TypedActorSystemOps(val sys: ActorSystem[_]) extends AnyVal { - def toClassic: akka.actor.ActorSystem = sys.classicSystem + def toClassic: pekko.actor.ActorSystem = sys.classicSystem /** * INTERNAL API */ - @InternalApi private[akka] def internalSystemActorOf[U]( + @InternalApi private[pekko] def internalSystemActorOf[U]( behavior: Behavior[U], name: String, props: Props): ActorRef[U] = { @@ -88,9 +89,9 @@ package object adapter { } /** - * Extension methods added to [[akka.actor.ActorContext]]. + * Extension methods added to [[pekko.actor.ActorContext]]. */ - implicit class ClassicActorContextOps(val ctx: akka.actor.ActorContext) extends AnyVal { + implicit class ClassicActorContextOps(val ctx: pekko.actor.ActorContext) extends AnyVal { /** * Spawn the given behavior as a child of the user actor in a classic ActorContext. @@ -127,34 +128,34 @@ package object adapter { } /** - * Extension methods added to [[akka.actor.typed.scaladsl.ActorContext]]. + * Extension methods added to [[pekko.actor.typed.scaladsl.ActorContext]]. */ implicit class TypedActorContextOps(val ctx: scaladsl.ActorContext[_]) extends AnyVal { - def actorOf(props: akka.actor.Props): akka.actor.ActorRef = + def actorOf(props: pekko.actor.Props): pekko.actor.ActorRef = ActorContextAdapter.toClassic(ctx).actorOf(props) - def actorOf(props: akka.actor.Props, name: String): akka.actor.ActorRef = + def actorOf(props: pekko.actor.Props, name: String): pekko.actor.ActorRef = ActorContextAdapter.toClassic(ctx).actorOf(props, name) - def toClassic: akka.actor.ActorContext = ActorContextAdapter.toClassic(ctx) + def toClassic: pekko.actor.ActorContext = ActorContextAdapter.toClassic(ctx) // watch, unwatch and stop not needed here because of the implicit ActorRef conversion } /** - * Extension methods added to [[akka.actor.typed.ActorRef]]. + * Extension methods added to [[pekko.actor.typed.ActorRef]]. */ implicit class TypedActorRefOps(val ref: ActorRef[_]) extends AnyVal { - def toClassic: akka.actor.ActorRef = ActorRefAdapter.toClassic(ref) + def toClassic: pekko.actor.ActorRef = ActorRefAdapter.toClassic(ref) } /** - * Extension methods added to [[akka.actor.ActorRef]]. + * Extension methods added to [[pekko.actor.ActorRef]]. */ - implicit class ClassicActorRefOps(val ref: akka.actor.ActorRef) extends AnyVal { + implicit class ClassicActorRefOps(val ref: pekko.actor.ActorRef) extends AnyVal { /** - * Adapt the classic `ActorRef` to `akka.actor.typed.ActorRef[T]`. There is also an + * Adapt the classic `ActorRef` to `org.apache.pekko.actor.typed.ActorRef[T]`. There is also an * automatic implicit conversion for this, but this more explicit variant might * sometimes be preferred. */ @@ -162,24 +163,24 @@ package object adapter { } /** - * Implicit conversion from classic [[akka.actor.ActorRef]] to [[akka.actor.typed.ActorRef]]. + * Implicit conversion from classic [[pekko.actor.ActorRef]] to [[pekko.actor.typed.ActorRef]]. */ - implicit def actorRefAdapter[T](ref: akka.actor.ActorRef): ActorRef[T] = ActorRefAdapter(ref) + implicit def actorRefAdapter[T](ref: pekko.actor.ActorRef): ActorRef[T] = ActorRefAdapter(ref) /** - * Extension methods added to [[akka.actor.typed.Scheduler]]. + * Extension methods added to [[pekko.actor.typed.Scheduler]]. */ implicit class TypedSchedulerOps(val scheduler: Scheduler) extends AnyVal { - def toClassic: akka.actor.Scheduler = SchedulerAdapter.toClassic(scheduler) + def toClassic: pekko.actor.Scheduler = SchedulerAdapter.toClassic(scheduler) } /** - * Extension methods added to [[akka.actor.Scheduler]]. + * Extension methods added to [[pekko.actor.Scheduler]]. */ - implicit class ClassicSchedulerOps(val scheduler: akka.actor.Scheduler) extends AnyVal { + implicit class ClassicSchedulerOps(val scheduler: pekko.actor.Scheduler) extends AnyVal { /** - * Adapt the classic `Scheduler` to `akka.actor.typed.Scheduler`. + * Adapt the classic `Scheduler` to `org.apache.pekko.actor.typed.Scheduler`. */ def toTyped: Scheduler = new SchedulerAdapter(scheduler) } diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/package.scala b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/package.scala similarity index 99% rename from akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/package.scala rename to akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/package.scala index 2da3ca6193..0dc06acb28 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/package.scala +++ b/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/package.scala @@ -2,7 +2,7 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor.typed +package org.apache.pekko.actor.typed import org.slf4j.Logger import org.slf4j.Marker @@ -17,11 +17,11 @@ package object scaladsl { * Enable these extension methods with: * * {{{ - * import akka.actor.typed.scaladsl.LoggerOps + * import org.apache.pekko.actor.typed.scaladsl.LoggerOps * }}} * or * {{{ - * import akka.actor.typed.scaladsl._ + * import org.apache.pekko.actor.typed.scaladsl._ * }}} * * @param log the underlying [[org.slf4j.Logger]] diff --git a/akka-actor/src/main/boilerplate/akka/japi/function/Functions.scala.template b/akka-actor/src/main/boilerplate/org/apache/pekko/japi/function/Functions.scala.template similarity index 96% rename from akka-actor/src/main/boilerplate/akka/japi/function/Functions.scala.template rename to akka-actor/src/main/boilerplate/org/apache/pekko/japi/function/Functions.scala.template index fa045377e1..9b8ccd2bab 100644 --- a/akka-actor/src/main/boilerplate/akka/japi/function/Functions.scala.template +++ b/akka-actor/src/main/boilerplate/org/apache/pekko/japi/function/Functions.scala.template @@ -2,7 +2,7 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.japi.function +package org.apache.pekko.japi.function import scala.annotation.nowarn diff --git a/akka-actor/src/main/boilerplate/akka/japi/tuple/Tuples.scala.template b/akka-actor/src/main/boilerplate/org/apache/pekko/japi/tuple/Tuples.scala.template similarity index 91% rename from akka-actor/src/main/boilerplate/akka/japi/tuple/Tuples.scala.template rename to akka-actor/src/main/boilerplate/org/apache/pekko/japi/tuple/Tuples.scala.template index ea9c99279c..b586794e07 100644 --- a/akka-actor/src/main/boilerplate/akka/japi/tuple/Tuples.scala.template +++ b/akka-actor/src/main/boilerplate/org/apache/pekko/japi/tuple/Tuples.scala.template @@ -2,7 +2,7 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.japi.tuple +package org.apache.pekko.japi.tuple [3..22#/** * Used to create tuples with 1 elements in Java. diff --git a/akka-actor/src/main/java/akka/actor/AbstractActorRef.java b/akka-actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java similarity index 89% rename from akka-actor/src/main/java/akka/actor/AbstractActorRef.java rename to akka-actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java index 1d0b5aded2..cb6abb6ff2 100644 --- a/akka-actor/src/main/java/akka/actor/AbstractActorRef.java +++ b/akka-actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; -import akka.util.Unsafe; +import org.apache.pekko.util.Unsafe; final class AbstractActorRef { static final long cellOffset; diff --git a/akka-actor/src/main/java/akka/actor/AbstractScheduler.java b/akka-actor/src/main/java/org/apache/pekko/actor/AbstractScheduler.java similarity index 94% rename from akka-actor/src/main/java/akka/actor/AbstractScheduler.java rename to akka-actor/src/main/java/org/apache/pekko/actor/AbstractScheduler.java index 84eaf48faf..f50b474e4f 100644 --- a/akka-actor/src/main/java/akka/actor/AbstractScheduler.java +++ b/akka-actor/src/main/java/org/apache/pekko/actor/AbstractScheduler.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor; +package org.apache.pekko.actor; -import akka.util.JavaDurationConverters; +import org.apache.pekko.util.JavaDurationConverters; import scala.concurrent.ExecutionContext; import scala.concurrent.duration.FiniteDuration; @@ -18,7 +18,7 @@ import scala.concurrent.duration.FiniteDuration; * *

Scheduler implementation are loaded reflectively at ActorSystem start-up with the following * constructor arguments: 1) the system’s com.typesafe.config.Config (from system.settings.config) - * 2) a akka.event.LoggingAdapter 3) a java.util.concurrent.ThreadFactory + * 2) a org.apache.pekko.event.LoggingAdapter 3) a java.util.concurrent.ThreadFactory */ public abstract class AbstractScheduler extends AbstractSchedulerBase { diff --git a/akka-actor/src/main/java/akka/actor/dungeon/AbstractActorCell.java b/akka-actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java similarity index 62% rename from akka-actor/src/main/java/akka/actor/dungeon/AbstractActorCell.java rename to akka-actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java index b33be581bb..ba34fb0876 100644 --- a/akka-actor/src/main/java/akka/actor/dungeon/AbstractActorCell.java +++ b/akka-actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java @@ -2,10 +2,10 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.dungeon; +package org.apache.pekko.actor.dungeon; -import akka.actor.ActorCell; -import akka.util.Unsafe; +import org.apache.pekko.actor.ActorCell; +import org.apache.pekko.util.Unsafe; final class AbstractActorCell { static final long mailboxOffset; @@ -18,19 +18,19 @@ final class AbstractActorCell { mailboxOffset = Unsafe.instance.objectFieldOffset( ActorCell.class.getDeclaredField( - "akka$actor$dungeon$Dispatch$$_mailboxDoNotCallMeDirectly")); + "org$apache$pekko$actor$dungeon$Dispatch$$_mailboxDoNotCallMeDirectly")); childrenOffset = Unsafe.instance.objectFieldOffset( ActorCell.class.getDeclaredField( - "akka$actor$dungeon$Children$$_childrenRefsDoNotCallMeDirectly")); + "org$apache$pekko$actor$dungeon$Children$$_childrenRefsDoNotCallMeDirectly")); nextNameOffset = Unsafe.instance.objectFieldOffset( ActorCell.class.getDeclaredField( - "akka$actor$dungeon$Children$$_nextNameDoNotCallMeDirectly")); + "org$apache$pekko$actor$dungeon$Children$$_nextNameDoNotCallMeDirectly")); functionRefsOffset = Unsafe.instance.objectFieldOffset( ActorCell.class.getDeclaredField( - "akka$actor$dungeon$Children$$_functionRefsDoNotCallMeDirectly")); + "org$apache$pekko$actor$dungeon$Children$$_functionRefsDoNotCallMeDirectly")); } catch (Throwable t) { throw new ExceptionInInitializerError(t); } diff --git a/akka-actor/src/main/java/akka/annotation/ApiMayChange.java b/akka-actor/src/main/java/org/apache/pekko/annotation/ApiMayChange.java similarity index 97% rename from akka-actor/src/main/java/akka/annotation/ApiMayChange.java rename to akka-actor/src/main/java/org/apache/pekko/annotation/ApiMayChange.java index 2cd53961de..9595b3a876 100644 --- a/akka-actor/src/main/java/akka/annotation/ApiMayChange.java +++ b/akka-actor/src/main/java/org/apache/pekko/annotation/ApiMayChange.java @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.annotation; +package org.apache.pekko.annotation; import java.lang.annotation.*; diff --git a/akka-actor/src/main/java/akka/annotation/DoNotInherit.java b/akka-actor/src/main/java/org/apache/pekko/annotation/DoNotInherit.java similarity index 96% rename from akka-actor/src/main/java/akka/annotation/DoNotInherit.java rename to akka-actor/src/main/java/org/apache/pekko/annotation/DoNotInherit.java index 6e2c4079ad..29f7348408 100644 --- a/akka-actor/src/main/java/akka/annotation/DoNotInherit.java +++ b/akka-actor/src/main/java/org/apache/pekko/annotation/DoNotInherit.java @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.annotation; +package org.apache.pekko.annotation; import java.lang.annotation.*; diff --git a/akka-actor/src/main/java/akka/annotation/InternalApi.java b/akka-actor/src/main/java/org/apache/pekko/annotation/InternalApi.java similarity index 93% rename from akka-actor/src/main/java/akka/annotation/InternalApi.java rename to akka-actor/src/main/java/org/apache/pekko/annotation/InternalApi.java index 73fe937d5f..305e4b54a0 100644 --- a/akka-actor/src/main/java/akka/annotation/InternalApi.java +++ b/akka-actor/src/main/java/org/apache/pekko/annotation/InternalApi.java @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.annotation; +package org.apache.pekko.annotation; import java.lang.annotation.*; @@ -10,7 +10,7 @@ import java.lang.annotation.*; * Marks APIs that are considered internal to Akka and may change at any point in time without any * warning. * - *

For example, this annotation should be used when the Scala {@code private[akka]} access + *

For example, this annotation should be used when the Scala {@code private[pekko]} access * restriction is used, as Java has no way of representing this package restricted access and such * methods and classes are represented as {@code public} in byte-code. * diff --git a/akka-actor/src/main/java/akka/annotation/InternalStableApi.java b/akka-actor/src/main/java/org/apache/pekko/annotation/InternalStableApi.java similarity index 89% rename from akka-actor/src/main/java/akka/annotation/InternalStableApi.java rename to akka-actor/src/main/java/org/apache/pekko/annotation/InternalStableApi.java index 869bc535e7..36386e3637 100644 --- a/akka-actor/src/main/java/akka/annotation/InternalStableApi.java +++ b/akka-actor/src/main/java/org/apache/pekko/annotation/InternalStableApi.java @@ -2,7 +2,7 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.annotation; +package org.apache.pekko.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -16,7 +16,7 @@ import java.lang.annotation.Target; * possible usage outside of the Akka core modules. * *

If a method/class annotated with this annotation is part of a public API and has the Scala - * {@code private[akka]} access restriction, which leads to a public method from Java, there should + * {@code private[pekko]} access restriction, which leads to a public method from Java, there should * be a javadoc/scaladoc comment where the first line MUST include {@code INTERNAL API} in order to * be easily identifiable from generated documentation. Additional information may be put on the * same line as the INTERNAL API comment in order to clarify further. diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractBoundedNodeQueue.java b/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractBoundedNodeQueue.java similarity index 99% rename from akka-actor/src/main/java/akka/dispatch/AbstractBoundedNodeQueue.java rename to akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractBoundedNodeQueue.java index bd5f4ae505..e90a34e6cc 100644 --- a/akka-actor/src/main/java/akka/dispatch/AbstractBoundedNodeQueue.java +++ b/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractBoundedNodeQueue.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch; +package org.apache.pekko.dispatch; -import akka.util.Unsafe; +import org.apache.pekko.util.Unsafe; /** * Lock-free bounded non-blocking multiple-producer single-consumer queue based on the works of: diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java b/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMailbox.java similarity index 89% rename from akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java rename to akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMailbox.java index f6f8e8434d..ea459f6e5a 100644 --- a/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java +++ b/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMailbox.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch; +package org.apache.pekko.dispatch; -import akka.util.Unsafe; +import org.apache.pekko.util.Unsafe; final class AbstractMailbox { final static long mailboxStatusOffset; diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java b/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMessageDispatcher.java similarity index 89% rename from akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java rename to akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMessageDispatcher.java index a450a52bdb..c76bc1ec6a 100644 --- a/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java +++ b/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMessageDispatcher.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch; +package org.apache.pekko.dispatch; -import akka.util.Unsafe; +import org.apache.pekko.util.Unsafe; abstract class AbstractMessageDispatcher { final static long shutdownScheduleOffset; diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java b/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractNodeQueue.java similarity index 98% rename from akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java rename to akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractNodeQueue.java index e8b51741d8..6768e06c13 100644 --- a/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java +++ b/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractNodeQueue.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch; +package org.apache.pekko.dispatch; -import akka.util.Unsafe; +import org.apache.pekko.util.Unsafe; import java.util.concurrent.atomic.AtomicReference; diff --git a/akka-actor/src/main/java/akka/dispatch/affinity/OnSpinWait.java b/akka-actor/src/main/java/org/apache/pekko/dispatch/affinity/OnSpinWait.java similarity index 91% rename from akka-actor/src/main/java/akka/dispatch/affinity/OnSpinWait.java rename to akka-actor/src/main/java/org/apache/pekko/dispatch/affinity/OnSpinWait.java index 3b7e2d0eb9..eea9d14f17 100644 --- a/akka-actor/src/main/java/akka/dispatch/affinity/OnSpinWait.java +++ b/akka-actor/src/main/java/org/apache/pekko/dispatch/affinity/OnSpinWait.java @@ -2,11 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch.affinity; +package org.apache.pekko.dispatch.affinity; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; -import akka.annotation.InternalApi; +import org.apache.pekko.annotation.InternalApi; import static java.lang.invoke.MethodType.methodType; /** diff --git a/akka-actor/src/main/java/akka/japi/JAPI.java b/akka-actor/src/main/java/org/apache/pekko/japi/JAPI.java similarity index 87% rename from akka-actor/src/main/java/akka/japi/JAPI.java rename to akka-actor/src/main/java/org/apache/pekko/japi/JAPI.java index 6518c1190b..ccba211805 100644 --- a/akka-actor/src/main/java/akka/japi/JAPI.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/JAPI.java @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.japi; +package org.apache.pekko.japi; import scala.collection.Seq; diff --git a/akka-actor/src/main/java/akka/japi/pf/AbstractMatch.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractMatch.java similarity index 96% rename from akka-actor/src/main/java/akka/japi/pf/AbstractMatch.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractMatch.java index d8457701b6..09a5611c2e 100644 --- a/akka-actor/src/main/java/akka/japi/pf/AbstractMatch.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractMatch.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; import scala.PartialFunction; diff --git a/akka-actor/src/main/java/akka/japi/pf/AbstractPFBuilder.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractPFBuilder.java similarity index 96% rename from akka-actor/src/main/java/akka/japi/pf/AbstractPFBuilder.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractPFBuilder.java index bd0575012c..358782345d 100644 --- a/akka-actor/src/main/java/akka/japi/pf/AbstractPFBuilder.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractPFBuilder.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; import scala.PartialFunction; diff --git a/akka-actor/src/main/java/akka/japi/pf/DeciderBuilder.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java similarity index 91% rename from akka-actor/src/main/java/akka/japi/pf/DeciderBuilder.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java index 825d28ab4a..8cfe900c46 100644 --- a/akka-actor/src/main/java/akka/japi/pf/DeciderBuilder.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java @@ -2,12 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; -import static akka.actor.SupervisorStrategy.Directive; +import static org.apache.pekko.actor.SupervisorStrategy.Directive; /** - * Used for building a partial function for {@link akka.actor.Actor#supervisorStrategy() + * Used for building a partial function for {@link org.apache.pekko.actor.Actor#supervisorStrategy() * Actor.supervisorStrategy()}. * Inside an actor you can use it like this with Java 8 to define * your supervisorStrategy. * diff --git a/akka-actor/src/main/java/akka/japi/pf/FI.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/FI.java similarity index 92% rename from akka-actor/src/main/java/akka/japi/pf/FI.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/FI.java index 45e1cd1cf9..be32286dc3 100644 --- a/akka-actor/src/main/java/akka/japi/pf/FI.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/FI.java @@ -2,13 +2,13 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; /** * Class that encapsulates Functional Interfaces used for creating partial functions. * *

These classes are kept for compatibility, but for future API's please prefer the ones in - * {@link akka.japi.function}. + * {@link org.apache.pekko.japi.function}. */ public final class FI { private FI() {} @@ -17,7 +17,7 @@ public final class FI { * Functional interface for an application. * *

This class is kept for compatibility, but for future API's please prefer {@link - * akka.japi.function.Function}. + * org.apache.pekko.japi.function.Function}. * * @param the input type, that this Apply will be applied to * @param the return type, that the results of the application will have @@ -37,7 +37,7 @@ public final class FI { * Functional interface for an application. * *

This class is kept for compatibility, but for future API's please prefer {@link - * akka.japi.function.Function2}. + * org.apache.pekko.japi.function.Function2}. * * @param the first input type, that this Apply will be applied to * @param the second input type, that this Apply will be applied to @@ -59,7 +59,7 @@ public final class FI { * Functional interface for a predicate. * *

This class is kept for compatibility, but for future API's please prefer {@link - * java.util.function.Predicate} or {@link akka.japi.function.Predicate}. + * java.util.function.Predicate} or {@link org.apache.pekko.japi.function.Predicate}. * * @param the type that the predicate will operate on. */ @@ -96,7 +96,7 @@ public final class FI { * Functional interface for an application. * *

This class is kept for compatibility, but for future API's please prefer {@link - * akka.japi.function.Procedure}. + * org.apache.pekko.japi.function.Procedure}. * * @param the input type, that this Apply will be applied to */ @@ -171,7 +171,7 @@ public final class FI { * Functional interface for an application. * *

This class is kept for compatibility, but for future API's please prefer {@link - * akka.japi.function.Effect}. + * org.apache.pekko.japi.function.Effect}. */ @FunctionalInterface public interface UnitApplyVoid { @@ -184,7 +184,7 @@ public final class FI { * types. * *

This class is kept for compatibility, but for future API's please prefer {@link - * java.util.function.Predicate} or {@link akka.japi.function.Predicate}. + * java.util.function.Predicate} or {@link org.apache.pekko.japi.function.Predicate}. */ @FunctionalInterface interface Predicate { diff --git a/akka-actor/src/main/java/akka/japi/pf/FSMStateFunctionBuilder.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java similarity index 98% rename from akka-actor/src/main/java/akka/japi/pf/FSMStateFunctionBuilder.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java index 331931e7a3..8bb5037d45 100644 --- a/akka-actor/src/main/java/akka/japi/pf/FSMStateFunctionBuilder.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java @@ -2,14 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; -import akka.actor.FSM; +import org.apache.pekko.actor.FSM; import scala.PartialFunction; import java.util.List; /** - * Builder used to create a partial function for {@link akka.actor.FSM#whenUnhandled}. + * Builder used to create a partial function for {@link org.apache.pekko.actor.FSM#whenUnhandled}. * * @param the state type * @param the data type diff --git a/akka-actor/src/main/java/akka/japi/pf/FSMStopBuilder.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStopBuilder.java similarity index 95% rename from akka-actor/src/main/java/akka/japi/pf/FSMStopBuilder.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStopBuilder.java index 120ab3d2d8..4a1bb6e070 100644 --- a/akka-actor/src/main/java/akka/japi/pf/FSMStopBuilder.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStopBuilder.java @@ -2,14 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; -import akka.actor.FSM; +import org.apache.pekko.actor.FSM; import scala.PartialFunction; import scala.runtime.BoxedUnit; /** - * Builder used to create a partial function for {@link akka.actor.FSM#onTermination}. + * Builder used to create a partial function for {@link org.apache.pekko.actor.FSM#onTermination}. * * @param the state type * @param the data type diff --git a/akka-actor/src/main/java/akka/japi/pf/FSMTransitionHandlerBuilder.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java similarity index 95% rename from akka-actor/src/main/java/akka/japi/pf/FSMTransitionHandlerBuilder.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java index d5d0bc8146..1f51b8ccb4 100644 --- a/akka-actor/src/main/java/akka/japi/pf/FSMTransitionHandlerBuilder.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java @@ -2,14 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; import scala.PartialFunction; import scala.runtime.BoxedUnit; import scala.Tuple2; /** - * Builder used to create a partial function for {@link akka.actor.FSM#onTransition}. + * Builder used to create a partial function for {@link org.apache.pekko.actor.FSM#onTransition}. * * @param the state type */ diff --git a/akka-actor/src/main/java/akka/japi/pf/Match.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/Match.java similarity index 99% rename from akka-actor/src/main/java/akka/japi/pf/Match.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/Match.java index 716407172f..b31e1bc94b 100644 --- a/akka-actor/src/main/java/akka/japi/pf/Match.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/Match.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; import scala.MatchError; import scala.PartialFunction; diff --git a/akka-actor/src/main/java/akka/japi/pf/PFBuilder.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/PFBuilder.java similarity index 99% rename from akka-actor/src/main/java/akka/japi/pf/PFBuilder.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/PFBuilder.java index 9f558b259b..ff307edf90 100644 --- a/akka-actor/src/main/java/akka/japi/pf/PFBuilder.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/PFBuilder.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; /** * A builder for {@link scala.PartialFunction}. diff --git a/akka-actor/src/main/java/akka/japi/pf/ReceiveBuilder.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/ReceiveBuilder.java similarity index 97% rename from akka-actor/src/main/java/akka/japi/pf/ReceiveBuilder.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/ReceiveBuilder.java index ce7f6db318..a0019cde00 100644 --- a/akka-actor/src/main/java/akka/japi/pf/ReceiveBuilder.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/ReceiveBuilder.java @@ -2,15 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; -import akka.actor.AbstractActor.Receive; +import org.apache.pekko.actor.AbstractActor.Receive; import scala.PartialFunction; import scala.runtime.BoxedUnit; /** - * Used for building a partial function for {@link akka.actor.AbstractActor#createReceive() - * AbstractActor.createReceive()}. + * Used for building a partial function for {@link + * org.apache.pekko.actor.AbstractActor#createReceive() AbstractActor.createReceive()}. * *

There is both a match on type only, and a match on type and predicate. * diff --git a/akka-actor/src/main/java/akka/japi/pf/UnitMatch.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitMatch.java similarity index 99% rename from akka-actor/src/main/java/akka/japi/pf/UnitMatch.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitMatch.java index cd0d05c8eb..f3a8bb5bf0 100644 --- a/akka-actor/src/main/java/akka/japi/pf/UnitMatch.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitMatch.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; import scala.MatchError; import scala.PartialFunction; diff --git a/akka-actor/src/main/java/akka/japi/pf/UnitPFBuilder.java b/akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitPFBuilder.java similarity index 99% rename from akka-actor/src/main/java/akka/japi/pf/UnitPFBuilder.java rename to akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitPFBuilder.java index 9a5e94ef32..510e69eb1f 100644 --- a/akka-actor/src/main/java/akka/japi/pf/UnitPFBuilder.java +++ b/akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitPFBuilder.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.japi.pf; +package org.apache.pekko.japi.pf; import scala.runtime.BoxedUnit; diff --git a/akka-actor/src/main/java/akka/pattern/AbstractCircuitBreaker.java b/akka-actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java similarity index 89% rename from akka-actor/src/main/java/akka/pattern/AbstractCircuitBreaker.java rename to akka-actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java index 623c55d658..a37844a87c 100644 --- a/akka-actor/src/main/java/akka/pattern/AbstractCircuitBreaker.java +++ b/akka-actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern; +package org.apache.pekko.pattern; -import akka.util.Unsafe; +import org.apache.pekko.util.Unsafe; class AbstractCircuitBreaker { protected static final long stateOffset; diff --git a/akka-actor/src/main/java/akka/pattern/AbstractPromiseActorRef.java b/akka-actor/src/main/java/org/apache/pekko/pattern/AbstractPromiseActorRef.java similarity index 89% rename from akka-actor/src/main/java/akka/pattern/AbstractPromiseActorRef.java rename to akka-actor/src/main/java/org/apache/pekko/pattern/AbstractPromiseActorRef.java index d64076ac85..889ecc831c 100644 --- a/akka-actor/src/main/java/akka/pattern/AbstractPromiseActorRef.java +++ b/akka-actor/src/main/java/org/apache/pekko/pattern/AbstractPromiseActorRef.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.pattern; +package org.apache.pekko.pattern; -import akka.util.Unsafe; +import org.apache.pekko.util.Unsafe; final class AbstractPromiseActorRef { static final long stateOffset; diff --git a/akka-actor/src/main/java/akka/util/Unsafe.java b/akka-actor/src/main/java/org/apache/pekko/util/Unsafe.java similarity index 98% rename from akka-actor/src/main/java/akka/util/Unsafe.java rename to akka-actor/src/main/java/org/apache/pekko/util/Unsafe.java index b95b072724..ea551d810a 100644 --- a/akka-actor/src/main/java/akka/util/Unsafe.java +++ b/akka-actor/src/main/java/org/apache/pekko/util/Unsafe.java @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util; +package org.apache.pekko.util; -import akka.annotation.InternalApi; +import org.apache.pekko.annotation.InternalApi; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf index 906d064a83..0fd844cc0f 100644 --- a/akka-actor/src/main/resources/reference.conf +++ b/akka-actor/src/main/resources/reference.conf @@ -12,18 +12,18 @@ akka { # Home directory of Akka, modules in the deploy directory will be loaded home = "" - # Loggers to register at boot time (akka.event.Logging$DefaultLogger logs + # Loggers to register at boot time (org.apache.pekko.event.Logging$DefaultLogger logs # to STDOUT) - loggers = ["akka.event.Logging$DefaultLogger"] + loggers = ["org.apache.pekko.event.Logging$DefaultLogger"] # Filter of log events that is used by the LoggingAdapter before # publishing log events to the eventStream. It can perform # fine grained filtering based on the log source. The default # implementation filters on the `loglevel`. # FQCN of the LoggingFilter. The Class of the FQCN must implement - # akka.event.LoggingFilter and have a public constructor with - # (akka.actor.ActorSystem.Settings, akka.event.EventStream) parameters. - logging-filter = "akka.event.DefaultLoggingFilter" + # org.apache.pekko.event.LoggingFilter and have a public constructor with + # (org.apache.pekko.actor.ActorSystem.Settings, org.apache.pekko.event.EventStream) parameters. + logging-filter = "org.apache.pekko.event.DefaultLoggingFilter" # Specifies the default loggers dispatcher loggers-dispatcher = "akka.actor.default-dispatcher" @@ -73,7 +73,7 @@ akka { # # Should not be set by end user applications in 'application.conf', use the extensions property for that # - library-extensions = ${?akka.library-extensions} ["akka.serialization.SerializationExtension$"] + library-extensions = ${?akka.library-extensions} ["org.apache.pekko.serialization.SerializationExtension$"] # List FQCN of extensions which shall be loaded at actor system startup. # Should be on the format: 'extensions = ["foo", "bar"]' etc. @@ -116,9 +116,9 @@ akka { provider = "local" # The guardian "/user" will use this class to obtain its supervisorStrategy. - # It needs to be a subclass of akka.actor.SupervisorStrategyConfigurator. - # In addition to the default there is akka.actor.StoppingSupervisorStrategy. - guardian-supervisor-strategy = "akka.actor.DefaultSupervisorStrategy" + # It needs to be a subclass of org.apache.pekko.actor.SupervisorStrategyConfigurator. + # In addition to the default there is org.apache.pekko.actor.StoppingSupervisorStrategy. + guardian-supervisor-strategy = "org.apache.pekko.actor.DefaultSupervisorStrategy" # Timeout for Extension creation and a few other potentially blocking # initialization tasks. @@ -135,7 +135,7 @@ akka { # If serialize-messages or serialize-creators are enabled classes that starts with # a prefix listed here are not verified. - no-serialization-verification-needed-class-prefix = ["akka."] + no-serialization-verification-needed-class-prefix = ["org.apache.pekko."] # Timeout for send operations to top-level actors which are in the process # of being started. This is only relevant if using a bounded mailbox or the @@ -151,21 +151,21 @@ akka { # Mapping between ´deployment.router' short names to fully qualified class names router.type-mapping { - from-code = "akka.routing.NoRouter" - round-robin-pool = "akka.routing.RoundRobinPool" - round-robin-group = "akka.routing.RoundRobinGroup" - random-pool = "akka.routing.RandomPool" - random-group = "akka.routing.RandomGroup" - balancing-pool = "akka.routing.BalancingPool" - smallest-mailbox-pool = "akka.routing.SmallestMailboxPool" - broadcast-pool = "akka.routing.BroadcastPool" - broadcast-group = "akka.routing.BroadcastGroup" - scatter-gather-pool = "akka.routing.ScatterGatherFirstCompletedPool" - scatter-gather-group = "akka.routing.ScatterGatherFirstCompletedGroup" - tail-chopping-pool = "akka.routing.TailChoppingPool" - tail-chopping-group = "akka.routing.TailChoppingGroup" - consistent-hashing-pool = "akka.routing.ConsistentHashingPool" - consistent-hashing-group = "akka.routing.ConsistentHashingGroup" + from-code = "org.apache.pekko.routing.NoRouter" + round-robin-pool = "org.apache.pekko.routing.RoundRobinPool" + round-robin-group = "org.apache.pekko.routing.RoundRobinGroup" + random-pool = "org.apache.pekko.routing.RandomPool" + random-group = "org.apache.pekko.routing.RandomGroup" + balancing-pool = "org.apache.pekko.routing.BalancingPool" + smallest-mailbox-pool = "org.apache.pekko.routing.SmallestMailboxPool" + broadcast-pool = "org.apache.pekko.routing.BroadcastPool" + broadcast-group = "org.apache.pekko.routing.BroadcastGroup" + scatter-gather-pool = "org.apache.pekko.routing.ScatterGatherFirstCompletedPool" + scatter-gather-group = "org.apache.pekko.routing.ScatterGatherFirstCompletedGroup" + tail-chopping-pool = "org.apache.pekko.routing.TailChoppingPool" + tail-chopping-group = "org.apache.pekko.routing.TailChoppingGroup" + consistent-hashing-pool = "org.apache.pekko.routing.ConsistentHashingPool" + consistent-hashing-group = "org.apache.pekko.routing.ConsistentHashingGroup" } deployment { @@ -191,9 +191,9 @@ akka { # - available: "from-code", "round-robin", "random", "smallest-mailbox", # "scatter-gather", "broadcast" # - or: Fully qualified class name of the router class. - # The class must extend akka.routing.CustomRouterConfig and + # The class must extend org.apache.pekko.routing.CustomRouterConfig and # have a public constructor with com.typesafe.config.Config - # and optional akka.actor.DynamicAccess parameter. + # and optional org.apache.pekko.actor.DynamicAccess parameter. # - default is "from-code"; # Whether or not an actor is transformed to a Router is decided in code # only (Props.withRouter). The type of router can be overridden in the @@ -366,7 +366,7 @@ akka { # Dispatcher, PinnedDispatcher, or a FQCN to a class inheriting # MessageDispatcherConfigurator with a public constructor with # both com.typesafe.config.Config parameter and - # akka.dispatch.DispatcherPrerequisites parameters. + # org.apache.pekko.dispatch.DispatcherPrerequisites parameters. # PinnedDispatcher must be used together with executor=thread-pool-executor. type = "Dispatcher" @@ -392,7 +392,7 @@ akka { } # This will be used if you have set "executor = "affinity-pool-executor"" - # Underlying thread pool implementation is akka.dispatch.affinity.AffinityPool. + # Underlying thread pool implementation is org.apache.pekko.dispatch.affinity.AffinityPool. # This executor is classified as "ApiMayChange". affinity-pool-executor { # Min number of threads to cap factor-based parallelism number to @@ -415,8 +415,8 @@ akka { # FQCN of the Rejection handler used in the pool. # Must have an empty public constructor and must - # implement akka.actor.affinity.RejectionHandlerFactory. - rejection-handler = "akka.dispatch.affinity.ThrowOnOverflowRejectionHandler" + # implement org.apache.pekko.actor.affinity.RejectionHandlerFactory. + rejection-handler = "org.apache.pekko.dispatch.affinity.ThrowOnOverflowRejectionHandler" # Level of CPU time used, on a scale between 1 and 10, during backoff/idle. # The tradeoff is that to have low latency more CPU time must be used to be @@ -426,14 +426,14 @@ akka { # Level 10 strongly prefer low latency over low CPU consumption. idle-cpu-level = 5 - # FQCN of the akka.dispatch.affinity.QueueSelectorFactory. + # FQCN of the org.apache.pekko.dispatch.affinity.QueueSelectorFactory. # The Class of the FQCN must have a public constructor with a # (com.typesafe.config.Config) parameter. - # A QueueSelectorFactory create instances of akka.dispatch.affinity.QueueSelector, + # A QueueSelectorFactory create instances of org.apache.pekko.dispatch.affinity.QueueSelector, # that is responsible for determining which task queue a Runnable should be enqueued in. - queue-selector = "akka.dispatch.affinity.FairDistributionHashCache" + queue-selector = "org.apache.pekko.dispatch.affinity.FairDistributionHashCache" - # When using the "akka.dispatch.affinity.FairDistributionHashCache" queue selector + # When using the "org.apache.pekko.dispatch.affinity.FairDistributionHashCache" queue selector # internally the AffinityPool uses two methods to determine which task # queue to allocate a Runnable to: # - map based - maintains a round robin counter and a map of Runnable @@ -581,8 +581,8 @@ akka { default-mailbox { # FQCN of the MailboxType. The Class of the FQCN must have a public # constructor with - # (akka.actor.ActorSystem.Settings, com.typesafe.config.Config) parameters. - mailbox-type = "akka.dispatch.UnboundedMailbox" + # (org.apache.pekko.actor.ActorSystem.Settings, com.typesafe.config.Config) parameters. + mailbox-type = "org.apache.pekko.dispatch.UnboundedMailbox" # If the mailbox is bounded then it uses this setting to determine its # capacity. The provided value must be positive. @@ -605,81 +605,81 @@ akka { mailbox { # Mapping between message queue semantics and mailbox configurations. - # Used by akka.dispatch.RequiresMessageQueue[T] to enforce different + # Used by org.apache.pekko.dispatch.RequiresMessageQueue[T] to enforce different # mailbox types on actors. # If your Actor implements RequiresMessageQueue[T], then when you create # an instance of that actor its mailbox type will be decided by looking # up a mailbox configuration via T in this mapping requirements { - "akka.dispatch.UnboundedMessageQueueSemantics" = + "org.apache.pekko.dispatch.UnboundedMessageQueueSemantics" = akka.actor.mailbox.unbounded-queue-based - "akka.dispatch.BoundedMessageQueueSemantics" = + "org.apache.pekko.dispatch.BoundedMessageQueueSemantics" = akka.actor.mailbox.bounded-queue-based - "akka.dispatch.DequeBasedMessageQueueSemantics" = + "org.apache.pekko.dispatch.DequeBasedMessageQueueSemantics" = akka.actor.mailbox.unbounded-deque-based - "akka.dispatch.UnboundedDequeBasedMessageQueueSemantics" = + "org.apache.pekko.dispatch.UnboundedDequeBasedMessageQueueSemantics" = akka.actor.mailbox.unbounded-deque-based - "akka.dispatch.BoundedDequeBasedMessageQueueSemantics" = + "org.apache.pekko.dispatch.BoundedDequeBasedMessageQueueSemantics" = akka.actor.mailbox.bounded-deque-based - "akka.dispatch.MultipleConsumerSemantics" = + "org.apache.pekko.dispatch.MultipleConsumerSemantics" = akka.actor.mailbox.unbounded-queue-based - "akka.dispatch.ControlAwareMessageQueueSemantics" = + "org.apache.pekko.dispatch.ControlAwareMessageQueueSemantics" = akka.actor.mailbox.unbounded-control-aware-queue-based - "akka.dispatch.UnboundedControlAwareMessageQueueSemantics" = + "org.apache.pekko.dispatch.UnboundedControlAwareMessageQueueSemantics" = akka.actor.mailbox.unbounded-control-aware-queue-based - "akka.dispatch.BoundedControlAwareMessageQueueSemantics" = + "org.apache.pekko.dispatch.BoundedControlAwareMessageQueueSemantics" = akka.actor.mailbox.bounded-control-aware-queue-based - "akka.event.LoggerMessageQueueSemantics" = + "org.apache.pekko.event.LoggerMessageQueueSemantics" = akka.actor.mailbox.logger-queue } unbounded-queue-based { # FQCN of the MailboxType, The Class of the FQCN must have a public - # constructor with (akka.actor.ActorSystem.Settings, + # constructor with (org.apache.pekko.actor.ActorSystem.Settings, # com.typesafe.config.Config) parameters. - mailbox-type = "akka.dispatch.UnboundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.UnboundedMailbox" } bounded-queue-based { # FQCN of the MailboxType, The Class of the FQCN must have a public - # constructor with (akka.actor.ActorSystem.Settings, + # constructor with (org.apache.pekko.actor.ActorSystem.Settings, # com.typesafe.config.Config) parameters. - mailbox-type = "akka.dispatch.BoundedMailbox" + mailbox-type = "org.apache.pekko.dispatch.BoundedMailbox" } unbounded-deque-based { # FQCN of the MailboxType, The Class of the FQCN must have a public - # constructor with (akka.actor.ActorSystem.Settings, + # constructor with (org.apache.pekko.actor.ActorSystem.Settings, # com.typesafe.config.Config) parameters. - mailbox-type = "akka.dispatch.UnboundedDequeBasedMailbox" + mailbox-type = "org.apache.pekko.dispatch.UnboundedDequeBasedMailbox" } bounded-deque-based { # FQCN of the MailboxType, The Class of the FQCN must have a public - # constructor with (akka.actor.ActorSystem.Settings, + # constructor with (org.apache.pekko.actor.ActorSystem.Settings, # com.typesafe.config.Config) parameters. - mailbox-type = "akka.dispatch.BoundedDequeBasedMailbox" + mailbox-type = "org.apache.pekko.dispatch.BoundedDequeBasedMailbox" } unbounded-control-aware-queue-based { # FQCN of the MailboxType, The Class of the FQCN must have a public - # constructor with (akka.actor.ActorSystem.Settings, + # constructor with (org.apache.pekko.actor.ActorSystem.Settings, # com.typesafe.config.Config) parameters. - mailbox-type = "akka.dispatch.UnboundedControlAwareMailbox" + mailbox-type = "org.apache.pekko.dispatch.UnboundedControlAwareMailbox" } bounded-control-aware-queue-based { # FQCN of the MailboxType, The Class of the FQCN must have a public - # constructor with (akka.actor.ActorSystem.Settings, + # constructor with (org.apache.pekko.actor.ActorSystem.Settings, # com.typesafe.config.Config) parameters. - mailbox-type = "akka.dispatch.BoundedControlAwareMailbox" + mailbox-type = "org.apache.pekko.dispatch.BoundedControlAwareMailbox" } # The LoggerMailbox will drain all messages in the mailbox # when the system is shutdown and deliver them to the StandardOutLogger. # Do not change this unless you know what you are doing. logger-queue { - mailbox-type = "akka.event.LoggerMailboxType" + mailbox-type = "org.apache.pekko.event.LoggerMailboxType" } } @@ -714,7 +714,7 @@ akka { # This setting is a short-cut to # - using DisabledJavaSerializer instead of JavaSerializer # - # Completely disable the use of `akka.serialization.JavaSerialization` by the + # Completely disable the use of `org.apache.pekko.serialization.JavaSerialization` by the # Akka Serialization extension, instead DisabledJavaSerializer will # be inserted which will fail explicitly if attempts to use java serialization are made. # @@ -741,13 +741,13 @@ akka { # Entries for pluggable serializers and their bindings. serializers { - java = "akka.serialization.JavaSerializer" - bytes = "akka.serialization.ByteArraySerializer" - primitive-long = "akka.serialization.LongSerializer" - primitive-int = "akka.serialization.IntSerializer" - primitive-string = "akka.serialization.StringSerializer" - primitive-bytestring = "akka.serialization.ByteStringSerializer" - primitive-boolean = "akka.serialization.BooleanSerializer" + java = "org.apache.pekko.serialization.JavaSerializer" + bytes = "org.apache.pekko.serialization.ByteArraySerializer" + primitive-long = "org.apache.pekko.serialization.LongSerializer" + primitive-int = "org.apache.pekko.serialization.IntSerializer" + primitive-string = "org.apache.pekko.serialization.StringSerializer" + primitive-bytestring = "org.apache.pekko.serialization.ByteStringSerializer" + primitive-boolean = "org.apache.pekko.serialization.BooleanSerializer" } # Class to Serializer binding. You only need to specify the name of an @@ -762,9 +762,9 @@ akka { "java.io.Serializable" = java "java.lang.String" = primitive-string - "akka.util.ByteString$ByteString1C" = primitive-bytestring - "akka.util.ByteString$ByteString1" = primitive-bytestring - "akka.util.ByteString$ByteStrings" = primitive-bytestring + "org.apache.pekko.util.ByteString$ByteString1C" = primitive-bytestring + "org.apache.pekko.util.ByteString$ByteString1" = primitive-bytestring + "org.apache.pekko.util.ByteString$ByteStrings" = primitive-bytestring "java.lang.Long" = primitive-long "scala.Long" = primitive-long "java.lang.Integer" = primitive-int @@ -775,13 +775,13 @@ akka { # Configuration namespace of serialization identifiers. # Each serializer implementation must have an entry in the following format: - # `akka.actor.serialization-identifiers."FQCN" = ID` + # `org.apache.pekko.actor.serialization-identifiers."FQCN" = ID` # where `FQCN` is fully qualified class name of the serializer implementation # and `ID` is globally unique serializer identifier number. # Identifier values from 0 to 40 are reserved for Akka internal usage. serialization-identifiers { - "akka.serialization.JavaSerializer" = 1 - "akka.serialization.ByteArraySerializer" = 4 + "org.apache.pekko.serialization.JavaSerializer" = 1 + "org.apache.pekko.serialization.ByteArraySerializer" = 4 primitive-long = 18 primitive-int = 19 @@ -798,8 +798,8 @@ akka { "com.google.protobuf.GeneratedMessage", "com.google.protobuf.GeneratedMessageV3", "scalapb.GeneratedMessageCompanion", - "akka.protobuf.GeneratedMessage", - "akka.protobufv3.internal.GeneratedMessageV3" + "org.apache.pekko.protobuf.GeneratedMessage", + "org.apache.pekko.protobufv3.internal.GeneratedMessageV3" ] # Additional classes that are allowed even if they are not defined in `serialization-bindings`. @@ -835,12 +835,12 @@ akka { # This setting selects the timer implementation which shall be loaded at # system start-up. - # The class given here must implement the akka.actor.Scheduler interface + # The class given here must implement the org.apache.pekko.actor.Scheduler interface # and offer a public constructor which takes three arguments: # 1) com.typesafe.config.Config - # 2) akka.event.LoggingAdapter + # 2) org.apache.pekko.event.LoggingAdapter # 3) java.util.concurrent.ThreadFactory - implementation = akka.actor.LightArrayRevolverScheduler + implementation = org.apache.pekko.actor.LightArrayRevolverScheduler # When shutting down the scheduler, there will typically be a thread which # needs to be stopped, and this timeout determines how long to wait for @@ -1074,8 +1074,8 @@ akka { # To-be-deprecated DNS resolver implementation which uses the Java InetAddress to resolve DNS records. # To be replaced by `akka.io.dns.async` which implements the DNS protocol natively and without blocking (which InetAddress does) inet-address { - # Must implement akka.io.DnsProvider - provider-object = "akka.io.InetAddressDnsProvider" + # Must implement org.apache.pekko.io.DnsProvider + provider-object = "org.apache.pekko.io.InetAddressDnsProvider" # To set the time to cache name resolutions # Possible values: @@ -1092,7 +1092,7 @@ akka { } async-dns { - provider-object = "akka.io.dns.internal.AsyncDnsProvider" + provider-object = "org.apache.pekko.io.dns.internal.AsyncDnsProvider" # Set upper bound for caching successfully resolved dns entries # if the DNS record has a smaller TTL value than the setting that @@ -1191,10 +1191,10 @@ akka { # Overrides are applied using the `reason.getClass.getName`. # Overrides the `exit-code` when the `Reason` is a cluster # Downing or a Cluster Join Unsuccessful event - "akka.actor.CoordinatedShutdown$ClusterDowningReason$" { + "org.apache.pekko.actor.CoordinatedShutdown$ClusterDowningReason$" { exit-code = -1 } - "akka.actor.CoordinatedShutdown$ClusterJoinUnsuccessfulReason$" { + "org.apache.pekko.actor.CoordinatedShutdown$ClusterJoinUnsuccessfulReason$" { exit-code = -1 } } diff --git a/akka-actor/src/main/scala-2.12/akka/compat/Future.scala b/akka-actor/src/main/scala-2.12/org/apache/pekko/compat/Future.scala similarity index 90% rename from akka-actor/src/main/scala-2.12/akka/compat/Future.scala rename to akka-actor/src/main/scala-2.12/org/apache/pekko/compat/Future.scala index 4647151433..54410a18cc 100644 --- a/akka-actor/src/main/scala-2.12/akka/compat/Future.scala +++ b/akka-actor/src/main/scala-2.12/org/apache/pekko/compat/Future.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.compat +package org.apache.pekko.compat import scala.collection.immutable import scala.concurrent.{ ExecutionContext, Future => SFuture } import scala.annotation.nowarn -import akka.annotation.InternalApi -import akka.util.ccompat._ +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.util.ccompat._ /** * INTERNAL API @@ -20,7 +21,7 @@ import akka.util.ccompat._ * * Remove these classes as soon as support for Scala 2.12 is dropped! */ -@nowarn @InternalApi private[akka] object Future { +@nowarn @InternalApi private[pekko] object Future { def fold[T, R](futures: IterableOnce[SFuture[T]])(zero: R)(op: (R, T) => R)( implicit executor: ExecutionContext): SFuture[R] = SFuture.fold[T, R](futures)(zero)(op)(executor) diff --git a/akka-actor/src/main/scala-2.12/akka/compat/PartialFunction.scala b/akka-actor/src/main/scala-2.12/org/apache/pekko/compat/PartialFunction.scala similarity index 77% rename from akka-actor/src/main/scala-2.12/akka/compat/PartialFunction.scala rename to akka-actor/src/main/scala-2.12/org/apache/pekko/compat/PartialFunction.scala index 75253f9850..663e4cd436 100644 --- a/akka-actor/src/main/scala-2.12/akka/compat/PartialFunction.scala +++ b/akka-actor/src/main/scala-2.12/org/apache/pekko/compat/PartialFunction.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.compat +package org.apache.pekko.compat import scala.annotation.nowarn -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi /** * INTERNAL API @@ -16,7 +16,7 @@ import akka.annotation.InternalApi * * Remove these classes as soon as support for Scala 2.12 is dropped! */ -@InternalApi private[akka] object PartialFunction { +@InternalApi private[pekko] object PartialFunction { def fromFunction[A, B](f: (A) => B): scala.PartialFunction[A, B] = { @nowarn val pf = scala.PartialFunction(f) diff --git a/akka-actor/src/main/scala-2.12/akka/dispatch/internal/SameThreadExecutionContext.scala b/akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala similarity index 76% rename from akka-actor/src/main/scala-2.12/akka/dispatch/internal/SameThreadExecutionContext.scala rename to akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala index f97e7ff9c0..b0b66ad67a 100644 --- a/akka-actor/src/main/scala-2.12/akka/dispatch/internal/SameThreadExecutionContext.scala +++ b/akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch.internal +package org.apache.pekko.dispatch.internal import scala.concurrent.ExecutionContext -import akka.annotation.InternalApi -import akka.dispatch.BatchingExecutor +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.dispatch.BatchingExecutor /** - * Factory to create same thread ec. Not intended to be called from any other site than to create [[akka.dispatch.ExecutionContexts#parasitic]] + * Factory to create same thread ec. Not intended to be called from any other site than to create [[pekko.dispatch.ExecutionContexts#parasitic]] * * INTERNAL API */ diff --git a/akka-actor/src/main/scala-2.12/akka/dispatch/internal/ScalaBatchable.scala b/akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/ScalaBatchable.scala similarity index 63% rename from akka-actor/src/main/scala-2.12/akka/dispatch/internal/ScalaBatchable.scala rename to akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/ScalaBatchable.scala index 7a28ae0b2d..b90147e610 100644 --- a/akka-actor/src/main/scala-2.12/akka/dispatch/internal/ScalaBatchable.scala +++ b/akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/ScalaBatchable.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch.internal +package org.apache.pekko.dispatch.internal -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.annotation.InternalApi /** * INTERNAL API */ @InternalApi -private[akka] object ScalaBatchable { +private[pekko] object ScalaBatchable { // see Scala 2.13 source tree for explanation def isBatchable(runnable: Runnable): Boolean = runnable match { - case b: akka.dispatch.Batchable => b.isBatchable + case b: pekko.dispatch.Batchable => b.isBatchable case _: scala.concurrent.OnCompleteRunnable => true case _ => false } diff --git a/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteIterator.scala similarity index 98% rename from akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala rename to akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteIterator.scala index 8ebfb31d1f..8eab8b3530 100644 --- a/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala +++ b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteIterator.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.nio.{ ByteBuffer, ByteOrder } @@ -11,15 +11,15 @@ import scala.collection.LinearSeq import scala.collection.mutable.ListBuffer import scala.reflect.ClassTag -import akka.util.Collections.EmptyImmutableSeq +import org.apache.pekko.util.Collections.EmptyImmutableSeq object ByteIterator { object ByteArrayIterator { - protected[akka] def apply(array: Array[Byte]): ByteArrayIterator = + protected[pekko] def apply(array: Array[Byte]): ByteArrayIterator = new ByteArrayIterator(array, 0, array.length) - protected[akka] def apply(array: Array[Byte], from: Int, until: Int): ByteArrayIterator = + protected[pekko] def apply(array: Array[Byte], from: Int, until: Int): ByteArrayIterator = new ByteArrayIterator(array, from, until) val empty: ByteArrayIterator = apply(Array.emptyByteArray) @@ -178,7 +178,7 @@ object ByteIterator { val empty: MultiByteArrayIterator = new MultiByteArrayIterator(Nil) - protected[akka] def apply(iterators: LinearSeq[ByteArrayIterator]): MultiByteArrayIterator = + protected[pekko] def apply(iterators: LinearSeq[ByteArrayIterator]): MultiByteArrayIterator = new MultiByteArrayIterator(iterators) } @@ -219,7 +219,7 @@ object ByteIterator { result } - private[akka] def ++:(that: ByteArrayIterator): this.type = { + private[pekko] def ++:(that: ByteArrayIterator): this.type = { iterators = that +: iterators this } diff --git a/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala similarity index 96% rename from akka-actor/src/main/scala-2.12/akka/util/ByteString.scala rename to akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala index b11e3046c6..d856550061 100644 --- a/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala +++ b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.io.{ ObjectInputStream, ObjectOutputStream } import java.lang.{ Iterable => JIterable } @@ -151,7 +151,7 @@ object ByteString { def apply(): ByteStringBuilder = newBuilder } - private[akka] object ByteString1C extends Companion { + private[pekko] object ByteString1C extends Companion { def fromString(s: String): ByteString1C = new ByteString1C(s.getBytes(StandardCharsets.UTF_8)) def apply(bytes: Array[Byte]): ByteString1C = new ByteString1C(bytes) val SerializationIdentity = 1.toByte @@ -177,10 +177,10 @@ object ByteString { override def iterator: ByteIterator.ByteArrayIterator = ByteIterator.ByteArrayIterator(bytes, 0, bytes.length) /** INTERNAL API */ - private[akka] def toByteString1: ByteString1 = ByteString1(bytes, 0, bytes.length) + private[pekko] def toByteString1: ByteString1 = ByteString1(bytes, 0, bytes.length) /** INTERNAL API */ - private[akka] def byteStringCompanion = ByteString1C + private[pekko] def byteStringCompanion = ByteString1C override def asByteBuffer: ByteBuffer = toByteString1.asByteBuffer @@ -236,14 +236,14 @@ object ByteString { else if (from >= length || until <= 0 || from >= until) ByteString.empty else toByteString1.slice(from, until) - private[akka] override def writeToOutputStream(os: ObjectOutputStream): Unit = + private[pekko] override def writeToOutputStream(os: ObjectOutputStream): Unit = toByteString1.writeToOutputStream(os) override def copyToBuffer(buffer: ByteBuffer): Int = writeToBuffer(buffer, offset = 0) /** INTERNAL API: Specialized for internal use, writing multiple ByteString1C into the same ByteBuffer. */ - private[akka] def writeToBuffer(buffer: ByteBuffer, offset: Int): Int = { + private[pekko] def writeToBuffer(buffer: ByteBuffer, offset: Int): Int = { val copyLength = Math.min(buffer.remaining, offset + length) if (copyLength > 0) { buffer.put(bytes, offset, copyLength) @@ -252,7 +252,7 @@ object ByteString { } /** INTERNAL API: Specialized for internal use, appending ByteString1C to a ByteStringBuilder. */ - private[akka] def appendToBuilder(buffer: ByteStringBuilder) = { + private[pekko] def appendToBuilder(buffer: ByteStringBuilder) = { buffer.putByteArrayUnsafe(bytes) } @@ -260,7 +260,7 @@ object ByteString { } /** INTERNAL API: ByteString backed by exactly one array, with start / end markers */ - private[akka] object ByteString1 extends Companion { + private[pekko] object ByteString1 extends Companion { val empty: ByteString1 = new ByteString1(Array.empty[Byte]) def fromString(s: String): ByteString1 = apply(s.getBytes(StandardCharsets.UTF_8)) def apply(bytes: Array[Byte]): ByteString1 = apply(bytes, 0, bytes.length) @@ -297,20 +297,20 @@ object ByteString { throw new IndexOutOfBoundsException(index.toString) } - private[akka] def writeToOutputStream(os: ObjectOutputStream): Unit = { + private[pekko] def writeToOutputStream(os: ObjectOutputStream): Unit = { os.writeInt(length) os.write(bytes, startIndex, length) } def isCompact: Boolean = length == bytes.length - private[akka] def byteStringCompanion = ByteString1 + private[pekko] def byteStringCompanion = ByteString1 override def dropRight(n: Int): ByteString = dropRight1(n) /** INTERNAL API */ - private[akka] def dropRight1(n: Int): ByteString1 = + private[pekko] def dropRight1(n: Int): ByteString1 = if (n <= 0) this else if (length - n <= 0) ByteString1.empty else new ByteString1(bytes, startIndex, length - n) @@ -319,7 +319,7 @@ object ByteString { if (n <= 0) this else drop1(n) /** INTERNAL API */ - private[akka] def drop1(n: Int): ByteString1 = { + private[pekko] def drop1(n: Int): ByteString1 = { val nextStartIndex = startIndex + n if (nextStartIndex >= bytes.length) ByteString1.empty else ByteString1(bytes, nextStartIndex, length - n) @@ -328,7 +328,7 @@ object ByteString { override def take(n: Int): ByteString = if (n <= 0) ByteString.empty else take1(n) - private[akka] def take1(n: Int): ByteString1 = + private[pekko] def take1(n: Int): ByteString1 = if (n >= length) this else ByteString1(bytes, startIndex, n) @@ -339,7 +339,7 @@ object ByteString { writeToBuffer(buffer) /** INTERNAL API: Specialized for internal use, writing multiple ByteString1C into the same ByteBuffer. */ - private[akka] def writeToBuffer(buffer: ByteBuffer): Int = { + private[pekko] def writeToBuffer(buffer: ByteBuffer): Int = { val copyLength = Math.min(buffer.remaining, length) if (copyLength > 0) { buffer.put(bytes, startIndex, copyLength) @@ -424,7 +424,7 @@ object ByteString { } } - private[akka] object ByteStrings extends Companion { + private[pekko] object ByteStrings extends Companion { def apply(bytestrings: Vector[ByteString1]): ByteString = new ByteStrings(bytestrings, bytestrings.foldLeft(0)(_ + _.length)) @@ -488,7 +488,7 @@ object ByteString { /** * A ByteString with 2 or more fragments. */ - final class ByteStrings private (private[akka] val bytestrings: Vector[ByteString1], val length: Int) + final class ByteStrings private (private[pekko] val bytestrings: Vector[ByteString1], val length: Int) extends ByteString with Serializable { if (bytestrings.isEmpty) throw new IllegalArgumentException("bytestrings must not be empty") @@ -523,7 +523,7 @@ object ByteString { } } - private[akka] def byteStringCompanion = ByteStrings + private[pekko] def byteStringCompanion = ByteStrings def isCompact: Boolean = if (bytestrings.length == 1) bytestrings.head.isCompact else false @@ -560,7 +560,7 @@ object ByteString { override def encodeBase64: ByteString = compact.encodeBase64 - private[akka] def writeToOutputStream(os: ObjectOutputStream): Unit = { + private[pekko] def writeToOutputStream(os: ObjectOutputStream): Unit = { os.writeInt(bytestrings.length) bytestrings.foreach(_.writeToOutputStream(os)) } @@ -570,7 +570,7 @@ object ByteString { else if (n >= length) this else take0(n) - private[akka] def take0(n: Int): ByteString = { + private[pekko] def take0(n: Int): ByteString = { @tailrec def go(last: Int, restToTake: Int): (Int, Int) = { val bs = bytestrings(last) if (bs.length > restToTake) (last, restToTake) @@ -689,7 +689,7 @@ object ByteString { private def readResolve(): AnyRef = orig } - private[akka] object Companion { + private[pekko] object Companion { private val companionMap = Seq(ByteString1, ByteString1C, ByteStrings) .map(x => x.SerializationIdentity -> x) .toMap @@ -698,7 +698,7 @@ object ByteString { def apply(from: Byte): Companion = companionMap(from) } - private[akka] sealed trait Companion { + private[pekko] sealed trait Companion { def SerializationIdentity: Byte def readFromInputStream(is: ObjectInputStream): ByteString } @@ -714,7 +714,7 @@ object ByteString { */ sealed abstract class ByteString extends IndexedSeq[Byte] with IndexedSeqOptimized[Byte, ByteString] { def apply(idx: Int): Byte - private[akka] def byteStringCompanion: ByteString.Companion + private[pekko] def byteStringCompanion: ByteString.Companion // override so that toString will also be `ByteString(...)` for the concrete subclasses // of ByteString which changed for Scala 2.12, see https://github.com/akka/akka/issues/21774 override final def stringPrefix: String = "ByteString" @@ -815,7 +815,7 @@ sealed abstract class ByteString extends IndexedSeq[Byte] with IndexedSeqOptimiz override def foreach[@specialized U](f: Byte => U): Unit = iterator.foreach(f) - private[akka] def writeToOutputStream(os: ObjectOutputStream): Unit + private[pekko] def writeToOutputStream(os: ObjectOutputStream): Unit /** * Efficiently concatenate another ByteString. @@ -1003,7 +1003,7 @@ sealed abstract class CompactByteString extends ByteString with Serializable { } /** - * A mutable builder for efficiently creating a [[akka.util.ByteString]]. + * A mutable builder for efficiently creating a [[org.apache.pekko.util.ByteString]]. * * The created ByteString is not automatically compacted. */ @@ -1117,7 +1117,7 @@ final class ByteStringBuilder extends Builder[Byte, ByteString] { this } - private[akka] def putByteArrayUnsafe(xs: Array[Byte]): this.type = { + private[pekko] def putByteArrayUnsafe(xs: Array[Byte]): this.type = { clearTemp() _builder += ByteString1(xs) _length += xs.length diff --git a/akka-actor/src/main/scala-2.12/akka/util/ccompat/CompatImpl.scala b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/CompatImpl.scala similarity index 95% rename from akka-actor/src/main/scala-2.12/akka/util/ccompat/CompatImpl.scala rename to akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/CompatImpl.scala index 52076e31a2..dacb6555fb 100644 --- a/akka-actor/src/main/scala-2.12/akka/util/ccompat/CompatImpl.scala +++ b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/CompatImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.util.ccompat +package org.apache.pekko.util.ccompat import scala.collection.generic.CanBuildFrom import scala.collection.mutable.Builder diff --git a/akka-actor/src/main/scala-2.13+/akka/util/ccompat/ccompatUsedUntil213.scala b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala similarity index 68% rename from akka-actor/src/main/scala-2.13+/akka/util/ccompat/ccompatUsedUntil213.scala rename to akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala index 1cd7da061c..e14b04c1e6 100644 --- a/akka-actor/src/main/scala-2.13+/akka/util/ccompat/ccompatUsedUntil213.scala +++ b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala @@ -2,11 +2,11 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.util.ccompat +package org.apache.pekko.util.ccompat import scala.annotation.Annotation -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi /** * INTERNAL API @@ -15,4 +15,4 @@ import akka.annotation.InternalApi * but not 2.13. Gets rid of the 'unused import' warning on 2.13. */ @InternalApi -private[akka] class ccompatUsedUntil213 extends Annotation +private[pekko] class ccompatUsedUntil213 extends Annotation diff --git a/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala similarity index 82% rename from akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala rename to akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala index 3af8da6ae3..34d72e1227 100644 --- a/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala +++ b/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import scala.{ collection => c } import scala.collection.{ immutable => i, mutable => m, GenTraversable } @@ -26,9 +26,9 @@ package object ccompat { * @tparam A Type of elements (e.g. `Int`, `Boolean`, etc.) * @tparam C Type of collection (e.g. `List[Int]`, `TreeMap[Int, String]`, etc.) */ - private[akka] type Factory[-A, +C] = CanBuildFrom[Nothing, A, C] + private[pekko] type Factory[-A, +C] = CanBuildFrom[Nothing, A, C] - private[akka] implicit class FactoryOps[-A, +C](private val factory: Factory[A, C]) { + private[pekko] implicit class FactoryOps[-A, +C](private val factory: Factory[A, C]) { /** * @return A collection of type `C` containing the same elements @@ -44,11 +44,11 @@ package object ccompat { def newBuilder: m.Builder[A, C] = factory() } - private[akka] implicit def genericCompanionToCBF[A, CC[X] <: GenTraversable[X]]( + private[pekko] implicit def genericCompanionToCBF[A, CC[X] <: GenTraversable[X]]( fact: GenericCompanion[CC]): CanBuildFrom[Any, A, CC[A]] = simpleCBF(fact.newBuilder[A]) - private[akka] implicit def sortedSetCompanionToCBF[ + private[pekko] implicit def sortedSetCompanionToCBF[ A: Ordering, CC[X] <: c.SortedSet[X] with c.SortedSetLike[X, CC[X]]]( fact: SortedSetFactory[CC]): CanBuildFrom[Any, A, CC[A]] = simpleCBF(fact.newBuilder[A]) @@ -58,17 +58,17 @@ package object ccompat { builder.result() } - private[akka] implicit class ImmutableSortedMapExtensions(private val fact: i.SortedMap.type) extends AnyVal { + private[pekko] implicit class ImmutableSortedMapExtensions(private val fact: i.SortedMap.type) extends AnyVal { def from[K: Ordering, V](source: TraversableOnce[(K, V)]): i.SortedMap[K, V] = build(i.SortedMap.newBuilder[K, V], source) } - private[akka] implicit class ImmutableTreeMapExtensions(private val fact: i.TreeMap.type) extends AnyVal { + private[pekko] implicit class ImmutableTreeMapExtensions(private val fact: i.TreeMap.type) extends AnyVal { def from[K: Ordering, V](source: TraversableOnce[(K, V)]): i.TreeMap[K, V] = build(i.TreeMap.newBuilder[K, V], source) } - private[akka] implicit class SortedExtensionMethods[K, T <: Sorted[K, T]](private val fact: Sorted[K, T]) { + private[pekko] implicit class SortedExtensionMethods[K, T <: Sorted[K, T]](private val fact: Sorted[K, T]) { def rangeFrom(from: K): T = fact.from(from) def rangeTo(to: K): T = fact.to(to) def rangeUntil(until: K): T = fact.until(until) diff --git a/akka-actor/src/main/scala-2.13+/akka/compat/Future.scala b/akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/Future.scala similarity index 93% rename from akka-actor/src/main/scala-2.13+/akka/compat/Future.scala rename to akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/Future.scala index 7a08498d20..ba2bcaaf6b 100644 --- a/akka-actor/src/main/scala-2.13+/akka/compat/Future.scala +++ b/akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/Future.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.compat +package org.apache.pekko.compat import scala.collection.immutable import scala.concurrent.{ ExecutionContext, Future => SFuture } -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi /** * INTERNAL API @@ -17,7 +17,7 @@ import akka.annotation.InternalApi * * Remove these classes as soon as support for Scala 2.12 is dropped! */ -@InternalApi private[akka] object Future { +@InternalApi private[pekko] object Future { def fold[T, R](futures: IterableOnce[SFuture[T]])(zero: R)(op: (R, T) => R)( implicit executor: ExecutionContext): SFuture[R] = { // This will have performance implications since the elements are copied to a Vector diff --git a/akka-actor/src/main/scala-2.13+/akka/compat/PartialFunction.scala b/akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/PartialFunction.scala similarity index 76% rename from akka-actor/src/main/scala-2.13+/akka/compat/PartialFunction.scala rename to akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/PartialFunction.scala index 36b18f08ab..220e3f7e5a 100644 --- a/akka-actor/src/main/scala-2.13+/akka/compat/PartialFunction.scala +++ b/akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/PartialFunction.scala @@ -2,9 +2,9 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.compat +package org.apache.pekko.compat -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi /** * INTERNAL API @@ -14,7 +14,7 @@ import akka.annotation.InternalApi * * Remove these classes as soon as support for Scala 2.12 is dropped! */ -@InternalApi private[akka] object PartialFunction { +@InternalApi private[pekko] object PartialFunction { def fromFunction[A, B](f: (A) => B): scala.PartialFunction[A, B] = { scala.PartialFunction.fromFunction(f) diff --git a/akka-actor/src/main/scala-2.13+/akka/dispatch/internal/SameThreadExecutionContext.scala b/akka-actor/src/main/scala-2.13+/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala similarity index 65% rename from akka-actor/src/main/scala-2.13+/akka/dispatch/internal/SameThreadExecutionContext.scala rename to akka-actor/src/main/scala-2.13+/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala index 40d0b3751c..f4cff300b6 100644 --- a/akka-actor/src/main/scala-2.13+/akka/dispatch/internal/SameThreadExecutionContext.scala +++ b/akka-actor/src/main/scala-2.13+/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch.internal +package org.apache.pekko.dispatch.internal import scala.concurrent.ExecutionContext -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.annotation.InternalApi /** - * Factory to create same thread ec. Not intended to be called from any other site than to create [[akka.dispatch.ExecutionContexts#parasitic]] + * Factory to create same thread ec. Not intended to be called from any other site than to create [[pekko.dispatch.ExecutionContexts#parasitic]] * * INTERNAL API */ diff --git a/akka-actor/src/main/scala-2.12/akka/util/ccompat/ccompatUsedUntil213.scala b/akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala similarity index 68% rename from akka-actor/src/main/scala-2.12/akka/util/ccompat/ccompatUsedUntil213.scala rename to akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala index 1cd7da061c..e14b04c1e6 100644 --- a/akka-actor/src/main/scala-2.12/akka/util/ccompat/ccompatUsedUntil213.scala +++ b/akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala @@ -2,11 +2,11 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.util.ccompat +package org.apache.pekko.util.ccompat import scala.annotation.Annotation -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi /** * INTERNAL API @@ -15,4 +15,4 @@ import akka.annotation.InternalApi * but not 2.13. Gets rid of the 'unused import' warning on 2.13. */ @InternalApi -private[akka] class ccompatUsedUntil213 extends Annotation +private[pekko] class ccompatUsedUntil213 extends Annotation diff --git a/akka-actor/src/main/scala-2.13+/akka/util/ccompat/package.scala b/akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/package.scala similarity index 82% rename from akka-actor/src/main/scala-2.13+/akka/util/ccompat/package.scala rename to akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/package.scala index f5fdc19c67..4453a3ff41 100644 --- a/akka-actor/src/main/scala-2.13+/akka/util/ccompat/package.scala +++ b/akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/package.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util /** * INTERNAL API @@ -12,8 +12,8 @@ package akka.util * not promising binary compatibility yet at the time of writing. */ package object ccompat { - private[akka] type Factory[-A, +C] = scala.collection.Factory[A, C] - private[akka] val Factory = scala.collection.Factory + private[pekko] type Factory[-A, +C] = scala.collection.Factory[A, C] + private[pekko] val Factory = scala.collection.Factory // When we drop support for 2.12 we can delete this concept // and import scala.jdk.CollectionConverters.Ops._ instead diff --git a/akka-actor/src/main/scala-2.13/akka/dispatch/internal/ScalaBatchable.scala b/akka-actor/src/main/scala-2.13/org/apache/pekko/dispatch/internal/ScalaBatchable.scala similarity index 65% rename from akka-actor/src/main/scala-2.13/akka/dispatch/internal/ScalaBatchable.scala rename to akka-actor/src/main/scala-2.13/org/apache/pekko/dispatch/internal/ScalaBatchable.scala index 87d10886c5..f585599fcb 100644 --- a/akka-actor/src/main/scala-2.13/akka/dispatch/internal/ScalaBatchable.scala +++ b/akka-actor/src/main/scala-2.13/org/apache/pekko/dispatch/internal/ScalaBatchable.scala @@ -2,25 +2,26 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch.internal +package org.apache.pekko.dispatch.internal -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.annotation.InternalApi /** * INTERNAL API */ @InternalApi -private[akka] object ScalaBatchable { +private[pekko] object ScalaBatchable { /* * In Scala 2.13.0 `OnCompleteRunnable` was deprecated, and in 2.13.4 * `impl.Promise.Transformation` no longer extend the deprecated `OnCompleteRunnable` * but instead `scala.concurrent.Batchable` (which anyway extends `OnCompleteRunnable`). - * On top of that we have or own legacy version `akka.dispatch.Batchable`. + * On top of that we have or own legacy version `org.apache.pekko.dispatch.Batchable`. */ def isBatchable(runnable: Runnable): Boolean = runnable match { - case b: akka.dispatch.Batchable => b.isBatchable + case b: pekko.dispatch.Batchable => b.isBatchable case _: scala.concurrent.Batchable => true case _ => false } diff --git a/akka-actor/src/main/scala-2.13/akka/util/ByteIterator.scala b/akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteIterator.scala similarity index 98% rename from akka-actor/src/main/scala-2.13/akka/util/ByteIterator.scala rename to akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteIterator.scala index 39ef608cdb..e725c3c7f2 100644 --- a/akka-actor/src/main/scala-2.13/akka/util/ByteIterator.scala +++ b/akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteIterator.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.nio.{ ByteBuffer, ByteOrder } import scala.annotation.tailrec @@ -10,17 +10,17 @@ import scala.collection.BufferedIterator import scala.collection.LinearSeq import scala.collection.mutable.ListBuffer import scala.reflect.ClassTag -import akka.util.Collections.EmptyImmutableSeq +import org.apache.pekko.util.Collections.EmptyImmutableSeq import scala.annotation.nowarn object ByteIterator { object ByteArrayIterator { - protected[akka] def apply(array: Array[Byte]): ByteArrayIterator = + protected[pekko] def apply(array: Array[Byte]): ByteArrayIterator = new ByteArrayIterator(array, 0, array.length) - protected[akka] def apply(array: Array[Byte], from: Int, until: Int): ByteArrayIterator = + protected[pekko] def apply(array: Array[Byte], from: Int, until: Int): ByteArrayIterator = new ByteArrayIterator(array, from, until) val empty: ByteArrayIterator = apply(Array.emptyByteArray) @@ -190,7 +190,7 @@ object ByteIterator { val empty: MultiByteArrayIterator = new MultiByteArrayIterator(Nil) - protected[akka] def apply(iterators: LinearSeq[ByteArrayIterator]): MultiByteArrayIterator = + protected[pekko] def apply(iterators: LinearSeq[ByteArrayIterator]): MultiByteArrayIterator = new MultiByteArrayIterator(iterators) } @@ -231,7 +231,7 @@ object ByteIterator { result } - private[akka] def ++:(that: ByteArrayIterator): this.type = { + private[pekko] def ++:(that: ByteArrayIterator): this.type = { iterators = that +: iterators this } diff --git a/akka-actor/src/main/scala-2.13/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala similarity index 96% rename from akka-actor/src/main/scala-2.13/akka/util/ByteString.scala rename to akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala index 182fa91e06..afa5a6ebe5 100644 --- a/akka-actor/src/main/scala-2.13/akka/util/ByteString.scala +++ b/akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.io.{ ObjectInputStream, ObjectOutputStream } import java.lang.{ Iterable => JIterable } @@ -153,7 +153,7 @@ object ByteString { // override def apply(ignore: TraversableOnce[Byte]): ByteStringBuilder = new ByteStringBuilder // } - private[akka] object ByteString1C extends Companion { + private[pekko] object ByteString1C extends Companion { val empty = new ByteString1C(Array.emptyByteArray) def fromString(s: String): ByteString1C = new ByteString1C(s.getBytes(StandardCharsets.UTF_8)) @@ -181,10 +181,10 @@ object ByteString { override def iterator: ByteIterator.ByteArrayIterator = ByteIterator.ByteArrayIterator(bytes, 0, bytes.length) /** INTERNAL API */ - private[akka] def toByteString1: ByteString1 = ByteString1(bytes, 0, bytes.length) + private[pekko] def toByteString1: ByteString1 = ByteString1(bytes, 0, bytes.length) /** INTERNAL API */ - private[akka] def byteStringCompanion = ByteString1C + private[pekko] def byteStringCompanion = ByteString1C override def asByteBuffer: ByteBuffer = toByteString1.asByteBuffer @@ -239,14 +239,14 @@ object ByteString { else if (from >= length || until <= 0 || from >= until) ByteString.empty else toByteString1.slice(from, until) - private[akka] override def writeToOutputStream(os: ObjectOutputStream): Unit = + private[pekko] override def writeToOutputStream(os: ObjectOutputStream): Unit = toByteString1.writeToOutputStream(os) override def copyToBuffer(buffer: ByteBuffer): Int = writeToBuffer(buffer, offset = 0) /** INTERNAL API: Specialized for internal use, writing multiple ByteString1C into the same ByteBuffer. */ - private[akka] def writeToBuffer(buffer: ByteBuffer, offset: Int): Int = { + private[pekko] def writeToBuffer(buffer: ByteBuffer, offset: Int): Int = { val copyLength = Math.min(buffer.remaining, offset + length) if (copyLength > 0) { buffer.put(bytes, offset, copyLength) @@ -255,7 +255,7 @@ object ByteString { } /** INTERNAL API: Specialized for internal use, appending ByteString1C to a ByteStringBuilder. */ - private[akka] def appendToBuilder(buffer: ByteStringBuilder) = { + private[pekko] def appendToBuilder(buffer: ByteStringBuilder) = { buffer.putByteArrayUnsafe(bytes) } @@ -272,7 +272,7 @@ object ByteString { } /** INTERNAL API: ByteString backed by exactly one array, with start / end markers */ - private[akka] object ByteString1 extends Companion { + private[pekko] object ByteString1 extends Companion { val empty: ByteString1 = new ByteString1(Array.emptyByteArray, 0, 0) def fromString(s: String): ByteString1 = apply(s.getBytes(StandardCharsets.UTF_8)) def apply(bytes: Array[Byte]): ByteString1 = apply(bytes, 0, bytes.length) @@ -306,20 +306,20 @@ object ByteString { throw new IndexOutOfBoundsException(index.toString) } - private[akka] def writeToOutputStream(os: ObjectOutputStream): Unit = { + private[pekko] def writeToOutputStream(os: ObjectOutputStream): Unit = { os.writeInt(length) os.write(bytes, startIndex, length) } def isCompact: Boolean = length == bytes.length - private[akka] def byteStringCompanion = ByteString1 + private[pekko] def byteStringCompanion = ByteString1 override def dropRight(n: Int): ByteString = dropRight1(n) /** INTERNAL API */ - private[akka] def dropRight1(n: Int): ByteString1 = + private[pekko] def dropRight1(n: Int): ByteString1 = if (n <= 0) this else if (length - n <= 0) ByteString1.empty else new ByteString1(bytes, startIndex, length - n) @@ -328,7 +328,7 @@ object ByteString { if (n <= 0) this else drop1(n) /** INTERNAL API */ - private[akka] def drop1(n: Int): ByteString1 = { + private[pekko] def drop1(n: Int): ByteString1 = { val nextStartIndex = startIndex + n if (nextStartIndex >= bytes.length) ByteString1.empty else ByteString1(bytes, nextStartIndex, length - n) @@ -337,7 +337,7 @@ object ByteString { override def take(n: Int): ByteString = if (n <= 0) ByteString.empty else take1(n) - private[akka] def take1(n: Int): ByteString1 = + private[pekko] def take1(n: Int): ByteString1 = if (n >= length) this else ByteString1(bytes, startIndex, n) @@ -348,7 +348,7 @@ object ByteString { writeToBuffer(buffer) /** INTERNAL API: Specialized for internal use, writing multiple ByteString1C into the same ByteBuffer. */ - private[akka] def writeToBuffer(buffer: ByteBuffer): Int = { + private[pekko] def writeToBuffer(buffer: ByteBuffer): Int = { val copyLength = Math.min(buffer.remaining, length) if (copyLength > 0) { buffer.put(bytes, startIndex, copyLength) @@ -441,7 +441,7 @@ object ByteString { } } - private[akka] object ByteStrings extends Companion { + private[pekko] object ByteStrings extends Companion { def apply(bytestrings: Vector[ByteString1]): ByteString = new ByteStrings(bytestrings, bytestrings.foldLeft(0)(_ + _.length)) @@ -505,7 +505,7 @@ object ByteString { /** * A ByteString with 2 or more fragments. */ - final class ByteStrings private (private[akka] val bytestrings: Vector[ByteString1], val length: Int) + final class ByteStrings private (private[pekko] val bytestrings: Vector[ByteString1], val length: Int) extends ByteString with Serializable { if (bytestrings.isEmpty) throw new IllegalArgumentException("bytestrings must not be empty") @@ -540,7 +540,7 @@ object ByteString { } } - private[akka] def byteStringCompanion = ByteStrings + private[pekko] def byteStringCompanion = ByteStrings def isCompact: Boolean = if (bytestrings.length == 1) bytestrings.head.isCompact else false @@ -577,7 +577,7 @@ object ByteString { override def encodeBase64: ByteString = compact.encodeBase64 - private[akka] def writeToOutputStream(os: ObjectOutputStream): Unit = { + private[pekko] def writeToOutputStream(os: ObjectOutputStream): Unit = { os.writeInt(bytestrings.length) bytestrings.foreach(_.writeToOutputStream(os)) } @@ -587,7 +587,7 @@ object ByteString { else if (n >= length) this else take0(n) - private[akka] def take0(n: Int): ByteString = { + private[pekko] def take0(n: Int): ByteString = { @tailrec def go(last: Int, restToTake: Int): (Int, Int) = { val bs = bytestrings(last) if (bs.length > restToTake) (last, restToTake) @@ -722,7 +722,7 @@ object ByteString { private def readResolve(): AnyRef = orig } - private[akka] object Companion { + private[pekko] object Companion { private val companionMap = Seq(ByteString1, ByteString1C, ByteStrings) .map(x => x.SerializationIdentity -> x) .toMap @@ -731,7 +731,7 @@ object ByteString { def apply(from: Byte): Companion = companionMap(from) } - private[akka] sealed trait Companion { + private[pekko] sealed trait Companion { def SerializationIdentity: Byte def readFromInputStream(is: ObjectInputStream): ByteString } @@ -755,7 +755,7 @@ sealed abstract class ByteString override def empty: ByteString = ByteString.empty def apply(idx: Int): Byte - private[akka] def byteStringCompanion: ByteString.Companion + private[pekko] def byteStringCompanion: ByteString.Companion // override so that toString will also be `ByteString(...)` for the concrete subclasses // of ByteString which changed for Scala 2.12, see https://github.com/akka/akka/issues/21774 override final def className: String = "ByteString" @@ -869,7 +869,7 @@ sealed abstract class ByteString override def foreach[@specialized U](f: Byte => U): Unit = iterator.foreach(f) - private[akka] def writeToOutputStream(os: ObjectOutputStream): Unit + private[pekko] def writeToOutputStream(os: ObjectOutputStream): Unit /** * Efficiently concatenate another ByteString. @@ -1066,7 +1066,7 @@ sealed abstract class CompactByteString extends ByteString with Serializable { } /** - * A mutable builder for efficiently creating a [[akka.util.ByteString]]. + * A mutable builder for efficiently creating a [[org.apache.pekko.util.ByteString]]. * * The created ByteString is not automatically compacted. */ @@ -1186,7 +1186,7 @@ final class ByteStringBuilder extends Builder[Byte, ByteString] { this } - private[akka] def putByteArrayUnsafe(xs: Array[Byte]): this.type = { + private[pekko] def putByteArrayUnsafe(xs: Array[Byte]): this.type = { clearTemp() _builder += ByteString1(xs) _length += xs.length diff --git a/akka-actor/src/main/scala-3/akka/dispatch/internal/ScalaBatchable.scala b/akka-actor/src/main/scala-3/org/apache/pekko/dispatch/internal/ScalaBatchable.scala similarity index 62% rename from akka-actor/src/main/scala-3/akka/dispatch/internal/ScalaBatchable.scala rename to akka-actor/src/main/scala-3/org/apache/pekko/dispatch/internal/ScalaBatchable.scala index 5868461447..0b0324cf45 100644 --- a/akka-actor/src/main/scala-3/akka/dispatch/internal/ScalaBatchable.scala +++ b/akka-actor/src/main/scala-3/org/apache/pekko/dispatch/internal/ScalaBatchable.scala @@ -2,19 +2,20 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch.internal +package org.apache.pekko.dispatch.internal -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.annotation.InternalApi /** * INTERNAL API */ @InternalApi -private[akka] object ScalaBatchable { +private[pekko] object ScalaBatchable { // See Scala 2.13 ScalaBatchable for explanation def isBatchable(runnable: Runnable): Boolean = runnable match { - case b: akka.dispatch.Batchable => b.isBatchable + case b: pekko.dispatch.Batchable => b.isBatchable case _: scala.concurrent.Batchable => true case _ => false } diff --git a/akka-actor/src/main/scala-3/akka/util/ByteIterator.scala b/akka-actor/src/main/scala-3/org/apache/pekko/util/ByteIterator.scala similarity index 98% rename from akka-actor/src/main/scala-3/akka/util/ByteIterator.scala rename to akka-actor/src/main/scala-3/org/apache/pekko/util/ByteIterator.scala index 6345477f91..5d46f421d3 100644 --- a/akka-actor/src/main/scala-3/akka/util/ByteIterator.scala +++ b/akka-actor/src/main/scala-3/org/apache/pekko/util/ByteIterator.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.nio.{ ByteBuffer, ByteOrder } @@ -12,15 +12,15 @@ import scala.collection.LinearSeq import scala.collection.mutable.ListBuffer import scala.reflect.ClassTag -import akka.util.Collections.EmptyImmutableSeq +import org.apache.pekko.util.Collections.EmptyImmutableSeq object ByteIterator { object ByteArrayIterator { - protected[akka] def apply(array: Array[Byte]): ByteArrayIterator = + protected[pekko] def apply(array: Array[Byte]): ByteArrayIterator = new ByteArrayIterator(array, 0, array.length) - protected[akka] def apply(array: Array[Byte], from: Int, until: Int): ByteArrayIterator = + protected[pekko] def apply(array: Array[Byte], from: Int, until: Int): ByteArrayIterator = new ByteArrayIterator(array, from, until) val empty: ByteArrayIterator = apply(Array.emptyByteArray) @@ -187,7 +187,7 @@ object ByteIterator { val empty: MultiByteArrayIterator = new MultiByteArrayIterator(Nil) - protected[akka] def apply(iterators: LinearSeq[ByteArrayIterator]): MultiByteArrayIterator = + protected[pekko] def apply(iterators: LinearSeq[ByteArrayIterator]): MultiByteArrayIterator = new MultiByteArrayIterator(iterators) } @@ -228,7 +228,7 @@ object ByteIterator { result } - private[akka] def ++:(that: ByteArrayIterator): this.type = { + private[pekko] def ++:(that: ByteArrayIterator): this.type = { iterators = that +: iterators this } diff --git a/akka-actor/src/main/scala-3/akka/util/ByteString.scala b/akka-actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala similarity index 96% rename from akka-actor/src/main/scala-3/akka/util/ByteString.scala rename to akka-actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala index 4ae11d7ec6..64a3abd365 100644 --- a/akka-actor/src/main/scala-3/akka/util/ByteString.scala +++ b/akka-actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.util +package org.apache.pekko.util import java.io.{ ObjectInputStream, ObjectOutputStream } import java.lang.{ Iterable => JIterable } @@ -155,7 +155,7 @@ object ByteString { // override def apply(ignore: TraversableOnce[Byte]): ByteStringBuilder = new ByteStringBuilder // } - private[akka] object ByteString1C extends Companion { + private[pekko] object ByteString1C extends Companion { val empty = new ByteString1C(Array.emptyByteArray) def fromString(s: String): ByteString1C = new ByteString1C(s.getBytes(StandardCharsets.UTF_8)) @@ -183,10 +183,10 @@ object ByteString { override def iterator: ByteIterator.ByteArrayIterator = ByteIterator.ByteArrayIterator(bytes, 0, bytes.length) /** INTERNAL API */ - private[akka] def toByteString1: ByteString1 = ByteString1(bytes, 0, bytes.length) + private[pekko] def toByteString1: ByteString1 = ByteString1(bytes, 0, bytes.length) /** INTERNAL API */ - private[akka] def byteStringCompanion = ByteString1C + private[pekko] def byteStringCompanion = ByteString1C override def asByteBuffer: ByteBuffer = toByteString1.asByteBuffer @@ -241,14 +241,14 @@ object ByteString { else if (from >= length || until <= 0 || from >= until) ByteString.empty else toByteString1.slice(from, until) - private[akka] override def writeToOutputStream(os: ObjectOutputStream): Unit = + private[pekko] override def writeToOutputStream(os: ObjectOutputStream): Unit = toByteString1.writeToOutputStream(os) override def copyToBuffer(buffer: ByteBuffer): Int = writeToBuffer(buffer, offset = 0) /** INTERNAL API: Specialized for internal use, writing multiple ByteString1C into the same ByteBuffer. */ - private[akka] def writeToBuffer(buffer: ByteBuffer, offset: Int): Int = { + private[pekko] def writeToBuffer(buffer: ByteBuffer, offset: Int): Int = { val copyLength = Math.min(buffer.remaining, offset + length) if (copyLength > 0) { buffer.put(bytes, offset, copyLength) @@ -257,7 +257,7 @@ object ByteString { } /** INTERNAL API: Specialized for internal use, appending ByteString1C to a ByteStringBuilder. */ - private[akka] def appendToBuilder(buffer: ByteStringBuilder) = { + private[pekko] def appendToBuilder(buffer: ByteStringBuilder) = { buffer.putByteArrayUnsafe(bytes) } @@ -273,7 +273,7 @@ object ByteString { } /** INTERNAL API: ByteString backed by exactly one array, with start / end markers */ - private[akka] object ByteString1 extends Companion { + private[pekko] object ByteString1 extends Companion { val empty: ByteString1 = new ByteString1(Array.emptyByteArray, 0, 0) def fromString(s: String): ByteString1 = apply(s.getBytes(StandardCharsets.UTF_8)) def apply(bytes: Array[Byte]): ByteString1 = apply(bytes, 0, bytes.length) @@ -307,20 +307,20 @@ object ByteString { throw new IndexOutOfBoundsException(index.toString) } - private[akka] def writeToOutputStream(os: ObjectOutputStream): Unit = { + private[pekko] def writeToOutputStream(os: ObjectOutputStream): Unit = { os.writeInt(length) os.write(bytes, startIndex, length) } def isCompact: Boolean = length == bytes.length - private[akka] def byteStringCompanion = ByteString1 + private[pekko] def byteStringCompanion = ByteString1 override def dropRight(n: Int): ByteString = dropRight1(n) /** INTERNAL API */ - private[akka] def dropRight1(n: Int): ByteString1 = + private[pekko] def dropRight1(n: Int): ByteString1 = if (n <= 0) this else if (length - n <= 0) ByteString1.empty else new ByteString1(bytes, startIndex, length - n) @@ -329,7 +329,7 @@ object ByteString { if (n <= 0) this else drop1(n) /** INTERNAL API */ - private[akka] def drop1(n: Int): ByteString1 = { + private[pekko] def drop1(n: Int): ByteString1 = { val nextStartIndex = startIndex + n if (nextStartIndex >= bytes.length) ByteString1.empty else ByteString1(bytes, nextStartIndex, length - n) @@ -338,7 +338,7 @@ object ByteString { override def take(n: Int): ByteString = if (n <= 0) ByteString.empty else take1(n) - private[akka] def take1(n: Int): ByteString1 = + private[pekko] def take1(n: Int): ByteString1 = if (n >= length) this else ByteString1(bytes, startIndex, n) @@ -349,7 +349,7 @@ object ByteString { writeToBuffer(buffer) /** INTERNAL API: Specialized for internal use, writing multiple ByteString1C into the same ByteBuffer. */ - private[akka] def writeToBuffer(buffer: ByteBuffer): Int = { + private[pekko] def writeToBuffer(buffer: ByteBuffer): Int = { val copyLength = Math.min(buffer.remaining, length) if (copyLength > 0) { buffer.put(bytes, startIndex, copyLength) @@ -442,7 +442,7 @@ object ByteString { } } - private[akka] object ByteStrings extends Companion { + private[pekko] object ByteStrings extends Companion { def apply(bytestrings: Vector[ByteString1]): ByteString = new ByteStrings(bytestrings, bytestrings.foldLeft(0)(_ + _.length)) @@ -506,7 +506,7 @@ object ByteString { /** * A ByteString with 2 or more fragments. */ - final class ByteStrings private (private[akka] val bytestrings: Vector[ByteString1], val length: Int) + final class ByteStrings private (private[pekko] val bytestrings: Vector[ByteString1], val length: Int) extends ByteString with Serializable { if (bytestrings.isEmpty) throw new IllegalArgumentException("bytestrings must not be empty") @@ -541,7 +541,7 @@ object ByteString { } } - private[akka] def byteStringCompanion = ByteStrings + private[pekko] def byteStringCompanion = ByteStrings def isCompact: Boolean = if (bytestrings.length == 1) bytestrings.head.isCompact else false @@ -578,7 +578,7 @@ object ByteString { override def encodeBase64: ByteString = compact.encodeBase64 - private[akka] def writeToOutputStream(os: ObjectOutputStream): Unit = { + private[pekko] def writeToOutputStream(os: ObjectOutputStream): Unit = { os.writeInt(bytestrings.length) bytestrings.foreach(_.writeToOutputStream(os)) } @@ -588,7 +588,7 @@ object ByteString { else if (n >= length) this else take0(n) - private[akka] def take0(n: Int): ByteString = { + private[pekko] def take0(n: Int): ByteString = { @tailrec def go(last: Int, restToTake: Int): (Int, Int) = { val bs = bytestrings(last) if (bs.length > restToTake) (last, restToTake) @@ -723,7 +723,7 @@ object ByteString { private def readResolve(): AnyRef = orig } - private[akka] object Companion { + private[pekko] object Companion { private val companionMap = Seq(ByteString1, ByteString1C, ByteStrings) .map(x => x.SerializationIdentity -> x) .toMap @@ -732,7 +732,7 @@ object ByteString { def apply(from: Byte): Companion = companionMap(from) } - private[akka] sealed trait Companion { + private[pekko] sealed trait Companion { def SerializationIdentity: Byte def readFromInputStream(is: ObjectInputStream): ByteString } @@ -756,7 +756,7 @@ sealed abstract class ByteString override def empty: ByteString = ByteString.empty def apply(idx: Int): Byte - private[akka] def byteStringCompanion: ByteString.Companion + private[pekko] def byteStringCompanion: ByteString.Companion // override so that toString will also be `ByteString(...)` for the concrete subclasses // of ByteString which changed for Scala 2.12, see https://github.com/akka/akka/issues/21774 override final def className: String = "ByteString" @@ -869,7 +869,7 @@ sealed abstract class ByteString override def foreach[@specialized U](f: Byte => U): Unit = iterator.foreach(f) - private[akka] def writeToOutputStream(os: ObjectOutputStream): Unit + private[pekko] def writeToOutputStream(os: ObjectOutputStream): Unit /** * Efficiently concatenate another ByteString. @@ -1066,7 +1066,7 @@ sealed abstract class CompactByteString extends ByteString with Serializable { } /** - * A mutable builder for efficiently creating a [[akka.util.ByteString]]. + * A mutable builder for efficiently creating a [[org.apache.pekko.util.ByteString]]. * * The created ByteString is not automatically compacted. */ @@ -1186,7 +1186,7 @@ final class ByteStringBuilder extends Builder[Byte, ByteString] { this } - private[akka] def putByteArrayUnsafe(xs: Array[Byte]): this.type = { + private[pekko] def putByteArrayUnsafe(xs: Array[Byte]): this.type = { clearTemp() _builder += ByteString1(xs) _length += xs.length diff --git a/akka-actor/src/main/scala/akka/AkkaException.scala b/akka-actor/src/main/scala/org/apache/pekko/AkkaException.scala similarity index 97% rename from akka-actor/src/main/scala/akka/AkkaException.scala rename to akka-actor/src/main/scala/org/apache/pekko/AkkaException.scala index b1452797ad..a93afb196b 100644 --- a/akka-actor/src/main/scala/akka/AkkaException.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/AkkaException.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka +package org.apache.pekko /** * Akka base Exception. diff --git a/akka-actor/src/main/scala/akka/AkkaVersion.scala b/akka-actor/src/main/scala/org/apache/pekko/AkkaVersion.scala similarity index 87% rename from akka-actor/src/main/scala/akka/AkkaVersion.scala rename to akka-actor/src/main/scala/org/apache/pekko/AkkaVersion.scala index 461b94d8ea..f76e633593 100644 --- a/akka-actor/src/main/scala/akka/AkkaVersion.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/AkkaVersion.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka +package org.apache.pekko -import akka.annotation.InternalApi +import org.apache.pekko.annotation.InternalApi -final class UnsupportedAkkaVersion private[akka] (msg: String) extends RuntimeException(msg) +final class UnsupportedAkkaVersion private[pekko] (msg: String) extends RuntimeException(msg) object AkkaVersion { @@ -28,7 +28,7 @@ object AkkaVersion { * Internal API: */ @InternalApi - private[akka] def require(libraryName: String, requiredVersion: String, currentVersion: String): Unit = { + private[pekko] def require(libraryName: String, requiredVersion: String, currentVersion: String): Unit = { if (requiredVersion != currentVersion) { val VersionPattern = """(\d+)\.(\d+)\.(\d+)(-(?:M|RC)\d+)?""".r currentVersion match { diff --git a/akka-actor/src/main/scala/akka/Done.scala b/akka-actor/src/main/scala/org/apache/pekko/Done.scala similarity index 90% rename from akka-actor/src/main/scala/akka/Done.scala rename to akka-actor/src/main/scala/org/apache/pekko/Done.scala index 32c182754f..24c9ed5b60 100644 --- a/akka-actor/src/main/scala/akka/Done.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/Done.scala @@ -2,11 +2,11 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka +package org.apache.pekko import java.io.Serializable -import akka.annotation.DoNotInherit +import org.apache.pekko.annotation.DoNotInherit /** * Typically used together with `Future` to signal completion diff --git a/akka-actor/src/main/scala/akka/Main.scala b/akka-actor/src/main/scala/org/apache/pekko/Main.scala similarity index 80% rename from akka-actor/src/main/scala/akka/Main.scala rename to akka-actor/src/main/scala/org/apache/pekko/Main.scala index 939a9a442e..633ac2db77 100644 --- a/akka-actor/src/main/scala/akka/Main.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/Main.scala @@ -2,20 +2,21 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka +package org.apache.pekko import scala.util.control.NonFatal -import akka.actor.Actor -import akka.actor.ActorLogging -import akka.actor.ActorRef -import akka.actor.ActorSystem -import akka.actor.ExtendedActorSystem -import akka.actor.Props -import akka.actor.Terminated +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.ActorLogging +import pekko.actor.ActorRef +import pekko.actor.ActorSystem +import pekko.actor.ExtendedActorSystem +import pekko.actor.Props +import pekko.actor.Terminated /** - * Main class to start an [[akka.actor.ActorSystem]] with one + * Main class to start an [[pekko.actor.ActorSystem]] with one * top level application supervisor actor. It will shutdown * the actor system when the top level actor is terminated. */ diff --git a/akka-actor/src/main/scala/akka/NotUsed.scala b/akka-actor/src/main/scala/org/apache/pekko/NotUsed.scala similarity index 96% rename from akka-actor/src/main/scala/akka/NotUsed.scala rename to akka-actor/src/main/scala/org/apache/pekko/NotUsed.scala index 6bb00cb365..dd0075bdda 100644 --- a/akka-actor/src/main/scala/akka/NotUsed.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/NotUsed.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka +package org.apache.pekko /** * This type is used in generic type signatures wherever the actual value is of no importance. diff --git a/akka-actor/src/main/scala/akka/actor/AbstractActor.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala similarity index 92% rename from akka-actor/src/main/scala/akka/actor/AbstractActor.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala index 0855a63bfd..0b9400d551 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractActor.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.Optional @@ -12,9 +12,10 @@ import scala.runtime.BoxedUnit import scala.annotation.nowarn -import akka.annotation.DoNotInherit -import akka.japi.pf.ReceiveBuilder -import akka.util.JavaDurationConverters +import org.apache.pekko +import pekko.annotation.DoNotInherit +import pekko.japi.pf.ReceiveBuilder +import pekko.util.JavaDurationConverters /** * Java API: compatible with lambda expressions @@ -24,7 +25,7 @@ object AbstractActor { /** * Defines which messages the Actor can handle, along with the implementation of * how the messages should be processed. You can build such behavior with the - * [[akka.japi.pf.ReceiveBuilder]] but it can be implemented in other ways than + * [[pekko.japi.pf.ReceiveBuilder]] but it can be implemented in other ways than * using the `ReceiveBuilder` since it in the end is just a wrapper around a * Scala `PartialFunction`. In Java, you can implement `PartialFunction` by * extending `AbstractPartialFunction`. @@ -51,7 +52,7 @@ object AbstractActor { * Not intended for public inheritance/implementation */ @DoNotInherit - trait ActorContext extends akka.actor.ActorContext { + trait ActorContext extends pekko.actor.ActorContext { /** * The ActorRef representing this actor @@ -150,7 +151,7 @@ object AbstractActor { /** * Gets the current receive timeout. - * When specified, the receive method should be able to handle a [[akka.actor.ReceiveTimeout]] message. + * When specified, the receive method should be able to handle a [[pekko.actor.ReceiveTimeout]] message. * * *Warning*: This method is not thread-safe and must not be accessed from threads other * than the ordinary actor message processing thread, such as [[java.util.concurrent.CompletionStage]] and [[scala.concurrent.Future]] callbacks. @@ -161,8 +162,8 @@ object AbstractActor { } /** - * Defines the inactivity timeout after which the sending of a [[akka.actor.ReceiveTimeout]] message is triggered. - * When specified, the receive function should be able to handle a [[akka.actor.ReceiveTimeout]] message. + * Defines the inactivity timeout after which the sending of a [[pekko.actor.ReceiveTimeout]] message is triggered. + * When specified, the receive function should be able to handle a [[pekko.actor.ReceiveTimeout]] message. * 1 millisecond is the minimum supported timeout. * * Please note that the receive timeout might fire and enqueue the `ReceiveTimeout` message right after @@ -340,9 +341,9 @@ abstract class UntypedAbstractActor extends AbstractActor { /** * Recommended convention is to call this method if the message * isn't handled in [[#onReceive]] (e.g. unknown message type). - * By default it fails with either a [[akka.actor.DeathPactException]] (in - * case of an unhandled [[akka.actor.Terminated]] message) or publishes an [[akka.actor.UnhandledMessage]] - * to the actor's system's [[akka.event.EventStream]]. + * By default it fails with either a [[pekko.actor.DeathPactException]] (in + * case of an unhandled [[pekko.actor.Terminated]] message) or publishes an [[pekko.actor.UnhandledMessage]] + * to the actor's system's [[pekko.event.EventStream]]. */ override def unhandled(message: Any): Unit = super.unhandled(message) } @@ -387,14 +388,14 @@ abstract class AbstractLoggingActor extends AbstractActor with ActorLogging * You can override the default mailbox provided when `DequeBasedMessageQueueSemantics` are requested via config: * 

  *   akka.actor.mailbox.requirements {
- *     "akka.dispatch.BoundedDequeBasedMessageQueueSemantics" = your-custom-mailbox
+ *     "org.apache.pekko.dispatch.BoundedDequeBasedMessageQueueSemantics" = your-custom-mailbox
  *   }
  *
* Alternatively, you can add your own requirement marker to the actor and configure a mailbox type to be used * for your marker. * - * For a `Stash` based actor that enforces unbounded deques see [[akka.actor.AbstractActorWithUnboundedStash]]. - * There is also an unrestricted version [[akka.actor.AbstractActorWithUnrestrictedStash]] that does not + * For a `Stash` based actor that enforces unbounded deques see [[pekko.actor.AbstractActorWithUnboundedStash]]. + * There is also an unrestricted version [[pekko.actor.AbstractActorWithUnrestrictedStash]] that does not * enforce the mailbox type. */ abstract class AbstractActorWithStash extends AbstractActor with Stash @@ -403,8 +404,8 @@ abstract class AbstractActorWithStash extends AbstractActor with Stash * Java API: compatible with lambda expressions * * Actor base class with `Stash` that enforces an unbounded deque for the actor. The proper mailbox has to be configured - * manually, and the mailbox should extend the [[akka.dispatch.DequeBasedMessageQueueSemantics]] marker trait. - * See [[akka.actor.AbstractActorWithStash]] for details on how `Stash` works. + * manually, and the mailbox should extend the [[pekko.dispatch.DequeBasedMessageQueueSemantics]] marker trait. + * See [[pekko.actor.AbstractActorWithStash]] for details on how `Stash` works. */ abstract class AbstractActorWithUnboundedStash extends AbstractActor with UnboundedStash @@ -412,6 +413,6 @@ abstract class AbstractActorWithUnboundedStash extends AbstractActor with Unboun * Java API: compatible with lambda expressions * * Actor base class with `Stash` that does not enforce any mailbox type. The mailbox of the actor has to be configured - * manually. See [[akka.actor.AbstractActorWithStash]] for details on how `Stash` works. + * manually. See [[pekko.actor.AbstractActorWithStash]] for details on how `Stash` works. */ abstract class AbstractActorWithUnrestrictedStash extends AbstractActor with UnrestrictedStash diff --git a/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala similarity index 90% rename from akka-actor/src/main/scala/akka/actor/AbstractFSM.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala index 48c667a4d2..1ef51f1e60 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala @@ -2,11 +2,12 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration.FiniteDuration -import akka.util.JavaDurationConverters._ +import org.apache.pekko +import pekko.util.JavaDurationConverters._ /** * Java API: compatible with lambda expressions @@ -34,8 +35,8 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { import FSM._ - import akka.japi.pf._ - import akka.japi.pf.FI._ + import pekko.japi.pf._ + import pekko.japi.pf.FI._ /** * Returns this AbstractActor's ActorContext @@ -119,7 +120,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { /** * Set initial state. Call this method from the constructor before the [[#initialize]] method. * If different state is needed after a restart this method, followed by [[#initialize]], can - * be used in the actor life cycle hooks [[akka.actor.Actor#preStart]] and [[akka.actor.Actor#postRestart]]. + * be used in the actor life cycle hooks [[pekko.actor.Actor#preStart]] and [[pekko.actor.Actor#postRestart]]. * * @param stateName initial state designator * @param stateData initial state data @@ -130,7 +131,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { /** * Set initial state. Call this method from the constructor before the [[#initialize]] method. * If different state is needed after a restart this method, followed by [[#initialize]], can - * be used in the actor life cycle hooks [[akka.actor.Actor#preStart]] and [[akka.actor.Actor#postRestart]]. + * be used in the actor life cycle hooks [[pekko.actor.Actor#preStart]] and [[pekko.actor.Actor#postRestart]]. * * @param stateName initial state designator * @param stateData initial state data @@ -142,7 +143,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { /** * Set initial state. Call this method from the constructor before the [[#initialize]] method. * If different state is needed after a restart this method, followed by [[#initialize]], can - * be used in the actor life cycle hooks [[akka.actor.Actor#preStart]] and [[akka.actor.Actor#postRestart]]. + * be used in the actor life cycle hooks [[pekko.actor.Actor#preStart]] and [[pekko.actor.Actor#postRestart]]. * * @param stateName initial state designator * @param stateData initial state data @@ -170,7 +171,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { * called, not only the first one matching. */ final def onTransition(transitionHandler: UnitApply2[S, S]): Unit = { - val pf: PartialFunction[(S, S), Unit] = akka.compat.PartialFunction.fromFunction(transitionHandler(_: S, _: S)) + val pf: PartialFunction[(S, S), Unit] = pekko.compat.PartialFunction.fromFunction(transitionHandler(_: S, _: S)) super.onTransition(pf) } @@ -191,7 +192,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { super.onTermination(stopBuilder.build().asInstanceOf[PartialFunction[StopEvent, Unit]]) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches on an event and data type and a predicate. * @@ -209,7 +210,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().event(eventType, dataType, predicate, apply) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches on an event and data type. * @@ -225,7 +226,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().event(eventType, dataType, apply) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches if the event type and predicate matches. * @@ -241,7 +242,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().event(eventType, predicate, apply) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches if the event type matches. * @@ -253,7 +254,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().event(eventType, apply) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches if the predicate matches. * @@ -267,7 +268,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().event(predicate, apply) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches on the data type and if any of the event types * in the list match or any of the event instances in the list compares equal. @@ -284,7 +285,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().event(eventMatches, dataType, apply) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches if any of the event types in the list match or any * of the event instances in the list compares equal. @@ -297,7 +298,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().event(eventMatches, apply) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches on the data type and if the event compares equal. * @@ -313,7 +314,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().eventEquals(event, dataType, apply) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches if the event compares equal. * @@ -325,7 +326,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().eventEquals(event, apply) /** - * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set. * * A case statement that matches on any type of event. * @@ -336,7 +337,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStateFunctionBuilder[S, D]().anyEvent(apply) /** - * Create an [[akka.japi.pf.FSMTransitionHandlerBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first case statement set. * * A case statement that matches on a from state and a to state. * @@ -349,7 +350,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMTransitionHandlerBuilder[S]().state(fromState, toState, apply) /** - * Create an [[akka.japi.pf.FSMTransitionHandlerBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first case statement set. * * A case statement that matches on a from state and a to state. * @@ -362,7 +363,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMTransitionHandlerBuilder[S]().state(fromState, toState, apply) /** - * Create an [[akka.japi.pf.FSMStopBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement set. * * A case statement that matches on an [[FSM.Reason]]. * @@ -374,7 +375,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStopBuilder[S, D]().stop(reason, apply) /** - * Create an [[akka.japi.pf.FSMStopBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement set. * * A case statement that matches on a reason type. * @@ -386,7 +387,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStopBuilder[S, D]().stop(reasonType, apply) /** - * Create an [[akka.japi.pf.FSMStopBuilder]] with the first case statement set. + * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement set. * * A case statement that matches on a reason type and a predicate. * @@ -402,7 +403,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { new FSMStopBuilder[S, D]().stop(reasonType, predicate, apply) /** - * Create a [[akka.japi.pf.UnitPFBuilder]] with the first case statement set. + * Create a [[pekko.japi.pf.UnitPFBuilder]] with the first case statement set. * * @param dataType a type to match the argument against * @param apply an action to apply to the argument if the type matches @@ -412,7 +413,7 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { UnitMatch.`match`(dataType, apply) /** - * Create a [[akka.japi.pf.UnitPFBuilder]] with the first case statement set. + * Create a [[pekko.japi.pf.UnitPFBuilder]] with the first case statement set. * * @param dataType a type to match the argument against * @param predicate a predicate that will be evaluated on the argument if the type matches diff --git a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala similarity index 89% rename from akka-actor/src/main/scala/akka/actor/AbstractProps.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala index 278495223f..2cbc2067b0 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.lang.reflect.{ Modifier, ParameterizedType, TypeVariable } import java.lang.reflect.Constructor @@ -10,24 +10,25 @@ import java.lang.reflect.Constructor import scala.annotation.tailrec import scala.annotation.varargs -import akka.japi.Creator -import akka.util.Reflect +import org.apache.pekko +import pekko.japi.Creator +import pekko.util.Reflect /** * Java API: Factory for Props instances. */ -private[akka] trait AbstractProps { +private[pekko] trait AbstractProps { /** * INTERNAL API */ - private[akka] def validate(clazz: Class[_]): Unit = { + private[pekko] def validate(clazz: Class[_]): Unit = { if (Modifier.isAbstract(clazz.getModifiers)) { throw new IllegalArgumentException(s"Actor class [${clazz.getName}] must not be abstract") } else if (!classOf[Actor].isAssignableFrom(clazz) && !classOf[IndirectActorProducer].isAssignableFrom(clazz)) { throw new IllegalArgumentException( - s"Actor class [${clazz.getName}] must be subClass of akka.actor.Actor or akka.actor.IndirectActorProducer.") + s"Actor class [${clazz.getName}] must be subClass of org.apache.pekko.actor.Actor or org.apache.pekko.actor.IndirectActorProducer.") } } @@ -39,7 +40,7 @@ private[akka] trait AbstractProps { new Props(deploy = Props.defaultDeploy, clazz = clazz, args = args.toList) /** - * Create new Props from the given [[akka.japi.Creator]]. + * Create new Props from the given [[pekko.japi.Creator]]. * * You can not use a Java 8 lambda with this method since the generated classes * don't carry enough type information. @@ -71,7 +72,7 @@ private[akka] trait AbstractProps { } /** - * Create new Props from the given [[akka.japi.Creator]] with the type set to the given actorClass. + * Create new Props from the given [[pekko.japi.Creator]] with the type set to the given actorClass. */ def create[T <: Actor](actorClass: Class[T], creator: Creator[T]): Props = { checkCreatorClosingOver(creator.getClass) diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/Actor.scala similarity index 85% rename from akka-actor/src/main/scala/akka/actor/Actor.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/Actor.scala index 49d5e5d809..3d94e7ab04 100644 --- a/akka-actor/src/main/scala/akka/actor/Actor.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/Actor.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.Optional @@ -10,17 +10,18 @@ import scala.annotation.tailrec import scala.beans.BeanProperty import scala.util.control.NoStackTrace -import akka.AkkaException -import akka.annotation.InternalApi -import akka.event.LoggingAdapter -import akka.util.unused +import org.apache.pekko +import pekko.AkkaException +import pekko.annotation.InternalApi +import pekko.event.LoggingAdapter +import pekko.util.unused /** * INTERNAL API * * Marker trait to show which Messages are automatically handled by Akka */ -private[akka] trait AutoReceivedMessage extends Serializable +private[pekko] trait AutoReceivedMessage extends Serializable /** * Marker trait to indicate that a message might be potentially harmful, @@ -64,14 +65,14 @@ case object Kill extends Kill { /** * A message all Actors will understand, that when processed will reply with - * [[akka.actor.ActorIdentity]] containing the `ActorRef`. The `messageId` + * [[pekko.actor.ActorIdentity]] containing the `ActorRef`. The `messageId` * is returned in the `ActorIdentity` message as `correlationId`. */ @SerialVersionUID(1L) final case class Identify(messageId: Any) extends AutoReceivedMessage with NotInfluenceReceiveTimeout /** - * Reply to [[akka.actor.Identify]]. Contains + * Reply to [[pekko.actor.Identify]]. Contains * `Some(ref)` with the `ActorRef` of the actor replying to the request or * `None` if no actor matched the request. * The `correlationId` is taken from the `messageId` in @@ -110,7 +111,7 @@ final case class ActorIdentity(correlationId: Any, ref: Option[ActorRef]) { * that the remote node hosting the watched actor was detected as unreachable */ @SerialVersionUID(1L) -final case class Terminated private[akka] (@BeanProperty actor: ActorRef)( +final case class Terminated private[pekko] (@BeanProperty actor: ActorRef)( @BeanProperty val existenceConfirmed: Boolean, @BeanProperty val addressTerminated: Boolean) extends AutoReceivedMessage @@ -122,13 +123,13 @@ final case class Terminated private[akka] (@BeanProperty actor: ActorRef)( * INTERNAL API * * Used for remote death watch. Failure detector publish this to the - * [[akka.event.AddressTerminatedTopic]] when a remote node is detected to be unreachable and/or decided to + * [[pekko.event.AddressTerminatedTopic]] when a remote node is detected to be unreachable and/or decided to * be removed. - * The watcher ([[akka.actor.dungeon.DeathWatch]]) subscribes to the `AddressTerminatedTopic` - * and translates this event to [[akka.actor.Terminated]], which is sent itself. + * The watcher ([[pekko.actor.dungeon.DeathWatch]]) subscribes to the `AddressTerminatedTopic` + * and translates this event to [[pekko.actor.Terminated]], which is sent itself. */ @SerialVersionUID(1L) -private[akka] final case class AddressTerminated(address: Address) +private[pekko] final case class AddressTerminated(address: Address) extends AutoReceivedMessage with PossiblyHarmful with DeadLetterSuppression @@ -158,13 +159,13 @@ trait NotInfluenceReceiveTimeout * For instance, if you try to create an Actor that doesn't extend Actor. */ @SerialVersionUID(1L) -final case class IllegalActorStateException private[akka] (message: String) extends AkkaException(message) +final case class IllegalActorStateException private[pekko] (message: String) extends AkkaException(message) /** - * ActorKilledException is thrown when an Actor receives the [[akka.actor.Kill]] message + * ActorKilledException is thrown when an Actor receives the [[pekko.actor.Kill]] message */ @SerialVersionUID(1L) -final case class ActorKilledException private[akka] (message: String) extends AkkaException(message) with NoStackTrace +final case class ActorKilledException private[pekko] (message: String) extends AkkaException(message) with NoStackTrace /** * An InvalidActorNameException is thrown when you try to convert something, usually a String, to an Actor name @@ -192,9 +193,9 @@ class ActorInitializationException protected (actor: ActorRef, message: String, object ActorInitializationException { private def enrichedMessage(actor: ActorRef, message: String) = if (actor == null) message else s"${actor.path}: $message" - private[akka] def apply(actor: ActorRef, message: String, cause: Throwable = null): ActorInitializationException = + private[pekko] def apply(actor: ActorRef, message: String, cause: Throwable = null): ActorInitializationException = new ActorInitializationException(actor, message, cause) - private[akka] def apply(message: String): ActorInitializationException = + private[pekko] def apply(message: String): ActorInitializationException = new ActorInitializationException(null, message, null) def unapply(ex: ActorInitializationException): Option[(ActorRef, String, Throwable)] = Some((ex.getActor, ex.getMessage, ex.getCause)) @@ -212,7 +213,7 @@ object ActorInitializationException { * @param messageOption is the message which was optionally passed into preRestart() */ @SerialVersionUID(1L) -final case class PreRestartException private[akka] ( +final case class PreRestartException private[pekko] ( actor: ActorRef, cause: Throwable, originalCause: Throwable, @@ -234,7 +235,7 @@ final case class PreRestartException private[akka] ( * @param originalCause is the exception which caused the restart in the first place */ @SerialVersionUID(1L) -final case class PostRestartException private[akka] (actor: ActorRef, cause: Throwable, originalCause: Throwable) +final case class PostRestartException private[pekko] (actor: ActorRef, cause: Throwable, originalCause: Throwable) extends ActorInitializationException( actor, "exception post restart (" + (if (originalCause == null) "null" else originalCause.getClass) + ")", @@ -242,7 +243,7 @@ final case class PostRestartException private[akka] (actor: ActorRef, cause: Thr /** * This is an extractor for retrieving the original cause (i.e. the first - * failure) from a [[akka.actor.PostRestartException]]. In the face of multiple + * failure) from a [[pekko.actor.PostRestartException]]. In the face of multiple * “nested” restarts it will walk the origCause-links until it arrives at a * non-PostRestartException type. */ @@ -262,14 +263,14 @@ object OriginalRestartException { * Currently only `null` is an invalid message. */ @SerialVersionUID(1L) -final case class InvalidMessageException private[akka] (message: String) extends AkkaException(message) +final case class InvalidMessageException private[pekko] (message: String) extends AkkaException(message) /** * A DeathPactException is thrown by an Actor that receives a Terminated(someActor) message * that it doesn't handle itself, effectively crashing the Actor and escalating to the supervisor. */ @SerialVersionUID(1L) -final case class DeathPactException private[akka] (dead: ActorRef) +final case class DeathPactException private[pekko] (dead: ActorRef) extends AkkaException("Monitored actor [" + dead + "] terminated") with NoStackTrace @@ -278,7 +279,7 @@ final case class DeathPactException private[akka] (dead: ActorRef) * avoid cascading interrupts to other threads than the originally interrupted one. */ @SerialVersionUID(1L) -class ActorInterruptedException private[akka] (cause: Throwable) extends AkkaException(cause.getMessage, cause) +class ActorInterruptedException private[pekko] (cause: Throwable) extends AkkaException(cause.getMessage, cause) /** * This message is published to the EventStream whenever an Actor receives a message it doesn't understand @@ -293,7 +294,7 @@ final case class UnhandledMessage( with AllDeadLetters /** - * Superseeded by [[akka.pattern.StatusReply]], prefer that when possible. + * Superseeded by [[pekko.pattern.StatusReply]], prefer that when possible. * * Classes for passing status back to the sender. * Used for internal ACKing protocol. But exposed as utility class for user-specific ACKing protocols as well. @@ -333,7 +334,7 @@ trait ActorLogging { this: Actor => def log: LoggingAdapter = { // only used in Actor, i.e. thread safe if (_log eq null) - _log = akka.event.Logging(context.system, this) + _log = pekko.event.Logging(context.system, this) _log } @@ -358,11 +359,11 @@ trait ActorLogging { this: Actor => * }}} */ trait DiagnosticActorLogging extends Actor { - import akka.event.Logging._ - val log = akka.event.Logging(this) + import pekko.event.Logging._ + val log = pekko.event.Logging(this) def mdc(@unused currentMessage: Any): MDC = emptyMDC - override protected[akka] def aroundReceive(receive: Actor.Receive, msg: Any): Unit = + override protected[pekko] def aroundReceive(receive: Actor.Receive, msg: Any): Unit = try { log.mdc(mdc(msg)) super.aroundReceive(receive, msg) @@ -424,13 +425,13 @@ object Actor { * - ''RUNNING'' (created and started actor) - can receive messages * - ''SHUTDOWN'' (when 'stop' is invoked) - can't do anything * - * The Actor's own [[akka.actor.ActorRef]] is available as `self`, the current - * message’s sender as `sender()` and the [[akka.actor.ActorContext]] as + * The Actor's own [[pekko.actor.ActorRef]] is available as `self`, the current + * message’s sender as `sender()` and the [[pekko.actor.ActorContext]] as * `context`. The only abstract method is `receive` which shall return the * initial behavior of the actor as a partial function (behavior can be changed * using `context.become` and `context.unbecome`). * - * This is the Scala API (hence the Scala code below), for the Java API see [[akka.actor.AbstractActor]]. + * This is the Scala API (hence the Scala code below), for the Java API see [[pekko.actor.AbstractActor]]. * * {{{ * class ExampleActor extends Actor { @@ -480,8 +481,8 @@ trait Actor { * WARNING: Only valid within the Actor itself, so do not close over it and * publish it to other threads! * - * [[akka.actor.ActorContext]] is the Scala API. `getContext` returns a - * [[akka.actor.AbstractActor.ActorContext]], which is the Java API of the actor + * [[pekko.actor.ActorContext]] is the Scala API. `getContext` returns a + * [[pekko.actor.AbstractActor.ActorContext]], which is the Java API of the actor * context. */ implicit val context: ActorContext = { @@ -508,7 +509,7 @@ trait Actor { /** * The reference sender Actor of the last received message. * Is defined if the message was sent from another Actor, - * else `deadLetters` in [[akka.actor.ActorSystem]]. + * else `deadLetters` in [[pekko.actor.ActorSystem]]. * * WARNING: Only valid within the Actor itself, so do not close over it and * publish it to other threads! @@ -532,7 +533,7 @@ trait Actor { * @param msg current message. */ @InternalApi - protected[akka] def aroundReceive(receive: Actor.Receive, msg: Any): Unit = { + protected[pekko] def aroundReceive(receive: Actor.Receive, msg: Any): Unit = { // optimization: avoid allocation of lambda if (receive.applyOrElse(msg, Actor.notHandledFun).asInstanceOf[AnyRef] eq Actor.NotHandled) { unhandled(msg) @@ -545,7 +546,7 @@ trait Actor { * Can be overridden to intercept calls to `preStart`. Calls `preStart` by default. */ @InternalApi - protected[akka] def aroundPreStart(): Unit = preStart() + protected[pekko] def aroundPreStart(): Unit = preStart() /** * INTERNAL API. @@ -553,7 +554,7 @@ trait Actor { * Can be overridden to intercept calls to `postStop`. Calls `postStop` by default. */ @InternalApi - protected[akka] def aroundPostStop(): Unit = postStop() + protected[pekko] def aroundPostStop(): Unit = postStop() /** * INTERNAL API. @@ -561,7 +562,7 @@ trait Actor { * Can be overridden to intercept calls to `preRestart`. Calls `preRestart` by default. */ @InternalApi - protected[akka] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = preRestart(reason, message) + protected[pekko] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = preRestart(reason, message) /** * INTERNAL API. @@ -569,7 +570,7 @@ trait Actor { * Can be overridden to intercept calls to `postRestart`. Calls `postRestart` by default. */ @InternalApi - protected[akka] def aroundPostRestart(reason: Throwable): Unit = postRestart(reason) + protected[pekko] def aroundPostRestart(reason: Throwable): Unit = postRestart(reason) /** * User overridable definition the strategy to use for supervising @@ -639,9 +640,9 @@ trait Actor { * User overridable callback. *

* Is called when a message isn't handled by the current behavior of the actor - * by default it fails with either a [[akka.actor.DeathPactException]] (in - * case of an unhandled [[akka.actor.Terminated]] message) or publishes an [[akka.actor.UnhandledMessage]] - * to the actor's system's [[akka.event.EventStream]] + * by default it fails with either a [[pekko.actor.DeathPactException]] (in + * case of an unhandled [[pekko.actor.Terminated]] message) or publishes an [[pekko.actor.UnhandledMessage]] + * to the actor's system's [[pekko.event.EventStream]] */ def unhandled(message: Any): Unit = { message match { diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala similarity index 97% rename from akka-actor/src/main/scala/akka/actor/ActorCell.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala index de0ca9c047..b302969029 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.io.{ NotSerializableException, ObjectOutputStream } import java.util.concurrent.ThreadLocalRandom @@ -14,19 +14,20 @@ import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration.Duration import scala.util.control.NonFatal -import akka.actor.dungeon.ChildrenContainer -import akka.annotation.{ InternalApi, InternalStableApi } -import akka.dispatch.{ Envelope, MessageDispatcher } -import akka.dispatch.sysmsg._ -import akka.event.Logging.{ Debug, Error, LogEvent } -import akka.japi.Procedure -import akka.util.unused +import org.apache.pekko +import pekko.actor.dungeon.ChildrenContainer +import pekko.annotation.{ InternalApi, InternalStableApi } +import pekko.dispatch.{ Envelope, MessageDispatcher } +import pekko.dispatch.sysmsg._ +import pekko.event.Logging.{ Debug, Error, LogEvent } +import pekko.japi.Procedure +import pekko.util.unused /** * The actor context - the view of the actor cell from the actor. * Exposes contextual information for the actor and the current message. * - * There are several possibilities for creating actors (see [[akka.actor.Props]] + * There are several possibilities for creating actors (see [[pekko.actor.Props]] * for details on `props`): * * {{{ @@ -65,7 +66,7 @@ trait ActorContext extends ActorRefFactory with ClassicActorContextProvider { /** * Gets the current receive timeout. - * When specified, the receive method should be able to handle a [[akka.actor.ReceiveTimeout]] message. + * When specified, the receive method should be able to handle a [[pekko.actor.ReceiveTimeout]] message. * * *Warning*: This method is not thread-safe and must not be accessed from threads other * than the ordinary actor message processing thread, such as [[java.util.concurrent.CompletionStage]] and [[scala.concurrent.Future]] callbacks. @@ -73,8 +74,8 @@ trait ActorContext extends ActorRefFactory with ClassicActorContextProvider { def receiveTimeout: Duration /** - * Defines the inactivity timeout after which the sending of a [[akka.actor.ReceiveTimeout]] message is triggered. - * When specified, the receive function should be able to handle a [[akka.actor.ReceiveTimeout]] message. + * Defines the inactivity timeout after which the sending of a [[pekko.actor.ReceiveTimeout]] message is triggered. + * When specified, the receive function should be able to handle a [[pekko.actor.ReceiveTimeout]] message. * 1 millisecond is the minimum supported timeout. * * Please note that the receive timeout might fire and enqueue the `ReceiveTimeout` message right after @@ -238,7 +239,7 @@ trait ActorContext extends ActorRefFactory with ClassicActorContextProvider { * INTERNAL API */ @InternalApi -private[akka] trait Cell { +private[pekko] trait Cell { /** * The “self” reference which this Cell is attached to. @@ -285,7 +286,7 @@ private[akka] trait Cell { * Returns “true” if the actor is locally known to be terminated, “false” if * alive or uncertain. */ - private[akka] def isTerminated: Boolean + private[pekko] def isTerminated: Boolean /** * The supervisor of this actor. @@ -361,7 +362,7 @@ private[akka] trait Cell { * supported APIs in this place. This is not the API you were looking * for! (waves hand) */ -private[akka] object ActorCell { +private[pekko] object ActorCell { val contextStack = new ThreadLocal[List[ActorContext]] { override def initialValue: List[ActorContext] = Nil } @@ -407,7 +408,7 @@ private[akka] object ActorCell { * for! (waves hand) */ @nowarn("msg=deprecated") -private[akka] class ActorCell( +private[pekko] class ActorCell( val system: ActorSystemImpl, val self: InternalActorRef, _initialProps: Props, diff --git a/akka-actor/src/main/scala/akka/actor/ActorLogMarker.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala similarity index 85% rename from akka-actor/src/main/scala/akka/actor/ActorLogMarker.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala index 7600f64867..d8c0cde5b4 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorLogMarker.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala @@ -2,10 +2,11 @@ * Copyright (C) 2019-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor -import akka.annotation.ApiMayChange -import akka.event.LogMarker +import org.apache.pekko +import pekko.annotation.ApiMayChange +import pekko.event.LogMarker /** * This is public with the purpose to document the used markers and properties of log events. diff --git a/akka-actor/src/main/scala/akka/actor/ActorPath.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala similarity index 96% rename from akka-actor/src/main/scala/akka/actor/ActorPath.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala index 49a2b5ebea..8da83af623 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorPath.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.lang.{ StringBuilder => JStringBuilder } import java.net.MalformedURLException @@ -11,7 +11,8 @@ import scala.collection.immutable import scala.annotation.nowarn -import akka.japi.Util.immutableSeq +import org.apache.pekko +import pekko.japi.Util.immutableSeq /** * Java API @@ -137,7 +138,7 @@ object ActorPath { if (len > 0 && s.charAt(0) != '$') validate(0) else 0 } - private[akka] final val emptyActorPath: immutable.Iterable[String] = List("") + private[pekko] final val emptyActorPath: immutable.Iterable[String] = List("") } /** @@ -251,13 +252,13 @@ sealed trait ActorPath extends Comparable[ActorPath] with Serializable { * Unique identifier of the actor. Used for distinguishing * different incarnations of actors with same path (name elements). */ - private[akka] def uid: Int + private[pekko] def uid: Int /** * INTERNAL API * Creates a new ActorPath with same elements but with the specified `uid`. */ - private[akka] def withUid(uid: Int): ActorPath + private[pekko] def withUid(uid: Int): ActorPath } @@ -303,19 +304,20 @@ final case class RootActorPath(address: Address, name: String = "/") extends Act /** * INTERNAL API */ - private[akka] def uid: Int = ActorCell.undefinedUid + private[pekko] def uid: Int = ActorCell.undefinedUid /** * INTERNAL API */ - override private[akka] def withUid(uid: Int): ActorPath = + override private[pekko] def withUid(uid: Int): ActorPath = if (uid == ActorCell.undefinedUid) this else throw new IllegalStateException(s"RootActorPath must have undefinedUid, [$uid != ${ActorCell.undefinedUid}") } @SerialVersionUID(1L) -final class ChildActorPath private[akka] (val parent: ActorPath, val name: String, override private[akka] val uid: Int) +final class ChildActorPath private[pekko] (val parent: ActorPath, val name: String, + override private[pekko] val uid: Int) extends ActorPath { if (name.indexOf('/') != -1) throw new IllegalArgumentException("/ is a path separator and is not legal in ActorPath names: [%s]".format(name)) @@ -351,7 +353,7 @@ final class ChildActorPath private[akka] (val parent: ActorPath, val name: Strin /** * INTERNAL API */ - override private[akka] def withUid(uid: Int): ActorPath = + override private[pekko] def withUid(uid: Int): ActorPath = if (uid == this.uid) this else new ChildActorPath(parent, name, uid) @@ -456,7 +458,7 @@ final class ChildActorPath private[akka] (val parent: ActorPath, val name: Strin // TODO RK investigate Phil’s hash from scala.collection.mutable.HashTable.improve override def hashCode: Int = { - import akka.routing.MurmurHash._ + import pekko.routing.MurmurHash._ @tailrec def rec(p: ActorPath, h: Int, c: Int, k: Int): Int = p match { diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala similarity index 91% rename from akka-actor/src/main/scala/akka/actor/ActorRef.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala index 6e7b49526d..9344c827d8 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.ConcurrentHashMap @@ -11,18 +11,19 @@ import scala.annotation.nowarn import scala.collection.immutable import scala.util.control.NonFatal -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi -import akka.dispatch._ -import akka.dispatch.sysmsg._ -import akka.event.AddressTerminatedTopic -import akka.event.EventStream -import akka.event.Logging -import akka.event.MarkerLoggingAdapter -import akka.pattern.PromiseActorRef -import akka.serialization.JavaSerializer -import akka.serialization.Serialization -import akka.util.OptionVal +import org.apache.pekko +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi +import pekko.dispatch._ +import pekko.dispatch.sysmsg._ +import pekko.event.AddressTerminatedTopic +import pekko.event.EventStream +import pekko.event.Logging +import pekko.event.MarkerLoggingAdapter +import pekko.pattern.PromiseActorRef +import pekko.serialization.JavaSerializer +import pekko.serialization.Serialization +import pekko.util.OptionVal object ActorRef { @@ -36,9 +37,9 @@ object ActorRef { /** * Immutable and serializable handle to an actor, which may or may not reside - * on the local host or inside the same [[akka.actor.ActorSystem]]. An ActorRef - * can be obtained from an [[akka.actor.ActorRefFactory]], an interface which - * is implemented by ActorSystem and [[akka.actor.ActorContext]]. This means + * on the local host or inside the same [[pekko.actor.ActorSystem]]. An ActorRef + * can be obtained from an [[pekko.actor.ActorRefFactory]], an interface which + * is implemented by ActorSystem and [[pekko.actor.ActorContext]]. This means * actors can be created top-level in the ActorSystem or as children of an * existing actor, but only from within that actor. * @@ -48,7 +49,7 @@ object ActorRef { * * Scala: * {{{ - * import akka.pattern.ask + * import org.apache.pekko.pattern.ask * import scala.concurrent.Await * * class ExampleActor extends Actor { @@ -68,8 +69,8 @@ object ActorRef { * * Java: * {{{ - * import static akka.pattern.Patterns.ask; - * import static akka.pattern.Patterns.pipe; + * import static org.apache.pekko.pattern.Patterns.ask; + * import static org.apache.pekko.pattern.Patterns.pipe; * * public class ExampleActor extends AbstractActor { * // this child will be destroyed and re-created upon restart by default @@ -93,7 +94,7 @@ object ActorRef { * }}} * * ActorRef does not have a method for terminating the actor it points to, use - * [[akka.actor.ActorRefFactory]]`.stop(ref)`, or send a [[akka.actor.PoisonPill]], + * [[pekko.actor.ActorRefFactory]]`.stop(ref)`, or send a [[pekko.actor.PoisonPill]], * for this purpose. * * Two actor references are compared equal when they have the same path and point to @@ -126,7 +127,7 @@ abstract class ActorRef extends java.lang.Comparable[ActorRef] with Serializable * Sends the specified message to this ActorRef, i.e. fire-and-forget * semantics, including the sender reference if possible. * - * Pass [[akka.actor.ActorRef]] `noSender` or `null` as sender if there is nobody to reply to + * Pass [[pekko.actor.ActorRef]] `noSender` or `null` as sender if there is nobody to reply to */ final def tell(msg: Any, sender: ActorRef): Unit = this.!(msg)(sender) @@ -160,7 +161,7 @@ abstract class ActorRef extends java.lang.Comparable[ActorRef] with Serializable * But you cannot rely on that it is alive if it returns false, since this by nature is a racy method. */ @InternalApi - private[akka] def isTerminated: Boolean + private[pekko] def isTerminated: Boolean final override def hashCode: Int = { if (path.uid == ActorCell.undefinedUid) path.hashCode @@ -210,14 +211,14 @@ trait ScalaActorRef { ref: ActorRef with InternalActorRef with ActorRefScope => * often necessary to distinguish between local and non-local references, this * is the only method provided on the scope. */ -private[akka] trait ActorRefScope { +private[pekko] trait ActorRefScope { def isLocal: Boolean } /** * Refs which are statically known to be local inherit from this Scope */ -private[akka] trait LocalRef extends ActorRefScope { +private[pekko] trait LocalRef extends ActorRefScope { final def isLocal = true } @@ -228,14 +229,14 @@ private[akka] trait LocalRef extends ActorRefScope { * which is why `isStarted` features here; it is not improbable that cluster * actor refs will have the same behavior. */ -private[akka] trait RepointableRef extends ActorRefScope { +private[pekko] trait RepointableRef extends ActorRefScope { def isStarted: Boolean } /** * INTERNAL API */ -@InternalApi private[akka] object InternalActorRef { +@InternalApi private[pekko] object InternalActorRef { def isTemporaryRef(ref: ActorRef): Boolean = ref match { case i: InternalActorRef => @@ -254,7 +255,7 @@ private[akka] trait RepointableRef extends ActorRefScope { * DO NOT USE THIS UNLESS INTERNALLY WITHIN AKKA! */ @nowarn("msg=deprecated") -@InternalApi private[akka] abstract class InternalActorRef extends ActorRef with ScalaActorRef { this: ActorRefScope => +@InternalApi private[pekko] abstract class InternalActorRef extends ActorRef with ScalaActorRef { this: ActorRefScope => /* * Actor life-cycle management, invoked only internally (in response to user requests via ActorContext). */ @@ -296,7 +297,7 @@ private[akka] trait RepointableRef extends ActorRefScope { * alive or uncertain. */ @InternalApi - private[akka] def isTerminated: Boolean + private[pekko] def isTerminated: Boolean } /** @@ -305,7 +306,7 @@ private[akka] trait RepointableRef extends ActorRefScope { * type of `underlying` so that follow-up calls can use invokevirtual instead * of invokeinterface. */ -private[akka] abstract class ActorRefWithCell extends InternalActorRef { this: ActorRefScope => +private[pekko] abstract class ActorRefWithCell extends InternalActorRef { this: ActorRefScope => def underlying: Cell def children: immutable.Iterable[ActorRef] def getSingleChild(name: String): InternalActorRef @@ -314,7 +315,7 @@ private[akka] abstract class ActorRefWithCell extends InternalActorRef { this: A /** * This is an internal look-up failure token, not useful for anything else. */ -private[akka] case object Nobody extends MinimalActorRef { +private[pekko] case object Nobody extends MinimalActorRef { override val path: RootActorPath = new RootActorPath(Address("akka", "all-systems"), "/Nobody") override def provider = throw new UnsupportedOperationException("Nobody does not provide") @@ -327,7 +328,7 @@ private[akka] case object Nobody extends MinimalActorRef { /** * INTERNAL API */ -@SerialVersionUID(1L) private[akka] class SerializedNobody extends Serializable { +@SerialVersionUID(1L) private[pekko] class SerializedNobody extends Serializable { @throws(classOf[java.io.ObjectStreamException]) private def readResolve(): AnyRef = Nobody } @@ -337,7 +338,7 @@ private[akka] case object Nobody extends MinimalActorRef { * * INTERNAL API */ -private[akka] class LocalActorRef private[akka] ( +private[pekko] class LocalActorRef private[pekko] ( _system: ActorSystemImpl, _props: Props, _dispatcher: MessageDispatcher, @@ -376,7 +377,7 @@ private[akka] class LocalActorRef private[akka] ( * returns false, you cannot be sure if it's alive still (race condition) */ @InternalApi - override private[akka] def isTerminated: Boolean = actorCell.isTerminated + override private[pekko] def isTerminated: Boolean = actorCell.isTerminated /** * Starts the actor after initialization. @@ -458,8 +459,8 @@ private[akka] class LocalActorRef private[akka] ( * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class SerializedActorRef private (path: String) { - import akka.serialization.JavaSerializer.currentSystem +private[pekko] final case class SerializedActorRef private (path: String) { + import pekko.serialization.JavaSerializer.currentSystem def this(actorRef: ActorRef) = { this(Serialization.serializedActorPath(actorRef)) @@ -470,7 +471,7 @@ private[akka] final case class SerializedActorRef private (path: String) { case null => throw new IllegalStateException( "Trying to deserialize a serialized ActorRef without an ActorSystem in scope." + - " Use 'akka.serialization.JavaSerializer.currentSystem.withValue(system) { ... }'") + " Use 'org.apache.pekko.serialization.JavaSerializer.currentSystem.withValue(system) { ... }'") case someSystem => someSystem.provider.resolveActorRef(path) } @@ -479,7 +480,7 @@ private[akka] final case class SerializedActorRef private (path: String) { /** * INTERNAL API */ -private[akka] object SerializedActorRef { +private[pekko] object SerializedActorRef { def apply(actorRef: ActorRef): SerializedActorRef = { new SerializedActorRef(actorRef) } @@ -490,7 +491,7 @@ private[akka] object SerializedActorRef { * * INTERNAL API */ -private[akka] trait MinimalActorRef extends InternalActorRef with LocalRef { +private[pekko] trait MinimalActorRef extends InternalActorRef with LocalRef { override def getParent: InternalActorRef = Nobody override def getChild(names: Iterator[String]): InternalActorRef = if (names.forall(_.isEmpty)) this else Nobody @@ -500,7 +501,7 @@ private[akka] trait MinimalActorRef extends InternalActorRef with LocalRef { override def resume(causedByFailure: Throwable): Unit = () override def stop(): Unit = () - override private[akka] def isTerminated = false + override private[pekko] def isTerminated = false override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = () @@ -516,7 +517,8 @@ private[akka] trait MinimalActorRef extends InternalActorRef with LocalRef { * * INTERNAL API */ -@InternalApi private[akka] final class IgnoreActorRef(override val provider: ActorRefProvider) extends MinimalActorRef { +@InternalApi private[pekko] final class IgnoreActorRef( + override val provider: ActorRefProvider) extends MinimalActorRef { override val path: ActorPath = IgnoreActorRef.path @@ -527,7 +529,7 @@ private[akka] trait MinimalActorRef extends InternalActorRef with LocalRef { /** * INTERNAL API */ -@InternalApi private[akka] object IgnoreActorRef { +@InternalApi private[pekko] object IgnoreActorRef { private val fakeSystemName = "local" @@ -553,7 +555,7 @@ private[akka] trait MinimalActorRef extends InternalActorRef with LocalRef { /** * INTERNAL API */ -@InternalApi @SerialVersionUID(1L) private[akka] object SerializedIgnore extends Serializable { +@InternalApi @SerialVersionUID(1L) private[pekko] object SerializedIgnore extends Serializable { @throws(classOf[java.io.ObjectStreamException]) private def readResolve(): AnyRef = IgnoreActorRef } @@ -603,7 +605,7 @@ final case class SuppressedDeadLetter(message: DeadLetterSuppression, sender: Ac } /** - * Envelope that is published on the eventStream wrapped in [[akka.actor.DeadLetter]] for every message that is + * Envelope that is published on the eventStream wrapped in [[pekko.actor.DeadLetter]] for every message that is * dropped due to overfull queues or routers with no routees. * * When this message was sent without a sender [[ActorRef]], `sender` will be `ActorRef.noSender`, i.e. `null`. @@ -641,7 +643,7 @@ trait WrappedMessage { def message: Any } -private[akka] object DeadLetterActorRef { +private[pekko] object DeadLetterActorRef { @SerialVersionUID(1L) class SerializedDeadLetterActorRef extends Serializable { // TODO implement as Protobuf for performance? @throws(classOf[java.io.ObjectStreamException]) @@ -657,13 +659,13 @@ private[akka] object DeadLetterActorRef { * * INTERNAL API */ -private[akka] class EmptyLocalActorRef( +private[pekko] class EmptyLocalActorRef( override val provider: ActorRefProvider, override val path: ActorPath, val eventStream: EventStream) extends MinimalActorRef { - override private[akka] def isTerminated = true + override private[pekko] def isTerminated = true override def sendSystemMessage(message: SystemMessage): Unit = { if (Mailbox.debug) println(s"ELAR $path having enqueued $message") @@ -715,11 +717,11 @@ private[akka] class EmptyLocalActorRef( /** * Internal implementation of the dead letter destination: will publish any - * received message to the eventStream, wrapped as [[akka.actor.DeadLetter]]. + * received message to the eventStream, wrapped as [[pekko.actor.DeadLetter]]. * * INTERNAL API */ -private[akka] class DeadLetterActorRef(_provider: ActorRefProvider, _path: ActorPath, _eventStream: EventStream) +private[pekko] class DeadLetterActorRef(_provider: ActorRefProvider, _path: ActorPath, _eventStream: EventStream) extends EmptyLocalActorRef(_provider, _path, _eventStream) { override def !(message: Any)(implicit sender: ActorRef = this): Unit = message match { @@ -749,7 +751,7 @@ private[akka] class DeadLetterActorRef(_provider: ActorRefProvider, _path: Actor * * INTERNAL API */ -private[akka] class VirtualPathContainer( +private[pekko] class VirtualPathContainer( override val provider: ActorRefProvider, override val path: ActorPath, override val getParent: InternalActorRef, @@ -847,7 +849,7 @@ private[akka] class VirtualPathContainer( /** * INTERNAL API */ -@InternalApi private[akka] object FunctionRef { +@InternalApi private[pekko] object FunctionRef { def deadLetterMessageHandler(system: ActorSystem): (ActorRef, Any) => Unit = { (sender, msg) => // avoid infinite loop (StackOverflow) if FunctionRef is used for subscribing to DeadLetter from eventStream if (!msg.isInstanceOf[DeadLetter]) @@ -872,7 +874,7 @@ private[akka] class VirtualPathContainer( * [[FunctionRef#unwatch]] must be called to avoid a resource leak, which is different * from an ordinary actor. */ -@InternalApi private[akka] final class FunctionRef( +@InternalApi private[pekko] final class FunctionRef( override val path: ActorPath, override val provider: ActorRefProvider, system: ActorSystem, @@ -910,7 +912,7 @@ private[akka] class VirtualPathContainer( * INTERNAL API */ @InternalApi - override private[akka] def isTerminated: Boolean = _watchedBy.isEmpty + override private[pekko] def isTerminated: Boolean = _watchedBy.isEmpty // noinspection EmptyCheck protected def sendTerminated(): Unit = { diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala similarity index 92% rename from akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala index 1b4141ab75..cb286bbdd5 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.atomic.AtomicLong @@ -10,18 +10,19 @@ import scala.annotation.implicitNotFound import scala.concurrent.{ ExecutionContextExecutor, Future, Promise } import scala.util.control.NonFatal -import akka.ConfigurationException -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi -import akka.dispatch.{ Mailboxes, RequiresMessageQueue, UnboundedMessageQueueSemantics } -import akka.dispatch.Dispatchers -import akka.dispatch.sysmsg._ -import akka.event._ -import akka.routing._ -import akka.serialization.Serialization -import akka.util.Collections.EmptyImmutableSeq -import akka.util.Helpers -import akka.util.OptionVal +import org.apache.pekko +import pekko.ConfigurationException +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi +import pekko.dispatch.{ Mailboxes, RequiresMessageQueue, UnboundedMessageQueueSemantics } +import pekko.dispatch.Dispatchers +import pekko.dispatch.sysmsg._ +import pekko.event._ +import pekko.routing._ +import pekko.serialization.Serialization +import pekko.util.Collections.EmptyImmutableSeq +import pekko.util.Helpers +import pekko.util.OptionVal /** * Interface for all ActorRef providers to implement. @@ -59,7 +60,7 @@ import akka.util.OptionVal def deadLetters: ActorRef /** INTERNAL API */ - @InternalApi private[akka] def ignoreRef: ActorRef + @InternalApi private[pekko] def ignoreRef: ActorRef /** * The root path for all actors within this actor system, not including any remote address information. @@ -77,7 +78,7 @@ import akka.util.OptionVal * and then—when the ActorSystem is constructed—the second phase during * which actors may be created (e.g. the guardians). */ - private[akka] def init(system: ActorSystemImpl): Unit + private[pekko] def init(system: ActorSystemImpl): Unit /** * The Deployer associated with this ActorRefProvider @@ -102,7 +103,7 @@ import akka.util.OptionVal /** * INTERNAL API: Registers an actorRef at a path returned by tempPath(); do NOT pass in any other path. */ - private[akka] def registerTempActor(actorRef: InternalActorRef, path: ActorPath): Unit + private[pekko] def registerTempActor(actorRef: InternalActorRef, path: ActorPath): Unit /** * Unregister a temporary actor from the “/temp” path (i.e. obtained from tempPath()); do NOT pass in any other path. @@ -118,7 +119,7 @@ import akka.util.OptionVal * but it should be overridable from external configuration; the lookup of * the latter can be suppressed by setting ``lookupDeploy`` to ``false``. */ - private[akka] def actorOf( + private[pekko] def actorOf( system: ActorSystemImpl, props: Props, supervisor: InternalActorRef, @@ -160,13 +161,13 @@ import akka.util.OptionVal def getDefaultAddress: Address /** INTERNAL API */ - @InternalApi private[akka] def serializationInformation: Serialization.Information + @InternalApi private[pekko] def serializationInformation: Serialization.Information /** * INTERNAL API */ @InternalApi - private[akka] def addressString: String + private[pekko] def addressString: String } @@ -210,9 +211,9 @@ trait ActorRefFactory { * generated name (currently similar to base64-encoded integer count, * reversed and with “$” prepended, may change in the future). * - * See [[akka.actor.Props]] for details on how to obtain a `Props` object. + * See [[pekko.actor.Props]] for details on how to obtain a `Props` object. * - * @throws akka.ConfigurationException if deployment, dispatcher + * @throws pekko.ConfigurationException if deployment, dispatcher * or mailbox configuration is wrong * @throws UnsupportedOperationException if invoked on an ActorSystem that * uses a custom user guardian @@ -224,11 +225,11 @@ trait ActorRefFactory { * not be null, empty or start with “$”. If the given name is already in use, * an `InvalidActorNameException` is thrown. * - * See [[akka.actor.Props]] for details on how to obtain a `Props` object. + * See [[pekko.actor.Props]] for details on how to obtain a `Props` object. * - * @throws akka.actor.InvalidActorNameException if the given name is + * @throws pekko.actor.InvalidActorNameException if the given name is * invalid or already in use - * @throws akka.ConfigurationException if deployment, dispatcher + * @throws pekko.ConfigurationException if deployment, dispatcher * or mailbox configuration is wrong * @throws UnsupportedOperationException if invoked on an ActorSystem that * uses a custom user guardian @@ -236,7 +237,7 @@ trait ActorRefFactory { def actorOf(props: Props, name: String): ActorRef /** - * Construct an [[akka.actor.ActorSelection]] from the given path, which is + * Construct an [[pekko.actor.ActorSelection]] from the given path, which is * parsed for wildcards (these are replaced by regular expressions * internally). No attempt is made to verify the existence of any part of * the supplied path, it is recommended to send a message and gather the @@ -254,7 +255,7 @@ trait ActorRefFactory { } /** - * Construct an [[akka.actor.ActorSelection]] from the given path, which is + * Construct an [[pekko.actor.ActorSelection]] from the given path, which is * parsed for wildcards (these are replaced by regular expressions * internally). No attempt is made to verify the existence of any part of * the supplied path, it is recommended to send a message and gather the @@ -264,7 +265,7 @@ trait ActorRefFactory { ActorSelection(provider.rootGuardianAt(path.address), path.elements) /** - * Stop the actor pointed to by the given [[akka.actor.ActorRef]]; this is + * Stop the actor pointed to by the given [[pekko.actor.ActorRef]]; this is * an asynchronous operation, i.e. involves a message send. * If this method is applied to the `self` reference from inside an Actor * then that Actor is guaranteed to not process any further messages after @@ -277,12 +278,12 @@ trait ActorRefFactory { /** * Internal Akka use only, used in implementation of system.stop(child). */ -private[akka] final case class StopChild(child: ActorRef) +private[pekko] final case class StopChild(child: ActorRef) /** * INTERNAL API */ -private[akka] object SystemGuardian { +private[pekko] object SystemGuardian { /** * For the purpose of orderly shutdown it's possible @@ -297,7 +298,7 @@ private[akka] object SystemGuardian { case object TerminationHookDone } -private[akka] object LocalActorRefProvider { +private[pekko] object LocalActorRefProvider { /* * Root and user guardian @@ -321,7 +322,7 @@ private[akka] object LocalActorRefProvider { private class SystemGuardian(override val supervisorStrategy: SupervisorStrategy, val guardian: ActorRef) extends Actor with RequiresMessageQueue[UnboundedMessageQueueSemantics] { - import akka.actor.SystemGuardian._ + import pekko.actor.SystemGuardian._ var terminationHooks = Set.empty[ActorRef] @@ -372,7 +373,7 @@ private[akka] object LocalActorRefProvider { * * Depending on this class is not supported, only the [[ActorRefProvider]] interface is supported. */ -private[akka] class LocalActorRefProvider private[akka] ( +private[pekko] class LocalActorRefProvider private[pekko] ( _systemName: String, override val settings: ActorSystem.Settings, val eventStream: EventStream, @@ -391,14 +392,14 @@ private[akka] class LocalActorRefProvider private[akka] ( override val rootPath: ActorPath = RootActorPath(Address("akka", _systemName)) - private[akka] val log: MarkerLoggingAdapter = + private[pekko] val log: MarkerLoggingAdapter = Logging.withMarker(eventStream, classOf[LocalActorRefProvider]) /* * This dedicated logger is used whenever a deserialization failure occurs * and can therefore be disabled/enabled independently */ - private[akka] val logDeser: MarkerLoggingAdapter = + private[pekko] val logDeser: MarkerLoggingAdapter = Logging.withMarker(eventStream, getClass.getName + ".Deserialization") override val deadLetters: InternalActorRef = @@ -435,7 +436,7 @@ private[akka] class LocalActorRefProvider private[akka] ( * Top-level anchor for the supervision hierarchy of this actor system. Will * receive only Supervise/ChildTerminated system messages or Failure message. */ - private[akka] val theOneWhoWalksTheBubblesOfSpaceTime: InternalActorRef = new MinimalActorRef { + private[pekko] val theOneWhoWalksTheBubblesOfSpaceTime: InternalActorRef = new MinimalActorRef { val causeOfTermination: Promise[Terminated] = Promise[Terminated]() val path = rootPath / "bubble-walker" @@ -454,7 +455,7 @@ private[akka] class LocalActorRefProvider private[akka] ( * INTERNAL API */ @InternalApi - override private[akka] def isTerminated: Boolean = !isWalking + override private[pekko] def isTerminated: Boolean = !isWalking override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = if (isWalking) @@ -600,7 +601,7 @@ private[akka] class LocalActorRefProvider private[akka] ( tempContainer.removeChild(path.name) } - private[akka] def init(_system: ActorSystemImpl): Unit = { + private[pekko] def init(_system: ActorSystemImpl): Unit = { system = _system rootGuardian.start() // chain death watchers so that killing guardian stops the application @@ -630,7 +631,7 @@ private[akka] class LocalActorRefProvider private[akka] ( /** * INTERNAL API */ - private[akka] def resolveActorRef(ref: InternalActorRef, pathElements: Iterable[String]): InternalActorRef = + private[pekko] def resolveActorRef(ref: InternalActorRef, pathElements: Iterable[String]): InternalActorRef = if (pathElements.isEmpty) { logDeser.debug("Resolve (deserialization) of empty path doesn't match an active actor, using deadLetters.") deadLetters @@ -752,7 +753,7 @@ private[akka] class LocalActorRefProvider private[akka] ( // no need for volatile, only intended as cached value, not necessarily a singleton value private var serializationInformationCache: OptionVal[Serialization.Information] = OptionVal.None - @InternalApi override private[akka] def serializationInformation: Serialization.Information = { + @InternalApi override private[pekko] def serializationInformation: Serialization.Information = { Serialization.Information(getDefaultAddress, system) serializationInformationCache match { case OptionVal.Some(info) => info @@ -770,7 +771,7 @@ private[akka] class LocalActorRefProvider private[akka] ( // lazily initialized with fallback since it can depend on transport which is not initialized up front // worth caching since if it is used once in a system it will very likely be used many times @volatile private var _addressString: OptionVal[String] = OptionVal.None - override private[akka] def addressString: String = { + override private[pekko] def addressString: String = { _addressString match { case OptionVal.Some(addr) => addr case _ => diff --git a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala similarity index 92% rename from akka-actor/src/main/scala/akka/actor/ActorSelection.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala index 221fc4a3d4..08dc460e2f 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.CompletionStage import java.util.regex.Pattern @@ -18,11 +18,12 @@ import scala.util.Success import scala.annotation.nowarn -import akka.dispatch.ExecutionContexts -import akka.pattern.ask -import akka.routing.MurmurHash -import akka.util.{ Helpers, JavaDurationConverters, Timeout } -import akka.util.ccompat._ +import org.apache.pekko +import pekko.dispatch.ExecutionContexts +import pekko.pattern.ask +import pekko.routing.MurmurHash +import pekko.util.{ Helpers, JavaDurationConverters, Timeout } +import pekko.util.ccompat._ /** * An ActorSelection is a logical view of a section of an ActorSystem's tree of Actors, @@ -33,7 +34,7 @@ import akka.util.ccompat._ abstract class ActorSelection extends Serializable { this: ScalaActorSelection => - protected[akka] val anchor: ActorRef + protected[pekko] val anchor: ActorRef protected val path: immutable.IndexedSeq[SelectionPathElement] @@ -138,7 +139,7 @@ abstract class ActorSelection extends Serializable { } /** - * The [[akka.actor.ActorPath]] of the anchor actor. + * The [[pekko.actor.ActorPath]] of the anchor actor. */ def anchorPath: ActorPath = anchor.path @@ -149,7 +150,7 @@ abstract class ActorSelection extends Serializable { /** * String representation of the actor selection suitable for storage and recreation. - * The output is similar to the URI fragment returned by [[akka.actor.ActorPath#toSerializationFormat]]. + * The output is similar to the URI fragment returned by [[pekko.actor.ActorPath#toSerializationFormat]]. * @return URI fragment */ def toSerializationFormat: String = { @@ -223,7 +224,7 @@ object ActorSelection { * The receive logic for ActorSelectionMessage. The idea is to recursively descend as far as possible * with local refs and hand over to that “foreign” child when we encounter it. */ - private[akka] def deliverSelection(anchor: InternalActorRef, sender: ActorRef, sel: ActorSelectionMessage): Unit = + private[pekko] def deliverSelection(anchor: InternalActorRef, sender: ActorRef, sel: ActorSelectionMessage): Unit = if (sel.elements.isEmpty) anchor.tell(sel.msg, sender) else { @@ -306,7 +307,7 @@ trait ScalaActorSelection { * message is delivered by traversing the various actor paths involved. */ @SerialVersionUID(2L) // it has protobuf serialization in akka-remote -private[akka] final case class ActorSelectionMessage( +private[pekko] final case class ActorSelectionMessage( msg: Any, elements: immutable.Iterable[SelectionPathElement], wildcardFanOut: Boolean) @@ -327,13 +328,13 @@ private[akka] final case class ActorSelectionMessage( */ @nowarn("msg=@SerialVersionUID has no effect on traits") @SerialVersionUID(1L) -private[akka] sealed trait SelectionPathElement +private[pekko] sealed trait SelectionPathElement /** * INTERNAL API */ @SerialVersionUID(2L) -private[akka] final case class SelectChildName(name: String) extends SelectionPathElement { +private[pekko] final case class SelectChildName(name: String) extends SelectionPathElement { override def toString: String = name } @@ -341,7 +342,7 @@ private[akka] final case class SelectChildName(name: String) extends SelectionPa * INTERNAL API */ @SerialVersionUID(2L) -private[akka] final case class SelectChildPattern(patternStr: String) extends SelectionPathElement { +private[pekko] final case class SelectChildPattern(patternStr: String) extends SelectionPathElement { val pattern: Pattern = Helpers.makePattern(patternStr) override def toString: String = patternStr } @@ -350,7 +351,7 @@ private[akka] final case class SelectChildPattern(patternStr: String) extends Se * INTERNAL API */ @SerialVersionUID(2L) -private[akka] case object SelectParent extends SelectionPathElement { +private[pekko] case object SelectParent extends SelectionPathElement { override def toString: String = ".." } diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala similarity index 95% rename from akka-actor/src/main/scala/akka/actor/ActorSystem.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala index 7ae33b4b08..7c903754a2 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.io.Closeable import java.util.Optional @@ -21,18 +21,19 @@ import scala.util.control.{ ControlThrowable, NonFatal } import com.typesafe.config.{ Config, ConfigFactory } -import akka.ConfigurationException -import akka.actor.dungeon.ChildrenContainer -import akka.actor.setup.{ ActorSystemSetup, Setup } -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi -import akka.dispatch._ -import akka.event._ -import akka.event.Logging.DefaultLogger -import akka.japi.Util.immutableSeq -import akka.serialization.SerializationExtension -import akka.util._ -import akka.util.Helpers.toRootLowerCase +import org.apache.pekko +import pekko.ConfigurationException +import pekko.actor.dungeon.ChildrenContainer +import pekko.actor.setup.{ ActorSystemSetup, Setup } +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi +import pekko.dispatch._ +import pekko.event._ +import pekko.event.Logging.DefaultLogger +import pekko.japi.Util.immutableSeq +import pekko.serialization.SerializationExtension +import pekko.util._ +import pekko.util.Helpers.toRootLowerCase object BootstrapSetup { @@ -93,12 +94,12 @@ object BootstrapSetup { * @param fqcn the fully-qualified class name of the selected provider */ abstract class ProviderSelection private ( - private[akka] val identifier: String, - private[akka] val fqcn: String, - private[akka] val hasCluster: Boolean) + private[pekko] val identifier: String, + private[pekko] val fqcn: String, + private[pekko] val hasCluster: Boolean) object ProviderSelection { - private[akka] val RemoteActorRefProvider = "akka.remote.RemoteActorRefProvider" - private[akka] val ClusterActorRefProvider = "akka.cluster.ClusterActorRefProvider" + private[pekko] val RemoteActorRefProvider = "org.apache.pekko.remote.RemoteActorRefProvider" + private[pekko] val ClusterActorRefProvider = "org.apache.pekko.cluster.ClusterActorRefProvider" case object Local extends ProviderSelection("local", classOf[LocalActorRefProvider].getName, hasCluster = false) // these two cannot be referenced by class as they may not be on the classpath @@ -122,7 +123,7 @@ object ProviderSelection { def cluster(): ProviderSelection = Cluster /** INTERNAL API */ - @InternalApi private[akka] def apply(providerClass: String): ProviderSelection = + @InternalApi private[pekko] def apply(providerClass: String): ProviderSelection = providerClass match { case "local" => Local // additional fqcn for older configs not using 'remote' or 'cluster' @@ -169,7 +170,7 @@ final class BootstrapSetup private ( object ActorSystem { - val Version: String = akka.Version.current // generated file + val Version: String = pekko.Version.current // generated file /** * Creates a new ActorSystem with the name "default", @@ -318,7 +319,7 @@ object ActorSystem { /** * INTERNAL API */ - @InternalApi private[akka] object Settings { + @InternalApi private[pekko] object Settings { /** * INTERNAL API @@ -328,9 +329,9 @@ object ActorSystem { * that `Slf4jLogger` (akka-slf4j) is in classpath. * Then adds `Slf4jLogger` to configured loggers and removes `DefaultLogger`. */ - @InternalApi private[akka] def amendSlf4jConfig(config: Config, dynamicAccess: DynamicAccess): Config = { - val slf4jLoggerClassName = "akka.event.slf4j.Slf4jLogger" - val slf4jLoggingFilterClassName = "akka.event.slf4j.Slf4jLoggingFilter" + @InternalApi private[pekko] def amendSlf4jConfig(config: Config, dynamicAccess: DynamicAccess): Config = { + val slf4jLoggerClassName = "org.apache.pekko.event.slf4j.Slf4jLogger" + val slf4jLoggingFilterClassName = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter" val loggersConfKey = "akka.loggers" val loggingFilterConfKey = "akka.logging-filter" val configuredLoggers = immutableSeq(config.getStringList(loggersConfKey)) @@ -391,7 +392,7 @@ object ActorSystem { import config._ - import akka.util.Helpers.ConfigOps + import pekko.util.Helpers.ConfigOps final val ConfigVersion: String = getString("akka.version") @@ -417,7 +418,7 @@ object ActorSystem { final val SerializeAllMessages: Boolean = getBoolean("akka.actor.serialize-messages") final val SerializeAllCreators: Boolean = getBoolean("akka.actor.serialize-creators") final val NoSerializationVerificationNeededClassPrefix: Set[String] = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ getStringList("akka.actor.no-serialization-verification-needed-class-prefix").asScala.toSet } @@ -473,7 +474,7 @@ object ActorSystem { final val DefaultVirtualNodesFactor: Int = getInt("akka.actor.deployment.default.virtual-nodes-factor") if (ConfigVersion != Version) - throw new akka.ConfigurationException( + throw new pekko.ConfigurationException( "Akka JAR version [" + Version + "] does not match the provided config version [" + ConfigVersion + "]") /** @@ -483,7 +484,7 @@ object ActorSystem { } - private[akka] def findClassLoader(): ClassLoader = Reflect.findClassLoader() + private[pekko] def findClassLoader(): ClassLoader = Reflect.findClassLoader() } /** @@ -491,7 +492,7 @@ object ActorSystem { * configuration, e.g. dispatchers, deployments, remote capabilities and * addresses. It is also the entry point for creating or looking up actors. * - * There are several possibilities for creating actors (see [[akka.actor.Props]] + * There are several possibilities for creating actors (see [[pekko.actor.Props]] * for details on `props`): * * {{{ @@ -514,7 +515,7 @@ object ActorSystem { * * This class is not meant to be extended by user code. If you want to * actually roll your own Akka, it will probably be better to look into - * extending [[akka.actor.ExtendedActorSystem]] instead, but beware that you + * extending [[pekko.actor.ExtendedActorSystem]] instead, but beware that you * are completely on your own in that case! */ abstract class ActorSystem extends ActorRefFactory with ClassicActorSystemProvider { @@ -713,7 +714,7 @@ abstract class ActorSystem extends ActorRefFactory with ClassicActorSystemProvid } /** - * More powerful interface to the actor system’s implementation which is presented to extensions (see [[akka.actor.Extension]]). + * More powerful interface to the actor system’s implementation which is presented to extensions (see [[pekko.actor.Extension]]). * * Important Notice: * @@ -773,22 +774,22 @@ abstract class ExtendedActorSystem extends ActorSystem { * Careful, this may OOM on large actor systems, and it is only meant for * helping debugging in case something already went terminally wrong. */ - private[akka] def printTree: String + private[pekko] def printTree: String /** * INTERNAL API: random uid assigned at ActorSystem startup */ - @InternalApi private[akka] def uid: Long + @InternalApi private[pekko] def uid: Long /** * INTERNAL API: final step of `terminate()` */ - @InternalApi private[akka] def finalTerminate(): Unit + @InternalApi private[pekko] def finalTerminate(): Unit /** * INTERNAL API */ - @InternalApi private[akka] def isTerminating(): Boolean + @InternalApi private[pekko] def isTerminating(): Boolean } @@ -796,7 +797,7 @@ abstract class ExtendedActorSystem extends ActorSystem { * Internal API */ @InternalApi -private[akka] class ActorSystemImpl( +private[pekko] class ActorSystemImpl( val name: String, applicationConfig: Config, classLoader: ClassLoader, @@ -832,11 +833,11 @@ private[akka] class ActorSystemImpl( case NonFatal(_) | _: InterruptedException | _: NotImplementedError | _: ControlThrowable => log.error(cause, "Uncaught error from thread [{}]", thread.getName) case _ => - if (cause.isInstanceOf[IncompatibleClassChangeError] && cause.getMessage.startsWith("akka")) + if (cause.isInstanceOf[IncompatibleClassChangeError] && cause.getMessage.startsWith("org.apache.pekko")) System.err.println( s"""Detected ${cause.getClass.getName} error, which MAY be caused by incompatible Akka versions on the classpath. | Please note that a given Akka version MUST be the same across all modules of Akka that you are using, - | e.g. if you use akka-actor [${akka.Version.current} (resolved from current classpath)] all other core + | e.g. if you use akka-actor [${pekko.Version.current} (resolved from current classpath)] all other core | Akka modules MUST be of the same version. External projects like Alpakka, Persistence plugins or Akka | HTTP etc. have their own version numbers - please make sure you're using a compatible set of libraries. """.stripMargin.replaceAll("[\r\n]", "")) @@ -1074,14 +1075,14 @@ private[akka] class ActorSystemImpl( whenTerminated } - override private[akka] def finalTerminate(): Unit = { + override private[pekko] def finalTerminate(): Unit = { terminating = true // these actions are idempotent if (!settings.LogDeadLettersDuringShutdown) logDeadLetterListener.foreach(stop) guardian.stop() } - override private[akka] def isTerminating(): Boolean = { + override private[pekko] def isTerminating(): Boolean = { terminating || aborting || CoordinatedShutdown(this).shutdownReason().isDefined } diff --git a/akka-actor/src/main/scala/akka/actor/Address.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/Address.scala similarity index 93% rename from akka-actor/src/main/scala/akka/actor/Address.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/Address.scala index f01f98351a..0d61e16990 100644 --- a/akka-actor/src/main/scala/akka/actor/Address.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/Address.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.net.MalformedURLException import java.net.URI import java.net.URISyntaxException @@ -12,7 +12,8 @@ import scala.annotation.tailrec import scala.collection.immutable import scala.compat.java8.OptionConverters._ -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.annotation.InternalApi /** * The address specifies the physical location under which an Actor can be @@ -24,7 +25,7 @@ import akka.annotation.InternalApi * information with an address, then this must be done externally. */ @SerialVersionUID(1L) -final case class Address private[akka] (protocol: String, system: String, host: Option[String], port: Option[Int]) { +final case class Address private[pekko] (protocol: String, system: String, host: Option[String], port: Option[Int]) { // Please note that local/non-local distinction must be preserved: // host.isDefined == hasGlobalScope // host.isEmpty == hasLocalScope @@ -53,12 +54,12 @@ final case class Address private[akka] (protocol: String, system: String, host: /** * Returns true if this Address is only defined locally. It is not safe to send locally scoped addresses to remote - * hosts. See also [[akka.actor.Address#hasGlobalScope]]. + * hosts. See also [[pekko.actor.Address#hasGlobalScope]]. */ def hasLocalScope: Boolean = host.isEmpty /** - * Returns true if this Address is usable globally. Unlike locally defined addresses ([[akka.actor.Address#hasLocalScope]]) + * Returns true if this Address is usable globally. Unlike locally defined addresses ([[org.apache.pekko.actor.Address#hasLocalScope]]) * addresses of global scope are safe to sent to other hosts, as they globally and uniquely identify an addressable * entity. */ @@ -95,12 +96,12 @@ final case class Address private[akka] (protocol: String, system: String, host: * are any unusual characters in the host string. */ @InternalApi - private[akka] def hasInvalidHostCharacters: Boolean = + private[pekko] def hasInvalidHostCharacters: Boolean = host.exists(Address.InvalidHostRegex.findFirstIn(_).nonEmpty) /** INTERNAL API */ @InternalApi - private[akka] def checkHostCharacters(): Unit = + private[pekko] def checkHostCharacters(): Unit = require(!hasInvalidHostCharacters, s"Using invalid host characters '$host' in the Address is not allowed.") } @@ -134,7 +135,7 @@ object Address { } } -private[akka] trait PathUtils { +private[pekko] trait PathUtils { protected def split(s: String, fragment: String): List[String] = { @tailrec def rec(pos: Int, acc: List[String]): List[String] = { diff --git a/akka-actor/src/main/scala/akka/actor/ClassicActorSystemProvider.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala similarity index 64% rename from akka-actor/src/main/scala/akka/actor/ClassicActorSystemProvider.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala index 62b303c05d..f41f2002ed 100644 --- a/akka-actor/src/main/scala/akka/actor/ClassicActorSystemProvider.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala @@ -2,10 +2,11 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.annotation.DoNotInherit +import pekko.annotation.InternalApi /** * Glue API introduced to allow minimal user effort integration between classic and typed for example for streams. @@ -16,7 +17,7 @@ import akka.annotation.InternalApi trait ClassicActorSystemProvider { /** - * Allows access to the classic `akka.actor.ActorSystem` even for `akka.actor.typed.ActorSystem[_]`s. + * Allows access to the classic `org.apache.pekko.actor.ActorSystem` even for `org.apache.pekko.actor.typed.ActorSystem[_]`s. */ def classicSystem: ActorSystem } @@ -31,5 +32,5 @@ trait ClassicActorContextProvider { /** INTERNAL API */ @InternalApi - private[akka] def classicActorContext: ActorContext + private[pekko] def classicActorContext: ActorContext } diff --git a/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala similarity index 96% rename from akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala index 81b32d53b1..77b0be2280 100644 --- a/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.Optional import java.util.concurrent._ @@ -22,12 +22,13 @@ import scala.util.control.NonFatal import com.typesafe.config.Config import com.typesafe.config.ConfigFactory -import akka.Done -import akka.annotation.InternalApi -import akka.dispatch.ExecutionContexts -import akka.event.Logging -import akka.pattern.after -import akka.util.OptionVal +import org.apache.pekko +import pekko.Done +import pekko.annotation.InternalApi +import pekko.dispatch.ExecutionContexts +import pekko.event.Logging +import pekko.pattern.after +import pekko.util.OptionVal object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with ExtensionIdProvider { @@ -193,7 +194,7 @@ object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with Extensi } // locate reason-specific overrides and merge with defaults. - @InternalApi private[akka] def confWithOverrides(conf: Config, reason: Option[Reason]): Config = { + @InternalApi private[pekko] def confWithOverrides(conf: Config, reason: Option[Reason]): Config = { reason .flatMap { r => val basePath = s"""reason-overrides."${r.getClass.getName}"""" @@ -204,7 +205,7 @@ object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with Extensi /** INTERNAL API */ @InternalApi - private[akka] def init(system: ExtendedActorSystem, conf: Config, coord: CoordinatedShutdown): Unit = { + private[pekko] def init(system: ExtendedActorSystem, conf: Config, coord: CoordinatedShutdown): Unit = { // separated for testability initPhaseActorSystemTerminate(system, conf, coord) initJvmHook(system, conf, coord) @@ -289,7 +290,7 @@ object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with Extensi /** * INTERNAL API */ - private[akka] final case class Phase( + private[pekko] final case class Phase( dependsOn: Set[String], timeout: FiniteDuration, recover: Boolean, @@ -298,8 +299,8 @@ object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with Extensi /** * INTERNAL API */ - private[akka] def phasesFromConfig(conf: Config): Map[String, Phase] = { - import akka.util.ccompat.JavaConverters._ + private[pekko] def phasesFromConfig(conf: Config): Map[String, Phase] = { + import pekko.util.ccompat.JavaConverters._ val defaultPhaseTimeout = conf.getString("default-phase-timeout") val phasesConf = conf.getConfig("phases") val defaultPhaseConfig = ConfigFactory.parseString(s""" @@ -324,7 +325,7 @@ object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with Extensi /** * INTERNAL API: https://en.wikipedia.org/wiki/Topological_sorting */ - private[akka] def topologicalSort(phases: Map[String, Phase]): List[String] = { + private[pekko] def topologicalSort(phases: Map[String, Phase]): List[String] = { var result = List.empty[String] var unmarked = phases.keySet ++ phases.values.flatMap(_.dependsOn) // in case phase is not defined as key var tempMark = Set.empty[String] // for detecting cycles @@ -359,7 +360,7 @@ object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with Extensi * INTERNAL API */ @InternalApi -private[akka] trait JVMShutdownHooks { +private[pekko] trait JVMShutdownHooks { def addHook(t: Thread): Unit def removeHook(t: Thread): Boolean } @@ -368,12 +369,12 @@ private[akka] trait JVMShutdownHooks { * INTERNAL API */ @InternalApi -private[akka] object JVMShutdownHooks extends JVMShutdownHooks { +private[pekko] object JVMShutdownHooks extends JVMShutdownHooks { override def addHook(t: Thread): Unit = Runtime.getRuntime.addShutdownHook(t) override def removeHook(t: Thread): Boolean = Runtime.getRuntime.removeShutdownHook(t) } -final class CoordinatedShutdown private[akka] ( +final class CoordinatedShutdown private[pekko] ( system: ExtendedActorSystem, phases: Map[String, CoordinatedShutdown.Phase], jvmShutdownHooks: JVMShutdownHooks = JVMShutdownHooks) @@ -381,11 +382,11 @@ final class CoordinatedShutdown private[akka] ( import CoordinatedShutdown.{ Reason, UnknownReason } /** INTERNAL API */ - private[akka] val log = Logging(system, classOf[CoordinatedShutdown]) + private[pekko] val log = Logging(system, classOf[CoordinatedShutdown]) private val knownPhases = phases.keySet ++ phases.values.flatMap(_.dependsOn) /** INTERNAL API */ - private[akka] val orderedPhases = CoordinatedShutdown.topologicalSort(phases) + private[pekko] val orderedPhases = CoordinatedShutdown.topologicalSort(phases) private trait PhaseDefinition { def size: Int @@ -503,7 +504,7 @@ final class CoordinatedShutdown private[akka] ( def get(phaseName: String): Option[PhaseDefinition] = Option(registeredPhases.get(phaseName)) def totalDuration(): FiniteDuration = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ registeredPhases.keySet.asScala.foldLeft(Duration.Zero) { case (acc, phase) => acc + timeout(phase) @@ -530,13 +531,13 @@ final class CoordinatedShutdown private[akka] ( /** * INTERNAL API */ - private[akka] lazy val terminationWatcher = + private[pekko] lazy val terminationWatcher = system.systemActorOf(CoordinatedShutdownTerminationWatcher.props, "coordinatedShutdownTerminationWatcher") /** * INTERNAL API */ - private[akka] def jvmHooksLatch: CountDownLatch = _jvmHooksLatch.get + private[pekko] def jvmHooksLatch: CountDownLatch = _jvmHooksLatch.get /** * Scala API: Add a task to a phase, returning an object which will cancel it @@ -906,7 +907,7 @@ final class CoordinatedShutdown private[akka] ( /** INTERNAL API */ @InternalApi -private[akka] object CoordinatedShutdownTerminationWatcher { +private[pekko] object CoordinatedShutdownTerminationWatcher { final case class Watch(actor: ActorRef, deadline: Deadline, completionPromise: Promise[Done]) private final case class WatchedTimedOut(actor: ActorRef, completionPromise: Promise[Done], timeout: FiniteDuration) @@ -915,7 +916,7 @@ private[akka] object CoordinatedShutdownTerminationWatcher { /** INTERNAL API */ @InternalApi -private[akka] class CoordinatedShutdownTerminationWatcher extends Actor with Timers { +private[pekko] class CoordinatedShutdownTerminationWatcher extends Actor with Timers { private var waitingForActor: Map[ActorRef, Set[Promise[Done]]] = Map.empty private var alreadySeenTerminated = Set.empty[ActorRef] diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/Deployer.scala similarity index 94% rename from akka-actor/src/main/scala/akka/actor/Deployer.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/Deployer.scala index 0149bf3fc1..94af4a6327 100644 --- a/akka-actor/src/main/scala/akka/actor/Deployer.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/Deployer.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.atomic.AtomicReference @@ -11,9 +11,10 @@ import scala.annotation.tailrec import scala.annotation.nowarn import com.typesafe.config._ -import akka.annotation.InternalApi -import akka.routing._ -import akka.util.WildcardIndex +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.routing._ +import pekko.util.WildcardIndex object Deploy { final val NoDispatcherGiven = "" @@ -23,7 +24,7 @@ object Deploy { /** * INTERNAL API */ - @InternalApi private[akka] final val DispatcherSameAsParent = ".." + @InternalApi private[pekko] final val DispatcherSameAsParent = ".." def apply( path: String = "", @@ -154,16 +155,16 @@ final class Deploy( } /** - * The scope of a [[akka.actor.Deploy]] serves two purposes: as a marker for + * The scope of a [[pekko.actor.Deploy]] serves two purposes: as a marker for * 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 [[akka.actor.ActorRefProvider]], making + * used in conjunction with a custom [[pekko.actor.ActorRefProvider]], making * Akka actors fully extensible. */ trait Scope { /** - * When merging [[akka.actor.Deploy]] instances using ``withFallback()`` on + * When merging [[pekko.actor.Deploy]] instances using ``withFallback()`` on * the left one, this is propagated to “merging” scopes in the same way. * The setup is biased towards preferring the callee over the argument, i.e. * ``a.withFallback(b)`` is called expecting that ``a`` should in general take @@ -212,9 +213,9 @@ case object NoScopeGiven extends NoScopeGiven { /** * Deployer maps actor paths to actor deployments. */ -private[akka] class Deployer(val settings: ActorSystem.Settings, val dynamicAccess: DynamicAccess) { +private[pekko] class Deployer(val settings: ActorSystem.Settings, val dynamicAccess: DynamicAccess) { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ private val resizerEnabled: Config = ConfigFactory.parseString("resizer.enabled=on") private val deployments = new AtomicReference(WildcardIndex[Deploy]()) diff --git a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala similarity index 92% rename from akka-actor/src/main/scala/akka/actor/DynamicAccess.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala index 21f93526d1..b554bb5f11 100644 --- a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala @@ -2,18 +2,19 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.collection.immutable import scala.reflect.ClassTag import scala.util.Try -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.annotation.DoNotInherit /** * The DynamicAccess implementation is the class which is used for * loading all configurable parts of an actor system (the - * [[akka.actor.ReflectiveDynamicAccess]] is the default implementation). + * [[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. diff --git a/akka-actor/src/main/scala/akka/actor/Extension.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/Extension.scala similarity index 99% rename from akka-actor/src/main/scala/akka/actor/Extension.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/Extension.scala index 5b03769d71..d8a930ad17 100644 --- a/akka-actor/src/main/scala/akka/actor/Extension.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/Extension.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor /** * The basic ActorSystem covers all that is needed for locally running actors, diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/FSM.scala similarity index 92% rename from akka-actor/src/main/scala/akka/actor/FSM.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/FSM.scala index 116c616f8f..0dd6319b2b 100644 --- a/akka-actor/src/main/scala/akka/actor/FSM.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/FSM.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.collection.mutable import scala.concurrent.ExecutionContextExecutor @@ -13,9 +13,10 @@ import scala.concurrent.duration.FiniteDuration import scala.annotation.nowarn import language.implicitConversions -import akka.annotation.InternalApi -import akka.routing.{ Deafen, Listen, Listeners } -import akka.util.{ unused, JavaDurationConverters } +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.routing.{ Deafen, Listen, Listeners } +import pekko.util.{ unused, JavaDurationConverters } object FSM { @@ -34,32 +35,32 @@ object FSM { /** * Message type which is sent directly to the subscribed actor in - * [[akka.actor.FSM.SubscribeTransitionCallBack]] before sending any - * [[akka.actor.FSM.Transition]] messages. + * [[pekko.actor.FSM.SubscribeTransitionCallBack]] before sending any + * [[pekko.actor.FSM.Transition]] messages. */ final case class CurrentState[S](fsmRef: ActorRef, state: S) /** * Message type which is used to communicate transitions between states to - * all subscribed listeners (use [[akka.actor.FSM.SubscribeTransitionCallBack]]). + * all subscribed listeners (use [[pekko.actor.FSM.SubscribeTransitionCallBack]]). */ final case class Transition[S](fsmRef: ActorRef, from: S, to: S) /** - * Send this to an [[akka.actor.FSM]] to request first the [[FSM.CurrentState]] + * Send this to an [[pekko.actor.FSM]] to request first the [[FSM.CurrentState]] * and then a series of [[FSM.Transition]] updates. Cancel the subscription * using [[FSM.UnsubscribeTransitionCallBack]]. */ final case class SubscribeTransitionCallBack(actorRef: ActorRef) /** - * Unsubscribe from [[akka.actor.FSM.Transition]] notifications which was - * effected by sending the corresponding [[akka.actor.FSM.SubscribeTransitionCallBack]]. + * Unsubscribe from [[pekko.actor.FSM.Transition]] notifications which was + * effected by sending the corresponding [[pekko.actor.FSM.SubscribeTransitionCallBack]]. */ final case class UnsubscribeTransitionCallBack(actorRef: ActorRef) /** - * Reason why this [[akka.actor.FSM]] is shutting down. + * Reason why this [[pekko.actor.FSM]] is shutting down. */ sealed trait Reason @@ -75,7 +76,7 @@ object FSM { case object Shutdown extends Reason /** - * Signifies that the [[akka.actor.FSM]] is shutting itself down because of + * Signifies that the [[pekko.actor.FSM]] is shutting itself down because of * an error, e.g. if the state to transition into does not exist. You can use * this to communicate a more precise cause to the `onTermination` block. */ @@ -93,25 +94,25 @@ object FSM { /** INTERNAL API */ @InternalApi - private[akka] sealed trait TimerMode { + private[pekko] sealed trait TimerMode { def repeat: Boolean } /** INTERNAL API */ @InternalApi - private[akka] case object FixedRateMode extends TimerMode { + private[pekko] case object FixedRateMode extends TimerMode { override def repeat: Boolean = true } /** INTERNAL API */ @InternalApi - private[akka] case object FixedDelayMode extends TimerMode { + private[pekko] case object FixedDelayMode extends TimerMode { override def repeat: Boolean = true } /** INTERNAL API */ @InternalApi - private[akka] case object SingleMode extends TimerMode { + private[pekko] case object SingleMode extends TimerMode { override def repeat: Boolean = false } @@ -119,7 +120,7 @@ object FSM { * INTERNAL API */ @InternalApi - private[akka] final case class Timer(name: String, msg: Any, mode: TimerMode, generation: Int, owner: AnyRef)( + private[pekko] final case class Timer(name: String, msg: Any, mode: TimerMode, generation: Int, owner: AnyRef)( context: ActorContext) extends NoSerializationVerificationNeeded { private var ref: Option[Cancellable] = _ @@ -154,7 +155,7 @@ object FSM { val `→` = `->` /** - * Log Entry of the [[akka.actor.LoggingFSM]], can be obtained by calling `getLog`. + * Log Entry of the [[pekko.actor.LoggingFSM]], can be obtained by calling `getLog`. */ final case class LogEntry[S, D](stateName: S, stateData: D, event: Any) @@ -165,7 +166,7 @@ object FSM { * INTERNAL API * Using a subclass for binary compatibility reasons */ - private[akka] class SilentState[S, D]( + private[pekko] class SilentState[S, D]( stateName: S, stateData: D, timeout: Option[FiniteDuration], @@ -176,7 +177,7 @@ object FSM { /** * INTERNAL API */ - private[akka] override def notifies: Boolean = false + private[pekko] override def notifies: Boolean = false override def copy( stateName: S = stateName, @@ -190,7 +191,7 @@ object FSM { } /** - * This captures all of the managed state of the [[akka.actor.FSM]]: the state + * This captures all of the managed state of the [[pekko.actor.FSM]]: the state * name, the state data, possibly custom timeout, stop reason and replies * accumulated while processing the last message. */ @@ -250,7 +251,7 @@ object FSM { /** * INTERNAL API */ - private[akka] def notifies: Boolean = true + private[pekko] def notifies: Boolean = true // defined here to be able to override it in SilentState def copy( @@ -309,14 +310,14 @@ object FSM { /** * INTERNAL API. */ - private[akka] def withStopReason(reason: Reason): State[S, D] = { + private[pekko] def withStopReason(reason: Reason): State[S, D] = { copy(stopReason = Some(reason)) } /** * INTERNAL API. */ - private[akka] def withNotification(notifies: Boolean): State[S, D] = { + private[pekko] def withNotification(notifies: Boolean): State[S, D] = { if (notifies) State(stateName, stateData, timeout, stopReason, replies) else @@ -325,13 +326,13 @@ object FSM { } /** - * All messages sent to the [[akka.actor.FSM]] will be wrapped inside an + * All messages sent to the [[pekko.actor.FSM]] will be wrapped inside an * `Event`, which allows pattern matching to extract both state and data. */ final case class Event[D](event: Any, stateData: D) extends NoSerializationVerificationNeeded /** - * Case class representing the state of the [[akka.actor.FSM]] within the + * Case class representing the state of the [[pekko.actor.FSM]] within the * `onTermination` block. */ final case class StopEvent[S, D](reason: Reason, currentState: S, stateData: D) @@ -468,7 +469,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { /** * Set initial state. Call this method from the constructor before the [[#initialize]] method. * If different state is needed after a restart this method, followed by [[#initialize]], can - * be used in the actor life cycle hooks [[akka.actor.Actor#preStart]] and [[akka.actor.Actor#postRestart]]. + * be used in the actor life cycle hooks [[pekko.actor.Actor#preStart]] and [[pekko.actor.Actor#postRestart]]. * * @param stateName initial state designator * @param stateData initial state data @@ -642,7 +643,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { /** * INTERNAL API, used for testing. */ - private[akka] final def isStateTimerActive = timeoutFuture.isDefined + private[pekko] final def isStateTimerActive = timeoutFuture.isDefined /** * Set handler which is called upon each state transition, i.e. not when @@ -699,8 +700,8 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { /** * Verify existence of initial state and setup timers. This should be the - * last call within the constructor, or [[akka.actor.Actor#preStart]] and - * [[akka.actor.Actor#postRestart]] + * last call within the constructor, or [[pekko.actor.Actor#preStart]] and + * [[pekko.actor.Actor#postRestart]] * * An initial `currentState -> currentState` notification will be triggered by calling this method. * @@ -739,7 +740,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { * **************************************************************** */ - private[akka] def debugEvent: Boolean = false + private[pekko] def debugEvent: Boolean = false /* * FSM State data and current timeout handling @@ -845,7 +846,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { processEvent(event, source) } - private[akka] def processEvent(event: Event, @unused source: AnyRef): Unit = { + private[pekko] def processEvent(event: Event, @unused source: AnyRef): Unit = { val stateFunc = stateFunctions(currentState.stateName) val nextState = if (stateFunc.isDefinedAt(event)) { stateFunc(event) @@ -856,7 +857,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { applyState(nextState) } - private[akka] def applyState(nextState: State): Unit = { + private[pekko] def applyState(nextState: State): Unit = { nextState.stopReason match { case None => makeTransition(nextState) case _ => @@ -868,7 +869,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { } } - private[akka] def makeTransition(nextState: State): Unit = { + private[pekko] def makeTransition(nextState: State): Unit = { if (!stateFunctions.contains(nextState.stateName)) { terminate(stay().withStopReason(Failure("Next state %s does not exist".format(nextState.stateName)))) } else { @@ -942,8 +943,8 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { } /** - * Stackable trait for [[akka.actor.FSM]] which adds a rolling event log and - * debug logging capabilities (analogous to [[akka.event.LoggingReceive]]). + * Stackable trait for [[pekko.actor.FSM]] which adds a rolling event log and + * debug logging capabilities (analogous to [[pekko.event.LoggingReceive]]). * * @since 1.2 */ @@ -953,7 +954,7 @@ trait LoggingFSM[S, D] extends FSM[S, D] { this: Actor => def logDepth: Int = 0 - private[akka] override val debugEvent = context.system.settings.FsmDebugEvent + private[pekko] override val debugEvent = context.system.settings.FsmDebugEvent private val events = new Array[Event](logDepth) private val states = new Array[AnyRef](logDepth) @@ -970,7 +971,7 @@ trait LoggingFSM[S, D] extends FSM[S, D] { this: Actor => } } - private[akka] abstract override def processEvent(event: Event, source: AnyRef): Unit = { + private[pekko] abstract override def processEvent(event: Event, source: AnyRef): Unit = { if (debugEvent) { val srcstr = source match { case s: String => s diff --git a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala similarity index 91% rename from akka-actor/src/main/scala/akka/actor/FaultHandling.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala index 4a2f2a3047..f2f472e9ba 100644 --- a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor -import akka.annotation.InternalApi -import akka.event.Logging -import akka.event.Logging.{ Error, LogEvent, LogLevel } -import akka.japi.Util.immutableSeq -import akka.util.JavaDurationConverters._ -import akka.util.ccompat._ +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.event.Logging +import pekko.event.Logging.{ Error, LogEvent, LogLevel } +import pekko.japi.Util.immutableSeq +import pekko.util.JavaDurationConverters._ +import pekko.util.ccompat._ import java.lang.reflect.InvocationTargetException import java.lang.{ Iterable => JIterable } @@ -23,12 +24,12 @@ import scala.util.control.NonFatal /** * INTERNAL API */ -private[akka] sealed trait ChildStats +private[pekko] sealed trait ChildStats /** * INTERNAL API */ -private[akka] case object ChildNameReserved extends ChildStats +private[pekko] case object ChildNameReserved extends ChildStats /** * ChildRestartStats is the statistics kept by every parent Actor for every child Actor @@ -108,7 +109,7 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { /** INTERNAL API */ @InternalApi - private[akka] def logLevel: LogLevel + private[pekko] def logLevel: LogLevel } /** @@ -120,7 +121,7 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { * INTERNAL API */ @InternalApi - private[akka] sealed class Resume(private[akka] val logLevel: LogLevel) extends Directive + private[pekko] sealed class Resume(private[pekko] val logLevel: LogLevel) extends Directive /** * Discards the old Actor instance and replaces it with a new, @@ -132,7 +133,7 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { * INTERNAL API */ @InternalApi - private[akka] sealed class Restart(private[akka] val logLevel: LogLevel) extends Directive + private[pekko] sealed class Restart(private[pekko] val logLevel: LogLevel) extends Directive /** * Stops the Actor @@ -140,7 +141,7 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { case object Stop extends Stop(Logging.ErrorLevel) @InternalApi - private[akka] sealed class Stop(private[akka] val logLevel: LogLevel) extends Directive + private[pekko] sealed class Stop(private[pekko] val logLevel: LogLevel) extends Directive /** * Escalates the failure to the supervisor of the supervisor, @@ -148,7 +149,7 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { * the same exception as the child. */ case object Escalate extends Directive { - override private[akka] def logLevel = throw new IllegalStateException("Escalate is not logged") + override private[pekko] def logLevel = throw new IllegalStateException("Escalate is not logged") } /** @@ -199,8 +200,8 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { /** * When supervisorStrategy is not specified for an actor this * `Decider` is used by default in the supervisor strategy. - * The child will be stopped when [[akka.actor.ActorInitializationException]], - * [[akka.actor.ActorKilledException]], or [[akka.actor.DeathPactException]] is + * The child will be stopped when [[pekko.actor.ActorInitializationException]], + * [[pekko.actor.ActorKilledException]], or [[pekko.actor.DeathPactException]] is * thrown. It will be restarted for other `Exception` types. * The error is escalated if it's a `Throwable`, i.e. `Error`. */ @@ -238,7 +239,7 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { implicit def seqThrowable2Decider(trapExit: immutable.Seq[Class[_ <: Throwable]]): Decider = makeDecider(trapExit) type Decider = PartialFunction[Throwable, Directive] - type JDecider = akka.japi.Function[Throwable, Directive] + type JDecider = pekko.japi.Function[Throwable, Directive] type CauseDirective = (Class[_ <: Throwable], Directive) /** @@ -278,7 +279,7 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { * * INTERNAL API */ - private[akka] def sort(in: Iterable[CauseDirective]): immutable.Seq[CauseDirective] = + private[pekko] def sort(in: Iterable[CauseDirective]): immutable.Seq[CauseDirective] = in.foldLeft(new ArrayBuffer[CauseDirective](in.size)) { (buf, ca) => buf.indexWhere(_._1.isAssignableFrom(ca._1)) match { case -1 => buf.append(ca) @@ -288,13 +289,13 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { } .to(immutable.IndexedSeq) - private[akka] def withinTimeRangeOption(withinTimeRange: Duration): Option[Duration] = + private[pekko] def withinTimeRangeOption(withinTimeRange: Duration): Option[Duration] = if (withinTimeRange.isFinite && withinTimeRange >= Duration.Zero) Some(withinTimeRange) else None - private[akka] def maxNrOfRetriesOption(maxNrOfRetries: Int): Option[Int] = + private[pekko] def maxNrOfRetriesOption(maxNrOfRetries: Int): Option[Int] = if (maxNrOfRetries < 0) None else Some(maxNrOfRetries) - private[akka] val escalateDefault = (_: Any) => Escalate + private[pekko] val escalateDefault = (_: Any) => Escalate } /** @@ -303,7 +304,7 @@ object SupervisorStrategy extends SupervisorStrategyLowPriorityImplicits { * IMPORTANT: * * You should not normally need to create new subclasses, instead use the - * existing [[akka.actor.OneForOneStrategy]] or [[akka.actor.AllForOneStrategy]], + * existing [[pekko.actor.OneForOneStrategy]] or [[pekko.actor.AllForOneStrategy]], * but if you do, please read the docs of the methods below carefully, as * incorrect implementations may lead to “blocked” actor systems (i.e. * permanently suspended actors). @@ -344,9 +345,9 @@ abstract class SupervisorStrategy { * failure, which will lead to this actor re-throwing the exception which * caused the failure. The exception will not be wrapped. * - * This method calls [[akka.actor.SupervisorStrategy#logFailure]], which will + * This method calls [[pekko.actor.SupervisorStrategy#logFailure]], which will * log the failure unless it is escalated. You can customize the logging by - * setting [[akka.actor.SupervisorStrategy#loggingEnabled]] to `false` and + * setting [[pekko.actor.SupervisorStrategy#loggingEnabled]] to `false` and * do the logging inside the `decider` or override the `logFailure` method. * * @param children is a lazy collection (a view) @@ -384,7 +385,7 @@ abstract class SupervisorStrategy { /** * Default logging of actor failures when - * [[akka.actor.SupervisorStrategy#loggingEnabled]] is `true`. + * [[pekko.actor.SupervisorStrategy#loggingEnabled]] is `true`. * `Escalate` failures are not logged here, since they are supposed * to be handled at a level higher up in the hierarchy. * `Resume` failures are logged at `Warning` level. @@ -443,13 +444,13 @@ abstract class SupervisorStrategy { /** * Applies the fault handling `Directive` (Resume, Restart, Stop) specified in the `Decider` - * to all children when one fails, as opposed to [[akka.actor.OneForOneStrategy]] that applies + * to all children when one fails, as opposed to [[pekko.actor.OneForOneStrategy]] that applies * it only to the child actor that failed. * * @param maxNrOfRetries the number of times a child actor is allowed to be restarted, negative value means no limit, * if the limit is exceeded the child actor is stopped * @param withinTimeRange duration of the time window for maxNrOfRetries, Duration.Inf means no window - * @param decider mapping from Throwable to [[akka.actor.SupervisorStrategy.Directive]], you can also use a + * @param decider mapping from Throwable to [[pekko.actor.SupervisorStrategy.Directive]], you can also use a * [[scala.collection.immutable.Seq]] of Throwables which maps the given Throwables to restarts, otherwise escalates. * @param loggingEnabled the strategy logs the failure if this is enabled (true), by default it is enabled */ @@ -557,13 +558,13 @@ case class AllForOneStrategy( /** * Applies the fault handling `Directive` (Resume, Restart, Stop) specified in the `Decider` - * to the child actor that failed, as opposed to [[akka.actor.AllForOneStrategy]] that applies + * to the child actor that failed, as opposed to [[pekko.actor.AllForOneStrategy]] that applies * it to all children. * * @param maxNrOfRetries the number of times a child actor is allowed to be restarted, negative value means no limit * if the duration is infinite. If the limit is exceeded the child actor is stopped * @param withinTimeRange duration of the time window for maxNrOfRetries, Duration.Inf means no window - * @param decider mapping from Throwable to [[akka.actor.SupervisorStrategy.Directive]], you can also use a + * @param decider mapping from Throwable to [[pekko.actor.SupervisorStrategy.Directive]], you can also use a * [[scala.collection.immutable.Seq]] of Throwables which maps the given Throwables to restarts, otherwise escalates. * @param loggingEnabled the strategy logs the failure if this is enabled (true), by default it is enabled */ diff --git a/akka-actor/src/main/scala/akka/actor/IndirectActorProducer.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala similarity index 83% rename from akka-actor/src/main/scala/akka/actor/IndirectActorProducer.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala index 3afec0f3e5..62dc06bf45 100644 --- a/akka-actor/src/main/scala/akka/actor/IndirectActorProducer.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.collection.immutable import scala.annotation.nowarn -import akka.japi.Creator -import akka.util.Reflect +import org.apache.pekko +import pekko.japi.Creator +import pekko.util.Reflect /** * This interface defines a class of actor creation strategies deviating from @@ -38,7 +39,7 @@ trait IndirectActorProducer { def actorClass: Class[_ <: Actor] } -private[akka] object IndirectActorProducer { +private[pekko] object IndirectActorProducer { val CreatorFunctionConsumerClass = classOf[CreatorFunctionConsumer] val CreatorConsumerClass = classOf[CreatorConsumer] val TypedCreatorFunctionConsumerClass = classOf[TypedCreatorFunctionConsumer] @@ -69,7 +70,7 @@ private[akka] object IndirectActorProducer { /** * INTERNAL API */ -private[akka] class CreatorFunctionConsumer(creator: () => Actor) extends IndirectActorProducer { +private[pekko] class CreatorFunctionConsumer(creator: () => Actor) extends IndirectActorProducer { override def actorClass = classOf[Actor] override def produce() = creator() } @@ -77,7 +78,7 @@ private[akka] class CreatorFunctionConsumer(creator: () => Actor) extends Indire /** * INTERNAL API */ -private[akka] class CreatorConsumer(clazz: Class[_ <: Actor], creator: Creator[Actor]) extends IndirectActorProducer { +private[pekko] class CreatorConsumer(clazz: Class[_ <: Actor], creator: Creator[Actor]) extends IndirectActorProducer { override def actorClass = clazz override def produce() = creator.create() } @@ -85,7 +86,7 @@ private[akka] class CreatorConsumer(clazz: Class[_ <: Actor], creator: Creator[A /** * INTERNAL API */ -private[akka] class TypedCreatorFunctionConsumer(clz: Class[_ <: Actor], creator: () => Actor) +private[pekko] class TypedCreatorFunctionConsumer(clz: Class[_ <: Actor], creator: () => Actor) extends IndirectActorProducer { override def actorClass = clz override def produce() = creator() @@ -94,7 +95,7 @@ private[akka] class TypedCreatorFunctionConsumer(clz: Class[_ <: Actor], creator /** * INTERNAL API */ -private[akka] class ArgsReflectConstructor(clz: Class[_ <: Actor], args: immutable.Seq[Any]) +private[pekko] class ArgsReflectConstructor(clz: Class[_ <: Actor], args: immutable.Seq[Any]) extends IndirectActorProducer { private[this] val constructor = Reflect.findConstructor(clz, args) override def actorClass = clz @@ -104,7 +105,7 @@ private[akka] class ArgsReflectConstructor(clz: Class[_ <: Actor], args: immutab /** * INTERNAL API */ -private[akka] class NoArgsReflectConstructor(clz: Class[_ <: Actor]) extends IndirectActorProducer { +private[pekko] class NoArgsReflectConstructor(clz: Class[_ <: Actor]) extends IndirectActorProducer { Reflect.findConstructor(clz, List.empty) override def actorClass = clz override def produce() = Reflect.instantiate(clz) diff --git a/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala similarity index 97% rename from akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala index c03214a82e..d62e9946ad 100644 --- a/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.io.Closeable import java.util.concurrent.ThreadFactory @@ -16,10 +16,11 @@ import scala.util.control.NonFatal import com.typesafe.config.Config -import akka.dispatch.AbstractNodeQueue -import akka.event.LoggingAdapter -import akka.util.Helpers -import akka.util.Unsafe.{ instance => unsafe } +import org.apache.pekko +import pekko.dispatch.AbstractNodeQueue +import pekko.event.LoggingAdapter +import pekko.util.Helpers +import pekko.util.Unsafe.{ instance => unsafe } /** * This scheduler implementation is based on a revolving wheel of buckets, @@ -359,7 +360,7 @@ object LightArrayRevolverScheduler { case x => if (unsafe.compareAndSwapObject(this, taskOffset, x, replaceWith)) x else extractTask(replaceWith) } - private[akka] final def executeTask(): Boolean = extractTask(ExecutedTask) match { + private[pekko] final def executeTask(): Boolean = extractTask(ExecutedTask) match { case ExecutedTask | CancelledTask => false case other => try { diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/Props.scala similarity index 95% rename from akka-actor/src/main/scala/akka/actor/Props.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/Props.scala index 7d4c1ec41d..c991445478 100644 --- a/akka-actor/src/main/scala/akka/actor/Props.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/Props.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.annotation.varargs import scala.collection.immutable import scala.reflect.ClassTag -import akka.actor.Deploy.{ NoDispatcherGiven, NoMailboxGiven } -import akka.dispatch._ -import akka.routing._ +import org.apache.pekko +import pekko.actor.Deploy.{ NoDispatcherGiven, NoMailboxGiven } +import pekko.dispatch._ +import pekko.routing._ /** * Factory for Props instances. @@ -51,7 +52,7 @@ object Props extends AbstractProps { * * (Not because it is so immensely complicated, only because we might remove it if no longer needed internally) */ - private[akka] class EmptyActor extends Actor { + private[pekko] class EmptyActor extends Actor { def receive = Actor.emptyBehavior } @@ -126,7 +127,7 @@ final case class Props(deploy: Deploy, clazz: Class[_], args: immutable.Seq[Any] /** * INTERNAL API */ - private[akka] def producer: IndirectActorProducer = { + private[pekko] def producer: IndirectActorProducer = { if (_producer eq null) _producer = IndirectActorProducer(clazz, args) @@ -222,7 +223,7 @@ final case class Props(deploy: Deploy, clazz: Class[_], args: immutable.Seq[Any] * actor creation by the ActorSystem, i.e. for user-level code it can only be * used within the implementation of [[IndirectActorProducer#produce]]. */ - private[akka] def newActor(): Actor = { + private[pekko] def newActor(): Actor = { producer.produce() } } diff --git a/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala similarity index 93% rename from akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala index 27cf955bf3..965a624b62 100644 --- a/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.lang.reflect.InvocationTargetException @@ -11,10 +11,11 @@ import scala.reflect.ClassTag import scala.util.Failure import scala.util.Try -import akka.annotation.DoNotInherit +import org.apache.pekko +import pekko.annotation.DoNotInherit /** - * This is the default [[akka.actor.DynamicAccess]] implementation used by [[akka.actor.ExtendedActorSystem]] + * This is the default [[pekko.actor.DynamicAccess]] implementation used by [[pekko.actor.ExtendedActorSystem]] * unless overridden. It uses reflection to turn fully-qualified class names into `Class[_]` objects * and creates instances from there using `getDeclaredConstructor()` and invoking that. The class loader * to be used for all this is determined by the actor system’s class loader by default. diff --git a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala similarity index 96% rename from akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala index 9da28c1996..2fe6784d29 100644 --- a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.{ LinkedList => JLinkedList } import java.util.concurrent.locks.ReentrantLock @@ -13,11 +13,12 @@ import scala.util.control.NonFatal import scala.annotation.nowarn -import akka.actor.dungeon.ChildrenContainer -import akka.dispatch._ -import akka.dispatch.sysmsg._ -import akka.event.Logging.Warning -import akka.util.{ unused, Unsafe } +import org.apache.pekko +import pekko.actor.dungeon.ChildrenContainer +import pekko.dispatch._ +import pekko.dispatch.sysmsg._ +import pekko.event.Logging.Warning +import pekko.util.{ unused, Unsafe } /** * This actor ref starts out with some dummy cell (by default just enqueuing @@ -27,7 +28,7 @@ import akka.util.{ unused, Unsafe } * with a fully functional one, transfer all messages from dummy to real queue * and swap out the cell ref. */ -private[akka] class RepointableActorRef( +private[pekko] class RepointableActorRef( val system: ActorSystemImpl, val props: Props, val dispatcher: MessageDispatcher, @@ -187,7 +188,7 @@ private[akka] class RepointableActorRef( protected def writeReplace(): AnyRef = SerializedActorRef(this) } -private[akka] class UnstartedCell( +private[pekko] class UnstartedCell( val systemImpl: ActorSystemImpl, val self: RepointableActorRef, val props: Props, @@ -242,7 +243,7 @@ private[akka] class UnstartedCell( def resume(causedByFailure: Throwable): Unit = sendSystemMessage(Resume(causedByFailure)) def restart(cause: Throwable): Unit = sendSystemMessage(Recreate(cause)) def stop(): Unit = sendSystemMessage(Terminate()) - override private[akka] def isTerminated: Boolean = locked { + override private[pekko] def isTerminated: Boolean = locked { val cell = self.underlying if (cellIsReady(cell)) cell.isTerminated else false } diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala similarity index 98% rename from akka-actor/src/main/scala/akka/actor/Scheduler.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala index f65abcfc77..c701845e95 100644 --- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.util.concurrent.atomic.AtomicReference @@ -13,14 +13,15 @@ import scala.util.control.NoStackTrace import scala.annotation.nowarn -import akka.annotation.InternalApi -import akka.util.JavaDurationConverters +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.util.JavaDurationConverters /** * This exception is thrown by Scheduler.schedule* when scheduling is not * possible, e.g. after shutting down the Scheduler. */ -private final case class SchedulerException(msg: String) extends akka.AkkaException(msg) with NoStackTrace +private final case class SchedulerException(msg: String) extends pekko.AkkaException(msg) with NoStackTrace /** * An Akka scheduler service. @@ -45,7 +46,7 @@ private final case class SchedulerException(msg: String) extends akka.AkkaExcept * Scheduler implementation are loaded reflectively at ActorSystem start-up * with the following constructor arguments: * 1) the system’s com.typesafe.config.Config (from system.settings.config) - * 2) a akka.event.LoggingAdapter + * 2) a org.apache.pekko.event.LoggingAdapter * 3) a java.util.concurrent.ThreadFactory */ trait Scheduler { @@ -549,7 +550,7 @@ object Cancellable { /** * INTERNAL API */ - @InternalApi private[akka] val initialNotCancelled: Cancellable = new Cancellable { + @InternalApi private[pekko] val initialNotCancelled: Cancellable = new Cancellable { def cancel(): Boolean = false def isCancelled: Boolean = false } diff --git a/akka-actor/src/main/scala/akka/actor/Stash.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/Stash.scala similarity index 85% rename from akka-actor/src/main/scala/akka/actor/Stash.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/Stash.scala index db64c8da9a..ba998d41d6 100644 --- a/akka-actor/src/main/scala/akka/actor/Stash.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/Stash.scala @@ -2,14 +2,15 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.collection.immutable import scala.util.control.NoStackTrace -import akka.AkkaException -import akka.annotation.InternalStableApi -import akka.dispatch.{ +import org.apache.pekko +import pekko.AkkaException +import pekko.annotation.InternalStableApi +import pekko.dispatch.{ DequeBasedMessageQueueSemantics, Envelope, RequiresMessageQueue, @@ -45,14 +46,14 @@ import akka.dispatch.{ * You can override the default mailbox provided when `DequeBasedMessageQueueSemantics` are requested via config: * 

  *    akka.actor.mailbox.requirements {
- *      "akka.dispatch.BoundedDequeBasedMessageQueueSemantics" = your-custom-mailbox
+ *      "org.apache.pekko.dispatch.BoundedDequeBasedMessageQueueSemantics" = your-custom-mailbox
  *    }
  *
* Alternatively, you can add your own requirement marker to the actor and configure a mailbox type to be used * for your marker. * - * For a `Stash` that also enforces unboundedness of the deque see [[akka.actor.UnboundedStash]]. For a `Stash` - * that does not enforce any mailbox type see [[akka.actor.UnrestrictedStash]]. + * For a `Stash` that also enforces unboundedness of the deque see [[pekko.actor.UnboundedStash]]. For a `Stash` + * that does not enforce any mailbox type see [[pekko.actor.UnrestrictedStash]]. * * Note that the `Stash` trait must be mixed into (a subclass of) the `Actor` trait before * any trait/class that overrides the `preRestart` callback. This means it's not possible to write @@ -61,13 +62,13 @@ import akka.dispatch.{ trait Stash extends UnrestrictedStash with RequiresMessageQueue[DequeBasedMessageQueueSemantics] /** - * The `UnboundedStash` trait is a version of [[akka.actor.Stash]] that enforces an unbounded stash for you actor. + * The `UnboundedStash` trait is a version of [[pekko.actor.Stash]] that enforces an unbounded stash for you actor. */ trait UnboundedStash extends UnrestrictedStash with RequiresMessageQueue[UnboundedDequeBasedMessageQueueSemantics] /** - * A version of [[akka.actor.Stash]] that does not enforce any mailbox type. The proper mailbox has to be configured - * manually, and the mailbox should extend the [[akka.dispatch.DequeBasedMessageQueueSemantics]] marker trait. + * A version of [[pekko.actor.Stash]] that does not enforce any mailbox type. The proper mailbox has to be configured + * manually, and the mailbox should extend the [[pekko.dispatch.DequeBasedMessageQueueSemantics]] marker trait. */ trait UnrestrictedStash extends Actor with StashSupport { @@ -99,8 +100,8 @@ trait UnrestrictedStash extends Actor with StashSupport { * * @see [[StashSupport]] */ -private[akka] trait StashFactory { this: Actor => - private[akka] def createStash()(implicit ctx: ActorContext, ref: ActorRef): StashSupport = new StashSupport { +private[pekko] trait StashFactory { this: Actor => + private[pekko] def createStash()(implicit ctx: ActorContext, ref: ActorRef): StashSupport = new StashSupport { def context: ActorContext = ctx def self: ActorRef = ref } @@ -113,21 +114,21 @@ private[akka] trait StashFactory { this: Actor => * is maintained by [[UnrestrictedStash]] by extending this trait. Actors that explicitly need other stashes * (optionally in addition to and isolated from the user stash) can create new stashes via [[StashFactory]]. */ -private[akka] trait StashSupport { +private[pekko] trait StashSupport { /** * INTERNAL API. * * Context of the actor that uses this stash. */ - private[akka] def context: ActorContext + private[pekko] def context: ActorContext /** * INTERNAL API. * * Self reference of the actor that uses this stash. */ - private[akka] def self: ActorRef + private[pekko] def self: ActorRef /* The private stash of the actor. It is only accessible using `stash()` and * `unstashAll()`. @@ -147,7 +148,7 @@ private[akka] trait StashSupport { * The actor's deque-based message queue. * `mailbox.queue` is the underlying `Deque`. */ - private[akka] val mailbox: DequeBasedMessageQueueSemantics = { + private[pekko] val mailbox: DequeBasedMessageQueueSemantics = { actorCell.mailbox.messageQueue match { case queue: DequeBasedMessageQueueSemantics => queue case other => @@ -156,7 +157,7 @@ private[akka] trait StashSupport { s"DequeBasedMailbox required, got: ${other.getClass.getName}\n" + """An (unbounded) deque-based mailbox can be configured as follows: | my-custom-mailbox { - | mailbox-type = "akka.dispatch.UnboundedDequeBasedMailbox" + | mailbox-type = "org.apache.pekko.dispatch.UnboundedDequeBasedMailbox" | } |""".stripMargin) } @@ -183,7 +184,7 @@ private[akka] trait StashSupport { * Prepends `others` to this stash. This method is optimized for a large stash and * small `others`. */ - private[akka] def prepend(others: immutable.Seq[Envelope]): Unit = + private[pekko] def prepend(others: immutable.Seq[Envelope]): Unit = theStash = others.foldRight(theStash)((e, s) => e +: s) /** @@ -197,7 +198,7 @@ private[akka] trait StashSupport { * The unstashed message is guaranteed to be removed from the stash regardless * if the `unstash()` call successfully returns or throws an exception. */ - private[akka] def unstash(): Unit = + private[pekko] def unstash(): Unit = if (theStash.nonEmpty) try { enqueueFirst(theStash.head) @@ -232,7 +233,7 @@ private[akka] trait StashSupport { * prepended to the mailbox. */ @InternalStableApi - private[akka] def unstashAll(filterPredicate: Any => Boolean): Unit = { + private[pekko] def unstashAll(filterPredicate: Any => Boolean): Unit = { try { val i = theStash.reverseIterator.filter(envelope => filterPredicate(envelope.message)) while (i.hasNext) enqueueFirst(i.next()) @@ -247,7 +248,7 @@ private[akka] trait StashSupport { * Clears the stash and and returns all envelopes that have not been unstashed. */ @InternalStableApi - private[akka] def clearStash(): Vector[Envelope] = { + private[pekko] def clearStash(): Vector[Envelope] = { val stashed = theStash theStash = Vector.empty[Envelope] stashed diff --git a/akka-actor/src/main/scala/akka/actor/Timers.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/Timers.scala similarity index 97% rename from akka-actor/src/main/scala/akka/actor/Timers.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/Timers.scala index 3bf848d51a..fbea7b4083 100644 --- a/akka-actor/src/main/scala/akka/actor/Timers.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/Timers.scala @@ -2,14 +2,15 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration.FiniteDuration -import akka.annotation.DoNotInherit -import akka.dispatch.Envelope -import akka.util.JavaDurationConverters._ -import akka.util.OptionVal +import org.apache.pekko +import pekko.annotation.DoNotInherit +import pekko.dispatch.Envelope +import pekko.util.JavaDurationConverters._ +import pekko.util.OptionVal /** * Scala API: Mix in Timers into your Actor to get support for scheduled @@ -28,17 +29,17 @@ trait Timers extends Actor { */ final def timers: TimerScheduler = _timers - override protected[akka] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = { + override protected[pekko] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = { timers.cancelAll() super.aroundPreRestart(reason, message) } - override protected[akka] def aroundPostStop(): Unit = { + override protected[pekko] def aroundPostStop(): Unit = { timers.cancelAll() super.aroundPostStop() } - override protected[akka] def aroundReceive(receive: Actor.Receive, msg: Any): Unit = { + override protected[pekko] def aroundReceive(receive: Actor.Receive, msg: Any): Unit = { msg match { case timerMsg: TimerSchedulerImpl.TimerMsg => _timers.interceptTimerMsg(timerMsg) match { diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala similarity index 92% rename from akka-actor/src/main/scala/akka/actor/TypedActor.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala index b68121d0e4..2441839df6 100644 --- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import java.io.ObjectStreamException import java.lang.reflect.{ InvocationHandler, InvocationTargetException, Method, Proxy } @@ -19,18 +19,19 @@ import scala.util.control.NonFatal import scala.annotation.nowarn -import akka.dispatch._ -import akka.japi.{ Creator, Option => JOption } -import akka.japi.Util.{ immutableSeq, immutableSingletonSeq } -import akka.pattern.AskTimeoutException -import akka.serialization.{ JavaSerializer, SerializationExtension, Serializers } -import akka.util.Reflect.instantiator -import akka.util.Timeout +import org.apache.pekko +import pekko.dispatch._ +import pekko.japi.{ Creator, Option => JOption } +import pekko.japi.Util.{ immutableSeq, immutableSingletonSeq } +import pekko.pattern.AskTimeoutException +import pekko.serialization.{ JavaSerializer, SerializationExtension, Serializers } +import pekko.util.Reflect.instantiator +import pekko.util.Timeout /** * A TypedActorFactory is something that can created TypedActor instances. */ -@deprecated("Use 'akka.actor.typed' API.", since = "2.6.0") +@deprecated("Use 'org.apache.pekko.actor.typed' API.", since = "2.6.0") trait TypedActorFactory { /** @@ -89,12 +90,12 @@ trait TypedActorFactory { val proxyVar = new AtomVar[R] // Chicken'n'egg-resolver val c = props.creator // Cache this to avoid closing over the Props val i = props.interfaces // Cache this to avoid closing over the Props - val ap = Props(new akka.actor.TypedActor.TypedActor[R, T](proxyVar, c(), i)).withDeploy(props.actorProps().deploy) + val ap = Props(new pekko.actor.TypedActor.TypedActor[R, T](proxyVar, c(), i)).withDeploy(props.actorProps().deploy) typedActor.createActorRefProxy(props, proxyVar, actorFactory.actorOf(ap, name)) } /** - * Creates a TypedActor that intercepts the calls and forwards them as [[akka.actor.TypedActor.MethodCall]] + * Creates a TypedActor that intercepts the calls and forwards them as [[pekko.actor.TypedActor.MethodCall]] * to the provided ActorRef. */ def typedActorOf[R <: AnyRef, T <: R](props: TypedProps[T], actorRef: ActorRef): R = @@ -105,7 +106,7 @@ trait TypedActorFactory { /** * This represents the TypedActor Akka Extension, access to the functionality is done through a given ActorSystem. */ -@deprecated("Use 'akka.actor.typed' API.", since = "2.6.0") +@deprecated("Use 'org.apache.pekko.actor.typed' API.", since = "2.6.0") object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvider { override def get(system: ActorSystem): TypedActorExtension = super.get(system) override def get(system: ClassicActorSystemProvider): TypedActorExtension = super.get(system) @@ -118,7 +119,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi * will be children to the specified context, this allows for creating hierarchies of TypedActors. * Do _not_ let this instance escape the TypedActor since that will not be thread-safe. */ - @deprecated("Use 'akka.actor.typed' API.", since = "2.6.0") + @deprecated("Use 'org.apache.pekko.actor.typed' API.", since = "2.6.0") def apply(context: ActorContext): TypedActorFactory = ContextualTypedActorFactory(apply(context.system), context) /** @@ -139,7 +140,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi def isOneWay = method.getReturnType == java.lang.Void.TYPE def returnsFuture = classOf[Future[_]].isAssignableFrom(method.getReturnType) - def returnsJOption = classOf[akka.japi.Option[_]].isAssignableFrom(method.getReturnType) + def returnsJOption = classOf[pekko.japi.Option[_]].isAssignableFrom(method.getReturnType) def returnsOption = classOf[scala.Option[_]].isAssignableFrom(method.getReturnType) /** @@ -161,7 +162,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi case ps if ps.length == 0 => SerializedMethodCall(method.getDeclaringClass, method.getName, method.getParameterTypes, Array()) case ps => - val serialization = SerializationExtension(akka.serialization.JavaSerializer.currentSystem.value) + val serialization = SerializationExtension(pekko.serialization.JavaSerializer.currentSystem.value) val serializedParameters = new Array[(Int, String, Array[Byte])](ps.length) for (i <- 0 until ps.length) { val p = ps(i) @@ -179,7 +180,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi * * Represents the serialized form of a MethodCall, uses readResolve and writeReplace to marshall the call */ - private[akka] final case class SerializedMethodCall( + private[pekko] final case class SerializedMethodCall( ownerType: Class[_], methodName: String, parameterTypes: Array[Class[_]], @@ -188,11 +189,11 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi // TODO implement writeObject and readObject to serialize // TODO Possible optimization is to special encode the parameter-types to conserve space @throws(classOf[ObjectStreamException]) private def readResolve(): AnyRef = { - val system = akka.serialization.JavaSerializer.currentSystem.value + val system = pekko.serialization.JavaSerializer.currentSystem.value if (system eq null) throw new IllegalStateException( "Trying to deserialize a SerializedMethodCall without an ActorSystem in scope." + - " Use akka.serialization.JavaSerializer.currentSystem.withValue(system) { ... }") + " Use org.apache.pekko.serialization.JavaSerializer.currentSystem.withValue(system) { ... }") val serialization = SerializationExtension(system) MethodCall( ownerType.getDeclaredMethod(methodName, parameterTypes: _*), @@ -261,7 +262,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi * * Implementation of TypedActor as an Actor */ - private[akka] class TypedActor[R <: AnyRef, T <: R]( + private[pekko] class TypedActor[R <: AnyRef, T <: R]( val proxyVar: AtomVar[R], createInstance: => T, interfaces: immutable.Seq[Class[_]]) @@ -269,7 +270,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi self => // if we were remote deployed we need to create a local proxy if (!self.context.parent.asInstanceOf[InternalActorRef].isLocal) - akka.actor.TypedActor + pekko.actor.TypedActor .get(self.context.system) .createActorRefProxy(TypedProps(interfaces, createInstance), proxyVar, self.context.self) @@ -297,7 +298,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi } } } finally { - akka.actor.TypedActor(self.context.system).invocationHandlerFor(proxyVar.get) match { + pekko.actor.TypedActor(self.context.system).invocationHandlerFor(proxyVar.get) match { case null => case some => some.actorVar.set(self.context.system.deadLetters) // Point it to the DLQ @@ -322,12 +323,12 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi } protected def withContext[U](unitOfWork: => U): U = { - akka.actor.TypedActor.selfReference.set(proxyVar.get) - akka.actor.TypedActor.currentContext.set(self.context) + pekko.actor.TypedActor.selfReference.set(proxyVar.get) + pekko.actor.TypedActor.currentContext.set(self.context) try unitOfWork finally { - akka.actor.TypedActor.selfReference.set(null) - akka.actor.TypedActor.currentContext.set(null) + pekko.actor.TypedActor.selfReference.set(null) + pekko.actor.TypedActor.currentContext.set(null) } } @@ -444,7 +445,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi /** * INTERNAL API */ - private[akka] class TypedActorInvocationHandler( + private[pekko] class TypedActorInvocationHandler( @transient val extension: TypedActorExtension, @transient val actorVar: AtomVar[ActorRef], @transient val timeout: Timeout) @@ -461,7 +462,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi case "hashCode" => actor.hashCode.asInstanceOf[AnyRef] case _ => implicit val dispatcher = extension.system.dispatcher - import akka.pattern.ask + import pekko.pattern.ask MethodCall(method, args) match { case m if m.isOneWay => actor ! m; null // Null return value @@ -494,7 +495,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi /** * INTERNAL API */ - private[akka] final case class SerializedTypedActorInvocationHandler( + private[pekko] final case class SerializedTypedActorInvocationHandler( val actor: ActorRef, val timeout: FiniteDuration) { @throws(classOf[ObjectStreamException]) private def readResolve(): AnyRef = @@ -508,7 +509,8 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi @nowarn("msg=deprecated") def toTypedActorInvocationHandler(system: ActorSystem): TypedActorInvocationHandler = - new TypedActorInvocationHandler(akka.actor.TypedActor(system), new AtomVar[ActorRef](actor), new Timeout(timeout)) + new TypedActorInvocationHandler(pekko.actor.TypedActor(system), new AtomVar[ActorRef](actor), + new Timeout(timeout)) } } @@ -572,7 +574,7 @@ object TypedProps { /** * INTERNAL API */ - private[akka] def apply[T <: AnyRef](interfaces: immutable.Seq[Class[_]], creator: => T): TypedProps[T] = + private[pekko] def apply[T <: AnyRef](interfaces: immutable.Seq[Class[_]], creator: => T): TypedProps[T] = new TypedProps[T](interfaces, () => creator) } @@ -668,7 +670,7 @@ final case class TypedProps[T <: AnyRef] protected[TypedProps] ( this.copy(interfaces = interfaces.diff(TypedProps.extractInterfaces(interface))) /** - * Returns the akka.actor.Props representation of this TypedProps + * Returns the org.apache.pekko.actor.Props representation of this TypedProps */ def actorProps(): Props = if (dispatcher == Props.default.dispatcher) @@ -695,7 +697,7 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac import system.settings - import akka.util.Helpers.ConfigOps + import pekko.util.Helpers.ConfigOps /** * Default timeout for typed actor methods with non-void return type @@ -719,7 +721,7 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac /** * INTERNAL API */ - private[akka] def createActorRefProxy[R <: AnyRef, T <: R]( + private[pekko] def createActorRefProxy[R <: AnyRef, T <: R]( props: TypedProps[T], proxyVar: AtomVar[R], actorRef: => ActorRef): R = { @@ -747,7 +749,7 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac /** * INTERNAL API */ - private[akka] def invocationHandlerFor(typedActor: AnyRef): TypedActorInvocationHandler = + private[pekko] def invocationHandlerFor(typedActor: AnyRef): TypedActorInvocationHandler = if ((typedActor ne null) && classOf[Proxy].isAssignableFrom(typedActor.getClass) && Proxy.isProxyClass( typedActor.getClass)) typedActor match { case null => null diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala similarity index 93% rename from akka-actor/src/main/scala/akka/actor/dungeon/Children.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala index 8815d3f92f..44be6b87bc 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.dungeon +package org.apache.pekko.actor.dungeon import java.util.Optional @@ -10,16 +10,17 @@ import scala.annotation.tailrec import scala.collection.immutable import scala.util.control.NonFatal import scala.annotation.nowarn -import akka.actor._ -import akka.annotation.InternalStableApi -import akka.serialization.{ Serialization, SerializationExtension, Serializers } -import akka.util.{ Helpers, Unsafe } +import org.apache.pekko +import pekko.actor._ +import pekko.annotation.InternalStableApi +import pekko.serialization.{ Serialization, SerializationExtension, Serializers } +import pekko.util.{ Helpers, Unsafe } -private[akka] object Children { +private[pekko] object Children { val GetNobody = () => Nobody } -private[akka] trait Children { this: ActorCell => +private[pekko] trait Children { this: ActorCell => import ChildrenContainer._ @@ -46,16 +47,16 @@ private[akka] trait Children { this: ActorCell => makeChild(this, props, randomName(), async = false, systemService = false) def actorOf(props: Props, name: String): ActorRef = makeChild(this, props, checkName(name), async = false, systemService = false) - private[akka] def attachChild(props: Props, systemService: Boolean): ActorRef = + private[pekko] def attachChild(props: Props, systemService: Boolean): ActorRef = makeChild(this, props, randomName(), async = true, systemService = systemService) - private[akka] def attachChild(props: Props, name: String, systemService: Boolean): ActorRef = + private[pekko] def attachChild(props: Props, name: String, systemService: Boolean): ActorRef = makeChild(this, props, checkName(name), async = true, systemService = systemService) @nowarn @volatile private var _functionRefsDoNotCallMeDirectly = Map.empty[String, FunctionRef] private def functionRefs: Map[String, FunctionRef] = Unsafe.instance.getObjectVolatile(this, AbstractActorCell.functionRefsOffset).asInstanceOf[Map[String, FunctionRef]] - private[akka] def getFunctionRefOrNobody(name: String, uid: Int = ActorCell.undefinedUid): InternalActorRef = + private[pekko] def getFunctionRefOrNobody(name: String, uid: Int = ActorCell.undefinedUid): InternalActorRef = functionRefs.getOrElse(name, Children.GetNobody()) match { case f: FunctionRef => if (uid == ActorCell.undefinedUid || f.path.uid == uid) f else Nobody @@ -63,7 +64,7 @@ private[akka] trait Children { this: ActorCell => other } - private[akka] def addFunctionRef(f: (ActorRef, Any) => Unit, name: String = ""): FunctionRef = { + private[pekko] def addFunctionRef(f: (ActorRef, Any) => Unit, name: String = ""): FunctionRef = { val r = randomName(new java.lang.StringBuilder("$$")) val n = if (name != "") s"$r-$name" else r val childPath = new ChildActorPath(self.path, n, ActorCell.newUid()) @@ -79,7 +80,7 @@ private[akka] trait Children { this: ActorCell => ref } - private[akka] def removeFunctionRef(ref: FunctionRef): Boolean = { + private[pekko] def removeFunctionRef(ref: FunctionRef): Boolean = { require(ref.path.parent eq self.path, "trying to remove FunctionRef from wrong ActorCell") val name = ref.path.name @tailrec def rec(): Boolean = { diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala similarity index 96% rename from akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala index d615424616..803911accb 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala @@ -2,17 +2,18 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.dungeon +package org.apache.pekko.actor.dungeon import scala.collection.immutable -import akka.actor.{ ActorRef, ChildNameReserved, ChildRestartStats, ChildStats, InvalidActorNameException } -import akka.util.Collections.{ EmptyImmutableSeq, PartialImmutableValuesIterable } +import org.apache.pekko +import pekko.actor.{ ActorRef, ChildNameReserved, ChildRestartStats, ChildStats, InvalidActorNameException } +import pekko.util.Collections.{ EmptyImmutableSeq, PartialImmutableValuesIterable } /** * INTERNAL API */ -private[akka] trait ChildrenContainer { +private[pekko] trait ChildrenContainer { def add(name: String, stats: ChildRestartStats): ChildrenContainer def remove(child: ActorRef): ChildrenContainer @@ -40,7 +41,7 @@ private[akka] trait ChildrenContainer { * This object holds the classes performing the logic of managing the children * of an actor, hence they are intimately tied to ActorCell. */ -private[akka] object ChildrenContainer { +private[pekko] object ChildrenContainer { sealed trait SuspendReason case object UserRequest extends SuspendReason diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala similarity index 94% rename from akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala index a7c0b7bfd5..0cf1a7f571 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.dungeon +package org.apache.pekko.actor.dungeon -import akka.actor.{ Actor, ActorCell, ActorRef, ActorRefScope, Address, InternalActorRef, Terminated } -import akka.dispatch.sysmsg.{ DeathWatchNotification, Unwatch, Watch } -import akka.event.AddressTerminatedTopic -import akka.event.Logging.{ Debug, Warning } -import akka.util.unused +import org.apache.pekko +import pekko.actor.{ Actor, ActorCell, ActorRef, ActorRefScope, Address, InternalActorRef, Terminated } +import pekko.dispatch.sysmsg.{ DeathWatchNotification, Unwatch, Watch } +import pekko.event.AddressTerminatedTopic +import pekko.event.Logging.{ Debug, Warning } +import pekko.util.unused -private[akka] trait DeathWatch { this: ActorCell => +private[pekko] trait DeathWatch { this: ActorCell => /** * This map holds a [[None]] for actors for which we send a [[Terminated]] notification on termination, @@ -83,7 +84,7 @@ private[akka] trait DeathWatch { this: ActorCell => } /** - * When this actor is watching the subject of [[akka.actor.Terminated]] message + * When this actor is watching the subject of [[pekko.actor.Terminated]] message * it will be propagated to user's receive. */ protected def watchedActorTerminated( @@ -104,7 +105,7 @@ private[akka] trait DeathWatch { this: ActorCell => if (childrenRefs.getByRef(actor).isDefined) handleChildTerminated(actor) } - private[akka] def terminatedQueuedFor(subject: ActorRef, customMessage: Option[Any]): Unit = + private[pekko] def terminatedQueuedFor(subject: ActorRef, customMessage: Option[Any]): Unit = if (!terminatedQueued.contains(subject)) terminatedQueued += subject -> customMessage diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala similarity index 90% rename from akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala index 71e86414e5..bafdb65fa5 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.dungeon +package org.apache.pekko.actor.dungeon import scala.annotation.tailrec import scala.util.control.{ NoStackTrace, NonFatal } @@ -10,31 +10,32 @@ import scala.util.control.Exception.Catcher import scala.annotation.nowarn -import akka.AkkaException -import akka.actor._ -import akka.annotation.InternalApi -import akka.dispatch.{ Envelope, Mailbox } -import akka.dispatch.MailboxType -import akka.dispatch.ProducesMessageQueue -import akka.dispatch.UnboundedMailbox -import akka.dispatch.sysmsg._ -import akka.event.Logging.Error -import akka.serialization.{ DisabledJavaSerializer, SerializationExtension, Serializers } -import akka.serialization.Serialization -import akka.util.Unsafe +import org.apache.pekko +import pekko.AkkaException +import pekko.actor._ +import pekko.annotation.InternalApi +import pekko.dispatch.{ Envelope, Mailbox } +import pekko.dispatch.MailboxType +import pekko.dispatch.ProducesMessageQueue +import pekko.dispatch.UnboundedMailbox +import pekko.dispatch.sysmsg._ +import pekko.event.Logging.Error +import pekko.serialization.{ DisabledJavaSerializer, SerializationExtension, Serializers } +import pekko.serialization.Serialization +import pekko.util.Unsafe @SerialVersionUID(1L) final case class SerializationCheckFailedException private[dungeon] (msg: Object, cause: Throwable) extends AkkaException( s"Failed to serialize and deserialize message of type ${msg.getClass.getName} for testing. " + - "To avoid this error, either disable 'akka.actor.serialize-messages', mark the message with 'akka.actor.NoSerializationVerificationNeeded', or configure serialization to support this message", + "To avoid this error, either disable 'akka.actor.serialize-messages', mark the message with 'org.apache.pekko.actor.NoSerializationVerificationNeeded', or configure serialization to support this message", cause) /** * INTERNAL API */ @InternalApi -private[akka] trait Dispatch { this: ActorCell => +private[pekko] trait Dispatch { this: ActorCell => @nowarn @volatile private var _mailboxDoNotCallMeDirectly: Mailbox = _ // This must be volatile since it isn't protected by the mailbox status @@ -97,7 +98,7 @@ private[akka] trait Dispatch { this: ActorCell => if (sendSupervise) { // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅ - parent.sendSystemMessage(akka.dispatch.sysmsg.Supervise(self, async = false)) + parent.sendSystemMessage(pekko.dispatch.sysmsg.Supervise(self, async = false)) } this } diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala similarity index 95% rename from akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala index 48537c863a..8a34e73447 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala @@ -2,38 +2,39 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.dungeon +package org.apache.pekko.actor.dungeon import scala.collection.immutable import scala.util.control.Exception._ import scala.util.control.NonFatal -import akka.actor.ActorCell -import akka.actor.ActorInterruptedException -import akka.actor.ActorRef -import akka.actor.ActorRefScope -import akka.actor.InternalActorRef -import akka.actor.PostRestartException -import akka.actor.PreRestartException -import akka.annotation.InternalApi -import akka.annotation.InternalStableApi -import akka.dispatch._ -import akka.dispatch.sysmsg._ -import akka.event.Logging -import akka.event.Logging.Debug -import akka.event.Logging.Error +import org.apache.pekko +import pekko.actor.ActorCell +import pekko.actor.ActorInterruptedException +import pekko.actor.ActorRef +import pekko.actor.ActorRefScope +import pekko.actor.InternalActorRef +import pekko.actor.PostRestartException +import pekko.actor.PreRestartException +import pekko.annotation.InternalApi +import pekko.annotation.InternalStableApi +import pekko.dispatch._ +import pekko.dispatch.sysmsg._ +import pekko.event.Logging +import pekko.event.Logging.Debug +import pekko.event.Logging.Error /** * INTERNAL API */ -@InternalApi private[akka] object FaultHandling { +@InternalApi private[pekko] object FaultHandling { sealed trait FailedInfo private case object NoFailedInfo extends FailedInfo private final case class FailedRef(ref: ActorRef) extends FailedInfo private case object FailedFatally extends FailedInfo } -private[akka] trait FaultHandling { this: ActorCell => +private[pekko] trait FaultHandling { this: ActorCell => import FaultHandling._ /* ================= diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala similarity index 85% rename from akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala index 996091a2d3..34e89cd91e 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala @@ -2,20 +2,21 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.actor.dungeon +package org.apache.pekko.actor.dungeon import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration -import akka.actor.ActorCell -import akka.actor.Cancellable -import akka.actor.NotInfluenceReceiveTimeout +import org.apache.pekko +import pekko.actor.ActorCell +import pekko.actor.Cancellable +import pekko.actor.NotInfluenceReceiveTimeout -private[akka] object ReceiveTimeout { +private[pekko] object ReceiveTimeout { final val emptyReceiveTimeoutData: (Duration, Cancellable) = (Duration.Undefined, ActorCell.emptyCancellable) } -private[akka] trait ReceiveTimeout { this: ActorCell => +private[pekko] trait ReceiveTimeout { this: ActorCell => import ActorCell._ import ReceiveTimeout._ @@ -49,7 +50,7 @@ private[akka] trait ReceiveTimeout { this: ActorCell => private def rescheduleReceiveTimeout(f: FiniteDuration): Unit = { receiveTimeoutData._2.cancel() // Cancel any ongoing future - val task = system.scheduler.scheduleOnce(f, self, akka.actor.ReceiveTimeout)(this.dispatcher) + val task = system.scheduler.scheduleOnce(f, self, pekko.actor.ReceiveTimeout)(this.dispatcher) receiveTimeoutData = (f, task) } @@ -65,7 +66,7 @@ private[akka] trait ReceiveTimeout { this: ActorCell => receiveTimeoutData } - private[akka] def cancelReceiveTimeoutTask(): Unit = + private[pekko] def cancelReceiveTimeoutTask(): Unit = if (receiveTimeoutData._2 ne emptyCancellable) { receiveTimeoutData._2.cancel() receiveTimeoutData = (receiveTimeoutData._1, emptyCancellable) diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/TimerSchedulerImpl.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala similarity index 94% rename from akka-actor/src/main/scala/akka/actor/dungeon/TimerSchedulerImpl.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala index e190234eca..dc31e943e2 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/TimerSchedulerImpl.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala @@ -2,18 +2,19 @@ * Copyright (C) 2017-2022 Lightbend Inc. */ -package akka.actor +package org.apache.pekko.actor import scala.concurrent.duration.FiniteDuration -import akka.annotation.InternalApi -import akka.event.Logging -import akka.util.OptionVal +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.event.Logging +import pekko.util.OptionVal /** * INTERNAL API */ -@InternalApi private[akka] object TimerSchedulerImpl { +@InternalApi private[pekko] object TimerSchedulerImpl { sealed trait TimerMsg { def key: Any def generation: Int @@ -46,7 +47,7 @@ import akka.util.OptionVal /** * INTERNAL API */ -@InternalApi private[akka] class TimerSchedulerImpl(ctx: ActorContext) extends TimerScheduler { +@InternalApi private[pekko] class TimerSchedulerImpl(ctx: ActorContext) extends TimerScheduler { import TimerSchedulerImpl._ private val log = Logging(ctx.system, classOf[TimerScheduler]) diff --git a/akka-actor/src/main/scala/akka/actor/package.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/package.scala similarity index 94% rename from akka-actor/src/main/scala/akka/actor/package.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/package.scala index b0ff5ac55c..f0794878f7 100644 --- a/akka-actor/src/main/scala/akka/actor/package.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/package.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka +package org.apache.pekko import language.implicitConversions diff --git a/akka-actor/src/main/scala/akka/actor/setup/ActorSystemSetup.scala b/akka-actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala similarity index 90% rename from akka-actor/src/main/scala/akka/actor/setup/ActorSystemSetup.scala rename to akka-actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala index 1c60a69cf6..33c20f0463 100644 --- a/akka-actor/src/main/scala/akka/actor/setup/ActorSystemSetup.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.actor.setup +package org.apache.pekko.actor.setup import java.util.Optional @@ -10,7 +10,8 @@ import scala.annotation.varargs import scala.compat.java8.OptionConverters._ import scala.reflect.ClassTag -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.annotation.InternalApi /** * Marker supertype for a setup part that can be put inside [[ActorSystemSetup]], if a specific concrete setup @@ -48,10 +49,10 @@ object ActorSystemSetup { /** * A set of setup settings for programmatic configuration of the actor system. * - * Constructor is *Internal API*. Use the factory methods [[ActorSystemSetup#create]] and [[akka.actor.Actor#apply]] to create + * Constructor is *Internal API*. Use the factory methods [[ActorSystemSetup#create]] and [[pekko.actor.Actor#apply]] to create * instances. */ -final class ActorSystemSetup private[akka] (@InternalApi private[akka] val setups: Map[Class[_], AnyRef]) { +final class ActorSystemSetup private[pekko] (@InternalApi private[pekko] val setups: Map[Class[_], AnyRef]) { /** * Java API: Extract a concrete [[Setup]] of type `T` if it is defined in the settings. diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala similarity index 91% rename from akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala index 671fb580e7..70d03f8dd7 100644 --- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.{ util => ju } import java.util.concurrent._ @@ -15,13 +15,14 @@ import scala.util.control.NonFatal import scala.annotation.nowarn import com.typesafe.config.Config -import akka.actor._ -import akka.annotation.InternalStableApi -import akka.dispatch.affinity.AffinityPoolConfigurator -import akka.dispatch.sysmsg._ -import akka.event.EventStream -import akka.event.Logging.{ Debug, Error, LogEventException } -import akka.util.{ unused, Index, Unsafe } +import org.apache.pekko +import pekko.actor._ +import pekko.annotation.InternalStableApi +import pekko.dispatch.affinity.AffinityPoolConfigurator +import pekko.dispatch.sysmsg._ +import pekko.event.EventStream +import pekko.event.Logging.{ Debug, Error, LogEventException } +import pekko.util.{ unused, Index, Unsafe } final case class Envelope private (message: Any, sender: ActorRef) { @@ -43,7 +44,7 @@ object Envelope { } final case class TaskInvocation(eventStream: EventStream, runnable: Runnable, cleanup: () => Unit) extends Batchable { - final override def isBatchable: Boolean = akka.dispatch.internal.ScalaBatchable.isBatchable(runnable) + final override def isBatchable: Boolean = pekko.dispatch.internal.ScalaBatchable.isBatchable(runnable) def run(): Unit = try runnable.run() @@ -55,14 +56,14 @@ final case class TaskInvocation(eventStream: EventStream, runnable: Runnable, cl /** * INTERNAL API */ -private[akka] trait LoadMetrics { self: Executor => +private[pekko] trait LoadMetrics { self: Executor => def atFullThrottle(): Boolean } /** * INTERNAL API */ -private[akka] object MessageDispatcher { +private[pekko] object MessageDispatcher { val UNSCHEDULED = 0 // WARNING DO NOT CHANGE THE VALUE OF THIS: It relies on the faster init of 0 in AbstractMessageDispatcher val SCHEDULED = 1 val RESCHEDULED = 2 @@ -135,7 +136,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator /** * Creates and returns a mailbox for the given actor. */ - protected[akka] def createMailbox(actor: Cell, mailboxType: MailboxType): Mailbox + protected[pekko] def createMailbox(actor: Cell, mailboxType: MailboxType): Mailbox /** * Identifier of this dispatcher, corresponds to the full key @@ -216,7 +217,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator * * INTERNAL API */ - protected[akka] def register(actor: ActorCell): Unit = { + protected[pekko] def register(actor: ActorCell): Unit = { if (debug) actors.put(this, actor.self) addInhabitants(+1) } @@ -226,7 +227,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator * * INTERNAL API */ - protected[akka] def unregister(actor: ActorCell): Unit = { + protected[pekko] def unregister(actor: ActorCell): Unit = { if (debug) actors.remove(this, actor.self) addInhabitants(-1) val mailBox = actor.swapMailbox(mailboxes.deadLetterMailbox) @@ -261,12 +262,12 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator * * INTERNAL API */ - protected[akka] def shutdownTimeout: FiniteDuration + protected[pekko] def shutdownTimeout: FiniteDuration /** * After the call to this method, the dispatcher mustn't begin any new message processing for the specified reference */ - protected[akka] def suspend(actor: ActorCell): Unit = { + protected[pekko] def suspend(actor: ActorCell): Unit = { val mbox = actor.mailbox if ((mbox.actor eq actor) && (mbox.dispatcher eq this)) mbox.suspend() @@ -275,7 +276,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator /* * After the call to this method, the dispatcher must begin any new message processing for the specified reference */ - protected[akka] def resume(actor: ActorCell): Unit = { + protected[pekko] def resume(actor: ActorCell): Unit = { val mbox = actor.mailbox if ((mbox.actor eq actor) && (mbox.dispatcher eq this) && mbox.resume()) registerForExecution(mbox, false, false) @@ -286,21 +287,21 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator * * INTERNAL API */ - protected[akka] def systemDispatch(receiver: ActorCell, invocation: SystemMessage): Unit + protected[pekko] def systemDispatch(receiver: ActorCell, invocation: SystemMessage): Unit /** * Will be called when the dispatcher is to queue an invocation for execution * * INTERNAL API */ - protected[akka] def dispatch(receiver: ActorCell, invocation: Envelope): Unit + protected[pekko] def dispatch(receiver: ActorCell, invocation: Envelope): Unit /** * Suggest to register the provided mailbox for execution * * INTERNAL API */ - protected[akka] def registerForExecution( + protected[pekko] def registerForExecution( mbox: Mailbox, hasMessageHint: Boolean, hasSystemMessageHint: Boolean): Boolean @@ -309,22 +310,22 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator /** * INTERNAL API */ - protected[akka] def throughput: Int + protected[pekko] def throughput: Int /** * INTERNAL API */ - protected[akka] def throughputDeadlineTime: Duration + protected[pekko] def throughputDeadlineTime: Duration /** * INTERNAL API */ - @inline protected[akka] final val isThroughputDeadlineTimeDefined = throughputDeadlineTime.toMillis > 0 + @inline protected[pekko] final val isThroughputDeadlineTimeDefined = throughputDeadlineTime.toMillis > 0 /** * INTERNAL API */ - protected[akka] def executeTask(invocation: TaskInvocation): Unit + protected[pekko] def executeTask(invocation: TaskInvocation): Unit /** * Called one time every time an actor is detached from this dispatcher and this dispatcher has no actors left attached @@ -333,7 +334,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator * INTERNAL API */ @InternalStableApi - protected[akka] def shutdown(): Unit + protected[pekko] def shutdown(): Unit } /** @@ -399,7 +400,7 @@ class ThreadPoolExecutorConfigurator(config: Config, prerequisites: DispatcherPr protected def createThreadPoolConfigBuilder( config: Config, @unused prerequisites: DispatcherPrerequisites): ThreadPoolConfigBuilder = { - import akka.util.Helpers.ConfigOps + import org.apache.pekko.util.Helpers.ConfigOps val builder = ThreadPoolConfigBuilder(ThreadPoolConfig()) .setKeepAliveTime(config.getMillisDuration("keep-alive-time")) diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala similarity index 80% rename from akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala index c8bea5f2ca..bdec651426 100644 --- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.util.{ Comparator, Iterator } import java.util.concurrent.ConcurrentSkipListSet @@ -11,10 +11,11 @@ import scala.annotation.tailrec import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration -import akka.actor.ActorCell -import akka.actor.ActorSystemImpl -import akka.dispatch.sysmsg._ -import akka.util.Helpers +import org.apache.pekko +import pekko.actor.ActorCell +import pekko.actor.ActorSystemImpl +import pekko.dispatch.sysmsg._ +import pekko.util.Helpers /** * INTERNAL API: Use `BalancingPool` instead of this dispatcher directly. @@ -27,13 +28,13 @@ import akka.util.Helpers * best described as "work donating" because the actor of which work is being stolen takes the initiative. *

* The preferred way of creating dispatchers is to define configuration of it and use the - * the `lookup` method in [[akka.dispatch.Dispatchers]]. + * the `lookup` method in [[pekko.dispatch.Dispatchers]]. * - * @see akka.dispatch.BalancingDispatcher - * @see akka.dispatch.Dispatchers + * @see org.apache.pekko.dispatch.BalancingDispatcher + * @see org.apache.pekko.dispatch.Dispatchers */ @deprecated("Use BalancingPool instead of BalancingDispatcher", "2.3") -private[akka] class BalancingDispatcher( +private[pekko] class BalancingDispatcher( _configurator: MessageDispatcherConfigurator, _id: String, throughput: Int, @@ -53,7 +54,7 @@ private[akka] class BalancingDispatcher( /** * INTERNAL API */ - private[akka] val team = + private[pekko] val team = new ConcurrentSkipListSet[ActorCell](Helpers.identityHashComparator(new Comparator[ActorCell] { def compare(l: ActorCell, r: ActorCell) = l.self.path.compareTo(r.self.path) })) @@ -61,7 +62,7 @@ private[akka] class BalancingDispatcher( /** * INTERNAL API */ - private[akka] val messageQueue: MessageQueue = _mailboxType.create(None, None) + private[pekko] val messageQueue: MessageQueue = _mailboxType.create(None, None) private class SharingMailbox(val system: ActorSystemImpl, _messageQueue: MessageQueue) extends Mailbox(_messageQueue) @@ -80,21 +81,21 @@ private[akka] class BalancingDispatcher( } } - protected[akka] override def createMailbox(actor: akka.actor.Cell, mailboxType: MailboxType): Mailbox = + protected[pekko] override def createMailbox(actor: pekko.actor.Cell, mailboxType: MailboxType): Mailbox = new SharingMailbox(actor.systemImpl, messageQueue) - protected[akka] override def register(actor: ActorCell): Unit = { + protected[pekko] override def register(actor: ActorCell): Unit = { super.register(actor) team.add(actor) } - protected[akka] override def unregister(actor: ActorCell): Unit = { + protected[pekko] override def unregister(actor: ActorCell): Unit = { team.remove(actor) super.unregister(actor) teamWork() } - override protected[akka] def dispatch(receiver: ActorCell, invocation: Envelope) = { + override protected[pekko] def dispatch(receiver: ActorCell, invocation: Envelope) = { messageQueue.enqueue(receiver.self, invocation) if (!registerForExecution(receiver.mailbox, false, false)) teamWork() } diff --git a/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala similarity index 93% rename from akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala index 4bdf87aeb4..5ded0ab465 100644 --- a/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala @@ -2,9 +2,10 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch -import akka.annotation.InternalApi +import org.apache.pekko +import pekko.annotation.InternalApi import java.util.ArrayDeque import java.util.concurrent.Executor @@ -17,7 +18,7 @@ import scala.concurrent._ * All Batchables are automatically batched when submitted to a BatchingExecutor */ @InternalApi -private[akka] trait Batchable extends Runnable { +private[pekko] trait Batchable extends Runnable { def isBatchable: Boolean } @@ -52,7 +53,7 @@ private[akka] trait Batchable extends Runnable { * in the calling thread synchronously. It must enqueue/handoff the Runnable. */ @InternalApi -private[akka] trait BatchingExecutor extends Executor { +private[pekko] trait BatchingExecutor extends Executor { // invariant: if "_tasksLocal.get ne null" then we are inside Batch.run; if it is null, we are outside private[this] val _tasksLocal = new ThreadLocal[AbstractBatch]() @@ -134,5 +135,5 @@ private[akka] trait BatchingExecutor extends Executor { } /** Override this to define which runnables will be batched. */ - def batchable(runnable: Runnable): Boolean = akka.dispatch.internal.ScalaBatchable.isBatchable(runnable) + def batchable(runnable: Runnable): Boolean = pekko.dispatch.internal.ScalaBatchable.isBatchable(runnable) } diff --git a/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala similarity index 97% rename from akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala index d8f9e1f5f4..1ad5a4057a 100644 --- a/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.lang.Enum import java.util @@ -15,7 +15,7 @@ import com.typesafe.config._ /** * INTERNAL API */ -private[akka] object CachingConfig { +private[pekko] object CachingConfig { val emptyConfig = ConfigFactory.empty() sealed abstract trait PathEntry { @@ -40,7 +40,7 @@ private[akka] object CachingConfig { * * All other Config operations are delegated to the wrapped Config. */ -private[akka] class CachingConfig(_config: Config) extends Config { +private[pekko] class CachingConfig(_config: Config) extends Config { import CachingConfig._ diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala similarity index 87% rename from akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala index 75b2300f41..6e30ea7b69 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.util.concurrent.{ ExecutorService, RejectedExecutionException } import java.util.concurrent.atomic.AtomicReferenceFieldUpdater @@ -12,17 +12,18 @@ import scala.concurrent.duration.FiniteDuration import scala.annotation.nowarn -import akka.actor.ActorCell -import akka.dispatch.sysmsg.SystemMessage -import akka.event.Logging -import akka.event.Logging.Error +import org.apache.pekko +import pekko.actor.ActorCell +import pekko.dispatch.sysmsg.SystemMessage +import pekko.event.Logging +import pekko.event.Logging.Error /** * The event-based ``Dispatcher`` binds a set of Actors to a thread pool backed up by a * `BlockingQueue`. * * The preferred way of creating dispatchers is to define configuration of it and use the - * the `lookup` method in [[akka.dispatch.Dispatchers]]. + * the `lookup` method in [[pekko.dispatch.Dispatchers]]. * * @param throughput positive integer indicates the dispatcher will only process so much messages at a time from the * mailbox, without checking the mailboxes of other actors. Zero or negative means the dispatcher @@ -58,7 +59,7 @@ class Dispatcher( /** * INTERNAL API */ - protected[akka] def dispatch(receiver: ActorCell, invocation: Envelope): Unit = { + protected[pekko] def dispatch(receiver: ActorCell, invocation: Envelope): Unit = { val mbox = receiver.mailbox mbox.enqueue(receiver.self, invocation) registerForExecution(mbox, true, false) @@ -67,7 +68,7 @@ class Dispatcher( /** * INTERNAL API */ - protected[akka] def systemDispatch(receiver: ActorCell, invocation: SystemMessage): Unit = { + protected[pekko] def systemDispatch(receiver: ActorCell, invocation: SystemMessage): Unit = { val mbox = receiver.mailbox mbox.systemEnqueue(receiver.self, invocation) registerForExecution(mbox, false, true) @@ -76,7 +77,7 @@ class Dispatcher( /** * INTERNAL API */ - protected[akka] def executeTask(invocation: TaskInvocation): Unit = { + protected[pekko] def executeTask(invocation: TaskInvocation): Unit = { try { executorService.execute(invocation) } catch { @@ -94,7 +95,7 @@ class Dispatcher( /** * INTERNAL API */ - protected[akka] def createMailbox(actor: akka.actor.Cell, mailboxType: MailboxType): Mailbox = { + protected[pekko] def createMailbox(actor: pekko.actor.Cell, mailboxType: MailboxType): Mailbox = { new Mailbox(mailboxType.create(Some(actor.self), Some(actor.system))) with DefaultSystemMessageQueue } @@ -106,7 +107,7 @@ class Dispatcher( /** * INTERNAL API */ - protected[akka] def shutdown(): Unit = { + protected[pekko] def shutdown(): Unit = { val newDelegate = executorServiceDelegate.copy() // Doesn't matter which one we copy val es = esUpdater.getAndSet(this, newDelegate) es.shutdown() @@ -117,7 +118,7 @@ class Dispatcher( * * INTERNAL API */ - protected[akka] override def registerForExecution( + protected[pekko] override def registerForExecution( mbox: Mailbox, hasMessageHint: Boolean, hasSystemMessageHint: Boolean): Boolean = { diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala similarity index 89% rename from akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala index 14db028984..a86d28f9ac 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.util.concurrent.{ ConcurrentHashMap, ThreadFactory } @@ -11,12 +11,13 @@ import scala.concurrent.ExecutionContext import scala.annotation.nowarn import com.typesafe.config.{ Config, ConfigFactory, ConfigValueType } -import akka.ConfigurationException -import akka.actor.{ ActorSystem, DynamicAccess, Scheduler } -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.event.{ EventStream, LoggingAdapter } -import akka.event.Logging.Warning -import akka.util.Helpers.ConfigOps +import org.apache.pekko +import pekko.ConfigurationException +import pekko.actor.{ ActorSystem, DynamicAccess, Scheduler } +import pekko.annotation.{ DoNotInherit, InternalApi } +import pekko.event.{ EventStream, LoggingAdapter } +import pekko.event.Logging.Warning +import pekko.util.Helpers.ConfigOps /** * DispatcherPrerequisites represents useful contextual pieces when constructing a MessageDispatcher @@ -35,7 +36,7 @@ trait DispatcherPrerequisites { * INTERNAL API */ @InternalApi -private[akka] final case class DefaultDispatcherPrerequisites( +private[pekko] final case class DefaultDispatcherPrerequisites( threadFactory: ThreadFactory, eventStream: EventStream, scheduler: Scheduler, @@ -64,7 +65,7 @@ object Dispatchers { * INTERNAL API */ @InternalApi - private[akka] final val InternalDispatcherId = "akka.actor.internal-dispatcher" + private[pekko] final val InternalDispatcherId = "akka.actor.internal-dispatcher" private val MaxDispatcherAliasDepth = 20 @@ -73,7 +74,7 @@ object Dispatchers { * * Get (possibly aliased) dispatcher config. Returns empty config if not found. */ - private[akka] def getConfig(config: Config, id: String, depth: Int = 0): Config = { + private[pekko] def getConfig(config: Config, id: String, depth: Int = 0): Config = { if (depth > MaxDispatcherAliasDepth) ConfigFactory.empty(s"Didn't find dispatcher config after $MaxDispatcherAliasDepth aliases") else if (config.hasPath(id)) { @@ -100,7 +101,7 @@ object Dispatchers { * Not for user instantiation or extension */ @DoNotInherit -class Dispatchers @InternalApi private[akka] ( +class Dispatchers @InternalApi private[pekko] ( val settings: ActorSystem.Settings, val prerequisites: DispatcherPrerequisites, logger: LoggingAdapter) { @@ -122,7 +123,7 @@ class Dispatchers @InternalApi private[akka] ( /** * INTERNAL API */ - private[akka] val internalDispatcher = lookup(Dispatchers.InternalDispatcherId) + private[pekko] val internalDispatcher = lookup(Dispatchers.InternalDispatcherId) /** * Returns a dispatcher as specified in configuration. Please note that this @@ -191,7 +192,7 @@ class Dispatchers @InternalApi private[akka] ( * used by [[#lookup]] and [[#hasDispatcher]] instead of looking * up the configurator from the system configuration. * This enables dynamic addition of dispatchers, as used by the - * [[akka.routing.BalancingPool]]. + * [[pekko.routing.BalancingPool]]. * * A configurator for a certain id can only be registered once, i.e. * it can not be replaced. It is safe to call this method multiple times, @@ -204,15 +205,15 @@ class Dispatchers @InternalApi private[akka] ( /** * INTERNAL API */ - private[akka] def config(id: String): Config = { + private[pekko] def config(id: String): Config = { config(id, settings.config.getConfig(id)) } /** * INTERNAL API */ - private[akka] def config(id: String, appConfig: Config): Config = { - import akka.util.ccompat.JavaConverters._ + private[pekko] def config(id: String, appConfig: Config): Config = { + import pekko.util.ccompat.JavaConverters._ def simpleName = id.substring(id.lastIndexOf('.') + 1) idConfig(id) .withFallback(appConfig) @@ -221,7 +222,7 @@ class Dispatchers @InternalApi private[akka] ( } private def idConfig(id: String): Config = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ ConfigFactory.parseMap(Map("id" -> id).asJava) } @@ -237,7 +238,7 @@ class Dispatchers @InternalApi private[akka] ( * Throws: IllegalArgumentException if the value of "type" is not valid * IllegalArgumentException if it cannot create the MessageDispatcherConfigurator */ - private[akka] def from(cfg: Config): MessageDispatcher = configuratorFrom(cfg).dispatcher() + private[pekko] def from(cfg: Config): MessageDispatcher = configuratorFrom(cfg).dispatcher() /** * INTERNAL API @@ -271,7 +272,7 @@ class Dispatchers @InternalApi private[akka] ( throw new ConfigurationException( ("Cannot instantiate MessageDispatcherConfigurator type [%s], defined in [%s], " + "make sure it has constructor with [com.typesafe.config.Config] and " + - "[akka.dispatch.DispatcherPrerequisites] parameters").format(fqn, cfg.getString("id")), + "[org.apache.pekko.dispatch.DispatcherPrerequisites] parameters").format(fqn, cfg.getString("id")), exception) } .get @@ -280,7 +281,7 @@ class Dispatchers @InternalApi private[akka] ( } /** - * Configurator for creating [[akka.dispatch.Dispatcher]]. + * Configurator for creating [[pekko.dispatch.Dispatcher]]. * Returns the same dispatcher instance for each invocation * of the `dispatcher()` method. */ @@ -304,16 +305,16 @@ class DispatcherConfigurator(config: Config, prerequisites: DispatcherPrerequisi /** * INTERNAL API */ -private[akka] object BalancingDispatcherConfigurator { +private[pekko] object BalancingDispatcherConfigurator { private val defaultRequirement = - ConfigFactory.parseString("mailbox-requirement = akka.dispatch.MultipleConsumerSemantics") + ConfigFactory.parseString("mailbox-requirement = org.apache.pekko.dispatch.MultipleConsumerSemantics") def amendConfig(config: Config): Config = if (config.getString("mailbox-requirement") != Mailboxes.NoMailboxRequirement) config else defaultRequirement.withFallback(config) } /** - * Configurator for creating [[akka.dispatch.BalancingDispatcher]]. + * Configurator for creating [[pekko.dispatch.BalancingDispatcher]]. * Returns the same dispatcher instance for each invocation * of the `dispatcher()` method. */ @@ -327,7 +328,7 @@ class BalancingDispatcherConfigurator(_config: Config, _prerequisites: Dispatche val requirement = mailboxes.getMailboxRequirement(config) if (!classOf[MultipleConsumerSemantics].isAssignableFrom(requirement)) throw new IllegalArgumentException( - "BalancingDispatcher must have 'mailbox-requirement' which implements akka.dispatch.MultipleConsumerSemantics; " + + "BalancingDispatcher must have 'mailbox-requirement' which implements org.apache.pekko.dispatch.MultipleConsumerSemantics; " + s"dispatcher [$id] has [$requirement]") val mailboxType = if (config.hasPath("mailbox")) { @@ -364,7 +365,7 @@ class BalancingDispatcherConfigurator(_config: Config, _prerequisites: Dispatche } /** - * Configurator for creating [[akka.dispatch.PinnedDispatcher]]. + * Configurator for creating [[pekko.dispatch.PinnedDispatcher]]. * Returns new dispatcher instance for each invocation * of the `dispatcher()` method. */ diff --git a/akka-actor/src/main/scala/akka/dispatch/ForkJoinExecutorConfigurator.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala similarity index 99% rename from akka-actor/src/main/scala/akka/dispatch/ForkJoinExecutorConfigurator.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala index 85766b7cce..3c6d1e3c61 100644 --- a/akka-actor/src/main/scala/akka/dispatch/ForkJoinExecutorConfigurator.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.util.concurrent.{ ExecutorService, ForkJoinPool, ForkJoinTask, ThreadFactory } diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Future.scala similarity index 94% rename from akka-actor/src/main/scala/akka/dispatch/Future.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/Future.scala index 7c874f705c..c31311a94b 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Future.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Future.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.lang.{ Iterable => JIterable } import java.util.{ LinkedList => JLinkedList } @@ -16,12 +16,13 @@ import scala.util.{ Failure, Success, Try } import scala.annotation.nowarn -import akka.annotation.InternalApi -import akka.annotation.InternalStableApi -import akka.compat -import akka.dispatch.internal.SameThreadExecutionContext -import akka.japi.{ Function => JFunc, Option => JOption, Procedure } -import akka.util.unused +import org.apache.pekko +import pekko.annotation.InternalApi +import pekko.annotation.InternalStableApi +import pekko.compat +import pekko.dispatch.internal.SameThreadExecutionContext +import pekko.japi.{ Function => JFunc, Option => JOption, Procedure } +import pekko.util.unused /** * ExecutionContexts is the Java API for ExecutionContexts @@ -89,14 +90,14 @@ object ExecutionContexts { * Once Scala 2.12 is no longer supported this can be dropped in favour of directly using `ExecutionContext.parasitic` */ @InternalStableApi - private[akka] val parasitic: ExecutionContext = SameThreadExecutionContext() + private[pekko] val parasitic: ExecutionContext = SameThreadExecutionContext() /** * INTERNAL API */ @InternalApi @deprecated("Use ExecutionContexts.parasitic instead", "2.6.4") - private[akka] object sameThreadExecutionContext extends ExecutionContext with BatchingExecutor { + private[pekko] object sameThreadExecutionContext extends ExecutionContext with BatchingExecutor { override protected def unbatchedExecute(runnable: Runnable): Unit = parasitic.execute(runnable) override protected def resubmitOnBlock: Boolean = false // No point since we execute on same thread override def reportFailure(t: Throwable): Unit = @@ -109,7 +110,7 @@ object ExecutionContexts { * Futures is the Java API for Futures and Promises */ object Futures { - import akka.util.ccompat.JavaConverters._ + import org.apache.pekko.util.ccompat.JavaConverters._ /** * Starts an asynchronous computation and returns a `Future` object with the result of that computation. @@ -174,7 +175,7 @@ object Futures { def fold[T <: AnyRef, R <: AnyRef]( zero: R, futures: JIterable[Future[T]], - fun: akka.japi.Function2[R, T, R], + fun: pekko.japi.Function2[R, T, R], executor: ExecutionContext): Future[R] = compat.Future.fold(futures.asScala)(zero)(fun.apply)(executor) @@ -183,7 +184,7 @@ object Futures { */ def reduce[T <: AnyRef, R >: T]( futures: JIterable[Future[T]], - fun: akka.japi.Function2[R, T, R], + fun: pekko.japi.Function2[R, T, R], executor: ExecutionContext): Future[R] = compat.Future.reduce[T, R](futures.asScala)(fun.apply)(executor) @@ -343,7 +344,7 @@ abstract class Recover[+T] extends japi.RecoverBridge[T] { * possible to use `Future.filter` by constructing such a function indirectly: * * {{{ - * import static akka.dispatch.Filter.filterOf; + * import static org.apache.pekko.dispatch.Filter.filterOf; * Future f = ...; * f.filter(filterOf(new Function() { * @Override @@ -358,7 +359,7 @@ abstract class Recover[+T] extends japi.RecoverBridge[T] { * to failure cases. */ object Filter { - def filterOf[T](f: akka.japi.Function[T, java.lang.Boolean]): (T => Boolean) = + def filterOf[T](f: pekko.japi.Function[T, java.lang.Boolean]): (T => Boolean) = new Function1[T, Boolean] { def apply(result: T): Boolean = f(result).booleanValue() } } @@ -385,7 +386,7 @@ abstract class Foreach[-T] extends japi.UnitFunctionBridge[T] { /** * Callback for the Future.map and Future.flatMap operations that will be invoked * if the Future that this callback is registered on becomes completed with a success. - * This callback is the equivalent of an akka.japi.Function + * This callback is the equivalent of an org.apache.pekko.japi.Function * * Override "apply" normally, or "checkedApply" if you need to throw checked exceptions. * diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala similarity index 97% rename from akka-actor/src/main/scala/akka/dispatch/Mailbox.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala index 2238b3e51e..8a5a6e54d6 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.util.{ Comparator, Deque, PriorityQueue, Queue } import java.util.concurrent._ @@ -15,17 +15,18 @@ import scala.util.control.NonFatal import com.typesafe.config.Config -import akka.actor.{ ActorCell, ActorRef, ActorSystem, DeadLetter, InternalActorRef } -import akka.annotation.InternalStableApi -import akka.dispatch.sysmsg._ -import akka.event.Logging.Error -import akka.util.{ BoundedBlockingQueue, StablePriorityBlockingQueue, StablePriorityQueue, Unsafe } -import akka.util.Helpers.ConfigOps +import org.apache.pekko +import pekko.actor.{ ActorCell, ActorRef, ActorSystem, DeadLetter, InternalActorRef } +import pekko.annotation.InternalStableApi +import pekko.dispatch.sysmsg._ +import pekko.event.Logging.Error +import pekko.util.{ BoundedBlockingQueue, StablePriorityBlockingQueue, StablePriorityQueue, Unsafe } +import pekko.util.Helpers.ConfigOps /** * INTERNAL API */ -private[akka] object Mailbox { +private[pekko] object Mailbox { type Status = Int @@ -55,7 +56,7 @@ private[akka] object Mailbox { * * INTERNAL API */ -private[akka] abstract class Mailbox(val messageQueue: MessageQueue) +private[pekko] abstract class Mailbox(val messageQueue: MessageQueue) extends ForkJoinTask[Unit] with SystemMessageQueue with Runnable { @@ -448,7 +449,7 @@ class BoundedNodeMessageQueue(capacity: Int) /** * INTERNAL API */ -private[akka] trait SystemMessageQueue { +private[pekko] trait SystemMessageQueue { /** * Enqueue a new system message, e.g. by prepending atomically as new head of a single-linked list. @@ -467,7 +468,7 @@ private[akka] trait SystemMessageQueue { /** * INTERNAL API */ -private[akka] trait DefaultSystemMessageQueue { self: Mailbox => +private[pekko] trait DefaultSystemMessageQueue { self: Mailbox => @tailrec final def systemEnqueue(receiver: ActorRef, message: SystemMessage): Unit = { @@ -547,7 +548,7 @@ trait BoundedMessageQueueSemantics { * Used to determine mailbox factories which create [[BoundedMessageQueueSemantics]] * mailboxes, and thus should be validated that the `pushTimeOut` is greater than 0. */ -private[akka] trait ProducesPushTimeoutSemanticsMailbox { +private[pekko] trait ProducesPushTimeoutSemanticsMailbox { def pushTimeOut: Duration } @@ -865,7 +866,7 @@ object BoundedDequeBasedMailbox { } /** - * ControlAwareMessageQueue handles messages that extend [[akka.dispatch.ControlMessage]] with priority. + * ControlAwareMessageQueue handles messages that extend [[pekko.dispatch.ControlMessage]] with priority. */ trait ControlAwareMessageQueueSemantics extends QueueBasedMessageQueue { def controlQueue: Queue[Envelope] @@ -902,7 +903,7 @@ trait ControlMessage /** * UnboundedControlAwareMailbox is an unbounded MailboxType, that maintains two queues - * to allow messages that extend [[akka.dispatch.ControlMessage]] to be delivered with priority. + * to allow messages that extend [[pekko.dispatch.ControlMessage]] to be delivered with priority. */ final case class UnboundedControlAwareMailbox() extends MailboxType @@ -925,7 +926,7 @@ object UnboundedControlAwareMailbox { /** * BoundedControlAwareMailbox is a bounded MailboxType, that maintains two queues - * to allow messages that extend [[akka.dispatch.ControlMessage]] to be delivered with priority. + * to allow messages that extend [[pekko.dispatch.ControlMessage]] to be delivered with priority. */ final case class BoundedControlAwareMailbox(capacity: Int, override final val pushTimeOut: FiniteDuration) extends MailboxType diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala similarity index 93% rename from akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala index ddddd0e3af..dc7d9987e1 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.lang.reflect.ParameterizedType import java.util.concurrent.ConcurrentHashMap @@ -14,18 +14,19 @@ import scala.util.control.NonFatal import com.typesafe.config.{ Config, ConfigFactory } -import akka.ConfigurationException -import akka.actor.{ Actor, ActorRef, ActorSystem, DeadLetter, Deploy, DynamicAccess, Props } -import akka.annotation.InternalStableApi -import akka.dispatch.sysmsg.{ +import org.apache.pekko +import pekko.ConfigurationException +import pekko.actor.{ Actor, ActorRef, ActorSystem, DeadLetter, Deploy, DynamicAccess, Props } +import pekko.annotation.InternalStableApi +import pekko.dispatch.sysmsg.{ EarliestFirstSystemMessageList, LatestFirstSystemMessageList, SystemMessage, SystemMessageList } -import akka.event.EventStream -import akka.event.Logging.Warning -import akka.util.Reflect +import pekko.event.EventStream +import pekko.event.Logging.Warning +import pekko.util.Reflect object Mailboxes { final val DefaultMailboxId = "akka.actor.default-mailbox" @@ -33,7 +34,7 @@ object Mailboxes { final val BoundedCapacityPrefix = "bounded-capacity:" } -private[akka] class Mailboxes( +private[pekko] class Mailboxes( val settings: ActorSystem.Settings, val eventStream: EventStream, dynamicAccess: DynamicAccess, @@ -56,7 +57,7 @@ private[akka] class Mailboxes( } @InternalStableApi - private[akka] def onDeadLetterMailboxEnqueue(receiver: ActorRef, envelope: Envelope): Unit = envelope.message match { + private[pekko] def onDeadLetterMailboxEnqueue(receiver: ActorRef, envelope: Envelope): Unit = envelope.message match { case _: DeadLetter => // actor subscribing to DeadLetter, drop it case msg => deadLetters.tell(DeadLetter(msg, envelope.sender, receiver), envelope.sender) } @@ -64,7 +65,7 @@ private[akka] class Mailboxes( private val mailboxTypeConfigurators = new ConcurrentHashMap[String, MailboxType] private val mailboxBindings: Map[Class[_ <: Any], String] = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ settings.config .getConfig("akka.actor.mailbox.requirements") .root @@ -145,7 +146,7 @@ private[akka] class Mailboxes( /** * Finds out the mailbox type for an actor based on configuration, props and requirements. */ - protected[akka] def getMailboxType(props: Props, dispatcherConfig: Config): MailboxType = { + protected[pekko] def getMailboxType(props: Props, dispatcherConfig: Config): MailboxType = { val id = dispatcherConfig.getString("id") val deploy = props.deploy val actorClass = props.actorClass() @@ -237,7 +238,7 @@ private[akka] class Mailboxes( case exception => throw new IllegalArgumentException( s"Cannot instantiate MailboxType [$fqcn], defined in [$id], make sure it has a public" + - " constructor with [akka.actor.ActorSystem.Settings, com.typesafe.config.Config] parameters", + " constructor with [org.apache.pekko.actor.ActorSystem.Settings, com.typesafe.config.Config] parameters", exception) } .get @@ -274,7 +275,7 @@ private[akka] class Mailboxes( // INTERNAL API private def config(id: String): Config = { - import akka.util.ccompat.JavaConverters._ + import pekko.util.ccompat.JavaConverters._ ConfigFactory .parseMap(Map("id" -> id).asJava) .withFallback(settings.config.getConfig(id)) @@ -288,7 +289,7 @@ private[akka] class Mailboxes( /** * INTERNAL API: The capacity of the stash. Configured in the actor's mailbox or dispatcher config. */ - private[akka] final def stashCapacity(dispatcher: String, mailbox: String): Int = { + private[pekko] final def stashCapacity(dispatcher: String, mailbox: String): Int = { @tailrec def updateCache(cache: Map[String, Int], key: String, value: Int): Boolean = { stashCapacityCache.compareAndSet(cache, cache.updated(key, value)) || diff --git a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala similarity index 81% rename from akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala index b9168571a8..6d438e2144 100644 --- a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala @@ -2,18 +2,19 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration -import akka.actor.ActorCell +import org.apache.pekko +import pekko.actor.ActorCell /** * Dedicates a unique thread for each actor passed in as reference. Served through its messageQueue. * * The preferred way of creating dispatchers is to define configuration of it and use the - * the `lookup` method in [[akka.dispatch.Dispatchers]]. + * the `lookup` method in [[pekko.dispatch.Dispatchers]]. */ class PinnedDispatcher( _configurator: MessageDispatcherConfigurator, @@ -33,7 +34,7 @@ class PinnedDispatcher( private var owner: ActorCell = _actor // Relies on an external lock provided by MessageDispatcher.attach - protected[akka] override def register(actorCell: ActorCell) = { + protected[pekko] override def register(actorCell: ActorCell) = { val actor = owner if ((actor ne null) && actorCell != actor) throw new IllegalArgumentException("Cannot register to anyone but " + actor) @@ -41,7 +42,7 @@ class PinnedDispatcher( super.register(actorCell) } // Relies on an external lock provided by MessageDispatcher.detach - protected[akka] override def unregister(actor: ActorCell) = { + protected[pekko] override def unregister(actor: ActorCell) = { super.unregister(actor) owner = null } diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala similarity index 98% rename from akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala index 9459e52e4a..a5d66ea2ca 100644 --- a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch +package org.apache.pekko.dispatch import java.util.Collection import java.util.concurrent.{ @@ -164,7 +164,7 @@ object MonitorableThreadFactory { val doNothing: Thread.UncaughtExceptionHandler = new Thread.UncaughtExceptionHandler() { def uncaughtException(thread: Thread, cause: Throwable) = () } - private[akka] class AkkaForkJoinWorkerThread(_pool: ForkJoinPool) + private[pekko] class AkkaForkJoinWorkerThread(_pool: ForkJoinPool) extends ForkJoinWorkerThread(_pool) with BlockContext { override def blockOn[T](thunk: => T)(implicit permission: CanAwait): T = { diff --git a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala similarity index 95% rename from akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala index a8dec2d298..aa3748aae4 100644 --- a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2022 Lightbend Inc. */ -package akka.dispatch.affinity +package org.apache.pekko.dispatch.affinity import java.lang.Integer.reverseBytes import java.util.Collections @@ -16,11 +16,12 @@ import scala.collection.{ immutable, mutable } import com.typesafe.config.Config -import akka.annotation.{ ApiMayChange, InternalApi } -import akka.dispatch._ -import akka.event.Logging -import akka.util.{ ImmutableIntMap, ReentrantGuard } -import akka.util.Helpers.Requiring +import org.apache.pekko +import pekko.annotation.{ ApiMayChange, InternalApi } +import pekko.dispatch._ +import pekko.event.Logging +import pekko.util.{ ImmutableIntMap, ReentrantGuard } +import pekko.util.Helpers.Requiring @InternalApi @ApiMayChange @@ -110,7 +111,7 @@ private[affinity] object AffinityPool { */ @InternalApi @ApiMayChange -private[akka] class AffinityPool( +private[pekko] class AffinityPool( id: String, parallelism: Int, affinityGroupSize: Int, @@ -296,7 +297,7 @@ private[akka] class AffinityPool( */ @InternalApi @ApiMayChange -private[akka] final class AffinityPoolConfigurator(config: Config, prerequisites: DispatcherPrerequisites) +private[pekko] final class AffinityPoolConfigurator(config: Config, prerequisites: DispatcherPrerequisites) extends ExecutorServiceConfigurator(config, prerequisites) { private val poolSize = ThreadPoolConfig.scaledPoolSize( @@ -384,7 +385,7 @@ trait QueueSelector { */ @InternalApi @ApiMayChange -private[akka] final class ThrowOnOverflowRejectionHandler extends RejectionHandlerFactory with RejectionHandler { +private[pekko] final class ThrowOnOverflowRejectionHandler extends RejectionHandlerFactory with RejectionHandler { override def reject(command: Runnable, service: ExecutorService): Unit = throw new RejectedExecutionException(s"Task $command rejected from $service") override def create(): RejectionHandler = this @@ -395,7 +396,7 @@ private[akka] final class ThrowOnOverflowRejectionHandler extends RejectionHandl */ @InternalApi @ApiMayChange -private[akka] final class FairDistributionHashCache(val config: Config) extends QueueSelectorFactory { +private[pekko] final class FairDistributionHashCache(val config: Config) extends QueueSelectorFactory { private final val MaxFairDistributionThreshold = 2048 private[this] final val fairDistributionThreshold = config diff --git a/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala b/akka-actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala similarity index 69% rename from akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala rename to akka-actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala index 331041fdc8..ef69f10594 100644 --- a/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala @@ -2,21 +2,22 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.dispatch.sysmsg +package org.apache.pekko.dispatch.sysmsg import scala.annotation.tailrec -import akka.actor.{ ActorInitializationException, ActorRef, InternalActorRef, PossiblyHarmful } -import akka.actor.DeadLetterSuppression -import akka.annotation.InternalStableApi +import org.apache.pekko +import pekko.actor.{ ActorInitializationException, ActorRef, InternalActorRef, PossiblyHarmful } +import pekko.actor.DeadLetterSuppression +import pekko.annotation.InternalStableApi /** * INTERNAL API * - * Helper companion object for [[akka.dispatch.sysmsg.LatestFirstSystemMessageList]] and - * [[akka.dispatch.sysmsg.EarliestFirstSystemMessageList]] + * Helper companion object for [[pekko.dispatch.sysmsg.LatestFirstSystemMessageList]] and + * [[pekko.dispatch.sysmsg.EarliestFirstSystemMessageList]] */ -private[akka] object SystemMessageList { +private[pekko] object SystemMessageList { final val LNil: LatestFirstSystemMessageList = new LatestFirstSystemMessageList(null) final val ENil: EarliestFirstSystemMessageList = new EarliestFirstSystemMessageList(null) @@ -39,8 +40,8 @@ private[akka] object SystemMessageList { * INTERNAL API * * Value class supporting list operations on system messages. The `next` field of [[SystemMessage]] - * is hidden, and can only accessed through the value classes [[akka.dispatch.sysmsg.LatestFirstSystemMessageList]] and - * [[akka.dispatch.sysmsg.EarliestFirstSystemMessageList]], abstracting over the fact that system messages are the + * is hidden, and can only accessed through the value classes [[pekko.dispatch.sysmsg.LatestFirstSystemMessageList]] and + * [[pekko.dispatch.sysmsg.EarliestFirstSystemMessageList]], abstracting over the fact that system messages are the * list nodes themselves. If used properly, this stays a compile time construct without any allocation overhead. * * This list is mutable. @@ -48,7 +49,7 @@ private[akka] object SystemMessageList { * The type of the list also encodes that the messages contained are in reverse order, i.e. the head of the list is the * latest appended element. */ -private[akka] class LatestFirstSystemMessageList(val head: SystemMessage) extends AnyVal { +private[pekko] class LatestFirstSystemMessageList(val head: SystemMessage) extends AnyVal { import SystemMessageList._ /** @@ -70,7 +71,7 @@ private[akka] class LatestFirstSystemMessageList(val head: SystemMessage) extend * Gives back the list containing all the elements except the first. This operation has constant cost. * * *Warning:* as the underlying list nodes (the [[SystemMessage]] instances) are mutable, care - * should be taken when passing the tail to other methods. [[akka.dispatch.sysmsg.SystemMessage#unlink]] should be + * should be taken when passing the tail to other methods. [[pekko.dispatch.sysmsg.SystemMessage#unlink]] should be * called on the head if one wants to detach the tail permanently. */ final def tail: LatestFirstSystemMessageList = new LatestFirstSystemMessageList(head.next) @@ -79,7 +80,7 @@ private[akka] class LatestFirstSystemMessageList(val head: SystemMessage) extend * Reverses the list. This operation mutates the underlying list. The cost of the call to reverse is linear in the * number of elements. * - * The type of the returned list is of the opposite order: [[akka.dispatch.sysmsg.EarliestFirstSystemMessageList]] + * The type of the returned list is of the opposite order: [[pekko.dispatch.sysmsg.EarliestFirstSystemMessageList]] */ final def reverse: EarliestFirstSystemMessageList = new EarliestFirstSystemMessageList(reverseInner(head, null)) @@ -98,8 +99,8 @@ private[akka] class LatestFirstSystemMessageList(val head: SystemMessage) extend * INTERNAL API * * Value class supporting list operations on system messages. The `next` field of [[SystemMessage]] - * is hidden, and can only accessed through the value classes [[akka.dispatch.sysmsg.LatestFirstSystemMessageList]] and - * [[akka.dispatch.sysmsg.EarliestFirstSystemMessageList]], abstracting over the fact that system messages are the + * is hidden, and can only accessed through the value classes [[pekko.dispatch.sysmsg.LatestFirstSystemMessageList]] and + * [[pekko.dispatch.sysmsg.EarliestFirstSystemMessageList]], abstracting over the fact that system messages are the * list nodes themselves. If used properly, this stays a compile time construct without any allocation overhead. * * This list is mutable. @@ -107,7 +108,7 @@ private[akka] class LatestFirstSystemMessageList(val head: SystemMessage) extend * This list type also encodes that the messages contained are in reverse order, i.e. the head of the list is the * latest appended element. */ -private[akka] class EarliestFirstSystemMessageList(val head: SystemMessage) extends AnyVal { +private[pekko] class EarliestFirstSystemMessageList(val head: SystemMessage) extends AnyVal { import SystemMessageList._ /** @@ -129,7 +130,7 @@ private[akka] class EarliestFirstSystemMessageList(val head: SystemMessage) exte * Gives back the list containing all the elements except the first. This operation has constant cost. * * *Warning:* as the underlying list nodes (the [[SystemMessage]] instances) are mutable, care - * should be taken when passing the tail to other methods. [[akka.dispatch.sysmsg.SystemMessage#unlink]] should be + * should be taken when passing the tail to other methods. [[pekko.dispatch.sysmsg.SystemMessage#unlink]] should be * called on the head if one wants to detach the tail permanently. */ final def tail: EarliestFirstSystemMessageList = new EarliestFirstSystemMessageList(head.next) @@ -138,7 +139,7 @@ private[akka] class EarliestFirstSystemMessageList(val head: SystemMessage) exte * Reverses the list. This operation mutates the underlying list. The cost of the call to reverse is linear in the * number of elements. * - * The type of the returned list is of the opposite order: [[akka.dispatch.sysmsg.LatestFirstSystemMessageList]] + * The type of the returned list is of the opposite order: [[pekko.dispatch.sysmsg.LatestFirstSystemMessageList]] */ final def reverse: LatestFirstSystemMessageList = new LatestFirstSystemMessageList(reverseInner(head, null)) @@ -189,7 +190,7 @@ private[akka] class EarliestFirstSystemMessageList(val head: SystemMessage) exte * NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS */ @InternalStableApi -private[akka] sealed trait SystemMessage extends PossiblyHarmful with Serializable { +private[pekko] sealed trait SystemMessage extends PossiblyHarmful with Serializable { // Next fields are only modifiable via the SystemMessageList value class @transient private[sysmsg] var next: SystemMessage = _ @@ -202,71 +203,72 @@ private[akka] sealed trait SystemMessage extends PossiblyHarmful with Serializab /** * INTERNAL API */ -private[akka] trait StashWhenWaitingForChildren +private[pekko] trait StashWhenWaitingForChildren /** * INTERNAL API */ -private[akka] trait StashWhenFailed +private[pekko] trait StashWhenFailed /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Create(failure: Option[ActorInitializationException]) extends SystemMessage // sent to self from Dispatcher.register +private[pekko] final case class Create(failure: Option[ActorInitializationException]) extends SystemMessage // sent to self from Dispatcher.register /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Recreate(cause: Throwable) extends SystemMessage with StashWhenWaitingForChildren // sent to self from ActorCell.restart +private[pekko] final case class Recreate(cause: Throwable) extends SystemMessage with StashWhenWaitingForChildren // sent to self from ActorCell.restart /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Suspend() extends SystemMessage with StashWhenWaitingForChildren // sent to self from ActorCell.suspend +private[pekko] final case class Suspend() extends SystemMessage with StashWhenWaitingForChildren // sent to self from ActorCell.suspend /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Resume(causedByFailure: Throwable) extends SystemMessage with StashWhenWaitingForChildren // sent to self from ActorCell.resume +private[pekko] final case class Resume(causedByFailure: Throwable) extends SystemMessage + with StashWhenWaitingForChildren // sent to self from ActorCell.resume /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Terminate() extends SystemMessage with DeadLetterSuppression // sent to self from ActorCell.stop +private[pekko] final case class Terminate() extends SystemMessage with DeadLetterSuppression // sent to self from ActorCell.stop /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Supervise(child: ActorRef, async: Boolean) extends SystemMessage // sent to supervisor ActorRef from ActorCell.start +private[pekko] final case class Supervise(child: ActorRef, async: Boolean) extends SystemMessage // sent to supervisor ActorRef from ActorCell.start /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Watch(watchee: InternalActorRef, watcher: InternalActorRef) extends SystemMessage // sent to establish a DeathWatch +private[pekko] final case class Watch(watchee: InternalActorRef, watcher: InternalActorRef) extends SystemMessage // sent to establish a DeathWatch /** * INTERNAL API */ @SerialVersionUID(1L) // Watch and Unwatch have different signatures, but this can't be changed without breaking serialization compatibility -private[akka] final case class Unwatch(watchee: ActorRef, watcher: ActorRef) extends SystemMessage // sent to tear down a DeathWatch +private[pekko] final case class Unwatch(watchee: ActorRef, watcher: ActorRef) extends SystemMessage // sent to tear down a DeathWatch /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] case object NoMessage extends SystemMessage // switched into the mailbox to signal termination +private[pekko] case object NoMessage extends SystemMessage // switched into the mailbox to signal termination /** * INTERNAL API */ @SerialVersionUID(1L) -private[akka] final case class Failed(child: ActorRef, cause: Throwable, uid: Int) +private[pekko] final case class Failed(child: ActorRef, cause: Throwable, uid: Int) extends SystemMessage with StashWhenFailed with StashWhenWaitingForChildren @SerialVersionUID(1L) -private[akka] final case class DeathWatchNotification( +private[pekko] final case class DeathWatchNotification( actor: ActorRef, existenceConfirmed: Boolean, addressTerminated: Boolean) diff --git a/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala b/akka-actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala similarity index 85% rename from akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala rename to akka-actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala index 0102257804..0ed5fdf43e 100644 --- a/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala @@ -2,20 +2,21 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import java.util.concurrent.atomic.AtomicInteger -import akka.actor._ -import akka.event.Logging.simpleName -import akka.util.unused +import org.apache.pekko +import pekko.actor._ +import pekko.event.Logging.simpleName +import pekko.util.unused /** * INTERNAL API * * Watches all actors which subscribe on the given event stream, and unsubscribes them from it when they are Terminated. */ -protected[akka] class ActorClassificationUnsubscriber(bus: String, unsubscribe: ActorRef => Unit, debug: Boolean) +protected[pekko] class ActorClassificationUnsubscriber(bus: String, unsubscribe: ActorRef => Unit, debug: Boolean) extends Actor with Stash { @@ -66,9 +67,9 @@ protected[akka] class ActorClassificationUnsubscriber(bus: String, unsubscribe: /** * INTERNAL API * - * Provides factory for [[akka.event.ActorClassificationUnsubscriber]] actors with **unique names**. + * Provides factory for [[pekko.event.ActorClassificationUnsubscriber]] actors with **unique names**. */ -private[akka] object ActorClassificationUnsubscriber { +private[pekko] object ActorClassificationUnsubscriber { private val unsubscribersCount = new AtomicInteger(0) diff --git a/akka-actor/src/main/scala/akka/event/AddressTerminatedTopic.scala b/akka-actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala similarity index 69% rename from akka-actor/src/main/scala/akka/event/AddressTerminatedTopic.scala rename to akka-actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala index 629f0a2adc..7b40f6b0a3 100644 --- a/akka-actor/src/main/scala/akka/event/AddressTerminatedTopic.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala @@ -2,30 +2,31 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec -import akka.actor.ActorRef -import akka.actor.ActorSystem -import akka.actor.AddressTerminated -import akka.actor.ClassicActorSystemProvider -import akka.actor.ExtendedActorSystem -import akka.actor.Extension -import akka.actor.ExtensionId -import akka.actor.ExtensionIdProvider +import org.apache.pekko +import pekko.actor.ActorRef +import pekko.actor.ActorSystem +import pekko.actor.AddressTerminated +import pekko.actor.ClassicActorSystemProvider +import pekko.actor.ExtendedActorSystem +import pekko.actor.Extension +import pekko.actor.ExtensionId +import pekko.actor.ExtensionIdProvider /** * INTERNAL API * * Watchers of remote actor references register themselves as subscribers - * of [[akka.actor.AddressTerminated]] notifications. Remote and cluster + * of [[pekko.actor.AddressTerminated]] notifications. Remote and cluster * death watch publish `AddressTerminated` when a remote system is deemed * dead. */ -private[akka] object AddressTerminatedTopic extends ExtensionId[AddressTerminatedTopic] with ExtensionIdProvider { +private[pekko] object AddressTerminatedTopic extends ExtensionId[AddressTerminatedTopic] with ExtensionIdProvider { override def get(system: ActorSystem): AddressTerminatedTopic = super.get(system) override def get(system: ClassicActorSystemProvider): AddressTerminatedTopic = super.get(system) @@ -38,7 +39,7 @@ private[akka] object AddressTerminatedTopic extends ExtensionId[AddressTerminate /** * INTERNAL API */ -private[akka] final class AddressTerminatedTopic extends Extension { +private[pekko] final class AddressTerminatedTopic extends Extension { private val subscribers = new AtomicReference[Set[ActorRef]](Set.empty[ActorRef]) diff --git a/akka-actor/src/main/scala/akka/event/DeadLetterListener.scala b/akka-actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala similarity index 92% rename from akka-actor/src/main/scala/akka/event/DeadLetterListener.scala rename to akka-actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala index a1e87a91e6..c766ffad59 100644 --- a/akka-actor/src/main/scala/akka/event/DeadLetterListener.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala @@ -2,23 +2,24 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import scala.concurrent.duration.Deadline import scala.concurrent.duration.FiniteDuration -import akka.actor.Actor -import akka.actor.ActorLogMarker -import akka.actor.ActorRef -import akka.actor.AllDeadLetters -import akka.actor.DeadLetter -import akka.actor.DeadLetterActorRef -import akka.actor.DeadLetterSuppression -import akka.actor.Dropped -import akka.actor.UnhandledMessage -import akka.actor.WrappedMessage -import akka.event.Logging.Info -import akka.util.PrettyDuration._ +import org.apache.pekko +import pekko.actor.Actor +import pekko.actor.ActorLogMarker +import pekko.actor.ActorRef +import pekko.actor.AllDeadLetters +import pekko.actor.DeadLetter +import pekko.actor.DeadLetterActorRef +import pekko.actor.DeadLetterSuppression +import pekko.actor.Dropped +import pekko.actor.UnhandledMessage +import pekko.actor.WrappedMessage +import pekko.event.Logging.Info +import pekko.util.PrettyDuration._ class DeadLetterListener extends Actor { diff --git a/akka-actor/src/main/scala/akka/event/EventBus.scala b/akka-actor/src/main/scala/org/apache/pekko/event/EventBus.scala similarity index 95% rename from akka-actor/src/main/scala/akka/event/EventBus.scala rename to akka-actor/src/main/scala/org/apache/pekko/event/EventBus.scala index 1d36e70dde..c11512309a 100644 --- a/akka-actor/src/main/scala/akka/event/EventBus.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/event/EventBus.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import java.util.Comparator import java.util.concurrent.ConcurrentSkipListSet @@ -10,9 +10,10 @@ import java.util.concurrent.atomic.AtomicReference import scala.collection.immutable -import akka.actor.{ ActorRef, ActorSystem } -import akka.util.{ Subclassification, SubclassifiedIndex } -import akka.util.Index +import org.apache.pekko +import pekko.actor.{ ActorRef, ActorSystem } +import pekko.util.{ Subclassification, SubclassifiedIndex } +import pekko.util.Index /** * Represents the base type for EventBuses @@ -183,7 +184,7 @@ trait SubchannelClassification { this: EventBus => * INTERNAL API * Expensive call! Avoid calling directly from event bus subscribe / unsubscribe. */ - private[akka] def hasSubscriptions(subscriber: Subscriber): Boolean = + private[pekko] def hasSubscriptions(subscriber: Subscriber): Boolean = // FIXME binary incompatible, but I think it is safe to filter out this problem, // since it is only called from new functionality in EventStreamUnsubscriber cache.values.exists { _ contains subscriber } @@ -261,7 +262,7 @@ trait ScanningClassification { self: EventBus => /** * Maps ActorRefs to ActorRefs to form an EventBus where ActorRefs can listen to other ActorRefs. * - * All subscribers will be watched by an `akka.event.ActorClassificationUnsubscriber` and unsubscribed when they terminate. + * All subscribers will be watched by an `org.apache.pekko.event.ActorClassificationUnsubscriber` and unsubscribed when they terminate. * The unsubscriber actor will not be stopped automatically, and if you want to stop using the bus you should stop it yourself. */ trait ManagedActorClassification { this: ActorEventBus with ActorClassifier => @@ -411,7 +412,7 @@ trait ManagedActorClassification { this: ActorEventBus with ActorClassifier => /** * INTERNAL API */ - private[akka] def registerWithUnsubscriber(subscriber: ActorRef, seqNr: Int): Boolean = { + private[pekko] def registerWithUnsubscriber(subscriber: ActorRef, seqNr: Int): Boolean = { unsubscriber ! ActorClassificationUnsubscriber.Register(subscriber, seqNr) true } @@ -419,7 +420,7 @@ trait ManagedActorClassification { this: ActorEventBus with ActorClassifier => /** * INTERNAL API */ - private[akka] def unregisterFromUnsubscriber(subscriber: ActorRef, seqNr: Int): Boolean = { + private[pekko] def unregisterFromUnsubscriber(subscriber: ActorRef, seqNr: Int): Boolean = { unsubscriber ! ActorClassificationUnsubscriber.Unregister(subscriber, seqNr) true } diff --git a/akka-actor/src/main/scala/akka/event/EventStream.scala b/akka-actor/src/main/scala/org/apache/pekko/event/EventStream.scala similarity index 94% rename from akka-actor/src/main/scala/akka/event/EventStream.scala rename to akka-actor/src/main/scala/org/apache/pekko/event/EventStream.scala index 7c62e7eccc..be9f5e8b2a 100644 --- a/akka-actor/src/main/scala/akka/event/EventStream.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/event/EventStream.scala @@ -2,15 +2,16 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec -import akka.actor.{ ActorRef, ActorSystem } -import akka.event.Logging.simpleName -import akka.util.Subclassification +import org.apache.pekko +import pekko.actor.{ ActorRef, ActorSystem } +import pekko.event.Logging.simpleName +import pekko.util.Subclassification /** * An Akka EventStream is a pub-sub stream of events both system and user generated, @@ -28,7 +29,7 @@ class EventStream(sys: ActorSystem, private val debug: Boolean) extends LoggingB type Event = Any type Classifier = Class[_] - /** Either the list of subscribed actors, or a ref to an [[akka.event.EventStreamUnsubscriber]] */ + /** Either the list of subscribed actors, or a ref to an [[pekko.event.EventStreamUnsubscriber]] */ private val initiallySubscribedOrUnsubscriber = new AtomicReference[Either[Set[ActorRef], ActorRef]](Left(Set.empty)) protected implicit val subclassification: Subclassification[Classifier] = new Subclassification[Class[_]] { @@ -81,7 +82,7 @@ class EventStream(sys: ActorSystem, private val debug: Boolean) extends LoggingB * INTERNAL API */ @tailrec - final private[akka] def initUnsubscriber(unsubscriber: ActorRef): Boolean = { + final private[pekko] def initUnsubscriber(unsubscriber: ActorRef): Boolean = { // sys may be null for backwards compatibility reasons if (sys eq null) false else diff --git a/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala b/akka-actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala similarity index 86% rename from akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala rename to akka-actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala index 7531d429a4..ca10fc4831 100644 --- a/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala @@ -2,13 +2,14 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import java.util.concurrent.atomic.AtomicInteger -import akka.actor._ -import akka.dispatch.Dispatchers -import akka.event.Logging.simpleName +import org.apache.pekko +import pekko.actor._ +import pekko.dispatch.Dispatchers +import pekko.event.Logging.simpleName /** * INTERNAL API @@ -22,7 +23,7 @@ import akka.event.Logging.simpleName * subscribe calls * because of the need of linearizing the history message sequence and the possibility of sometimes * watching a few actors too much - we opt for the 2nd choice here. */ -protected[akka] class EventStreamUnsubscriber(eventStream: EventStream, debug: Boolean = false) extends Actor { +protected[pekko] class EventStreamUnsubscriber(eventStream: EventStream, debug: Boolean = false) extends Actor { import EventStreamUnsubscriber._ @@ -58,11 +59,11 @@ protected[akka] class EventStreamUnsubscriber(eventStream: EventStream, debug: B /** * INTERNAL API * - * Provides factory for [[akka.event.EventStreamUnsubscriber]] actors with **unique names**. - * This is needed if someone spins up more [[EventStream]]s using the same [[akka.actor.ActorSystem]], + * Provides factory for [[pekko.event.EventStreamUnsubscriber]] actors with **unique names**. + * This is needed if someone spins up more [[EventStream]]s using the same [[pekko.actor.ActorSystem]], * each stream gets it's own unsubscriber. */ -private[akka] object EventStreamUnsubscriber { +private[pekko] object EventStreamUnsubscriber { private val unsubscribersCount = new AtomicInteger(0) diff --git a/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala b/akka-actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala similarity index 75% rename from akka-actor/src/main/scala/akka/event/LoggerMailbox.scala rename to akka-actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala index 5a47c8083c..30a78c51e1 100644 --- a/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala @@ -2,25 +2,26 @@ * Copyright (C) 2015-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import com.typesafe.config.Config -import akka.actor.ActorRef -import akka.actor.ActorSystem -import akka.dispatch.MailboxType -import akka.dispatch.MessageQueue -import akka.dispatch.ProducesMessageQueue -import akka.dispatch.UnboundedMailbox -import akka.event.Logging.LogEvent -import akka.util.unused +import org.apache.pekko +import pekko.actor.ActorRef +import pekko.actor.ActorSystem +import pekko.dispatch.MailboxType +import pekko.dispatch.MessageQueue +import pekko.dispatch.ProducesMessageQueue +import pekko.dispatch.UnboundedMailbox +import pekko.event.Logging.LogEvent +import pekko.util.unused trait LoggerMessageQueueSemantics /** * INTERNAL API */ -private[akka] class LoggerMailboxType(@unused settings: ActorSystem.Settings, @unused config: Config) +private[pekko] class LoggerMailboxType(@unused settings: ActorSystem.Settings, @unused config: Config) extends MailboxType with ProducesMessageQueue[LoggerMailbox] { @@ -33,7 +34,7 @@ private[akka] class LoggerMailboxType(@unused settings: ActorSystem.Settings, @u /** * INTERNAL API */ -private[akka] class LoggerMailbox(@unused owner: ActorRef, system: ActorSystem) +private[pekko] class LoggerMailbox(@unused owner: ActorRef, system: ActorSystem) extends UnboundedMailbox.MessageQueue with LoggerMessageQueueSemantics { diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/org/apache/pekko/event/Logging.scala similarity index 94% rename from akka-actor/src/main/scala/akka/event/Logging.scala rename to akka-actor/src/main/scala/org/apache/pekko/event/Logging.scala index c203f284e5..4e7f049e5b 100644 --- a/akka-actor/src/main/scala/akka/event/Logging.scala +++ b/akka-actor/src/main/scala/org/apache/pekko/event/Logging.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2022 Lightbend Inc. */ -package akka.event +package org.apache.pekko.event import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.AtomicInteger @@ -15,15 +15,16 @@ import scala.util.control.{ NoStackTrace, NonFatal } import scala.annotation.nowarn -import akka.{ AkkaException, ConfigurationException } -import akka.actor._ -import akka.actor.ActorSystem.Settings -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.dispatch.RequiresMessageQueue -import akka.event.Logging._ -import akka.util.{ Helpers, ReentrantGuard } -import akka.util.Timeout -import akka.util.unused +import org.apache.pekko +import pekko.{ AkkaException, ConfigurationException } +import pekko.actor._ +import pekko.actor.ActorSystem.Settings +import pekko.annotation.{ DoNotInherit, InternalApi } +import pekko.dispatch.RequiresMessageQueue +import pekko.event.Logging._ +import pekko.util.{ Helpers, ReentrantGuard } +import pekko.util.Timeout +import pekko.util.unused /** * This trait brings log level handling to the EventStream: it reads the log @@ -97,7 +98,7 @@ trait LoggingBus extends ActorEventBus { /** * Internal Akka use only */ - private[akka] def startStdoutLogger(config: Settings): Unit = { + private[pekko] def startStdoutLogger(config: Settings): Unit = { setUpStdoutLogger(config) publish(Debug(simpleName(this), this.getClass, "StandardOutLogger started")) } @@ -105,7 +106,7 @@ trait LoggingBus extends ActorEventBus { /** * Internal Akka use only */ - private[akka] def startDefaultLoggers(system: ActorSystemImpl): Unit = { + private[pekko] def startDefaultLoggers(system: ActorSystemImpl): Unit = { val logName = simpleName(this) + "(" + system + ")" val level = levelFor(system.settings.LogLevel).getOrElse { // only log initialization errors directly with StandardOutLogger.print @@ -170,7 +171,7 @@ trait LoggingBus extends ActorEventBus { /** * Internal Akka use only */ - private[akka] def stopDefaultLoggers(system: ActorSystem): Unit = { + private[pekko] def stopDefaultLoggers(system: ActorSystem): Unit = { @nowarn("msg=never used") val level = _logLevel // volatile access before reading loggers if (!(loggers contains StandardOutLogger)) { @@ -202,7 +203,7 @@ trait LoggingBus extends ActorEventBus { val name = "log" + LogExt(system).id() + "-" + simpleName(clazz) val actor = system.systemActorOf(Props(clazz).withDispatcher(system.settings.LoggersDispatcher), name) implicit def timeout: Timeout = system.settings.LoggerStartTimeout - import akka.pattern.ask + import pekko.pattern.ask val response = try Await.result(actor ? InitializeLogger(this), timeout.duration) catch { @@ -226,7 +227,7 @@ trait LoggingBus extends ActorEventBus { /** * This trait defines the interface to be provided by a “log source formatting - * rule” as used by [[akka.event.Logging]]’s `apply`/`create` method. + * rule” as used by [[pekko.event.Logging]]’s `apply`/`create` method. * * See the companion object for default implementations. * @@ -277,11 +278,11 @@ trait LoggingBus extends ActorEventBus { /** * INTERNAL API */ -@InternalApi private[akka] final case class ActorWithLogClass(actor: Actor, logClass: Class[_]) +@InternalApi private[pekko] final case class ActorWithLogClass(actor: Actor, logClass: Class[_]) /** * This is a “marker” class which is inserted as originator class into - * [[akka.event.Logging.LogEvent]] when the string representation was supplied + * [[pekko.event.Logging.LogEvent]] when the string representation was supplied * directly. */ class DummyClassForStringSources @@ -289,20 +290,20 @@ class DummyClassForStringSources /** * This object holds predefined formatting rules for log sources. * - * In case an [[akka.actor.ActorSystem]] is provided, the following apply: + * In case an [[pekko.actor.ActorSystem]] is provided, the following apply: *

    - *
  • [[akka.actor.Actor]] and [[akka.actor.ActorRef]] will be represented by their absolute physical path
    • + *
  • [[pekko.actor.Actor]] and [[pekko.actor.ActorRef]] will be represented by their absolute physical path
    • *
  • providing a `String` as source will append "(<system address>)" and use the result
    • *
  • providing a `Class` will extract its simple name, append "(<system address>)" and use the result
    • - *
  • anything else gives compile error unless implicit [[akka.event.LogSource]] is in scope for it
    • + *
  • anything else gives compile error unless implicit [[pekko.event.LogSource]] is in scope for it
    • *
* - * In case a [[akka.event.LoggingBus]] is provided, the following apply: + * In case a [[pekko.event.LoggingBus]] is provided, the following apply: *
    - *
  • [[akka.actor.Actor]] and [[akka.actor.ActorRef]] will be represented by their absolute physical path
    • + *
  • [[pekko.actor.Actor]] and [[pekko.actor.ActorRef]] will be represented by their absolute physical path
    • *
  • providing a `String` as source will be used as is
    • *
  • providing a `Class` will extract its simple name
    • - *
  • anything else gives compile error unless implicit [[akka.event.LogSource]] is in scope for it
    • + *
  • anything else gives compile error unless implicit [[pekko.event.LogSource]] is in scope for it
    • *
*/ object LogSource { @@ -331,7 +332,7 @@ object LogSource { /** * INTERNAL API */ - @InternalApi private[akka] implicit val fromActorWithLoggerClass: LogSource[ActorWithLogClass] = + @InternalApi private[pekko] implicit val fromActorWithLoggerClass: LogSource[ActorWithLogClass] = new LogSource[ActorWithLogClass] { def genString(a: ActorWithLogClass) = fromActor.genString(a.actor) override def genString(a: ActorWithLogClass, system: ActorSystem) = fromActor.genString(a.actor, system) @@ -357,7 +358,7 @@ object LogSource { /** * Convenience converter access: given an implicit `LogSource` and - * [[akka.actor.ActorSystem]], generate the string representation and + * [[pekko.actor.ActorSystem]], generate the string representation and * originating class. */ def apply[T: LogSource](o: T, system: ActorSystem): (String, Class[_]) = { @@ -420,7 +421,7 @@ object LogSource { * * 

  * akka {
- *   loggers = ["akka.slf4j.Slf4jLogger"] # for example
+ *   loggers = ["org.apache.pekko.slf4j.Slf4jLogger"] # for example
  *   loglevel = "INFO"        # used when normal logging ("loggers") has been started
  *   stdout-loglevel = "WARN" # used during application start-up until normal logging is available
  * }
@@ -458,7 +459,7 @@ object Logging {
   /**
    * INTERNAL API
    */
-  private[akka] object LogExt extends ExtensionId[LogExt] {
+  private[pekko] object LogExt extends ExtensionId[LogExt] {
     override def createExtension(system: ExtendedActorSystem): LogExt =
       new LogExt(system)
   }
@@ -466,7 +467,7 @@ object Logging {
   /**
    * INTERNAL API
    */
-  private[akka] class LogExt(@unused system: ExtendedActorSystem) extends Extension {
+  private[pekko] class LogExt(@unused system: ExtendedActorSystem) extends Extension {
     private val loggerId = new AtomicInteger
     def id() = loggerId.incrementAndGet()
   }
@@ -499,7 +500,7 @@ object Logging {
    * to some kind of OffEvent.
    */
   @InternalApi
-  private[akka] final val OffLevel = LogLevel(Int.MinValue)
+  private[pekko] final val OffLevel = LogLevel(Int.MinValue)
 
   /**
    * Returns the LogLevel associated with the given string,
@@ -557,9 +558,9 @@ object Logging {
    * The source is used to identify the source of this logging channel and
    * must have a corresponding implicit LogSource[T] instance in scope; by
    * default these are provided for Class[_], Actor, ActorRef and String types.
-   * See the companion object of [[akka.event.LogSource]] for details.
+   * See the companion object of [[pekko.event.LogSource]] for details.
    *
-   * You can add your own rules quite easily, see [[akka.event.LogSource]].
+   * You can add your own rules quite easily, see [[pekko.event.LogSource]].
    */
   def apply[T: LogSource](system: ActorSystem, logSource: T): LoggingAdapter = {
     val (str, clazz) = LogSource(logSource, system)
@@ -582,9 +583,9 @@ object Logging {
    * The source is used to identify the source of this logging channel and
    * must have a corresponding implicit LogSource[T] instance in scope; by
    * default these are provided for Class[_], Actor, ActorRef and String types.
-   * See the companion object of [[akka.event.LogSource]] for details.
+   * See the companion object of [[pekko.event.LogSource]] for details.
    *
-   * You can add your own rules quite easily, see [[akka.event.LogSource]].
+   * You can add your own rules quite easily, see [[pekko.event.LogSource]].
    */
   def withMarker[T: LogSource](system: ActorSystem, logSource: T): MarkerLoggingAdapter = {
     val (str, clazz) = LogSource(logSource, system)
@@ -597,12 +598,12 @@ object Logging {
    * The source is used to identify the source of this logging channel and
    * must have a corresponding implicit LogSource[T] instance in scope; by
    * default these are provided for Class[_], Actor, ActorRef and String types.
-   * See the companion object of [[akka.event.LogSource]] for details.
+   * See the companion object of [[pekko.event.LogSource]] for details.
    *
-   * You can add your own rules quite easily, see [[akka.event.LogSource]].
+   * You can add your own rules quite easily, see [[pekko.event.LogSource]].
    *
-   * Note that this `LoggingAdapter` will use the [[akka.event.DefaultLoggingFilter]],
-   * and not the [[akka.event.LoggingFilter]] configured for the system
+   * Note that this `LoggingAdapter` will use the [[pekko.event.DefaultLoggingFilter]],
+   * and not the [[pekko.event.LoggingFilter]] configured for the system
    * (if different from `DefaultLoggingFilter`).
    */
   def apply[T: LogSource](bus: LoggingBus, logSource: T): LoggingAdapter = {
@@ -616,12 +617,12 @@ object Logging {
    * The source is used to identify the source of this logging channel and
    * must have a corresponding implicit LogSource[T] instance in scope; by
    * default these are provided for Class[_], Actor, ActorRef and String types.
-   * See the companion object of [[akka.event.LogSource]] for details.
+   * See the companion object of [[pekko.event.LogSource]] for details.
    *
-   * You can add your own rules quite easily, see [[akka.event.LogSource]].
+   * You can add your own rules quite easily, see [[pekko.event.LogSource]].
    *
-   * Note that this `LoggingAdapter` will use the [[akka.event.DefaultLoggingFilter]],
-   * and not the [[akka.event.LoggingFilter]] configured for the system
+   * Note that this `LoggingAdapter` will use the [[pekko.event.DefaultLoggingFilter]],
+   * and not the [[pekko.event.LoggingFilter]] configured for the system
    * (if different from `DefaultLoggingFilter`).
    */
   def withMarker[T: LogSource](bus: LoggingBus, logSource: T): MarkerLoggingAdapter = {
@@ -665,7 +666,7 @@ object Logging {
    * The source is used to identify the source of this logging channel and
    * must have a corresponding implicit LogSource[T] instance in scope; by
    * default these are provided for Class[_], Actor, ActorRef and String types.
-   * See the companion object of [[akka.event.LogSource]] for details.
+   * See the companion object of [[pekko.event.LogSource]] for details.
    */
   def getLogger(system: ActorSystem, logSource: AnyRef): LoggingAdapter = {
     val (str, clazz) = LogSource.fromAnyRef(logSource, system)
@@ -678,10 +679,10 @@ object Logging {
    * The source is used to identify the source of this logging channel and
    * must have a corresponding implicit LogSource[T] instance in scope; by
    * default these are provided for Class[_], Actor, ActorRef and String types.
-   * See the companion object of [[akka.event.LogSource]] for details.
+   * See the companion object of [[pekko.event.LogSource]] for details.
    *
-   * Note that this `LoggingAdapter` will use the [[akka.event.DefaultLoggingFilter]],
-   * and not the [[akka.event.LoggingFilter]] configured for the system
+   * Note that this `LoggingAdapter` will use the [[pekko.event.DefaultLoggingFilter]],
+   * and not the [[pekko.event.LoggingFilter]] configured for the system
    * (if different from `DefaultLoggingFilter`).
    */
   def getLogger(bus: LoggingBus, logSource: AnyRef): LoggingAdapter = {
@@ -754,7 +755,7 @@ object Logging {
      * Java API: Retrieve the contents of the MDC.
      */
     def getMDC: java.util.Map[String, Any] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       mdc.asJava
     }
   }
@@ -1119,7 +1120,7 @@ object Logging {
   /**
    * INTERNAL API
    */
-  @SerialVersionUID(1L) private[akka] class SerializedStandardOutLogger extends Serializable {
+  @SerialVersionUID(1L) private[pekko] class SerializedStandardOutLogger extends Serializable {
     @throws(classOf[java.io.ObjectStreamException])
     private def readResolve(): AnyRef = Logging.StandardOutLogger
   }
@@ -1617,14 +1618,14 @@ trait DiagnosticLoggingAdapter extends LoggingAdapter {
 
   import Logging._
 
-  import akka.util.ccompat.JavaConverters._
+  import pekko.util.ccompat.JavaConverters._
 
   private var _mdc = emptyMDC
 
   /**
    * Scala API:
    * Mapped Diagnostic Context for application defined values
-   * which can be used in PatternLayout when `akka.event.slf4j.Slf4jLogger` is configured.
+   * which can be used in PatternLayout when `org.apache.pekko.event.slf4j.Slf4jLogger` is configured.
    * Visit Logback Docs: MDC for more information.
    *
    * @return A Map containing the MDC values added by the application, or empty Map if no value was added.
@@ -1634,7 +1635,7 @@ trait DiagnosticLoggingAdapter extends LoggingAdapter {
   /**
    * Scala API:
    * Sets the values to be added to the MDC (Mapped Diagnostic Context) before the log is appended.
-   * These values can be used in PatternLayout when `akka.event.slf4j.Slf4jLogger` is configured.
+   * These values can be used in PatternLayout when `org.apache.pekko.event.slf4j.Slf4jLogger` is configured.
    * Visit Logback Docs: MDC for more information.
    */
   def mdc(mdc: MDC): Unit = _mdc = if (mdc != null) mdc else emptyMDC
@@ -1642,7 +1643,7 @@ trait DiagnosticLoggingAdapter extends LoggingAdapter {
   /**
    * Java API:
    * Mapped Diagnostic Context for application defined values
-   * which can be used in PatternLayout when `akka.event.slf4j.Slf4jLogger` is configured.
+   * which can be used in PatternLayout when `org.apache.pekko.event.slf4j.Slf4jLogger` is configured.
    * Visit Logback Docs: MDC for more information.
    * Note tha it returns a COPY of the actual MDC values.
    * You cannot modify any value by changing the returned Map.
@@ -1662,7 +1663,7 @@ trait DiagnosticLoggingAdapter extends LoggingAdapter {
   /**
    * Java API:
    * Sets the values to be added to the MDC (Mapped Diagnostic Context) before the log is appended.
-   * These values can be used in PatternLayout when `akka.event.slf4j.Slf4jLogger` is configured.
+   * These values can be used in PatternLayout when `org.apache.pekko.event.slf4j.Slf4jLogger` is configured.
    * Visit Logback Docs: MDC for more information.
    */
   def setMDC(jMdc: java.util.Map[String, Any]): Unit = mdc(if (jMdc != null) jMdc.asScala.toMap else emptyMDC)
@@ -1682,7 +1683,7 @@ class LogMarker(val name: String, val properties: Map[String, Any]) {
 
   /** Java API */
   def getProperties: java.util.Map[String, Object] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     properties.map { case (k, v) => (k, v.asInstanceOf[AnyRef]) }.asJava
   }
 
@@ -1692,7 +1693,7 @@ class LogMarker(val name: String, val properties: Map[String, Any]) {
 object LogMarker {
 
   /** The Marker is internally transferred via MDC using using this key */
-  private[akka] final val MDCKey = "marker"
+  private[pekko] final val MDCKey = "marker"
 
   def apply(name: String): LogMarker = new LogMarker(name, Map.empty)
 
@@ -1703,24 +1704,24 @@ object LogMarker {
 
   /** Java API */
   def create(name: String, properties: java.util.Map[String, Any]): LogMarker = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     apply(name, properties.asScala.toMap)
   }
 
   @Deprecated
-  @deprecated("use akka.event.LogEventWithMarker#marker instead", since = "2.5.12")
+  @deprecated("use org.apache.pekko.event.LogEventWithMarker#marker instead", since = "2.5.12")
   def extractFromMDC(mdc: MDC): Option[String] =
     mdc.get(MDCKey) match {
       case Some(v) => Some(v.toString)
       case None    => None
     }
 
-  private[akka] final val Security = apply("SECURITY")
+  private[pekko] final val Security = apply("SECURITY")
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] object Properties {
+  @InternalApi private[pekko] object Properties {
     val MessageClass = "akkaMessageClass"
     val RemoteAddress = "akkaRemoteAddress"
     val RemoteAddressUid = "akkaRemoteAddressUid"
@@ -2004,7 +2005,7 @@ final class DiagnosticMarkerBusLoggingAdapter(
     with DiagnosticLoggingAdapter
 
 /**
- * [[akka.event.LoggingAdapter]] that publishes [[akka.event.Logging.LogEvent]] to event stream.
+ * [[pekko.event.LoggingAdapter]] that publishes [[pekko.event.Logging.LogEvent]] to event stream.
  */
 class BusLogging(val bus: LoggingBus, val logSource: String, val logClass: Class[_], loggingFilter: LoggingFilter)
     extends LoggingAdapter {
diff --git a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala b/akka-actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala
similarity index 92%
rename from akka-actor/src/main/scala/akka/event/LoggingReceive.scala
rename to akka-actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala
index 5230a0c395..6b75e2d3ea 100644
--- a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.event
+package org.apache.pekko.event
 
 import scala.runtime.BoxedUnit
 
 import language.existentials
 
-import akka.actor.AbstractActor
-import akka.actor.Actor.Receive
-import akka.actor.ActorCell
-import akka.actor.ActorContext
-import akka.actor.DiagnosticActorLogging
-import akka.event.Logging.{ LogEvent, LogLevel }
+import org.apache.pekko
+import pekko.actor.AbstractActor
+import pekko.actor.Actor.Receive
+import pekko.actor.ActorCell
+import pekko.actor.ActorContext
+import pekko.actor.DiagnosticActorLogging
+import pekko.event.Logging.{ LogEvent, LogLevel }
 
 object LoggingReceive {
 
diff --git a/akka-actor/src/main/scala/akka/event/japi/EventBusJavaAPI.scala b/akka-actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala
similarity index 87%
rename from akka-actor/src/main/scala/akka/event/japi/EventBusJavaAPI.scala
rename to akka-actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala
index 7d019be81c..b5c0b479ec 100644
--- a/akka-actor/src/main/scala/akka/event/japi/EventBusJavaAPI.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.event.japi
+package org.apache.pekko.event.japi
 
-import akka.actor.{ ActorRef, ActorSystem }
-import akka.util.Subclassification
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ActorSystem }
+import pekko.util.Subclassification
 
 /**
- * Java API: See documentation for [[akka.event.EventBus]]
+ * Java API: See documentation for [[pekko.event.EventBus]]
  * E is the Event type
  * S is the Subscriber type
  * C is the Classifier type
@@ -39,13 +40,13 @@ trait EventBus[E, S, C] {
 }
 
 /**
- * Java API: See documentation for [[akka.event.LookupClassification]]
+ * Java API: See documentation for [[pekko.event.LookupClassification]]
  * E is the Event type
  * S is the Subscriber type
  * C is the Classifier type
  */
 abstract class LookupEventBus[E, S, C] extends EventBus[E, S, C] {
-  private val bus = new akka.event.EventBus with akka.event.LookupClassification {
+  private val bus = new pekko.event.EventBus with pekko.event.LookupClassification {
     type Event = E
     type Subscriber = S
     type Classifier = C
@@ -90,13 +91,13 @@ abstract class LookupEventBus[E, S, C] extends EventBus[E, S, C] {
 }
 
 /**
- * Java API: See documentation for [[akka.event.SubchannelClassification]]
+ * Java API: See documentation for [[pekko.event.SubchannelClassification]]
  * E is the Event type
  * S is the Subscriber type
  * C is the Classifier type
  */
 abstract class SubchannelEventBus[E, S, C] extends EventBus[E, S, C] {
-  private val bus = new akka.event.EventBus with akka.event.SubchannelClassification {
+  private val bus = new pekko.event.EventBus with pekko.event.SubchannelClassification {
     type Event = E
     type Subscriber = S
     type Classifier = C
@@ -134,13 +135,13 @@ abstract class SubchannelEventBus[E, S, C] extends EventBus[E, S, C] {
 }
 
 /**
- * Java API: See documentation for [[akka.event.ScanningClassification]]
+ * Java API: See documentation for [[pekko.event.ScanningClassification]]
  * E is the Event type
  * S is the Subscriber type
  * C is the Classifier type
  */
 abstract class ScanningEventBus[E, S, C] extends EventBus[E, S, C] {
-  private val bus = new akka.event.EventBus with akka.event.ScanningClassification {
+  private val bus = new pekko.event.EventBus with pekko.event.ScanningClassification {
     type Event = E
     type Subscriber = S
     type Classifier = C
@@ -185,14 +186,14 @@ abstract class ScanningEventBus[E, S, C] extends EventBus[E, S, C] {
 }
 
 /**
- * Java API: See documentation for [[akka.event.ManagedActorClassification]]
+ * Java API: See documentation for [[pekko.event.ManagedActorClassification]]
  * An EventBus where the Subscribers are ActorRefs and the Classifier is ActorRef
  * Means that ActorRefs "listen" to other ActorRefs
  * E is the Event type
  */
 abstract class ManagedActorEventBus[E](system: ActorSystem) extends EventBus[E, ActorRef, ActorRef] {
-  private val bus = new akka.event.ActorEventBus with akka.event.ManagedActorClassification
-  with akka.event.ActorClassifier {
+  private val bus = new pekko.event.ActorEventBus with pekko.event.ManagedActorClassification
+  with pekko.event.ActorClassifier {
     type Event = E
 
     override val system = ManagedActorEventBus.this.system
diff --git a/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala b/akka-actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala
similarity index 89%
rename from akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala
rename to akka-actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala
index 743c52ff70..46c2881652 100644
--- a/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.event.jul
+package org.apache.pekko.event.jul
 
 import java.util.logging
 
-import akka.actor.Actor
-import akka.actor.ActorSystem
-import akka.dispatch.RequiresMessageQueue
-import akka.event.DummyClassForStringSources
-import akka.event.EventStream
-import akka.event.LoggerMessageQueueSemantics
-import akka.event.Logging._
-import akka.event.LoggingFilter
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorSystem
+import pekko.dispatch.RequiresMessageQueue
+import pekko.event.DummyClassForStringSources
+import pekko.event.EventStream
+import pekko.event.LoggerMessageQueueSemantics
+import pekko.event.Logging._
+import pekko.event.LoggingFilter
+import pekko.util.unused
 
 /**
  * `java.util.logging` logger.
@@ -92,7 +93,7 @@ object Logger {
 }
 
 /**
- * [[akka.event.LoggingFilter]] that uses the log level defined in the JUL
+ * [[pekko.event.LoggingFilter]] that uses the log level defined in the JUL
  * backend configuration to filter log events before publishing
  * the log events to the `eventStream`.
  */
diff --git a/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala b/akka-actor/src/main/scala/org/apache/pekko/io/DirectByteBufferPool.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/DirectByteBufferPool.scala
index 706125109b..9ba14d2383 100644
--- a/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/DirectByteBufferPool.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.nio.ByteBuffer
 
@@ -26,7 +26,7 @@ trait BufferPool {
  * to be faster than wrapping on-heap Arrays. There is ultimately no performance
  * benefit to wrapping in-heap JVM data when writing with NIO.
  */
-private[akka] class DirectByteBufferPool(defaultBufferSize: Int, maxPoolEntries: Int) extends BufferPool {
+private[pekko] class DirectByteBufferPool(defaultBufferSize: Int, maxPoolEntries: Int) extends BufferPool {
   private[this] val pool: Array[ByteBuffer] = new Array[ByteBuffer](maxPoolEntries)
   private[this] var buffersInPool: Int = 0
 
@@ -77,7 +77,7 @@ private[akka] class DirectByteBufferPool(defaultBufferSize: Int, maxPoolEntries:
 }
 
 /** INTERNAL API */
-private[akka] object DirectByteBufferPool {
+private[pekko] object DirectByteBufferPool {
   private val CleanDirectBuffer: ByteBuffer => Unit =
     try {
       val cleanerMethod = Class.forName("java.nio.DirectByteBuffer").getMethod("cleaner")
diff --git a/akka-actor/src/main/scala/akka/io/Dns.scala b/akka-actor/src/main/scala/org/apache/pekko/io/Dns.scala
similarity index 93%
rename from akka-actor/src/main/scala/akka/io/Dns.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/Dns.scala
index b529122b2a..70cb842f21 100644
--- a/akka-actor/src/main/scala/akka/io/Dns.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/Dns.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.{ Inet4Address, Inet6Address, InetAddress, UnknownHostException }
 import java.util.concurrent.ConcurrentHashMap
@@ -13,16 +13,17 @@ import scala.collection.immutable
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.event.Logging
-import akka.io.dns.AAAARecord
-import akka.io.dns.ARecord
-import akka.io.dns.DnsProtocol
-import akka.routing.ConsistentHashingRouter.ConsistentHashable
-import akka.util.ccompat._
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.event.Logging
+import pekko.io.dns.AAAARecord
+import pekko.io.dns.ARecord
+import pekko.io.dns.DnsProtocol
+import pekko.routing.ConsistentHashingRouter.ConsistentHashable
+import pekko.util.ccompat._
+import pekko.util.unused
 
 /**
  * Not for user extension.
@@ -149,7 +150,7 @@ object Dns extends ExtensionId[DnsExt] with ExtensionIdProvider {
   override def get(system: ClassicActorSystemProvider): DnsExt = super.get(system)
 }
 
-class DnsExt private[akka] (val system: ExtendedActorSystem, resolverName: String, managerName: String)
+class DnsExt private[pekko] (val system: ExtendedActorSystem, resolverName: String, managerName: String)
     extends IO.Extension {
 
   private val asyncDns = new ConcurrentHashMap[String, ActorRef]
@@ -165,7 +166,7 @@ class DnsExt private[akka] (val system: ExtendedActorSystem, resolverName: Strin
    */
   @InternalApi
   @nowarn("msg=deprecated")
-  private[akka] def loadAsyncDns(managerName: String): ActorRef = {
+  private[pekko] def loadAsyncDns(managerName: String): ActorRef = {
     // This can't pass in `this` as then AsyncDns would pick up the system settings
     asyncDns.computeIfAbsent(
       managerName,
diff --git a/akka-actor/src/main/scala/akka/io/DnsProvider.scala b/akka-actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
similarity index 82%
rename from akka-actor/src/main/scala/akka/io/DnsProvider.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
index d2f23aee47..9427587c3e 100644
--- a/akka-actor/src/main/scala/akka/io/DnsProvider.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
@@ -2,9 +2,10 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
-import akka.actor.Actor
+import org.apache.pekko
+import pekko.actor.Actor
 
 /**
  * Where as it is possible to plug in alternative DNS implementations it is not recommended.
@@ -23,8 +24,8 @@ trait DnsProvider {
   def cache: Dns = new SimpleDnsCache()
 
   /**
-   * DNS resolver actor. Should respond to [[akka.io.dns.DnsProtocol.Resolve]] with
-   * [[akka.io.dns.DnsProtocol.Resolved]]
+   * DNS resolver actor. Should respond to [[pekko.io.dns.DnsProtocol.Resolve]] with
+   * [[pekko.io.dns.DnsProtocol.Resolved]]
    */
   def actorClass: Class[_ <: Actor]
 
diff --git a/akka-actor/src/main/scala/akka/io/IO.scala b/akka-actor/src/main/scala/org/apache/pekko/io/IO.scala
similarity index 82%
rename from akka-actor/src/main/scala/akka/io/IO.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/IO.scala
index 8d9857e915..b1abe30cd4 100644
--- a/akka-actor/src/main/scala/akka/io/IO.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/IO.scala
@@ -2,9 +2,10 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
-import akka.actor._
+import org.apache.pekko
+import pekko.actor._
 
 /**
  * Entry point to Akka’s IO layer.
@@ -13,7 +14,7 @@ import akka.actor._
  */
 object IO {
 
-  trait Extension extends akka.actor.Extension {
+  trait Extension extends pekko.actor.Extension {
     def manager: ActorRef
   }
 
diff --git a/akka-actor/src/main/scala/akka/io/Inet.scala b/akka-actor/src/main/scala/org/apache/pekko/io/Inet.scala
similarity index 85%
rename from akka-actor/src/main/scala/akka/io/Inet.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/Inet.scala
index 71092d6ea0..86f5815e68 100644
--- a/akka-actor/src/main/scala/akka/io/Inet.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/Inet.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.DatagramSocket
 import java.net.ServerSocket
 import java.net.Socket
 import java.nio.channels.DatagramChannel
 
-import akka.util.unused
+import org.apache.pekko
+import pekko.util.unused
 
 object Inet {
 
@@ -93,7 +94,7 @@ object Inet {
   object SO {
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the SO_RCVBUF option
+     * [[pekko.io.Inet.SocketOption]] to set the SO_RCVBUF option
      *
      * For more information see [[java.net.Socket#setReceiveBufferSize]]
      */
@@ -107,7 +108,7 @@ object Inet {
     // server socket options
 
     /**
-     * [[akka.io.Inet.SocketOption]] to enable or disable SO_REUSEADDR
+     * [[pekko.io.Inet.SocketOption]] to enable or disable SO_REUSEADDR
      *
      * For more information see [[java.net.Socket#setReuseAddress]]
      */
@@ -118,7 +119,7 @@ object Inet {
     }
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the SO_SNDBUF option.
+     * [[pekko.io.Inet.SocketOption]] to set the SO_SNDBUF option.
      *
      * For more information see [[java.net.Socket#setSendBufferSize]]
      */
@@ -128,7 +129,7 @@ object Inet {
     }
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the traffic class or
+     * [[pekko.io.Inet.SocketOption]] to set the traffic class or
      * type-of-service octet in the IP header for packets sent from this
      * socket.
      *
@@ -144,28 +145,28 @@ object Inet {
   trait SoForwarders {
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the SO_RCVBUF option
+     * [[pekko.io.Inet.SocketOption]] to set the SO_RCVBUF option
      *
      * For more information see [[java.net.Socket#setReceiveBufferSize]]
      */
     val ReceiveBufferSize = SO.ReceiveBufferSize
 
     /**
-     * [[akka.io.Inet.SocketOption]] to enable or disable SO_REUSEADDR
+     * [[pekko.io.Inet.SocketOption]] to enable or disable SO_REUSEADDR
      *
      * For more information see [[java.net.Socket#setReuseAddress]]
      */
     val ReuseAddress = SO.ReuseAddress
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the SO_SNDBUF option.
+     * [[pekko.io.Inet.SocketOption]] to set the SO_SNDBUF option.
      *
      * For more information see [[java.net.Socket#setSendBufferSize]]
      */
     val SendBufferSize = SO.SendBufferSize
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the traffic class or
+     * [[pekko.io.Inet.SocketOption]] to set the traffic class or
      * type-of-service octet in the IP header for packets sent from this
      * socket.
      *
@@ -178,28 +179,28 @@ object Inet {
     import SO._
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the SO_RCVBUF option
+     * [[pekko.io.Inet.SocketOption]] to set the SO_RCVBUF option
      *
      * For more information see [[java.net.Socket#setReceiveBufferSize]]
      */
     def receiveBufferSize(size: Int) = ReceiveBufferSize(size)
 
     /**
-     * [[akka.io.Inet.SocketOption]] to enable or disable SO_REUSEADDR
+     * [[pekko.io.Inet.SocketOption]] to enable or disable SO_REUSEADDR
      *
      * For more information see [[java.net.Socket#setReuseAddress]]
      */
     def reuseAddress(on: Boolean) = ReuseAddress(on)
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the SO_SNDBUF option.
+     * [[pekko.io.Inet.SocketOption]] to set the SO_SNDBUF option.
      *
      * For more information see [[java.net.Socket#setSendBufferSize]]
      */
     def sendBufferSize(size: Int) = SendBufferSize(size)
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the traffic class or
+     * [[pekko.io.Inet.SocketOption]] to set the traffic class or
      * type-of-service octet in the IP header for packets sent from this
      * socket.
      *
diff --git a/akka-actor/src/main/scala/akka/io/InetAddressDnsProvider.scala b/akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsProvider.scala
similarity index 83%
rename from akka-actor/src/main/scala/akka/io/InetAddressDnsProvider.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsProvider.scala
index f42409ce6f..a5d2641a74 100644
--- a/akka-actor/src/main/scala/akka/io/InetAddressDnsProvider.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsProvider.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import scala.annotation.nowarn
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
diff --git a/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala b/akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
similarity index 93%
rename from akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
index 1b13b8100c..43c3c2939a 100644
--- a/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.{ InetAddress, UnknownHostException }
 import java.net.Inet4Address
@@ -17,17 +17,18 @@ import scala.util.{ Failure, Success, Try }
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor.{ Actor, ActorLogging }
-import akka.actor.Status
-import akka.annotation.InternalApi
-import akka.io.dns.AAAARecord
-import akka.io.dns.ARecord
-import akka.io.dns.CachePolicy._
-import akka.io.dns.DnsProtocol
-import akka.io.dns.DnsProtocol.Ip
-import akka.io.dns.DnsProtocol.Srv
-import akka.io.dns.ResourceRecord
-import akka.util.Helpers.Requiring
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging }
+import pekko.actor.Status
+import pekko.annotation.InternalApi
+import pekko.io.dns.AAAARecord
+import pekko.io.dns.ARecord
+import pekko.io.dns.CachePolicy._
+import pekko.io.dns.DnsProtocol
+import pekko.io.dns.DnsProtocol.Ip
+import pekko.io.dns.DnsProtocol.Srv
+import pekko.io.dns.ResourceRecord
+import pekko.util.Helpers.Requiring
 
 /**
  * INTERNAL API
diff --git a/akka-actor/src/main/scala/akka/io/SelectionHandler.scala b/akka-actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/io/SelectionHandler.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala
index 98187f8444..1f6827b5ba 100644
--- a/akka-actor/src/main/scala/akka/io/SelectionHandler.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.nio.channels.{ CancelledKeyException, SelectableChannel, SelectionKey }
 import java.nio.channels.ClosedChannelException
@@ -18,13 +18,14 @@ import scala.util.control.NonFatal
 
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.event.Logging
-import akka.event.LoggingAdapter
-import akka.routing.RandomPool
-import akka.util.Helpers.Requiring
-import akka.util.SerializedSuspendableExecutionContext
+import org.apache.pekko
+import pekko.actor._
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.event.Logging
+import pekko.event.LoggingAdapter
+import pekko.routing.RandomPool
+import pekko.util.Helpers.Requiring
+import pekko.util.SerializedSuspendableExecutionContext
 
 abstract class SelectionHandlerSettings(config: Config) {
   import config._
diff --git a/akka-actor/src/main/scala/akka/io/SimpleDnsCache.scala b/akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala
similarity index 88%
rename from akka-actor/src/main/scala/akka/io/SimpleDnsCache.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala
index 9f5166925e..267e4cd00a 100644
--- a/akka-actor/src/main/scala/akka/io/SimpleDnsCache.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.util.concurrent.atomic.AtomicReference
 
@@ -11,15 +11,16 @@ import scala.collection.immutable
 
 import scala.annotation.nowarn
 
-import akka.actor.NoSerializationVerificationNeeded
-import akka.annotation.InternalApi
-import akka.io.dns.{ AAAARecord, ARecord }
-import akka.io.dns.CachePolicy.CachePolicy
-import akka.io.dns.CachePolicy.Forever
-import akka.io.dns.CachePolicy.Never
-import akka.io.dns.CachePolicy.Ttl
-import akka.io.dns.DnsProtocol
-import akka.io.dns.DnsProtocol.{ Ip, RequestType, Resolved }
+import org.apache.pekko
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.annotation.InternalApi
+import pekko.io.dns.{ AAAARecord, ARecord }
+import pekko.io.dns.CachePolicy.CachePolicy
+import pekko.io.dns.CachePolicy.Forever
+import pekko.io.dns.CachePolicy.Never
+import pekko.io.dns.CachePolicy.Ttl
+import pekko.io.dns.DnsProtocol
+import pekko.io.dns.DnsProtocol.{ Ip, RequestType, Resolved }
 
 private[io] trait PeriodicCacheCleanup {
   def cleanup(): Unit
@@ -70,7 +71,7 @@ class SimpleDnsCache extends Dns with PeriodicCacheCleanup with NoSerializationV
    * INTERNAL API
    */
   @InternalApi
-  private[akka] final def get(key: (String, RequestType)): Option[Resolved] = {
+  private[pekko] final def get(key: (String, RequestType)): Option[Resolved] = {
     cacheRef.get().get(key)
   }
 
diff --git a/akka-actor/src/main/scala/akka/io/SimpleDnsManager.scala b/akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala
similarity index 88%
rename from akka-actor/src/main/scala/akka/io/SimpleDnsManager.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala
index 1e5279c64c..b694a609cb 100644
--- a/akka-actor/src/main/scala/akka/io/SimpleDnsManager.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.util.concurrent.TimeUnit
 import scala.concurrent.duration.Duration
-import akka.actor.{ Actor, ActorLogging, Deploy, Props }
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.routing.FromConfig
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, Deploy, Props }
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.routing.FromConfig
 
 import scala.annotation.nowarn
 
diff --git a/akka-actor/src/main/scala/akka/io/Tcp.scala b/akka-actor/src/main/scala/org/apache/pekko/io/Tcp.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/io/Tcp.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/Tcp.scala
index f311f7c120..02b9f9d801 100644
--- a/akka-actor/src/main/scala/akka/io/Tcp.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/Tcp.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.lang.{ Iterable => JIterable }
 import java.net.InetSocketAddress
@@ -15,13 +15,14 @@ import scala.concurrent.duration._
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.annotation.InternalApi
-import akka.io.Inet._
-import akka.util.{ ByteString, Helpers }
-import akka.util.Helpers.Requiring
-import akka.util.JavaDurationConverters._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.InternalApi
+import pekko.io.Inet._
+import pekko.util.{ ByteString, Helpers }
+import pekko.util.Helpers.Requiring
+import pekko.util.JavaDurationConverters._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * TCP Extension for Akka’s IO layer.
@@ -60,7 +61,7 @@ object Tcp extends ExtensionId[TcpExt] with ExtensionIdProvider {
     // general socket options
 
     /**
-     * [[akka.io.Inet.SocketOption]] to enable or disable SO_KEEPALIVE
+     * [[pekko.io.Inet.SocketOption]] to enable or disable SO_KEEPALIVE
      *
      * For more information see `java.net.Socket.setKeepAlive`
      */
@@ -69,7 +70,7 @@ object Tcp extends ExtensionId[TcpExt] with ExtensionIdProvider {
     }
 
     /**
-     * [[akka.io.Inet.SocketOption]] to enable or disable OOBINLINE (receipt
+     * [[pekko.io.Inet.SocketOption]] to enable or disable OOBINLINE (receipt
      * of TCP urgent data) By default, this option is disabled and TCP urgent
      * data is silently discarded.
      *
@@ -82,7 +83,7 @@ object Tcp extends ExtensionId[TcpExt] with ExtensionIdProvider {
     // SO_LINGER is handled by the Close code
 
     /**
-     * [[akka.io.Inet.SocketOption]] to enable or disable TCP_NODELAY
+     * [[pekko.io.Inet.SocketOption]] to enable or disable TCP_NODELAY
      * (disable or enable Nagle's algorithm)
      *
      * Please note, that TCP_NODELAY is enabled by default.
@@ -472,14 +473,14 @@ object Tcp extends ExtensionId[TcpExt] with ExtensionIdProvider {
     // The cause will be lost in the unlikely case that someone uses `copy` on an instance.
     /** Creates a copy of this object with a new cause set. */
     @InternalApi
-    private[akka] def withCause(cause: Throwable): CommandFailed = {
+    private[pekko] def withCause(cause: Throwable): CommandFailed = {
       val newInstance = copy()
       newInstance._cause = Some(cause)
       newInstance
     }
 
     @InternalApi
-    private[akka] def causedByString =
+    private[pekko] def causedByString =
       _cause
         .map(t => {
           val msg =
@@ -599,7 +600,7 @@ class TcpExt(system: ExtendedActorSystem) extends IO.Extension {
   class Settings private[TcpExt] (_config: Config) extends SelectionHandlerSettings(_config) {
     import _config._
 
-    import akka.util.Helpers.ConfigOps
+    import pekko.util.Helpers.ConfigOps
 
     val NrOfSelectors: Int = getInt("nr-of-selectors").requiring(_ > 0, "nr-of-selectors must be > 0")
 
@@ -663,14 +664,14 @@ object TcpSO extends SoJavaFactories {
   import Tcp.SO._
 
   /**
-   * [[akka.io.Inet.SocketOption]] to enable or disable SO_KEEPALIVE
+   * [[pekko.io.Inet.SocketOption]] to enable or disable SO_KEEPALIVE
    *
    * For more information see `java.net.Socket.setKeepAlive`
    */
   def keepAlive(on: Boolean) = KeepAlive(on)
 
   /**
-   * [[akka.io.Inet.SocketOption]] to enable or disable OOBINLINE (receipt
+   * [[pekko.io.Inet.SocketOption]] to enable or disable OOBINLINE (receipt
    * of TCP urgent data) By default, this option is disabled and TCP urgent
    * data is silently discarded.
    *
@@ -679,7 +680,7 @@ object TcpSO extends SoJavaFactories {
   def oobInline(on: Boolean) = OOBInline(on)
 
   /**
-   * [[akka.io.Inet.SocketOption]] to enable or disable TCP_NODELAY
+   * [[pekko.io.Inet.SocketOption]] to enable or disable TCP_NODELAY
    * (disable or enable Nagle's algorithm)
    *
    * Please note, that TCP_NODELAY is enabled by default.
@@ -918,6 +919,6 @@ object TcpMessage {
   def resumeAccepting(batchSize: Int): Command = ResumeAccepting(batchSize)
 
   implicit private def fromJava[T](coll: JIterable[T]): immutable.Iterable[T] = {
-    akka.japi.Util.immutableSeq(coll)
+    pekko.japi.Util.immutableSeq(coll)
   }
 }
diff --git a/akka-actor/src/main/scala/akka/io/TcpConnection.scala b/akka-actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/io/TcpConnection.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
index 1fa7fe8a4e..0951d1f235 100644
--- a/akka-actor/src/main/scala/akka/io/TcpConnection.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.io.IOException
 import java.net.{ InetSocketAddress, SocketException }
@@ -18,12 +18,13 @@ import scala.util.control.{ NoStackTrace, NonFatal }
 
 import scala.annotation.nowarn
 
-import akka.actor._
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.io.Inet.SocketOption
-import akka.io.SelectionHandler._
-import akka.io.Tcp._
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.actor._
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.io.Inet.SocketOption
+import pekko.io.SelectionHandler._
+import pekko.io.Tcp._
+import pekko.util.ByteString
 
 /**
  * Base class for TcpIncomingConnection and TcpOutgoingConnection.
diff --git a/akka-actor/src/main/scala/akka/io/TcpIncomingConnection.scala b/akka-actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala
similarity index 87%
rename from akka-actor/src/main/scala/akka/io/TcpIncomingConnection.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala
index 8270353f8e..6b96216ab3 100644
--- a/akka-actor/src/main/scala/akka/io/TcpIncomingConnection.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.nio.channels.SocketChannel
 
@@ -10,8 +10,9 @@ import scala.collection.immutable
 
 import scala.annotation.nowarn
 
-import akka.actor.ActorRef
-import akka.io.Inet.SocketOption
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.io.Inet.SocketOption
 
 /**
  * An actor handling the connection state machine for an incoming, already connected
diff --git a/akka-actor/src/main/scala/akka/io/TcpListener.scala b/akka-actor/src/main/scala/org/apache/pekko/io/TcpListener.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/io/TcpListener.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/TcpListener.scala
index cda612bc8e..cc394eab79 100644
--- a/akka-actor/src/main/scala/akka/io/TcpListener.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/TcpListener.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.InetSocketAddress
 import java.nio.channels.{ SelectionKey, ServerSocketChannel, SocketChannel }
@@ -10,10 +10,11 @@ import java.nio.channels.{ SelectionKey, ServerSocketChannel, SocketChannel }
 import scala.annotation.tailrec
 import scala.util.control.NonFatal
 
-import akka.actor._
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.io.SelectionHandler._
-import akka.io.Tcp._
+import org.apache.pekko
+import pekko.actor._
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.io.SelectionHandler._
+import pekko.io.Tcp._
 
 /**
  * INTERNAL API
diff --git a/akka-actor/src/main/scala/akka/io/TcpManager.scala b/akka-actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
similarity index 52%
rename from akka-actor/src/main/scala/akka/io/TcpManager.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
index af5f842180..f495954f0b 100644
--- a/akka-actor/src/main/scala/akka/io/TcpManager.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
@@ -2,47 +2,48 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import Tcp._
 
-import akka.actor.{ ActorLogging, Props }
+import org.apache.pekko
+import pekko.actor.{ ActorLogging, Props }
 
 /**
  * INTERNAL API
  *
- * TcpManager is a facade for accepting commands ([[akka.io.Tcp.Command]]) to open client or server TCP connections.
+ * TcpManager is a facade for accepting commands ([[pekko.io.Tcp.Command]]) to open client or server TCP connections.
  *
- * TcpManager is obtainable by calling {{{ IO(Tcp) }}} (see [[akka.io.IO]] and [[akka.io.Tcp]])
+ * TcpManager is obtainable by calling {{{ IO(Tcp) }}} (see [[pekko.io.IO]] and [[pekko.io.Tcp]])
  *
  * == Bind ==
  *
- * To bind and listen to a local address, a [[akka.io.Tcp.Bind]] command must be sent to this actor. If the binding
- * was successful, the sender of the [[akka.io.Tcp.Bind]] will be notified with a [[akka.io.Tcp.Bound]]
- * message. The sender() of the [[akka.io.Tcp.Bound]] message is the Listener actor (an internal actor responsible for
- * listening to server events). To unbind the port an [[akka.io.Tcp.Unbind]] message must be sent to the Listener actor.
+ * To bind and listen to a local address, a [[pekko.io.Tcp.Bind]] command must be sent to this actor. If the binding
+ * was successful, the sender of the [[pekko.io.Tcp.Bind]] will be notified with a [[pekko.io.Tcp.Bound]]
+ * message. The sender() of the [[pekko.io.Tcp.Bound]] message is the Listener actor (an internal actor responsible for
+ * listening to server events). To unbind the port an [[pekko.io.Tcp.Unbind]] message must be sent to the Listener actor.
  *
  * If the bind request is rejected because the Tcp system is not able to register more channels (see the nr-of-selectors
  * and max-channels configuration options in the akka.io.tcp section of the configuration) the sender will be notified
- * with a [[akka.io.Tcp.CommandFailed]] message. This message contains the original command for reference.
+ * with a [[pekko.io.Tcp.CommandFailed]] message. This message contains the original command for reference.
  *
- * When an inbound TCP connection is established, the handler will be notified by a [[akka.io.Tcp.Connected]] message.
+ * When an inbound TCP connection is established, the handler will be notified by a [[pekko.io.Tcp.Connected]] message.
  * The sender of this message is the Connection actor (an internal actor representing the TCP connection). At this point
  * the procedure is the same as for outbound connections (see section below).
  *
  * == Connect ==
  *
- * To initiate a connection to a remote server, a [[akka.io.Tcp.Connect]] message must be sent to this actor. If the
- * connection succeeds, the sender() will be notified with a [[akka.io.Tcp.Connected]] message. The sender of the
- * [[akka.io.Tcp.Connected]] message is the Connection actor (an internal actor representing the TCP connection). Before
- * starting to use the connection, a handler must be registered to the Connection actor by sending a [[akka.io.Tcp.Register]]
+ * To initiate a connection to a remote server, a [[pekko.io.Tcp.Connect]] message must be sent to this actor. If the
+ * connection succeeds, the sender() will be notified with a [[pekko.io.Tcp.Connected]] message. The sender of the
+ * [[pekko.io.Tcp.Connected]] message is the Connection actor (an internal actor representing the TCP connection). Before
+ * starting to use the connection, a handler must be registered to the Connection actor by sending a [[pekko.io.Tcp.Register]]
  * command message. After a handler has been registered, all incoming data will be sent to the handler in the form of
- * [[akka.io.Tcp.Received]] messages. To write data to the connection, a [[akka.io.Tcp.Write]] message must be sent
+ * [[pekko.io.Tcp.Received]] messages. To write data to the connection, a [[pekko.io.Tcp.Write]] message must be sent
  * to the Connection actor.
  *
  * If the connect request is rejected because the Tcp system is not able to register more channels (see the nr-of-selectors
  * and max-channels configuration options in the akka.io.tcp section of the configuration) the sender will be notified
- * with a [[akka.io.Tcp.CommandFailed]] message. This message contains the original command for reference.
+ * with a [[pekko.io.Tcp.CommandFailed]] message. This message contains the original command for reference.
  */
 private[io] class TcpManager(tcp: TcpExt)
     extends SelectionHandler.SelectorBasedManager(tcp.Settings, tcp.Settings.NrOfSelectors)
diff --git a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala b/akka-actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala
index 98c2e3a33c..dcc039706f 100644
--- a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.{ ConnectException, InetSocketAddress }
 import java.nio.channels.{ SelectionKey, SocketChannel }
@@ -10,13 +10,14 @@ import java.nio.channels.{ SelectionKey, SocketChannel }
 import scala.concurrent.duration._
 import scala.util.control.{ NoStackTrace, NonFatal }
 
-import akka.actor.{ ActorRef, ReceiveTimeout }
-import akka.actor.Status.Failure
-import akka.annotation.InternalApi
-import akka.io.SelectionHandler._
-import akka.io.Tcp._
-import akka.io.TcpConnection.CloseInformation
-import akka.io.dns.DnsProtocol
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ReceiveTimeout }
+import pekko.actor.Status.Failure
+import pekko.annotation.InternalApi
+import pekko.io.SelectionHandler._
+import pekko.io.Tcp._
+import pekko.io.TcpConnection.CloseInformation
+import pekko.io.dns.DnsProtocol
 
 /**
  * An actor handling the connection state machine for an outgoing connection
diff --git a/akka-actor/src/main/scala/akka/io/Udp.scala b/akka-actor/src/main/scala/org/apache/pekko/io/Udp.scala
similarity index 96%
rename from akka-actor/src/main/scala/akka/io/Udp.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/Udp.scala
index 480b24e450..c761d74f7e 100644
--- a/akka-actor/src/main/scala/akka/io/Udp.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/Udp.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.DatagramSocket
 import java.net.InetSocketAddress
@@ -12,11 +12,12 @@ import scala.collection.immutable
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.io.Inet.{ SoJavaFactories, SocketOption }
-import akka.util.ByteString
-import akka.util.Helpers.Requiring
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor._
+import pekko.io.Inet.{ SoJavaFactories, SocketOption }
+import pekko.util.ByteString
+import pekko.util.Helpers.Requiring
+import pekko.util.ccompat._
 
 /**
  * UDP Extension for Akka’s IO layer.
@@ -121,7 +122,7 @@ object Udp extends ExtensionId[UdpExt] with ExtensionIdProvider {
    * The “simple sender” is a convenient service for being able to send datagrams
    * when the originating address is meaningless, i.e. when no reply is expected.
    *
-   * The “simple sender” will not stop itself, you will have to send it a [[akka.actor.PoisonPill]]
+   * The “simple sender” will not stop itself, you will have to send it a [[pekko.actor.PoisonPill]]
    * when you want to close the socket.
    */
   @nowarn("msg=deprecated")
@@ -187,7 +188,7 @@ object Udp extends ExtensionId[UdpExt] with ExtensionIdProvider {
   object SO extends Inet.SoForwarders {
 
     /**
-     * [[akka.io.Inet.SocketOption]] to set the SO_BROADCAST option
+     * [[pekko.io.Inet.SocketOption]] to set the SO_BROADCAST option
      *
      * For more information see [[java.net.DatagramSocket#setBroadcast]]
      */
@@ -249,7 +250,7 @@ object UdpMessage {
 
   import Udp._
 
-  import akka.util.ccompat.JavaConverters._
+  import pekko.util.ccompat.JavaConverters._
 
   /**
    * Each [[Udp.Send]] can optionally request a positive acknowledgment to be sent
@@ -316,7 +317,7 @@ object UdpMessage {
    * The “simple sender” is a convenient service for being able to send datagrams
    * when the originating address is meaningless, i.e. when no reply is expected.
    *
-   * The “simple sender” will not stop itself, you will have to send it a [[akka.actor.PoisonPill]]
+   * The “simple sender” will not stop itself, you will have to send it a [[pekko.actor.PoisonPill]]
    * when you want to close the socket.
    */
   def simpleSender(options: JIterable[SocketOption]): Command = SimpleSender(options.asScala.to(immutable.IndexedSeq))
@@ -345,7 +346,7 @@ object UdpSO extends SoJavaFactories {
   import Udp.SO._
 
   /**
-   * [[akka.io.Inet.SocketOption]] to set the SO_BROADCAST option
+   * [[pekko.io.Inet.SocketOption]] to set the SO_BROADCAST option
    *
    * For more information see [[java.net.DatagramSocket#setBroadcast]]
    */
diff --git a/akka-actor/src/main/scala/akka/io/UdpConnected.scala b/akka-actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/io/UdpConnected.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala
index 9721e655d8..f8be2a4e52 100644
--- a/akka-actor/src/main/scala/akka/io/UdpConnected.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.lang.{ Iterable => JIterable }
 import java.net.InetSocketAddress
@@ -11,11 +11,12 @@ import scala.collection.immutable
 
 import scala.annotation.nowarn
 
-import akka.actor._
-import akka.io.Inet.SocketOption
-import akka.io.Udp.UdpSettings
-import akka.util.ByteString
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor._
+import pekko.io.Inet.SocketOption
+import pekko.io.Udp.UdpSettings
+import pekko.util.ByteString
+import pekko.util.ccompat._
 
 /**
  * UDP Extension for Akka’s IO layer.
@@ -259,7 +260,7 @@ object UdpConnectedMessage {
   def resumeReading: Command = ResumeReading
 
   implicit private def fromJava[T](coll: JIterable[T]): immutable.Iterable[T] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     coll.asScala.to(immutable.Iterable)
   }
 }
diff --git a/akka-actor/src/main/scala/akka/io/UdpConnectedManager.scala b/akka-actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala
similarity index 81%
rename from akka-actor/src/main/scala/akka/io/UdpConnectedManager.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala
index 2fa5d31483..f3ebcd1e18 100644
--- a/akka-actor/src/main/scala/akka/io/UdpConnectedManager.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
-import akka.actor.Props
-import akka.io.UdpConnected.Connect
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.io.UdpConnected.Connect
 
 /**
  * INTERNAL API
diff --git a/akka-actor/src/main/scala/akka/io/UdpConnection.scala b/akka-actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala
similarity index 93%
rename from akka-actor/src/main/scala/akka/io/UdpConnection.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala
index a56e991f59..bae16259f8 100644
--- a/akka-actor/src/main/scala/akka/io/UdpConnection.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.{ InetSocketAddress, PortUnreachableException }
 import java.nio.ByteBuffer
@@ -12,13 +12,14 @@ import java.nio.channels.SelectionKey._
 import scala.annotation.tailrec
 import scala.util.control.NonFatal
 
-import akka.actor.{ Actor, ActorLogging, ActorRef }
-import akka.actor.Status.Failure
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.io.SelectionHandler._
-import akka.io.UdpConnected._
-import akka.io.dns.DnsProtocol
-import akka.util.{ unused, ByteString }
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRef }
+import pekko.actor.Status.Failure
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.io.SelectionHandler._
+import pekko.io.UdpConnected._
+import pekko.io.dns.DnsProtocol
+import pekko.util.{ unused, ByteString }
 
 /**
  * INTERNAL API
diff --git a/akka-actor/src/main/scala/akka/io/UdpListener.scala b/akka-actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
similarity index 92%
rename from akka-actor/src/main/scala/akka/io/UdpListener.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
index 57b1612b58..998264dbac 100644
--- a/akka-actor/src/main/scala/akka/io/UdpListener.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.InetSocketAddress
 import java.nio.ByteBuffer
@@ -11,12 +11,13 @@ import java.nio.channels.SelectionKey._
 import scala.annotation.tailrec
 import scala.util.control.NonFatal
 
-import akka.actor.{ Actor, ActorLogging, ActorRef }
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.io.Inet.DatagramChannelCreator
-import akka.io.SelectionHandler._
-import akka.io.Udp._
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRef }
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.io.Inet.DatagramChannelCreator
+import pekko.io.SelectionHandler._
+import pekko.io.Udp._
+import pekko.util.ByteString
 
 /**
  * INTERNAL API
diff --git a/akka-actor/src/main/scala/akka/io/UdpManager.scala b/akka-actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
similarity index 61%
rename from akka-actor/src/main/scala/akka/io/UdpManager.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
index 8054b6ad55..60b73baf27 100644
--- a/akka-actor/src/main/scala/akka/io/UdpManager.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
-import akka.actor.Props
-import akka.io.Udp._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.io.Udp._
 
 /**
  * INTERNAL API
  *
  * UdpManager is a facade for simple fire-and-forget style UDP operations
  *
- * UdpManager is obtainable by calling {{{ IO(Udp) }}} (see [[akka.io.IO]] and [[akka.io.Udp]])
+ * UdpManager is obtainable by calling {{{ IO(Udp) }}} (see [[pekko.io.IO]] and [[pekko.io.Udp]])
  *
  * *Warning!* Udp uses [[java.nio.channels.DatagramChannel#send]] to deliver datagrams, and as a consequence if a
  * security manager  has been installed then for each datagram it will verify if the target address and port number are
@@ -20,26 +21,26 @@ import akka.io.Udp._
  *
  * == Bind and send ==
  *
- * To bind and listen to a local address, a [[akka.io.Udp..Bind]] command must be sent to this actor. If the binding
- * was successful, the sender of the [[akka.io.Udp.Bind]] will be notified with a [[akka.io.Udp.Bound]]
- * message. The sender of the [[akka.io.Udp.Bound]] message is the Listener actor (an internal actor responsible for
- * listening to server events). To unbind the port an [[akka.io.Tcp.Unbind]] message must be sent to the Listener actor.
+ * To bind and listen to a local address, a [[pekko.io.Udp..Bind]] command must be sent to this actor. If the binding
+ * was successful, the sender of the [[pekko.io.Udp.Bind]] will be notified with a [[pekko.io.Udp.Bound]]
+ * message. The sender of the [[pekko.io.Udp.Bound]] message is the Listener actor (an internal actor responsible for
+ * listening to server events). To unbind the port an [[pekko.io.Tcp.Unbind]] message must be sent to the Listener actor.
  *
  * If the bind request is rejected because the Udp system is not able to register more channels (see the nr-of-selectors
  * and max-channels configuration options in the akka.io.udp section of the configuration) the sender will be notified
- * with a [[akka.io.Udp.CommandFailed]] message. This message contains the original command for reference.
+ * with a [[pekko.io.Udp.CommandFailed]] message. This message contains the original command for reference.
  *
- * The handler provided in the [[akka.io.Udp.Bind]] message will receive inbound datagrams to the bound port
- * wrapped in [[akka.io.Udp.Received]] messages which contain the payload of the datagram and the sender address.
+ * The handler provided in the [[pekko.io.Udp.Bind]] message will receive inbound datagrams to the bound port
+ * wrapped in [[pekko.io.Udp.Received]] messages which contain the payload of the datagram and the sender address.
  *
- * UDP datagrams can be sent by sending [[akka.io.Udp.Send]] messages to the Listener actor. The sender port of the
+ * UDP datagrams can be sent by sending [[pekko.io.Udp.Send]] messages to the Listener actor. The sender port of the
  * outbound datagram will be the port to which the Listener is bound.
  *
  * == Simple send ==
  *
  * Udp provides a simple method of sending UDP datagrams if no reply is expected. To acquire the Sender actor
  * a SimpleSend message has to be sent to the manager. The sender of the command will be notified by a SimpleSenderReady
- * message that the service is available. UDP datagrams can be sent by sending [[akka.io.Udp.Send]] messages to the
+ * message that the service is available. UDP datagrams can be sent by sending [[pekko.io.Udp.Send]] messages to the
  * sender of SimpleSenderReady. All the datagrams will contain an ephemeral local port as sender and answers will be
  * discarded.
  */
diff --git a/akka-actor/src/main/scala/akka/io/UdpSender.scala b/akka-actor/src/main/scala/org/apache/pekko/io/UdpSender.scala
similarity index 86%
rename from akka-actor/src/main/scala/akka/io/UdpSender.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/UdpSender.scala
index a8c69adfd4..f1f9b3948f 100644
--- a/akka-actor/src/main/scala/akka/io/UdpSender.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/UdpSender.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import scala.collection.immutable
 import scala.util.control.NonFatal
 
-import akka.actor._
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.io.Inet.{ DatagramChannelCreator, SocketOption }
-import akka.io.Udp._
+import org.apache.pekko
+import pekko.actor._
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.io.Inet.{ DatagramChannelCreator, SocketOption }
+import pekko.io.Udp._
 import scala.annotation.nowarn
 
 /**
diff --git a/akka-actor/src/main/scala/akka/io/WithUdpSend.scala b/akka-actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala
similarity index 93%
rename from akka-actor/src/main/scala/akka/io/WithUdpSend.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala
index 70f1d34bde..572babbfd1 100644
--- a/akka-actor/src/main/scala/akka/io/WithUdpSend.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.InetSocketAddress
 import java.nio.channels.{ DatagramChannel, SelectionKey }
 
 import scala.util.control.NonFatal
 
-import akka.actor.{ Actor, ActorLogging, ActorRef }
-import akka.io.SelectionHandler._
-import akka.io.Udp.{ CommandFailed, Send }
-import akka.io.dns.DnsProtocol
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRef }
+import pekko.io.SelectionHandler._
+import pekko.io.Udp.{ CommandFailed, Send }
+import pekko.io.dns.DnsProtocol
 
 /**
  * INTERNAL API
diff --git a/akka-actor/src/main/scala/akka/io/dns/CachePolicy.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala
similarity index 88%
rename from akka-actor/src/main/scala/akka/io/dns/CachePolicy.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala
index 6d42d56604..315439496d 100644
--- a/akka-actor/src/main/scala/akka/io/dns/CachePolicy.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns
+package org.apache.pekko.io.dns
 
 import scala.concurrent.duration.{ Duration, FiniteDuration, _ }
 
-import akka.annotation.InternalApi
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.util.JavaDurationConverters._
 
 object CachePolicy {
 
@@ -18,7 +19,7 @@ object CachePolicy {
   final class Ttl private (val value: FiniteDuration) extends CachePolicy {
     if (value < Duration.Zero)
       throw new IllegalArgumentException(s"TTL values must be a positive value (zero included).")
-    import akka.util.JavaDurationConverters._
+    import pekko.util.JavaDurationConverters._
     def getValue: java.time.Duration = value.asJava
 
     override def equals(other: Any): Boolean = other match {
@@ -45,7 +46,7 @@ object CachePolicy {
      * INTERNAL API
      */
     @InternalApi
-    private[akka] def toTll(policy: CachePolicy): Ttl = policy match {
+    private[pekko] def toTll(policy: CachePolicy): Ttl = policy match {
       case Never    => Ttl.never
       case Forever  => Ttl.effectivelyForever
       case ttl: Ttl => ttl
diff --git a/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala
similarity index 89%
rename from akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala
index ef22137a93..95ed1ccde0 100644
--- a/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns
+package org.apache.pekko.io.dns
 
 import java.net.Inet4Address
 import java.net.Inet6Address
@@ -12,13 +12,14 @@ import java.util
 
 import scala.collection.{ immutable => im }
 
-import akka.actor.NoSerializationVerificationNeeded
-import akka.io.IpVersionSelector
-import akka.routing.ConsistentHashingRouter.ConsistentHashable
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.io.IpVersionSelector
+import pekko.routing.ConsistentHashingRouter.ConsistentHashable
+import pekko.util.ccompat.JavaConverters._
 
 /**
- * Supersedes [[akka.io.Dns]] protocol.
+ * Supersedes [[pekko.io.Dns]] protocol.
  *
  * Note that one MUST configure `akka.io.dns.resolver = async-dns` to make use of this protocol and resolver.
  *
@@ -47,7 +48,7 @@ object DnsProtocol {
   def srvRequestType(): RequestType = Srv
 
   /**
-   * Sending this to the [[AsyncDnsManager]] will either lead to a [[Resolved]] or a [[akka.actor.Status.Failure]] response.
+   * Sending this to the [[AsyncDnsManager]] will either lead to a [[Resolved]] or a [[pekko.actor.Status.Failure]] response.
    * If request type are both, both resolutions must succeed or the response is a failure.
    */
   final case class Resolve(name: String, requestType: RequestType) extends ConsistentHashable {
diff --git a/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala
similarity index 93%
rename from akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala
index fcfabbbdb4..b30c36abe1 100644
--- a/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns
+package org.apache.pekko.io.dns
 
 import java.net.{ Inet4Address, Inet6Address, InetAddress }
 
@@ -11,11 +11,12 @@ import scala.concurrent.duration._
 
 import CachePolicy._
 
-import akka.actor.NoSerializationVerificationNeeded
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.io.dns.internal.{ DomainName, _ }
-import akka.util.{ unused, ByteIterator, ByteString }
+import org.apache.pekko
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.io.dns.internal.{ DomainName, _ }
+import pekko.util.{ unused, ByteIterator, ByteString }
 
 /**
  * Not for user extension
diff --git a/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala
similarity index 91%
rename from akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala
index 3bcf258158..bcb32f07c2 100644
--- a/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns
+package org.apache.pekko.io.dns
 
 import java.io.File
 import java.net.{ InetSocketAddress, URI }
@@ -14,16 +14,17 @@ import scala.util.{ Failure, Success, Try }
 
 import com.typesafe.config.{ Config, ConfigValueType }
 
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.event.Logging
-import akka.io.dns.CachePolicy.{ CachePolicy, Forever, Never, Ttl }
-import akka.io.dns.internal.{ ResolvConf, ResolvConfParser }
-import akka.util.Helpers
-import akka.util.Helpers.Requiring
-import akka.util.JavaDurationConverters._
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.InternalApi
+import pekko.event.Logging
+import pekko.io.dns.CachePolicy.{ CachePolicy, Forever, Never, Ttl }
+import pekko.io.dns.internal.{ ResolvConf, ResolvConfParser }
+import pekko.util.Helpers
+import pekko.util.Helpers.Requiring
+import pekko.util.JavaDurationConverters._
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 /** INTERNAL API */
 @InternalApi
@@ -136,7 +137,7 @@ object DnsSettings {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def parseNameserverAddress(str: String): InetSocketAddress =
+  @InternalApi private[pekko] def parseNameserverAddress(str: String): InetSocketAddress =
     str match {
       case inetSocketAddress(host, port) =>
         new InetSocketAddress(host, Option(port).fold(DnsFallbackPort)(_.toInt))
@@ -153,7 +154,7 @@ object DnsSettings {
    *
    * Based on: https://github.com/netty/netty/blob/4.1/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java#L58-L146
    */
-  private[akka] def getDefaultNameServers(system: ExtendedActorSystem): Try[List[InetSocketAddress]] = {
+  private[pekko] def getDefaultNameServers(system: ExtendedActorSystem): Try[List[InetSocketAddress]] = {
     def asInetSocketAddress(server: String): Try[InetSocketAddress] = {
       Try {
         val uri = new URI(server)
diff --git a/akka-actor/src/main/scala/akka/io/dns/RecordClass.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordClass.scala
similarity index 91%
rename from akka-actor/src/main/scala/akka/io/dns/RecordClass.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordClass.scala
index d124fbb623..d6f1f9ea60 100644
--- a/akka-actor/src/main/scala/akka/io/dns/RecordClass.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordClass.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns
+package org.apache.pekko.io.dns
 
 final case class RecordClass(code: Short, name: String)
 
diff --git a/akka-actor/src/main/scala/akka/io/dns/RecordType.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordType.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/io/dns/RecordType.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordType.scala
index 4edd23b137..f4db93beb2 100644
--- a/akka-actor/src/main/scala/akka/io/dns/RecordType.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordType.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns
+package org.apache.pekko.io.dns
 
-import akka.util.OptionVal
+import org.apache.pekko.util.OptionVal
 
 /**
  * DNS Record Type
@@ -19,7 +19,7 @@ object RecordType {
    */
   private final val lookupTable = Array.ofDim[RecordType](256)
 
-  private[akka] def lookup(code: Int): RecordType = lookupTable(code)
+  private[pekko] def lookup(code: Int): RecordType = lookupTable(code)
   def apply(id: Short): OptionVal[RecordType] = {
     if (id < 1 || id > 255) OptionVal.None
     else OptionVal(RecordType.lookup(id))
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala
similarity index 82%
rename from akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala
index 046e9fd213..390598cc1c 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
 import java.net.InetSocketAddress
 import java.util.concurrent.TimeUnit
@@ -13,21 +13,22 @@ import scala.concurrent.duration.Duration
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor.{ Actor, ActorLogging, ActorRefFactory, Deploy, ExtendedActorSystem, Props, Timers }
-import akka.annotation.InternalApi
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.io.{ Dns, DnsExt, DnsProvider }
-import akka.io.PeriodicCacheCleanup
-import akka.io.dns.{ AAAARecord, ARecord, DnsProtocol, DnsSettings }
-import akka.io.dns.internal.AsyncDnsManager.CacheCleanup
-import akka.routing.FromConfig
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRefFactory, Deploy, ExtendedActorSystem, Props, Timers }
+import pekko.annotation.InternalApi
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.io.{ Dns, DnsExt, DnsProvider }
+import pekko.io.PeriodicCacheCleanup
+import pekko.io.dns.{ AAAARecord, ARecord, DnsProtocol, DnsSettings }
+import pekko.io.dns.internal.AsyncDnsManager.CacheCleanup
+import pekko.routing.FromConfig
+import pekko.util.Timeout
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object AsyncDnsManager {
+private[pekko] object AsyncDnsManager {
   private case object CacheCleanup
 
   case object GetCache
@@ -49,8 +50,8 @@ private[io] final class AsyncDnsManager(
     with RequiresMessageQueue[UnboundedMessageQueueSemantics]
     with ActorLogging
     with Timers {
-  import akka.pattern.ask
-  import akka.pattern.pipe
+  import pekko.pattern.ask
+  import pekko.pattern.pipe
 
   /**
    * Ctr expected by the DnsExt for all DnsMangers
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsProvider.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala
similarity index 65%
rename from akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsProvider.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala
index b09fe28aa9..33a46a3434 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsProvider.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
 import scala.annotation.nowarn
 
-import akka.annotation.InternalApi
-import akka.io._
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.io._
 
 /**
  * INTERNAL API
  */
 @InternalApi
 @nowarn("msg=deprecated")
-private[akka] class AsyncDnsProvider extends DnsProvider {
+private[pekko] class AsyncDnsProvider extends DnsProvider {
   override def cache: Dns = new SimpleDnsCache()
   override def actorClass = classOf[AsyncDnsResolver]
   override def managerClass = classOf[AsyncDnsManager]
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala
similarity index 93%
rename from akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala
index 04bf7072ad..540f153192 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
 import java.net.{ Inet4Address, Inet6Address, InetAddress, InetSocketAddress }
 
@@ -12,17 +12,18 @@ import scala.concurrent.Future
 import scala.util.Try
 import scala.util.control.NonFatal
 
-import akka.actor.{ Actor, ActorLogging, ActorRef, ActorRefFactory }
-import akka.annotation.InternalApi
-import akka.io.SimpleDnsCache
-import akka.io.dns._
-import akka.io.dns.CachePolicy.{ Never, Ttl }
-import akka.io.dns.DnsProtocol.{ Ip, RequestType, Srv }
-import akka.io.dns.internal.DnsClient._
-import akka.pattern.{ ask, pipe }
-import akka.pattern.AskTimeoutException
-import akka.util.{ Helpers, Timeout }
-import akka.util.PrettyDuration._
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRef, ActorRefFactory }
+import pekko.annotation.InternalApi
+import pekko.io.SimpleDnsCache
+import pekko.io.dns._
+import pekko.io.dns.CachePolicy.{ Never, Ttl }
+import pekko.io.dns.DnsProtocol.{ Ip, RequestType, Srv }
+import pekko.io.dns.internal.DnsClient._
+import pekko.pattern.{ ask, pipe }
+import pekko.pattern.AskTimeoutException
+import pekko.util.{ Helpers, Timeout }
+import pekko.util.PrettyDuration._
 
 /**
  * INTERNAL API
@@ -226,7 +227,7 @@ private[io] final class AsyncDnsResolver(
  * INTERNAL API
  */
 @InternalApi
-private[akka] object AsyncDnsResolver {
+private[pekko] object AsyncDnsResolver {
 
   private val ipv4Address =
     """^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$""".r
@@ -234,10 +235,10 @@ private[akka] object AsyncDnsResolver {
   private val ipv6Address =
     """^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$""".r
 
-  private[akka] def isIpv4Address(name: String): Boolean =
+  private[pekko] def isIpv4Address(name: String): Boolean =
     ipv4Address.findAllMatchIn(name).nonEmpty
 
-  private[akka] def isIpv6Address(name: String): Boolean =
+  private[pekko] def isIpv6Address(name: String): Boolean =
     ipv6Address.findAllMatchIn(name).nonEmpty
 
   private def isInetAddress(name: String): Boolean =
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala
similarity index 89%
rename from akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala
index 9c3da3ecab..d0266fad5f 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
 import java.net.{ InetAddress, InetSocketAddress }
 
@@ -12,17 +12,18 @@ import scala.util.Try
 
 import scala.annotation.nowarn
 
-import akka.actor.{ Actor, ActorLogging, ActorRef, NoSerializationVerificationNeeded, Props, Stash }
-import akka.actor.Status.Failure
-import akka.annotation.InternalApi
-import akka.io.{ IO, Tcp, Udp }
-import akka.io.dns.{ RecordClass, RecordType, ResourceRecord }
-import akka.pattern.{ BackoffOpts, BackoffSupervisor }
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRef, NoSerializationVerificationNeeded, Props, Stash }
+import pekko.actor.Status.Failure
+import pekko.annotation.InternalApi
+import pekko.io.{ IO, Tcp, Udp }
+import pekko.io.dns.{ RecordClass, RecordType, ResourceRecord }
+import pekko.pattern.{ BackoffOpts, BackoffSupervisor }
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object DnsClient {
+@InternalApi private[pekko] object DnsClient {
   sealed trait DnsQuestion {
     def id: Short
   }
@@ -37,7 +38,7 @@ import akka.pattern.{ BackoffOpts, BackoffSupervisor }
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class DnsClient(ns: InetSocketAddress) extends Actor with ActorLogging with Stash {
+@InternalApi private[pekko] class DnsClient(ns: InetSocketAddress) extends Actor with ActorLogging with Stash {
 
   import DnsClient._
   import context.system
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala
index e59f607547..944ec5af60 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
 import scala.collection.GenTraversableOnce
 import scala.collection.immutable.Seq
@@ -10,9 +10,10 @@ import scala.util.{ Failure, Success, Try }
 
 import scala.annotation.nowarn
 
-import akka.annotation.InternalApi
-import akka.io.dns.ResourceRecord
-import akka.util.{ ByteString, ByteStringBuilder }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.io.dns.ResourceRecord
+import pekko.util.{ ByteString, ByteStringBuilder }
 
 /**
  * INTERNAL API
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala
similarity index 83%
rename from akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala
index e9d86b119f..b93fac9cf1 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
-import akka.annotation.InternalApi
-import akka.util.{ ByteIterator, ByteString, ByteStringBuilder }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.util.{ ByteIterator, ByteString, ByteStringBuilder }
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object DomainName {
+private[pekko] object DomainName {
   def length(name: String): Short = {
     (name.length + 2).toShort
   }
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/Question.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala
similarity index 60%
rename from akka-actor/src/main/scala/akka/io/dns/internal/Question.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala
index 466c38f07f..58d32f3aba 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/Question.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
-import akka.annotation.InternalApi
-import akka.io.dns.{ RecordClass, RecordType }
-import akka.util.{ ByteIterator, ByteString, ByteStringBuilder }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.io.dns.{ RecordClass, RecordType }
+import pekko.util.{ ByteIterator, ByteString, ByteStringBuilder }
 
 /**
- * INTERNAL API
+ * INTE
  */
 @InternalApi
-private[akka] final case class Question(name: String, qType: RecordType, qClass: RecordClass) {
+private[pekko] final case class Question(name: String, qType: RecordType, qClass: RecordClass) {
   def write(out: ByteStringBuilder): Unit = {
     DomainName.write(out, name)
     RecordTypeSerializer.write(out, qType)
@@ -24,7 +25,7 @@ private[akka] final case class Question(name: String, qType: RecordType, qClass:
  * INTERNAL API
  */
 @InternalApi
-private[akka] object Question {
+private[pekko] object Question {
   def parse(it: ByteIterator, msg: ByteString): Question = {
     val name = DomainName.parse(it, msg)
     val qType = RecordTypeSerializer.parse(it)
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/RecordClassSerializer.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala
similarity index 69%
rename from akka-actor/src/main/scala/akka/io/dns/internal/RecordClassSerializer.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala
index fb102df1db..67e8130722 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/RecordClassSerializer.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
-import akka.annotation.InternalApi
-import akka.io.dns.RecordClass
-import akka.util.{ ByteIterator, ByteStringBuilder }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.io.dns.RecordClass
+import pekko.util.{ ByteIterator, ByteStringBuilder }
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object RecordClassSerializer {
+private[pekko] object RecordClassSerializer {
 
   def parse(it: ByteIterator): RecordClass = {
     it.getShort match {
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/RecordTypeSerializer.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala
similarity index 71%
rename from akka-actor/src/main/scala/akka/io/dns/internal/RecordTypeSerializer.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala
index a721164215..ce53351db0 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/RecordTypeSerializer.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
-import akka.io.dns.RecordType
-import akka.util.{ ByteIterator, ByteStringBuilder, OptionVal }
+import org.apache.pekko
+import pekko.io.dns.RecordType
+import pekko.util.{ ByteIterator, ByteStringBuilder, OptionVal }
 
 /**
  * INTERNAL API
  */
-private[akka] object RecordTypeSerializer {
+private[pekko] object RecordTypeSerializer {
 
   // TODO other type than ByteStringBuilder? (was used in akka-dns)
   def write(out: ByteStringBuilder, value: RecordType): Unit = {
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/ResolvConfParser.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/io/dns/internal/ResolvConfParser.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala
index 0c9a1b1216..42ad1f063d 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/ResolvConfParser.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
 import java.io.File
 import java.nio.file.Files
 
 import scala.util.Try
 
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.util.ccompat.JavaConverters._
 
 private[dns] case class ResolvConf(search: List[String], ndots: Int)
 
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala
similarity index 87%
rename from akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala
index 4e30bc1076..2dbfbdd602 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns.internal
+package org.apache.pekko.io.dns.internal
 
 import java.net.InetSocketAddress
 
-import akka.AkkaException
-import akka.actor.{ Actor, ActorLogging, ActorRef, Stash }
-import akka.annotation.InternalApi
-import akka.io.Tcp
-import akka.io.dns.internal.DnsClient.Answer
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.AkkaException
+import pekko.actor.{ Actor, ActorLogging, ActorRef, Stash }
+import pekko.annotation.InternalApi
+import pekko.io.Tcp
+import pekko.io.dns.internal.DnsClient.Answer
+import pekko.util.ByteString
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class TcpDnsClient(tcp: ActorRef, ns: InetSocketAddress, answerRecipient: ActorRef)
+@InternalApi private[pekko] class TcpDnsClient(tcp: ActorRef, ns: InetSocketAddress, answerRecipient: ActorRef)
     extends Actor
     with ActorLogging
     with Stash {
diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/package.scala b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala
similarity index 67%
rename from akka-actor/src/main/scala/akka/io/dns/internal/package.scala
rename to akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala
index dc08c37501..2129ed0028 100644
--- a/akka-actor/src/main/scala/akka/io/dns/internal/package.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.io.dns
+package org.apache.pekko.io.dns
 
 import java.nio.ByteOrder
 
-import akka.annotation.InternalApi
-import akka.io.dns.CachePolicy.{ CachePolicy, Forever, Never, Ttl }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.io.dns.CachePolicy.{ CachePolicy, Forever, Never, Ttl }
 
 /**
  * INTERNAL API
@@ -20,10 +21,10 @@ package object internal {
    * We know we always want to use network byte order when writing
    */
   @InternalApi
-  private[akka] implicit val networkByteOrder: ByteOrder = ByteOrder.BIG_ENDIAN
+  private[pekko] implicit val networkByteOrder: ByteOrder = ByteOrder.BIG_ENDIAN
 
   @InternalApi
-  private[akka] implicit object CachePolicyIsOrdered extends Ordering[CachePolicy] {
+  private[pekko] implicit object CachePolicyIsOrdered extends Ordering[CachePolicy] {
     def compare(a: CachePolicy, b: CachePolicy): Int =
       (a, b) match {
         case (Forever, Forever) => 0
diff --git a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala b/akka-actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/japi/JavaAPI.scala
rename to akka-actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
index 86cdb1fefe..a1687463e2 100644
--- a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.japi
+package org.apache.pekko.japi
 
 import java.util.Collections.{ emptyList, singletonList }
 
@@ -14,12 +14,13 @@ import scala.util.control.NoStackTrace
 
 import scala.annotation.nowarn
 
-import akka.util.Collections.EmptyImmutableSeq
+import org.apache.pekko
+import pekko.util.Collections.EmptyImmutableSeq
 
 /**
  * A Function interface. Used to create first-class-functions is Java.
  *
- * This class is kept for compatibility, but for future API's please prefer [[akka.japi.function.Function]].
+ * This class is kept for compatibility, but for future API's please prefer [[pekko.japi.function.Function]].
  */
 @FunctionalInterface
 trait Function[T, R] {
@@ -30,7 +31,7 @@ trait Function[T, R] {
 /**
  * A Function interface. Used to create 2-arg first-class-functions is Java.
  *
- * This class is kept for compatibility, but for future API's please prefer [[akka.japi.function.Function2]].
+ * This class is kept for compatibility, but for future API's please prefer [[pekko.japi.function.Function2]].
  */
 @FunctionalInterface
 trait Function2[T1, T2, R] {
@@ -41,7 +42,7 @@ trait Function2[T1, T2, R] {
 /**
  * A Procedure is like a Function, but it doesn't produce a return value.
  *
- * This class is kept for compatibility, but for future API's please prefer [[akka.japi.function.Procedure]].
+ * This class is kept for compatibility, but for future API's please prefer [[pekko.japi.function.Procedure]].
  */
 @FunctionalInterface
 trait Procedure[T] {
@@ -52,7 +53,7 @@ trait Procedure[T] {
 /**
  * An executable piece of code that takes no parameters and doesn't return any value.
  *
- * This class is kept for compatibility, but for future API's please prefer [[akka.japi.function.Effect]].
+ * This class is kept for compatibility, but for future API's please prefer [[pekko.japi.function.Effect]].
  */
 @FunctionalInterface
 trait Effect {
@@ -74,7 +75,7 @@ trait Predicate[T] {
  * Java API
  * Represents a pair (tuple) of two elements.
  *
- * Additional tuple types for 3 to 22 values are defined in the `akka.japi.tuple` package, e.g. [[akka.japi.tuple.Tuple3]].
+ * Additional tuple types for 3 to 22 values are defined in the `org.apache.pekko.japi.tuple` package, e.g. [[pekko.japi.tuple.Tuple3]].
  */
 @SerialVersionUID(1L)
 case class Pair[A, B](first: A, second: B) {
@@ -87,7 +88,7 @@ object Pair {
 /**
  * A constructor/factory, takes no parameters but creates a new value of type T every call.
  *
- * This class is kept for compatibility, but for future API's please prefer [[akka.japi.function.Creator]].
+ * This class is kept for compatibility, but for future API's please prefer [[pekko.japi.function.Creator]].
  */
 @nowarn("msg=@SerialVersionUID has no effect")
 @SerialVersionUID(1L)
diff --git a/akka-actor/src/main/scala/akka/japi/Throwables.scala b/akka-actor/src/main/scala/org/apache/pekko/japi/Throwables.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/japi/Throwables.scala
rename to akka-actor/src/main/scala/org/apache/pekko/japi/Throwables.scala
index 4c7dbef96c..903abc1ef0 100644
--- a/akka-actor/src/main/scala/akka/japi/Throwables.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/japi/Throwables.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.japi
+package org.apache.pekko.japi
 
 import scala.util.control.NonFatal
 
diff --git a/akka-actor/src/main/scala/akka/japi/function/Function.scala b/akka-actor/src/main/scala/org/apache/pekko/japi/function/Function.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/japi/function/Function.scala
rename to akka-actor/src/main/scala/org/apache/pekko/japi/function/Function.scala
index 809b45c0c3..9dfd84f816 100644
--- a/akka-actor/src/main/scala/akka/japi/function/Function.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/japi/function/Function.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.japi.function
+package org.apache.pekko.japi.function
 
 import scala.annotation.nowarn
 
diff --git a/akka-actor/src/main/scala/akka/japi/pf/CaseStatements.scala b/akka-actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/japi/pf/CaseStatements.scala
rename to akka-actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala
index 888c7d2344..8ad6de3699 100644
--- a/akka-actor/src/main/scala/akka/japi/pf/CaseStatements.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.japi.pf
+package org.apache.pekko.japi.pf
 
 import FI.{ Apply, Predicate, UnitApply }
 
diff --git a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
similarity index 91%
rename from akka-actor/src/main/scala/akka/pattern/AskSupport.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
index 9b0222f2f4..6c0681ad5f 100644
--- a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import java.net.URLEncoder
 import java.util.concurrent.TimeoutException
@@ -14,13 +14,14 @@ import scala.util.{ Failure, Success }
 import scala.annotation.nowarn
 import scala.util.control.NoStackTrace
 
-import akka.actor._
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.dispatch.ExecutionContexts
-import akka.dispatch.sysmsg._
-import akka.util.{ Timeout, Unsafe }
-import akka.util.ByteString
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.dispatch.ExecutionContexts
+import pekko.dispatch.sysmsg._
+import pekko.util.{ Timeout, Unsafe }
+import pekko.util.ByteString
+import pekko.util.unused
 
 /**
  * This is what is used to complete a Future that is returned from an ask/? call,
@@ -39,18 +40,18 @@ trait AskSupport {
 
   /**
    * Import this implicit conversion to gain `?` and `ask` methods on
-   * [[akka.actor.ActorRef]], which will defer to the
+   * [[pekko.actor.ActorRef]], which will defer to the
    * `ask(actorRef, message)(timeout)` method defined here.
    *
    * {{{
-   * import akka.pattern.ask
+   * import org.apache.pekko.pattern.ask
    *
    * val future = actor ? message             // => ask(actor, message)
    * val future = actor ask message           // => ask(actor, message)
    * val future = actor.ask(message)(timeout) // => ask(actor, message)(timeout)
    * }}}
    *
-   * All of the above use an implicit [[akka.util.Timeout]].
+   * All of the above use an implicit [[pekko.util.Timeout]].
    */
   implicit def ask(actorRef: ActorRef): AskableActorRef = new AskableActorRef(actorRef)
 
@@ -59,7 +60,7 @@ trait AskSupport {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The Future will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -88,16 +89,16 @@ trait AskSupport {
     actorRef.internalAsk(message, timeout, sender)
 
   /**
-   * Use for messages whose response is known to be a [[akka.pattern.StatusReply]]. When a [[akka.pattern.StatusReply.Success]] response
-   * arrives the future is completed with the wrapped value, if a [[akka.pattern.StatusReply.Error]] arrives the future is instead
+   * Use for messages whose response is known to be a [[pekko.pattern.StatusReply]]. When a [[pekko.pattern.StatusReply.Success]] response
+   * arrives the future is completed with the wrapped value, if a [[pekko.pattern.StatusReply.Error]] arrives the future is instead
    * failed.
    */
   def askWithStatus(actorRef: ActorRef, message: Any)(implicit timeout: Timeout): Future[Any] =
     actorRef.internalAskWithStatus(message)(timeout, Actor.noSender)
 
   /**
-   * Use for messages whose response is known to be a [[akka.pattern.StatusReply]]. When a [[akka.pattern.StatusReply.Success]] response
-   * arrives the future is completed with the wrapped value, if a [[akka.pattern.StatusReply.Error]] arrives the future is instead
+   * Use for messages whose response is known to be a [[pekko.pattern.StatusReply]]. When a [[pekko.pattern.StatusReply.Success]] response
+   * arrives the future is completed with the wrapped value, if a [[pekko.pattern.StatusReply.Error]] arrives the future is instead
    * failed.
    */
   def askWithStatus(actorRef: ActorRef, message: Any, sender: ActorRef)(implicit timeout: Timeout): Future[Any] =
@@ -105,18 +106,18 @@ trait AskSupport {
 
   /**
    * Import this implicit conversion to gain `?` and `ask` methods on
-   * [[akka.actor.ActorSelection]], which will defer to the
+   * [[pekko.actor.ActorSelection]], which will defer to the
    * `ask(actorSelection, message)(timeout)` method defined here.
    *
    * {{{
-   * import akka.pattern.ask
+   * import org.apache.pekko.pattern.ask
    *
    * val future = selection ? message             // => ask(selection, message)
    * val future = selection ask message           // => ask(selection, message)
    * val future = selection.ask(message)(timeout) // => ask(selection, message)(timeout)
    * }}}
    *
-   * All of the above use an implicit [[akka.util.Timeout]].
+   * All of the above use an implicit [[pekko.util.Timeout]].
    */
   implicit def ask(actorSelection: ActorSelection): AskableActorSelection = new AskableActorSelection(actorSelection)
 
@@ -125,7 +126,7 @@ trait AskSupport {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The Future will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -162,11 +163,11 @@ trait ExplicitAskSupport {
 
   /**
    * Import this implicit conversion to gain `?` and `ask` methods on
-   * [[akka.actor.ActorRef]], which will defer to the
+   * [[pekko.actor.ActorRef]], which will defer to the
    * `ask(actorRef, askSender => message)(timeout)` method defined here.
    *
    * {{{
-   * import akka.pattern.ask
+   * import org.apache.pekko.pattern.ask
    *
    * // same as `ask(actor, askSender => Request(askSender))`
    * val future = actor ? { askSender => Request(askSender) }
@@ -178,8 +179,8 @@ trait ExplicitAskSupport {
    * val future = actor ? (Request(_))(timeout)
    * }}}
    *
-   * All of the above use a required implicit [[akka.util.Timeout]] and optional implicit
-   * sender [[akka.actor.ActorRef]].
+   * All of the above use a required implicit [[pekko.util.Timeout]] and optional implicit
+   * sender [[pekko.actor.ActorRef]].
    */
   implicit def ask(actorRef: ActorRef): ExplicitlyAskableActorRef = new ExplicitlyAskableActorRef(actorRef)
 
@@ -188,7 +189,7 @@ trait ExplicitAskSupport {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The Future will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -219,11 +220,11 @@ trait ExplicitAskSupport {
 
   /**
    * Import this implicit conversion to gain `?` and `ask` methods on
-   * [[akka.actor.ActorSelection]], which will defer to the
+   * [[pekko.actor.ActorSelection]], which will defer to the
    * `ask(actorSelection, message)(timeout)` method defined here.
    *
    * {{{
-   * import akka.pattern.ask
+   * import org.apache.pekko.pattern.ask
    *
    * // same as `ask(selection, askSender => Request(askSender))`
    * val future = selection ? { askSender => Request(askSender) }
@@ -235,8 +236,8 @@ trait ExplicitAskSupport {
    * val future = selection ? (Request(_))(timeout)
    * }}}
    *
-   * All of the above use a required implicit [[akka.util.Timeout]] and optional implicit
-   * sender [[akka.actor.ActorRef]].
+   * All of the above use a required implicit [[pekko.util.Timeout]] and optional implicit
+   * sender [[pekko.actor.ActorRef]].
    */
   implicit def ask(actorSelection: ActorSelection): ExplicitlyAskableActorSelection =
     new ExplicitlyAskableActorSelection(actorSelection)
@@ -246,7 +247,7 @@ trait ExplicitAskSupport {
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The Future will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -287,7 +288,7 @@ object AskableActorRef {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def negativeTimeoutException(
+  @InternalApi private[pekko] def negativeTimeoutException(
       recipient: Any,
       message: Any,
       sender: ActorRef): IllegalArgumentException = {
@@ -299,7 +300,7 @@ object AskableActorRef {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def recipientTerminatedException(
+  @InternalApi private[pekko] def recipientTerminatedException(
       recipient: Any,
       message: Any,
       sender: ActorRef): AskTimeoutException = {
@@ -311,7 +312,7 @@ object AskableActorRef {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def unsupportedRecipientType(
+  @InternalApi private[pekko] def unsupportedRecipientType(
       recipient: Any,
       message: Any,
       sender: ActorRef): IllegalArgumentException = {
@@ -502,7 +503,7 @@ final class ExplicitlyAskableActorSelection(val actorSel: ActorSelection) extend
  *
  * INTERNAL API
  */
-private[akka] final class PromiseActorRef(
+private[pekko] final class PromiseActorRef(
     val provider: ActorRefProvider,
     val result: Promise[Any],
     _mcn: String,
@@ -638,7 +639,7 @@ private[akka] final class PromiseActorRef(
     case _ =>
   }
 
-  override private[akka] def isTerminated: Boolean = state match {
+  override private[pekko] def isTerminated: Boolean = state match {
     case Stopped | _: StoppedWithPath => true
     case _                            => false
   }
@@ -672,29 +673,29 @@ private[akka] final class PromiseActorRef(
   }
 
   @InternalStableApi
-  private[akka] def ask(actorSel: ActorSelection, message: Any, @unused timeout: Timeout): Future[Any] = {
+  private[pekko] def ask(actorSel: ActorSelection, message: Any, @unused timeout: Timeout): Future[Any] = {
     actorSel.tell(message, this)
     result.future
   }
 
   @InternalStableApi
-  private[akka] def ask(actorRef: ActorRef, message: Any, @unused timeout: Timeout): Future[Any] = {
+  private[pekko] def ask(actorRef: ActorRef, message: Any, @unused timeout: Timeout): Future[Any] = {
     actorRef.tell(message, this)
     result.future
   }
 
   @InternalStableApi
-  private[akka] def onComplete(@unused message: Any, @unused alreadyCompleted: Boolean): Unit = {}
+  private[pekko] def onComplete(@unused message: Any, @unused alreadyCompleted: Boolean): Unit = {}
 
   @InternalStableApi
-  private[akka] def onTimeout(@unused timeout: Timeout): Unit = {}
+  private[pekko] def onTimeout(@unused timeout: Timeout): Unit = {}
 }
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object PromiseActorRef {
+private[pekko] object PromiseActorRef {
   private case object Registering
   private case object Stopped
   private final case class StoppedWithPath(path: ActorPath)
diff --git a/akka-actor/src/main/scala/akka/pattern/Backoff.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/Backoff.scala
similarity index 93%
rename from akka-actor/src/main/scala/akka/pattern/Backoff.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/Backoff.scala
index 64b4a9b266..8f957bf58e 100644
--- a/akka-actor/src/main/scala/akka/pattern/Backoff.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/Backoff.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import scala.concurrent.duration.{ Duration, FiniteDuration }
 
 import scala.annotation.nowarn
 
-import akka.actor.{ OneForOneStrategy, Props, SupervisorStrategy }
-import akka.annotation.DoNotInherit
-import akka.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor }
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.{ OneForOneStrategy, Props, SupervisorStrategy }
+import pekko.annotation.DoNotInherit
+import pekko.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor }
+import pekko.util.JavaDurationConverters._
 
 /**
  * @deprecated This API is superseded by the [[BackoffOpts]] object.
@@ -54,9 +55,9 @@ object Backoff {
    * terminates itself as a failure signal instead of the normal behavior of throwing an exception.
    * ***'''
    * You can define another
-   * supervision strategy by using `akka.pattern.BackoffOptions.withSupervisorStrategy` on [[akka.pattern.BackoffOptions]].
+   * supervision strategy by using `org.apache.pekko.pattern.BackoffOptions.withSupervisorStrategy` on [[pekko.pattern.BackoffOptions]].
    *
-   * @param childProps     the [[akka.actor.Props]] of the child actor that
+   * @param childProps     the [[pekko.actor.Props]] of the child actor that
    *                       will be started and supervised
    * @param childName      name of the child actor
    * @param minBackoff     minimum (initial) duration until the child actor will
@@ -114,9 +115,9 @@ object Backoff {
    * terminates itself as a failure signal instead of the normal behavior of throwing an exception.
    * ***'''
    * You can define another
-   * supervision strategy by using `akka.pattern.BackoffOptions.withSupervisorStrategy` on [[akka.pattern.BackoffOptions]].
+   * supervision strategy by using `org.apache.pekko.pattern.BackoffOptions.withSupervisorStrategy` on [[pekko.pattern.BackoffOptions]].
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -169,9 +170,9 @@ object Backoff {
    * terminates itself as a failure signal instead of the normal behavior of throwing an exception.
    * ***'''
    * You can define another
-   * supervision strategy by using `akka.pattern.BackoffOptions.withSupervisorStrategy` on [[akka.pattern.BackoffOptions]].
+   * supervision strategy by using `org.apache.pekko.pattern.BackoffOptions.withSupervisorStrategy` on [[pekko.pattern.BackoffOptions]].
    *
-   * @param childProps     the [[akka.actor.Props]] of the child actor that
+   * @param childProps     the [[pekko.actor.Props]] of the child actor that
    *                       will be started and supervised
    * @param childName      name of the child actor
    * @param minBackoff     minimum (initial) duration until the child actor will
@@ -229,9 +230,9 @@ object Backoff {
    * terminates itself as a failure signal instead of the normal behavior of throwing an exception.
    * ***'''
    * You can define another
-   * supervision strategy by using `akka.pattern.BackoffOptions.withSupervisorStrategy` on [[akka.pattern.BackoffOptions]].
+   * supervision strategy by using `org.apache.pekko.pattern.BackoffOptions.withSupervisorStrategy` on [[pekko.pattern.BackoffOptions]].
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -278,7 +279,7 @@ object Backoff {
    * actors hit the backend resource at the same time.
    *
    * You can retrieve the current child `ActorRef` by sending `BackoffSupervisor.GetCurrentChild`
-   * message to this actor and it will reply with [[akka.pattern.BackoffSupervisor.CurrentChild]]
+   * message to this actor and it will reply with [[pekko.pattern.BackoffSupervisor.CurrentChild]]
    * containing the `ActorRef` of the current child, if any.
    *
    * The `BackoffSupervisor`delegates all messages from the child to the parent of the
@@ -286,7 +287,7 @@ object Backoff {
    *
    * The `BackoffSupervisor` forwards all other messages to the child, if it is currently running.
    *
-   * The child can stop itself and send a [[akka.actor.PoisonPill]] to the parent supervisor
+   * The child can stop itself and send a [[pekko.actor.PoisonPill]] to the parent supervisor
    * if it wants to do an intentional stop.
    *
    * Exceptions in the child are handled with the default supervisionStrategy, which can be changed by using
@@ -294,7 +295,7 @@ object Backoff {
    * `Restart` will perform a normal immediate restart of the child. A `Stop` will
    * stop the child, but it will be started again after the back-off duration.
    *
-   * @param childProps     the [[akka.actor.Props]] of the child actor that
+   * @param childProps     the [[pekko.actor.Props]] of the child actor that
    *                       will be started and supervised
    * @param childName      name of the child actor
    * @param minBackoff     minimum (initial) duration until the child actor will
@@ -345,7 +346,7 @@ object Backoff {
    * actors hit the backend resource at the same time.
    *
    * You can retrieve the current child `ActorRef` by sending `BackoffSupervisor.GetCurrentChild`
-   * message to this actor and it will reply with [[akka.pattern.BackoffSupervisor.CurrentChild]]
+   * message to this actor and it will reply with [[pekko.pattern.BackoffSupervisor.CurrentChild]]
    * containing the `ActorRef` of the current child, if any.
    *
    * The `BackoffSupervisor`delegates all messages from the child to the parent of the
@@ -353,7 +354,7 @@ object Backoff {
    *
    * The `BackoffSupervisor` forwards all other messages to the child, if it is currently running.
    *
-   * The child can stop itself and send a [[akka.actor.PoisonPill]] to the parent supervisor
+   * The child can stop itself and send a [[pekko.actor.PoisonPill]] to the parent supervisor
    * if it wants to do an intentional stop.
    *
    * Exceptions in the child are handled with the default supervisionStrategy, which can be changed by using
@@ -361,7 +362,7 @@ object Backoff {
    * `Restart` will perform a normal immediate restart of the child. A `Stop` will
    * stop the child, but it will be started again after the back-off duration.
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -407,7 +408,7 @@ object Backoff {
    * actors hit the backend resource at the same time.
    *
    * You can retrieve the current child `ActorRef` by sending `BackoffSupervisor.GetCurrentChild`
-   * message to this actor and it will reply with [[akka.pattern.BackoffSupervisor.CurrentChild]]
+   * message to this actor and it will reply with [[pekko.pattern.BackoffSupervisor.CurrentChild]]
    * containing the `ActorRef` of the current child, if any.
    *
    * The `BackoffSupervisor`delegates all messages from the child to the parent of the
@@ -415,7 +416,7 @@ object Backoff {
    *
    * The `BackoffSupervisor` forwards all other messages to the child, if it is currently running.
    *
-   * The child can stop itself and send a [[akka.actor.PoisonPill]] to the parent supervisor
+   * The child can stop itself and send a [[pekko.actor.PoisonPill]] to the parent supervisor
    * if it wants to do an intentional stop.
    *
    * Exceptions in the child are handled with the default supervisionStrategy, which can be changed by using
@@ -423,7 +424,7 @@ object Backoff {
    * `Restart` will perform a normal immediate restart of the child. A `Stop` will
    * stop the child, but it will be started again after the back-off duration.
    *
-   * @param childProps     the [[akka.actor.Props]] of the child actor that
+   * @param childProps     the [[pekko.actor.Props]] of the child actor that
    *                       will be started and supervised
    * @param childName      name of the child actor
    * @param minBackoff     minimum (initial) duration until the child actor will
@@ -474,7 +475,7 @@ object Backoff {
    * actors hit the backend resource at the same time.
    *
    * You can retrieve the current child `ActorRef` by sending `BackoffSupervisor.GetCurrentChild`
-   * message to this actor and it will reply with [[akka.pattern.BackoffSupervisor.CurrentChild]]
+   * message to this actor and it will reply with [[pekko.pattern.BackoffSupervisor.CurrentChild]]
    * containing the `ActorRef` of the current child, if any.
    *
    * The `BackoffSupervisor`delegates all messages from the child to the parent of the
@@ -482,7 +483,7 @@ object Backoff {
    *
    * The `BackoffSupervisor` forwards all other messages to the child, if it is currently running.
    *
-   * The child can stop itself and send a [[akka.actor.PoisonPill]] to the parent supervisor
+   * The child can stop itself and send a [[pekko.actor.PoisonPill]] to the parent supervisor
    * if it wants to do an intentional stop.
    *
    * Exceptions in the child are handled with the default supervisionStrategy, which can be changed by using
@@ -490,7 +491,7 @@ object Backoff {
    * `Restart` will perform a normal immediate restart of the child. A `Stop` will
    * stop the child, but it will be started again after the back-off duration.
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -563,7 +564,7 @@ trait BackoffOptions {
   /**
    * Returns the props to create the back-off supervisor.
    */
-  private[akka] def props: Props
+  private[pekko] def props: Props
 }
 
 @nowarn("msg=deprecated")
@@ -578,7 +579,7 @@ private final case class BackoffOptionsImpl(
     supervisorStrategy: OneForOneStrategy = OneForOneStrategy()(SupervisorStrategy.defaultStrategy.decider),
     replyWhileStopped: Option[Any] = None,
     finalStopMessage: Option[Any => Boolean] = None)
-    extends akka.pattern.BackoffOptions {
+    extends pekko.pattern.BackoffOptions {
 
   val backoffReset = reset.getOrElse(AutoReset(minBackoff))
 
diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala
similarity index 91%
rename from akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala
index 914250ad80..c224521e5c 100644
--- a/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import scala.concurrent.duration.{ Duration, FiniteDuration }
 
-import akka.actor.{ ActorRef, OneForOneStrategy, Props, SupervisorStrategy }
-import akka.annotation.{ DoNotInherit, InternalApi }
-import akka.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor }
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.{ ActorRef, OneForOneStrategy, Props, SupervisorStrategy }
+import pekko.annotation.{ DoNotInherit, InternalApi }
+import pekko.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor }
+import pekko.util.JavaDurationConverters._
 
 /**
  * Backoff options allow to specify a number of properties for backoff supervisors.
@@ -50,9 +51,9 @@ object BackoffOpts {
    * terminates itself as a failure signal instead of the normal behavior of throwing an exception.
    * ***'''
    * You can define another
-   * supervision strategy by using `akka.pattern.BackoffOptions.withSupervisorStrategy` on [[akka.pattern.BackoffOnFailureOptions]].
+   * supervision strategy by using `org.apache.pekko.pattern.BackoffOptions.withSupervisorStrategy` on [[pekko.pattern.BackoffOnFailureOptions]].
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -104,9 +105,9 @@ object BackoffOpts {
    * terminates itself as a failure signal instead of the normal behavior of throwing an exception.
    * ***'''
    * You can define another
-   * supervision strategy by using `akka.pattern.BackoffOptions.withSupervisorStrategy` on [[akka.pattern.BackoffOnFailureOptions]].
+   * supervision strategy by using `org.apache.pekko.pattern.BackoffOptions.withSupervisorStrategy` on [[pekko.pattern.BackoffOnFailureOptions]].
    *
-   * @param childProps     the [[akka.actor.Props]] of the child actor that
+   * @param childProps     the [[pekko.actor.Props]] of the child actor that
    *                       will be started and supervised
    * @param childName      name of the child actor
    * @param minBackoff     minimum (initial) duration until the child actor will
@@ -151,7 +152,7 @@ object BackoffOpts {
    * actors hit the backend resource at the same time.
    *
    * You can retrieve the current child `ActorRef` by sending `BackoffSupervisor.GetCurrentChild`
-   * message to this actor and it will reply with [[akka.pattern.BackoffSupervisor.CurrentChild]]
+   * message to this actor and it will reply with [[pekko.pattern.BackoffSupervisor.CurrentChild]]
    * containing the `ActorRef` of the current child, if any.
    *
    * The `BackoffSupervisor`delegates all messages from the child to the parent of the
@@ -159,7 +160,7 @@ object BackoffOpts {
    *
    * The `BackoffSupervisor` forwards all other messages to the child, if it is currently running.
    *
-   * The child can stop itself and send a [[akka.actor.PoisonPill]] to the parent supervisor
+   * The child can stop itself and send a [[pekko.actor.PoisonPill]] to the parent supervisor
    * if it wants to do an intentional stop.
    *
    * Exceptions in the child are handled with the default supervisionStrategy, which can be changed by using
@@ -167,7 +168,7 @@ object BackoffOpts {
    * `Restart` will perform a normal immediate restart of the child. A `Stop` will
    * stop the child, but it will be started again after the back-off duration.
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -212,7 +213,7 @@ object BackoffOpts {
    * actors hit the backend resource at the same time.
    *
    * You can retrieve the current child `ActorRef` by sending `BackoffSupervisor.GetCurrentChild`
-   * message to this actor and it will reply with [[akka.pattern.BackoffSupervisor.CurrentChild]]
+   * message to this actor and it will reply with [[pekko.pattern.BackoffSupervisor.CurrentChild]]
    * containing the `ActorRef` of the current child, if any.
    *
    * The `BackoffSupervisor`delegates all messages from the child to the parent of the
@@ -220,7 +221,7 @@ object BackoffOpts {
    *
    * The `BackoffSupervisor` forwards all other messages to the child, if it is currently running.
    *
-   * The child can stop itself and send a [[akka.actor.PoisonPill]] to the parent supervisor
+   * The child can stop itself and send a [[pekko.actor.PoisonPill]] to the parent supervisor
    * if it wants to do an intentional stop.
    *
    * Exceptions in the child are handled with the default supervisionStrategy, which can be changed by using
@@ -228,7 +229,7 @@ object BackoffOpts {
    * `Restart` will perform a normal immediate restart of the child. A `Stop` will
    * stop the child, but it will be started again after the back-off duration.
    *
-   * @param childProps     the [[akka.actor.Props]] of the child actor that
+   * @param childProps     the [[pekko.actor.Props]] of the child actor that
    *                       will be started and supervised
    * @param childName      name of the child actor
    * @param minBackoff     minimum (initial) duration until the child actor will
@@ -251,7 +252,7 @@ object BackoffOpts {
  * Not for user extension
  */
 @DoNotInherit
-private[akka] sealed trait ExtendedBackoffOptions[T <: ExtendedBackoffOptions[T]] {
+private[pekko] sealed trait ExtendedBackoffOptions[T <: ExtendedBackoffOptions[T]] {
 
   /**
    * Returns a new BackoffOptions with automatic back-off reset.
@@ -311,7 +312,7 @@ private[akka] sealed trait ExtendedBackoffOptions[T <: ExtendedBackoffOptions[T]
   /**
    * Returns the props to create the back-off supervisor.
    */
-  private[akka] def props: Props
+  private[pekko] def props: Props
 }
 
 @DoNotInherit
@@ -437,12 +438,12 @@ private final case class BackoffOnFailureOptionsImpl[T](
 }
 
 @InternalApi
-private[akka] sealed trait BackoffReset
-private[akka] case object ManualReset extends BackoffReset
-private[akka] final case class AutoReset(resetBackoff: FiniteDuration) extends BackoffReset
+private[pekko] sealed trait BackoffReset
+private[pekko] case object ManualReset extends BackoffReset
+private[pekko] final case class AutoReset(resetBackoff: FiniteDuration) extends BackoffReset
 
 @InternalApi
-private[akka] sealed trait HandlingWhileStopped
-private[akka] case object ForwardDeathLetters extends HandlingWhileStopped
-private[akka] case class ForwardTo(handler: ActorRef) extends HandlingWhileStopped
-private[akka] case class ReplyWith(msg: Any) extends HandlingWhileStopped
+private[pekko] sealed trait HandlingWhileStopped
+private[pekko] case object ForwardDeathLetters extends HandlingWhileStopped
+private[pekko] case class ForwardTo(handler: ActorRef) extends HandlingWhileStopped
+private[pekko] case class ReplyWith(msg: Any) extends HandlingWhileStopped
diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala
index facad6115c..20c72fe284 100644
--- a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import java.util.Optional
 import java.util.concurrent.ThreadLocalRandom
@@ -10,10 +10,11 @@ import java.util.concurrent.ThreadLocalRandom
 import scala.concurrent.duration.{ Duration, FiniteDuration }
 import scala.util.Try
 
-import akka.actor.{ ActorRef, DeadLetterSuppression, OneForOneStrategy, Props, SupervisorStrategy }
-import akka.annotation.InternalApi
-import akka.pattern.internal.BackoffOnStopSupervisor
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.{ ActorRef, DeadLetterSuppression, OneForOneStrategy, Props, SupervisorStrategy }
+import pekko.annotation.InternalApi
+import pekko.pattern.internal.BackoffOnStopSupervisor
+import pekko.util.JavaDurationConverters._
 
 object BackoffSupervisor {
 
@@ -24,7 +25,7 @@ object BackoffSupervisor {
    * most exceptions will immediately restart the child. You can define another
    * supervision strategy by using [[#propsWithSupervisorStrategy]].
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -57,7 +58,7 @@ object BackoffSupervisor {
    * most exceptions will immediately restart the child. You can define another
    * supervision strategy by using [[#propsWithSupervisorStrategy]].
    *
-   * @param childProps     the [[akka.actor.Props]] of the child actor that
+   * @param childProps     the [[pekko.actor.Props]] of the child actor that
    *                       will be started and supervised
    * @param childName      name of the child actor
    * @param minBackoff     minimum (initial) duration until the child actor will
@@ -92,7 +93,7 @@ object BackoffSupervisor {
    * most exceptions will immediately restart the child. You can define another
    * supervision strategy by using [[#propsWithSupervisorStrategy]].
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -119,7 +120,7 @@ object BackoffSupervisor {
    * most exceptions will immediately restart the child. You can define another
    * supervision strategy by using [[#propsWithSupervisorStrategy]].
    *
-   * @param childProps     the [[akka.actor.Props]] of the child actor that
+   * @param childProps     the [[pekko.actor.Props]] of the child actor that
    *                       will be started and supervised
    * @param childName      name of the child actor
    * @param minBackoff     minimum (initial) duration until the child actor will
@@ -151,7 +152,7 @@ object BackoffSupervisor {
    * `Restart` will perform a normal immediate restart of the child. A `Stop` will
    * stop the child, but it will be started again after the back-off duration.
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -196,7 +197,7 @@ object BackoffSupervisor {
    * `Restart` will perform a normal immediate restart of the child. A `Stop` will
    * stop the child, but it will be started again after the back-off duration.
    *
-   * @param childProps   the [[akka.actor.Props]] of the child actor that
+   * @param childProps   the [[pekko.actor.Props]] of the child actor that
    *                     will be started and supervised
    * @param childName    name of the child actor
    * @param minBackoff   minimum (initial) duration until the child actor will
@@ -296,20 +297,20 @@ object BackoffSupervisor {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] case object StartChild extends DeadLetterSuppression
+  private[pekko] case object StartChild extends DeadLetterSuppression
 
   /**
    * INTERNAL API
    */
   @InternalApi
-  private[akka] case class ResetRestartCount(current: Int) extends DeadLetterSuppression
+  private[pekko] case class ResetRestartCount(current: Int) extends DeadLetterSuppression
 
   /**
    * INTERNAL API
    *
    * Calculates an exponential back off delay.
    */
-  private[akka] def calculateDelay(
+  private[pekko] def calculateDelay(
       restartCount: Int,
       minBackoff: FiniteDuration,
       maxBackoff: FiniteDuration,
diff --git a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
index ba35194a44..cdb68fb830 100644
--- a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import java.util.Optional
 import java.util.concurrent.{ Callable, CompletionException, CompletionStage, CopyOnWriteArrayList, ThreadLocalRandom }
@@ -17,12 +17,13 @@ import scala.concurrent.duration._
 import scala.util.{ Failure, Success, Try }
 import scala.util.control.NoStackTrace
 import scala.util.control.NonFatal
-import akka.AkkaException
-import akka.actor.{ ExtendedActorSystem, Scheduler }
-import akka.dispatch.ExecutionContexts.parasitic
-import akka.pattern.internal.{ CircuitBreakerNoopTelemetry, CircuitBreakerTelemetry }
-import akka.util.JavaDurationConverters._
-import akka.util.Unsafe
+import org.apache.pekko
+import pekko.AkkaException
+import pekko.actor.{ ExtendedActorSystem, Scheduler }
+import pekko.dispatch.ExecutionContexts.parasitic
+import pekko.pattern.internal.{ CircuitBreakerNoopTelemetry, CircuitBreakerTelemetry }
+import pekko.util.JavaDurationConverters._
+import pekko.util.Unsafe
 
 /**
  * Companion object providing factory methods for Circuit Breaker which runs callbacks in caller's thread
@@ -678,7 +679,7 @@ class CircuitBreaker(
    *
    * @return count
    */
-  private[akka] def currentFailureCount: Int = Closed.get
+  private[pekko] def currentFailureCount: Int = Closed.get
 
   /**
    * Implements consistent transition between states. Throws IllegalStateException if an invalid transition is attempted.
@@ -1086,7 +1087,7 @@ class CircuitBreaker(
     override def callFails(): Unit = ()
 
     /**
-     * On entering this state, schedule an attempted reset via [[akka.actor.Scheduler]] and store the entry time to
+     * On entering this state, schedule an attempted reset via [[pekko.actor.Scheduler]] and store the entry time to
      * calculate remaining time before attempted reset.
      *
      * @return
diff --git a/akka-actor/src/main/scala/akka/pattern/CircuitBreakersRegistry.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
similarity index 92%
rename from akka-actor/src/main/scala/akka/pattern/CircuitBreakersRegistry.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
index 3765140341..d012d942e2 100644
--- a/akka-actor/src/main/scala/akka/pattern/CircuitBreakersRegistry.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import java.util.concurrent.ConcurrentHashMap
 import scala.concurrent.duration.{ DurationLong, MILLISECONDS }
-import akka.actor.{
+import org.apache.pekko
+import pekko.actor.{
   ActorSystem,
   ClassicActorSystemProvider,
   ExtendedActorSystem,
@@ -14,8 +15,8 @@ import akka.actor.{
   ExtensionId,
   ExtensionIdProvider
 }
-import akka.pattern.internal.CircuitBreakerTelemetryProvider
-import akka.util.ccompat.JavaConverters._
+import pekko.pattern.internal.CircuitBreakerTelemetryProvider
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Companion object providing factory methods for Circuit Breaker which runs callbacks in caller's thread
@@ -84,6 +85,6 @@ final class CircuitBreakersRegistry(system: ExtendedActorSystem) extends Extensi
       telemetry)(system.dispatcher)
   }
 
-  private[akka] def get(id: String): CircuitBreaker =
+  private[pekko] def get(id: String): CircuitBreaker =
     breakers.computeIfAbsent(id, createCircuitBreaker)
 }
diff --git a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
similarity index 96%
rename from akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
index f9fa077ee9..01e2cc7dff 100644
--- a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletionStage
@@ -12,8 +12,9 @@ import scala.concurrent.{ ExecutionContext, Future, Promise }
 import scala.concurrent.duration.FiniteDuration
 import scala.util.control.NonFatal
 
-import akka.actor._
-import akka.dispatch.Futures
+import org.apache.pekko
+import pekko.actor._
+import pekko.dispatch.Futures
 
 trait FutureTimeoutSupport {
 
diff --git a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala
similarity index 89%
rename from akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala
index 6b0d838c89..34715c720e 100644
--- a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
 
-import akka.actor._
-import akka.dispatch.ExecutionContexts
-import akka.dispatch.sysmsg.{ Unwatch, Watch }
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor._
+import pekko.dispatch.ExecutionContexts
+import pekko.dispatch.sysmsg.{ Unwatch, Watch }
+import pekko.util.Timeout
 
 trait GracefulStopSupport {
 
@@ -36,7 +37,7 @@ trait GracefulStopSupport {
    * }}}
    *
    * If the target actor isn't terminated within the timeout the [[scala.concurrent.Future]]
-   * is completed with failure [[akka.pattern.AskTimeoutException]].
+   * is completed with failure [[pekko.pattern.AskTimeoutException]].
    *
    * If you want to invoke specialized stopping logic on your target actor instead of PoisonPill, you can pass your
    * stop command as a parameter:
diff --git a/akka-actor/src/main/scala/akka/pattern/HandleBackoff.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala
similarity index 89%
rename from akka-actor/src/main/scala/akka/pattern/HandleBackoff.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala
index 232fa3e03f..2a3858fd89 100644
--- a/akka-actor/src/main/scala/akka/pattern/HandleBackoff.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
-import akka.actor.{ Actor, ActorRef, Props }
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, Props }
+import pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
  *
  * Implements basic backoff handling for [[internal.BackoffOnRestartSupervisor]] and [[internal.BackoffOnStopSupervisor]].
  */
-@InternalApi private[akka] trait HandleBackoff {
+@InternalApi private[pekko] trait HandleBackoff {
   this: Actor =>
   def childProps: Props
   def childName: String
diff --git a/akka-actor/src/main/scala/akka/pattern/Patterns.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
similarity index 92%
rename from akka-actor/src/main/scala/akka/pattern/Patterns.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
index 3987935775..266e974f20 100644
--- a/akka-actor/src/main/scala/akka/pattern/Patterns.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import java.util.Optional
 import java.util.concurrent.{ Callable, CompletionStage, TimeUnit }
@@ -10,8 +10,9 @@ import java.util.concurrent.{ Callable, CompletionStage, TimeUnit }
 import scala.compat.java8.FutureConverters._
 import scala.concurrent.ExecutionContext
 
-import akka.actor.{ ActorSelection, ClassicActorSystemProvider, Scheduler }
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.{ ActorSelection, ClassicActorSystemProvider, Scheduler }
+import pekko.util.JavaDurationConverters._
 
 /**
  * Java API: for Akka patterns such as `ask`, `pipe` and others which work with [[java.util.concurrent.CompletionStage]].
@@ -20,9 +21,9 @@ object Patterns {
   import scala.concurrent.Future
   import scala.concurrent.duration._
 
-  import akka.actor.ActorRef
-  import akka.japi
-  import akka.pattern.{
+  import pekko.actor.ActorRef
+  import pekko.japi
+  import pekko.pattern.{
     after => scalaAfter,
     ask => scalaAsk,
     askWithStatus => scalaAskWithStatus,
@@ -30,15 +31,15 @@ object Patterns {
     pipe => scalaPipe,
     retry => scalaRetry
   }
-  import akka.util.Timeout
+  import pekko.util.Timeout
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[scala.concurrent.Future]]
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The Future will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -67,12 +68,12 @@ object Patterns {
     scalaAsk(actor, message)(timeout).asInstanceOf[Future[AnyRef]]
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[java.util.concurrent.CompletionStage]]
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -97,8 +98,8 @@ object Patterns {
     scalaAsk(actor, message)(timeout.asScala).toJava.asInstanceOf[CompletionStage[AnyRef]]
 
   /**
-   * Use for messages whose response is known to be a [[akka.pattern.StatusReply]]. When a [[akka.pattern.StatusReply#success]] response
-   * arrives the future is completed with the wrapped value, if a [[akka.pattern.StatusReply#error]] arrives the future is instead
+   * Use for messages whose response is known to be a [[pekko.pattern.StatusReply]]. When a [[pekko.pattern.StatusReply#success]] response
+   * arrives the future is completed with the wrapped value, if a [[pekko.pattern.StatusReply#error]] arrives the future is instead
    * failed.
    */
   def askWithStatus(actor: ActorRef, message: Any, timeout: java.time.Duration): CompletionStage[AnyRef] =
@@ -140,12 +141,12 @@ object Patterns {
     extended.ask(actor, messageFactory.apply _)(Timeout.create(timeout)).toJava.asInstanceOf[CompletionStage[AnyRef]]
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[scala.concurrent.Future]]
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The Future will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -191,12 +192,12 @@ object Patterns {
     extended.ask(actor, messageFactory.apply _)(Timeout(timeoutMillis.millis)).asInstanceOf[Future[AnyRef]]
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[scala.concurrent.Future]]
-   * holding the eventual reply message; this means that the target [[akka.actor.ActorSelection]]
+   * holding the eventual reply message; this means that the target [[pekko.actor.ActorSelection]]
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The Future will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -225,12 +226,12 @@ object Patterns {
     scalaAsk(selection, message)(timeout).asInstanceOf[Future[AnyRef]]
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[java.util.concurrent.CompletionStage]]
-   * holding the eventual reply message; this means that the target [[akka.actor.ActorSelection]]
+   * holding the eventual reply message; this means that the target [[pekko.actor.ActorSelection]]
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -255,12 +256,12 @@ object Patterns {
     scalaAsk(selection, message)(timeout.asScala).toJava.asInstanceOf[CompletionStage[AnyRef]]
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[scala.concurrent.Future]]
-   * holding the eventual reply message; this means that the target [[akka.actor.ActorSelection]]
+   * holding the eventual reply message; this means that the target [[pekko.actor.ActorSelection]]
    * needs to send the result to the `sender` reference provided.
    *
-   * The Future will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The Future will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -324,9 +325,9 @@ object Patterns {
 
   /**
    * Register an onComplete callback on this [[scala.concurrent.Future]] to send
-   * the result to the given [[akka.actor.ActorRef]] or [[akka.actor.ActorSelection]].
+   * the result to the given [[pekko.actor.ActorRef]] or [[pekko.actor.ActorSelection]].
    * Returns the original Future to allow method chaining.
-   * If the future was completed with failure it is sent as a [[akka.actor.Status.Failure]]
+   * If the future was completed with failure it is sent as a [[pekko.actor.Status.Failure]]
    * to the recipient.
    *
    * Recommended usage example:
@@ -334,7 +335,7 @@ object Patterns {
    * {{{
    *   final Future f = Patterns.ask(worker, request, timeout);
    *   // apply some transformation (i.e. enrich with request info)
-   *   final Future transformed = f.map(new akka.japi.Function() { ... });
+   *   final Future transformed = f.map(new org.apache.pekko.japi.Function() { ... });
    *   // send it on to the next operator
    *   Patterns.pipe(transformed, context).to(nextActor);
    * }}}
@@ -343,9 +344,9 @@ object Patterns {
 
   /**
    * When this [[java.util.concurrent.CompletionStage]] finishes, send its result to the given
-   * [[akka.actor.ActorRef]] or [[akka.actor.ActorSelection]].
+   * [[pekko.actor.ActorRef]] or [[pekko.actor.ActorSelection]].
    * Returns the original CompletionStage to allow method chaining.
-   * If the future was completed with failure it is sent as a [[akka.actor.Status.Failure]]
+   * If the future was completed with failure it is sent as a [[pekko.actor.Status.Failure]]
    * to the recipient.
    *
    * Recommended usage example:
@@ -369,7 +370,7 @@ object Patterns {
    * Useful when you need to wait for termination or compose ordered termination of several actors.
    *
    * If the target actor isn't terminated within the timeout the [[scala.concurrent.Future]]
-   * is completed with failure [[akka.pattern.AskTimeoutException]].
+   * is completed with failure [[pekko.pattern.AskTimeoutException]].
    */
   def gracefulStop(target: ActorRef, timeout: FiniteDuration): Future[java.lang.Boolean] =
     scalaGracefulStop(target, timeout).asInstanceOf[Future[java.lang.Boolean]]
@@ -382,7 +383,7 @@ object Patterns {
    * Useful when you need to wait for termination or compose ordered termination of several actors.
    *
    * If the target actor isn't terminated within the timeout the [[java.util.concurrent.CompletionStage]]
-   * is completed with failure [[akka.pattern.AskTimeoutException]].
+   * is completed with failure [[pekko.pattern.AskTimeoutException]].
    */
   def gracefulStop(target: ActorRef, timeout: java.time.Duration): CompletionStage[java.lang.Boolean] =
     scalaGracefulStop(target, timeout.asScala).toJava.asInstanceOf[CompletionStage[java.lang.Boolean]]
@@ -398,7 +399,7 @@ object Patterns {
    * stop command as `stopMessage` parameter
    *
    * If the target actor isn't terminated within the timeout the [[scala.concurrent.Future]]
-   * is completed with failure [[akka.pattern.AskTimeoutException]].
+   * is completed with failure [[pekko.pattern.AskTimeoutException]].
    */
   def gracefulStop(target: ActorRef, timeout: FiniteDuration, stopMessage: Any): Future[java.lang.Boolean] =
     scalaGracefulStop(target, timeout, stopMessage).asInstanceOf[Future[java.lang.Boolean]]
@@ -414,7 +415,7 @@ object Patterns {
    * stop command as `stopMessage` parameter
    *
    * If the target actor isn't terminated within the timeout the [[java.util.concurrent.CompletionStage]]
-   * is completed with failure [[akka.pattern.AskTimeoutException]].
+   * is completed with failure [[pekko.pattern.AskTimeoutException]].
    */
   def gracefulStop(
       target: ActorRef,
@@ -637,24 +638,24 @@ object Patterns {
 /**
  * Java 8+ API for Akka 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 [[akka.pattern.Patterns]] instead.
+ * For working with Scala [[scala.concurrent.Future]] from Java you may want to use [[pekko.pattern.Patterns]] instead.
  */
 @deprecated("Use Patterns instead.", since = "2.5.19")
 object PatternsCS {
   import scala.concurrent.duration._
 
-  import akka.actor.ActorRef
-  import akka.japi
-  import akka.pattern.{ ask => scalaAsk, gracefulStop => scalaGracefulStop, retry => scalaRetry }
-  import akka.util.Timeout
+  import pekko.actor.ActorRef
+  import pekko.japi
+  import pekko.pattern.{ ask => scalaAsk, gracefulStop => scalaGracefulStop, retry => scalaRetry }
+  import pekko.util.Timeout
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[java.util.concurrent.CompletionStage]]
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -680,12 +681,12 @@ object PatternsCS {
     scalaAsk(actor, message)(timeout).toJava.asInstanceOf[CompletionStage[AnyRef]]
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[java.util.concurrent.CompletionStage]]
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -755,12 +756,12 @@ object PatternsCS {
     extended.ask(actor, messageFactory.apply _)(Timeout.create(timeout)).toJava.asInstanceOf[CompletionStage[AnyRef]]
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[java.util.concurrent.CompletionStage]]
    * holding the eventual reply message; this means that the target actor
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -809,12 +810,12 @@ object PatternsCS {
     askWithReplyTo(actor, messageFactory, Timeout(timeoutMillis.millis))
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[java.util.concurrent.CompletionStage]]
-   * holding the eventual reply message; this means that the target [[akka.actor.ActorSelection]]
+   * holding the eventual reply message; this means that the target [[pekko.actor.ActorSelection]]
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -840,12 +841,12 @@ object PatternsCS {
     scalaAsk(selection, message)(timeout).toJava.asInstanceOf[CompletionStage[AnyRef]]
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[java.util.concurrent.CompletionStage]]
-   * holding the eventual reply message; this means that the target [[akka.actor.ActorSelection]]
+   * holding the eventual reply message; this means that the target [[pekko.actor.ActorSelection]]
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -871,12 +872,12 @@ object PatternsCS {
     ask(selection, message, Timeout.create(timeout))
 
   /**
-   * Java API for `akka.pattern.ask`:
+   * Java API for `org.apache.pekko.pattern.ask`:
    * Sends a message asynchronously and returns a [[java.util.concurrent.CompletionStage]]
-   * holding the eventual reply message; this means that the target [[akka.actor.ActorSelection]]
+   * holding the eventual reply message; this means that the target [[pekko.actor.ActorSelection]]
    * needs to send the result to the `sender` reference provided.
    *
-   * The CompletionStage will be completed with an [[akka.pattern.AskTimeoutException]] after the
+   * The CompletionStage will be completed with an [[pekko.pattern.AskTimeoutException]] after the
    * given timeout has expired; this is independent from any timeout applied
    * while awaiting a result for this future (i.e. in
    * `Await.result(..., timeout)`). A typical reason for `AskTimeoutException` is that the
@@ -925,9 +926,9 @@ object PatternsCS {
 
   /**
    * When this [[java.util.concurrent.CompletionStage]] finishes, send its result to the given
-   * [[akka.actor.ActorRef]] or [[akka.actor.ActorSelection]].
+   * [[pekko.actor.ActorRef]] or [[pekko.actor.ActorSelection]].
    * Returns the original CompletionStage to allow method chaining.
-   * If the future was completed with failure it is sent as a [[akka.actor.Status.Failure]]
+   * If the future was completed with failure it is sent as a [[pekko.actor.Status.Failure]]
    * to the recipient.
    *
    * Recommended usage example:
@@ -952,7 +953,7 @@ object PatternsCS {
    * Useful when you need to wait for termination or compose ordered termination of several actors.
    *
    * If the target actor isn't terminated within the timeout the [[java.util.concurrent.CompletionStage]]
-   * is completed with failure [[akka.pattern.AskTimeoutException]].
+   * is completed with failure [[pekko.pattern.AskTimeoutException]].
    */
   @deprecated("Use the overloaded one which accepts java.time.Duration instead.", since = "2.5.12")
   def gracefulStop(target: ActorRef, timeout: FiniteDuration): CompletionStage[java.lang.Boolean] =
@@ -966,7 +967,7 @@ object PatternsCS {
    * Useful when you need to wait for termination or compose ordered termination of several actors.
    *
    * If the target actor isn't terminated within the timeout the [[java.util.concurrent.CompletionStage]]
-   * is completed with failure [[akka.pattern.AskTimeoutException]].
+   * is completed with failure [[pekko.pattern.AskTimeoutException]].
    */
   @deprecated("Use Patterns.gracefulStop instead.", since = "2.5.19")
   def gracefulStop(target: ActorRef, timeout: java.time.Duration): CompletionStage[java.lang.Boolean] =
@@ -983,7 +984,7 @@ object PatternsCS {
    * stop command as `stopMessage` parameter
    *
    * If the target actor isn't terminated within the timeout the [[java.util.concurrent.CompletionStage]]
-   * is completed with failure [[akka.pattern.AskTimeoutException]].
+   * is completed with failure [[pekko.pattern.AskTimeoutException]].
    */
   @deprecated("Use the overloaded one which accepts java.time.Duration instead.", since = "2.5.12")
   def gracefulStop(target: ActorRef, timeout: FiniteDuration, stopMessage: Any): CompletionStage[java.lang.Boolean] =
@@ -1000,7 +1001,7 @@ object PatternsCS {
    * stop command as `stopMessage` parameter
    *
    * If the target actor isn't terminated within the timeout the [[java.util.concurrent.CompletionStage]]
-   * is completed with failure [[akka.pattern.AskTimeoutException]].
+   * is completed with failure [[pekko.pattern.AskTimeoutException]].
    */
   @deprecated("Use Patterns.gracefulStop instead.", since = "2.5.19")
   def gracefulStop(
diff --git a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala
similarity index 90%
rename from akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala
index d3bb25ea9e..50ad7dfa4e 100644
--- a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import java.util.concurrent.CompletionStage
 import java.util.function.BiConsumer
@@ -12,9 +12,10 @@ import scala.util.{ Failure, Success }
 
 import language.implicitConversions
 
-import akka.actor.{ Actor, ActorRef, Status }
-import akka.actor.ActorSelection
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, Status }
+import pekko.actor.ActorSelection
+import pekko.util.unused
 
 trait PipeToSupport {
 
@@ -77,7 +78,7 @@ trait PipeToSupport {
    * Import this implicit conversion to gain the `pipeTo` method on [[scala.concurrent.Future]]:
    *
    * {{{
-   * import akka.pattern.pipe
+   * import org.apache.pekko.pattern.pipe
    * // requires implicit ExecutionContext, e.g. by importing `context.dispatcher` inside an Actor
    *
    * Future { doExpensiveCalc() } pipeTo nextActor
@@ -89,7 +90,7 @@ trait PipeToSupport {
    * }}}
    *
    * The successful result of the future is sent as a message to the recipient, or
-   * the failure is sent in a [[akka.actor.Status.Failure]] to the recipient.
+   * the failure is sent in a [[pekko.actor.Status.Failure]] to the recipient.
    */
   implicit def pipe[T](future: Future[T])(implicit executionContext: ExecutionContext): PipeableFuture[T] =
     new PipeableFuture(future)
@@ -98,7 +99,7 @@ trait PipeToSupport {
    * Import this implicit conversion to gain the `pipeTo` method on [[scala.concurrent.Future]]:
    *
    * {{{
-   * import akka.pattern.pipe
+   * import org.apache.pekko.pattern.pipe
    * // requires implicit ExecutionContext, e.g. by importing `context.dispatcher` inside an Actor
    *
    * Future { doExpensiveCalc() } pipeTo nextActor
@@ -110,7 +111,7 @@ trait PipeToSupport {
    * }}}
    *
    * The successful result of the future is sent as a message to the recipient, or
-   * the failure is sent in a [[akka.actor.Status.Failure]] to the recipient.
+   * the failure is sent in a [[pekko.actor.Status.Failure]] to the recipient.
    */
   implicit def pipeCompletionStage[T](future: CompletionStage[T])(
       implicit executionContext: ExecutionContext): PipeableCompletionStage[T] = new PipeableCompletionStage(future)
diff --git a/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala
similarity index 87%
rename from akka-actor/src/main/scala/akka/pattern/PromiseRef.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala
index a7a8907c1a..53fd008827 100644
--- a/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import scala.concurrent.{ Future, Promise }
 
-import akka.actor._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor._
+import pekko.util.Timeout
 
 /**
  * A combination of a Future and an ActorRef associated with it, which points
@@ -58,7 +59,7 @@ object PromiseRef {
   /**
    * Wraps an ActorRef and a Promise into a PromiseRef.
    */
-  private[akka] def wrap[T](actorRef: ActorRef, promise: Promise[T]): PromiseRef[T] = {
+  private[pekko] def wrap[T](actorRef: ActorRef, promise: Promise[T]): PromiseRef[T] = {
     new PromiseRefImpl(actorRef, promise)
   }
 
@@ -102,7 +103,7 @@ object FutureRef {
   /**
    * Wraps an ActorRef and a Future into a FutureRef.
    */
-  private[akka] def wrap[T](actorRef: ActorRef, future: Future[T]): FutureRef[T] = {
+  private[pekko] def wrap[T](actorRef: ActorRef, future: Future[T]): FutureRef[T] = {
     new FutureRefImpl(actorRef, future)
   }
 
@@ -140,18 +141,18 @@ object FutureRef {
   }
 }
 
-private[akka] class PromiseRefImpl[T](val ref: ActorRef, val promise: Promise[T])
+private[pekko] class PromiseRefImpl[T](val ref: ActorRef, val promise: Promise[T])
     extends PromiseRef[T]
     with FutureRef[T] {
   def toFutureRef: FutureRef[T] = this
 }
 
-private[akka] final class FutureRefImpl[T](val ref: ActorRef, val future: Future[T]) extends FutureRef[T]
+private[pekko] final class FutureRefImpl[T](val ref: ActorRef, val future: Future[T]) extends FutureRef[T]
 
-private[akka] final class AskPromiseRef private (promiseActorRef: PromiseActorRef)
+private[pekko] final class AskPromiseRef private (promiseActorRef: PromiseActorRef)
     extends PromiseRefImpl[Any](promiseActorRef, promiseActorRef.result)
 
-private[akka] object AskPromiseRef {
+private[pekko] object AskPromiseRef {
   def apply(provider: ActorRefProvider, timeout: Timeout): AskPromiseRef = {
     if (timeout.duration.length > 0) {
       val promiseActorRef =
diff --git a/akka-actor/src/main/scala/akka/pattern/RetrySupport.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/pattern/RetrySupport.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
index 624fe3c180..877c277afd 100644
--- a/akka-actor/src/main/scala/akka/pattern/RetrySupport.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.concurrent.duration.{ Duration, FiniteDuration }
 import scala.util.control.NonFatal
 
-import akka.actor.Scheduler
-import akka.util.ConstantFun
+import org.apache.pekko
+import pekko.actor.Scheduler
+import pekko.util.ConstantFun
 
 /**
  * This trait provides the retry utility function
diff --git a/akka-actor/src/main/scala/akka/pattern/StatusReply.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/pattern/StatusReply.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
index 3141cbbc55..1e8e712ccb 100644
--- a/akka-actor/src/main/scala/akka/pattern/StatusReply.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.pattern
+package org.apache.pekko.pattern
 
 import scala.concurrent.Future
 import scala.util.{ Failure => ScalaFailure }
 import scala.util.{ Success => ScalaSuccess }
 import scala.util.Try
 import scala.util.control.NoStackTrace
-import akka.Done
-import akka.actor.InvalidMessageException
-import akka.annotation.InternalApi
-import akka.dispatch.ExecutionContexts
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.InvalidMessageException
+import pekko.annotation.InternalApi
+import pekko.dispatch.ExecutionContexts
 
 /**
  * Generic top-level message type for replies that signal failure or success. Convenient to use together with the
@@ -160,7 +161,7 @@ object StatusReply {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def flattenStatusFuture[T](f: Future[StatusReply[T]]): Future[T] =
+  private[pekko] def flattenStatusFuture[T](f: Future[StatusReply[T]]): Future[T] =
     f.transform {
       case ScalaSuccess(s) =>
         s match {
diff --git a/akka-actor/src/main/scala/akka/pattern/extended/package.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala
similarity index 79%
rename from akka-actor/src/main/scala/akka/pattern/extended/package.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala
index 4763a1a292..262ae7e938 100644
--- a/akka-actor/src/main/scala/akka/pattern/extended/package.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka
+package org.apache.pekko
 package pattern
 
 /**
@@ -22,18 +22,18 @@ package pattern
  * In Scala the recommended usage is to import the pattern from the package
  * object:
  * {{{
- * import akka.pattern.extended.ask
+ * import org.apache.pekko.pattern.extended.ask
  *
  * ask(actor, askSender => Request(askSender)) // use it directly
  * actor ask (Request(_))   // use it by implicit conversion
  * }}}
  *
- * For Java the patterns are available as static methods of the [[akka.pattern.Patterns]]
+ * For Java the patterns are available as static methods of the [[org.apache.pekko.pattern.Patterns]]
  * class:
  * {{{
- * import static akka.pattern.Patterns.ask;
+ * import static org.apache.pekko.pattern.Patterns.ask;
  *
- * ask(actor, new akka.japi.Function {
+ * ask(actor, new org.apache.pekko.japi.Function {
  *   Object apply(ActorRef askSender) {
  *     return new Request(askSender);
  *   }
diff --git a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala
similarity index 90%
rename from akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala
index 03c1095c6b..abcd52dab9 100644
--- a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.pattern.internal
+package org.apache.pekko.pattern.internal
 
 import scala.concurrent.duration._
 
-import akka.actor.{ OneForOneStrategy, _ }
-import akka.actor.SupervisorStrategy._
-import akka.annotation.InternalApi
-import akka.pattern.{
+import org.apache.pekko
+import pekko.actor.{ OneForOneStrategy, _ }
+import pekko.actor.SupervisorStrategy._
+import pekko.annotation.InternalApi
+import pekko.pattern.{
   BackoffReset,
   BackoffSupervisor,
   ForwardDeathLetters,
@@ -23,8 +24,8 @@ import akka.pattern.{
  * INTERNAL API
  *
  * Back-off supervisor that stops and starts a child actor when the child actor restarts.
- * This back-off supervisor is created by using ``akka.pattern.BackoffSupervisor.props``
- * with ``akka.pattern.BackoffOpts.onFailure``.
+ * This back-off supervisor is created by using ``org.apache.pekko.pattern.BackoffSupervisor.props``
+ * with ``org.apache.pekko.pattern.BackoffOpts.onFailure``.
  */
 @InternalApi private[pattern] class BackoffOnRestartSupervisor(
     val childProps: Props,
diff --git a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala
similarity index 88%
rename from akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala
index 1eea0f8cb6..45f1c0d9f6 100644
--- a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.pattern.internal
+package org.apache.pekko.pattern.internal
 
 import scala.concurrent.duration.FiniteDuration
 
-import akka.actor.{ Actor, ActorLogging, OneForOneStrategy, Props, SupervisorStrategy, Terminated }
-import akka.actor.SupervisorStrategy.{ Directive, Escalate }
-import akka.annotation.InternalApi
-import akka.pattern.{
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, OneForOneStrategy, Props, SupervisorStrategy, Terminated }
+import pekko.actor.SupervisorStrategy.{ Directive, Escalate }
+import pekko.annotation.InternalApi
+import pekko.pattern.{
   BackoffReset,
   BackoffSupervisor,
   ForwardDeathLetters,
@@ -23,7 +24,7 @@ import akka.pattern.{
  * INTERNAL API
  *
  * Back-off supervisor that stops and starts a child actor using a back-off algorithm when the child actor stops.
- * This back-off supervisor is created by using `akka.pattern.BackoffSupervisor.props`
+ * This back-off supervisor is created by using `org.apache.pekko.pattern.BackoffSupervisor.props`
  * with `BackoffOpts.onStop`.
  */
 @InternalApi private[pattern] class BackoffOnStopSupervisor(
diff --git a/akka-actor/src/main/scala/akka/pattern/internal/CircuitBreakerTelemetry.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala
similarity index 87%
rename from akka-actor/src/main/scala/akka/pattern/internal/CircuitBreakerTelemetry.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala
index 61b051c3fe..5569e2befd 100644
--- a/akka-actor/src/main/scala/akka/pattern/internal/CircuitBreakerTelemetry.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2022 Lightbend Inc. 
  */
 
-package akka.pattern.internal
+package org.apache.pekko.pattern.internal
 
 import java.util.{ List => JList }
 
-import akka.actor.ExtendedActorSystem
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Service Provider Interface (SPI) for collecting metrics from Circuit Breaker.
@@ -47,7 +48,7 @@ trait CircuitBreakerTelemetry {
 
   /**
    * Invoked for each call when the future is completed with exception, except for
-   * [[scala.concurrent.TimeoutException]] and [[akka.pattern.CircuitBreakerOpenException]]
+   * [[scala.concurrent.TimeoutException]] and [[pekko.pattern.CircuitBreakerOpenException]]
    * that are handled by separate methods.
    *
    * @param elapsedNanos the elapsed duration of the call in nanoseconds
@@ -63,7 +64,7 @@ trait CircuitBreakerTelemetry {
 
   /**
    * Invoked for each call when the future is completed with
-   * `akka.pattern.CircuitBreakerOpenException`
+   * `org.apache.pekko.pattern.CircuitBreakerOpenException`
    */
   def onCallBreakerOpenFailure(): Unit
 
@@ -77,7 +78,7 @@ trait CircuitBreakerTelemetry {
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object CircuitBreakerTelemetryProvider {
+@InternalApi private[pekko] object CircuitBreakerTelemetryProvider {
   def start(breakerId: String, system: ExtendedActorSystem): CircuitBreakerTelemetry = {
     val configPath = "akka.circuit-breaker.telemetry.implementations"
     if (!system.settings.config.hasPath(configPath)) {
@@ -109,7 +110,7 @@ trait CircuitBreakerTelemetry {
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object CircuitBreakerNoopTelemetry extends CircuitBreakerTelemetry {
+@InternalApi private[pekko] object CircuitBreakerNoopTelemetry extends CircuitBreakerTelemetry {
   override def onOpen(): Unit = ()
 
   override def onClose(): Unit = ()
@@ -130,7 +131,7 @@ trait CircuitBreakerTelemetry {
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class CircuitBreakerEnsembleTelemetry(
+@InternalApi private[pekko] class CircuitBreakerEnsembleTelemetry(
     telemetryFqcns: Seq[String],
     breakerId: String,
     system: ExtendedActorSystem)
diff --git a/akka-actor/src/main/scala/akka/pattern/package.scala b/akka-actor/src/main/scala/org/apache/pekko/pattern/package.scala
similarity index 81%
rename from akka-actor/src/main/scala/akka/pattern/package.scala
rename to akka-actor/src/main/scala/org/apache/pekko/pattern/package.scala
index 011f617ec9..446438abde 100644
--- a/akka-actor/src/main/scala/akka/pattern/package.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/pattern/package.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka
+package org.apache.pekko
 
 /**
  * == Commonly Used Patterns With Akka ==
@@ -16,25 +16,25 @@ package akka
  * 
  • ask: create a temporary one-off actor for receiving a reply to a
  * message and complete a [[scala.concurrent.Future]] with it; returns said
  * Future.
    • 
- * 
  • pipeTo: feed eventually computed value of a future to an [[akka.actor.ActorRef]] as
+ * 
  • pipeTo: feed eventually computed value of a future to an [[org.apache.pekko.actor.ActorRef]] as
  * a message.
    • 
- * 
  • pipeToSelection: feed eventually computed value of a future to an [[akka.actor.ActorSelection]] as
+ * 
  • pipeToSelection: feed eventually computed value of a future to an [[org.apache.pekko.actor.ActorSelection]] as
  * a message.
    • 
  * 
  *
  * In Scala the recommended usage is to import the pattern from the package
  * object:
  * {{{
- * import akka.pattern.ask
+ * import org.apache.pekko.pattern.ask
  *
  * ask(actor, message) // use it directly
  * actor ask message   // use it by implicit conversion
  * }}}
  *
- * For Java the patterns are available as static methods of the [[akka.pattern.Patterns]]
+ * For Java the patterns are available as static methods of the [[org.apache.pekko.pattern.Patterns]]
  * class:
  * {{{
- * import static akka.pattern.Patterns.ask;
+ * import static org.apache.pekko.pattern.Patterns.ask;
  *
  * ask(actor, message);
  * }}}
diff --git a/akka-actor/src/main/scala/akka/routing/Balancing.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/Balancing.scala
similarity index 91%
rename from akka-actor/src/main/scala/akka/routing/Balancing.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/Balancing.scala
index aab33336e8..6e3bb9cbae 100644
--- a/akka-actor/src/main/scala/akka/routing/Balancing.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/Balancing.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import scala.collection.immutable
 
@@ -10,17 +10,18 @@ import scala.annotation.nowarn
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorContext
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.actor.SupervisorStrategy
-import akka.dispatch.BalancingDispatcherConfigurator
-import akka.dispatch.Dispatchers
+import org.apache.pekko
+import pekko.actor.ActorContext
+import pekko.actor.ActorSystem
+import pekko.actor.Props
+import pekko.actor.SupervisorStrategy
+import pekko.dispatch.BalancingDispatcherConfigurator
+import pekko.dispatch.Dispatchers
 
 /**
  * INTERNAL API
  */
-private[akka] object BalancingRoutingLogic {
+private[pekko] object BalancingRoutingLogic {
   def apply(): BalancingRoutingLogic = new BalancingRoutingLogic
 }
 
@@ -30,7 +31,7 @@ private[akka] object BalancingRoutingLogic {
  */
 @nowarn("msg=@SerialVersionUID has no effect")
 @SerialVersionUID(1L)
-private[akka] final class BalancingRoutingLogic extends RoutingLogic {
+private[pekko] final class BalancingRoutingLogic extends RoutingLogic {
   override def select(message: Any, routees: immutable.IndexedSeq[Routee]): Routee =
     if (routees.isEmpty) NoRoutee
     else routees.head
@@ -103,7 +104,7 @@ final case class BalancingPool(
   /**
    * INTERNAL API
    */
-  override private[akka] def newRoutee(routeeProps: Props, context: ActorContext): Routee = {
+  override private[pekko] def newRoutee(routeeProps: Props, context: ActorContext): Routee = {
 
     val rawDeployPath = context.self.path.elements.drop(1).mkString("/", "/", "")
     val deployPath = BalancingPoolDeploy.invalidConfigKeyChars.foldLeft(rawDeployPath) { (replaced, c) =>
@@ -163,6 +164,6 @@ final case class BalancingPool(
  * INTERNAL API
  * Can't be in the `BalancingPool` companion for binary compatibility reasons.
  */
-private[akka] object BalancingPoolDeploy {
+private[pekko] object BalancingPoolDeploy {
   val invalidConfigKeyChars = List('$', '@', ':')
 }
diff --git a/akka-actor/src/main/scala/akka/routing/Broadcast.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/routing/Broadcast.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala
index 6c7d647b12..3f7db3670c 100644
--- a/akka-actor/src/main/scala/akka/routing/Broadcast.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import scala.collection.immutable
 
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor.ActorSystem
-import akka.actor.SupervisorStrategy
-import akka.dispatch.Dispatchers
-import akka.japi.Util.immutableSeq
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.SupervisorStrategy
+import pekko.dispatch.Dispatchers
+import pekko.japi.Util.immutableSeq
 
 object BroadcastRoutingLogic {
   def apply(): BroadcastRoutingLogic = new BroadcastRoutingLogic
@@ -118,7 +119,7 @@ final case class BroadcastPool(
  * the router is defined in the configuration file for the actor being used.
  *
  * @param paths string representation of the actor paths of the routees, messages are
- *   sent with [[akka.actor.ActorSelection]] to these paths
+ *   sent with [[pekko.actor.ActorSelection]] to these paths
  *
  * @param routerDispatcher dispatcher to use for the router head actor, which handles
  *   router management messages
@@ -135,7 +136,7 @@ final case class BroadcastGroup(
   /**
    * Java API
    * @param routeePaths string representation of the actor paths of the routees, messages are
-   *   sent with [[akka.actor.ActorSelection]] to these paths
+   *   sent with [[pekko.actor.ActorSelection]] to these paths
    */
   def this(routeePaths: java.lang.Iterable[String]) = this(paths = immutableSeq(routeePaths))
 
diff --git a/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/routing/ConsistentHash.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala
index aee861c101..58552f8871 100644
--- a/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.util.Arrays
 
@@ -126,7 +126,7 @@ object ConsistentHash {
    * Java API: Factory method to create a ConsistentHash
    */
   def create[T](nodes: java.lang.Iterable[T], virtualNodesFactor: Int): ConsistentHash[T] = {
-    import akka.util.ccompat.JavaConverters._
+    import org.apache.pekko.util.ccompat.JavaConverters._
     apply(nodes.asScala, virtualNodesFactor)(ClassTag(classOf[Any].asInstanceOf[Class[T]]))
   }
 
diff --git a/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
similarity index 88%
rename from akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
index 6dc89b2ac3..8a51db6426 100644
--- a/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.util.concurrent.atomic.AtomicReference
 
@@ -11,35 +11,36 @@ import scala.util.control.NonFatal
 
 import com.typesafe.config.Config
 
-import akka.actor.ActorPath
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.actor.InvalidMessageException
-import akka.actor.SupervisorStrategy
-import akka.actor.WrappedMessage
-import akka.dispatch.Dispatchers
-import akka.event.Logging
-import akka.japi.Util.immutableSeq
-import akka.serialization.SerializationExtension
+import org.apache.pekko
+import pekko.actor.ActorPath
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.InvalidMessageException
+import pekko.actor.SupervisorStrategy
+import pekko.actor.WrappedMessage
+import pekko.dispatch.Dispatchers
+import pekko.event.Logging
+import pekko.japi.Util.immutableSeq
+import pekko.serialization.SerializationExtension
 
 object ConsistentHashingRouter {
 
   /**
    * If you don't define the `hashMapping` when
-   * constructing the [[akka.routing.ConsistentHashingRouter]]
+   * constructing the [[pekko.routing.ConsistentHashingRouter]]
    * the messages need to implement this interface to define what
    * data to use for the consistent hash key. Note that it's not
    * the hash, but the data to be hashed.
    *
    * If returning an `Array[Byte]` or String it will be used as is,
-   * otherwise the configured [[akka.serialization.Serializer]]
+   * otherwise the configured [[pekko.serialization.Serializer]]
    * will be applied to the returned data.
    *
    * If messages can't implement this interface themselves,
    * it's possible to wrap the messages in
-   * [[akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope]],
-   * or use [[akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope]]
+   * [[pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope]],
+   * or use [[pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope]]
    */
   trait ConsistentHashable {
     def consistentHashKey: Any
@@ -47,8 +48,8 @@ object ConsistentHashingRouter {
 
   /**
    * If you don't define the `hashMapping` when
-   * constructing the [[akka.routing.ConsistentHashingRouter]]
-   * and messages can't implement [[akka.routing.ConsistentHashingRouter.ConsistentHashable]]
+   * constructing the [[pekko.routing.ConsistentHashingRouter]]
+   * and messages can't implement [[pekko.routing.ConsistentHashingRouter.ConsistentHashable]]
    * themselves they can we wrapped by this envelope instead. The
    * router will only send the wrapped message to the destination,
    * i.e. the envelope will be stripped off.
@@ -70,7 +71,7 @@ object ConsistentHashingRouter {
    * the hash that is to be returned, but the data to be hashed.
    *
    * If returning an `Array[Byte]` or String it will be used as is,
-   * otherwise the configured [[akka.serialization.Serializer]]
+   * otherwise the configured [[pekko.serialization.Serializer]]
    * will be applied to the returned data.
    */
   type ConsistentHashMapping = PartialFunction[Any, Any]
@@ -91,7 +92,7 @@ object ConsistentHashingRouter {
    * this mapping.
    *
    * If returning an `Array[Byte]` or String it will be used as is,
-   * otherwise the configured [[akka.serialization.Serializer]]
+   * otherwise the configured [[pekko.serialization.Serializer]]
    * will be applied to the returned data.
    */
   trait ConsistentHashMapper {
@@ -101,7 +102,7 @@ object ConsistentHashingRouter {
   /**
    * INTERNAL API
    */
-  private[akka] def hashMappingAdapter(mapper: ConsistentHashMapper): ConsistentHashMapping = {
+  private[pekko] def hashMappingAdapter(mapper: ConsistentHashMapper): ConsistentHashMapping = {
     case message if mapper.hashKey(message).asInstanceOf[AnyRef] ne null =>
       mapper.hashKey(message)
   }
@@ -126,18 +127,18 @@ object ConsistentHashingRoutingLogic {
  * of the router to map incoming messages to their consistent hash key.
  * This makes the decision transparent for the sender.
  *
- * 2. The messages may implement [[akka.routing.ConsistentHashingRouter.ConsistentHashable]].
+ * 2. The messages may implement [[pekko.routing.ConsistentHashingRouter.ConsistentHashable]].
  * The key is part of the message and it's convenient to define it together
  * with the message definition.
  *
- * 3. The messages can be wrapped in a [[akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope]]
+ * 3. The messages can be wrapped in a [[pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope]]
  * to define what data to use for the consistent hash key. The sender knows
  * the key to use.
  *
  * These ways to define the consistent hash key can be use together and at
  * the same time for one router. The `hashMapping` is tried first.
  *
- * @param virtualNodesFactor number of virtual nodes per node, used in [[akka.routing.ConsistentHash]]
+ * @param virtualNodesFactor number of virtual nodes per node, used in [[pekko.routing.ConsistentHash]]
  *
  * @param hashMapping partial function from message to the data to
  *   use for the consistent hash key
@@ -178,7 +179,7 @@ final case class ConsistentHashingRoutingLogic(
   private lazy val log = Logging(system, classOf[ConsistentHashingRoutingLogic])
 
   /**
-   * Setting the number of virtual nodes per node, used in [[akka.routing.ConsistentHash]]
+   * Setting the number of virtual nodes per node, used in [[pekko.routing.ConsistentHash]]
    */
   def withVirtualNodesFactor(vnodes: Int): ConsistentHashingRoutingLogic = copy(virtualNodesFactor = vnodes)
 
@@ -248,7 +249,7 @@ final case class ConsistentHashingRoutingLogic(
 
 /**
  * A router pool that uses consistent hashing to select a routee based on the
- * sent message. The selection is described in [[akka.routing.ConsistentHashingRoutingLogic]].
+ * sent message. The selection is described in [[pekko.routing.ConsistentHashingRoutingLogic]].
  *
  * The configuration parameter trumps the constructor arguments. This means that
  * if you provide `nrOfInstances` during instantiation they will be ignored if
@@ -272,7 +273,7 @@ final case class ConsistentHashingRoutingLogic(
  *
  * @param resizer optional resizer that dynamically adjust the pool size
  *
- * @param virtualNodesFactor number of virtual nodes per node, used in [[akka.routing.ConsistentHash]]
+ * @param virtualNodesFactor number of virtual nodes per node, used in [[pekko.routing.ConsistentHash]]
  *
  * @param hashMapping partial function from message to the data to
  *   use for the consistent hash key
@@ -328,7 +329,7 @@ final case class ConsistentHashingPool(
   def withDispatcher(dispatcherId: String): ConsistentHashingPool = copy(routerDispatcher = dispatcherId)
 
   /**
-   * Setting the number of virtual nodes per node, used in [[akka.routing.ConsistentHash]]
+   * Setting the number of virtual nodes per node, used in [[pekko.routing.ConsistentHash]]
    */
   def withVirtualNodesFactor(vnodes: Int): ConsistentHashingPool = copy(virtualNodesFactor = vnodes)
 
@@ -354,16 +355,16 @@ final case class ConsistentHashingPool(
 
 /**
  * A router group that uses consistent hashing to select a routee based on the
- * sent message. The selection is described in [[akka.routing.ConsistentHashingRoutingLogic]].
+ * sent message. The selection is described in [[pekko.routing.ConsistentHashingRoutingLogic]].
  *
  * The configuration parameter trumps the constructor arguments. This means that
  * if you provide `paths` during instantiation they will be ignored if
  * the router is defined in the configuration file for the actor being used.
  *
  * @param paths string representation of the actor paths of the routees, messages are
- *   sent with [[akka.actor.ActorSelection]] to these paths
+ *   sent with [[pekko.actor.ActorSelection]] to these paths
  *
- * @param virtualNodesFactor number of virtual nodes per node, used in [[akka.routing.ConsistentHash]]
+ * @param virtualNodesFactor number of virtual nodes per node, used in [[pekko.routing.ConsistentHash]]
  *
  * @param hashMapping partial function from message to the data to
  *   use for the consistent hash key
@@ -385,7 +386,7 @@ final case class ConsistentHashingGroup(
   /**
    * Java API
    * @param routeePaths string representation of the actor paths of the routees, messages are
-   *   sent with [[akka.actor.ActorSelection]] to these paths
+   *   sent with [[pekko.actor.ActorSelection]] to these paths
    */
   def this(routeePaths: java.lang.Iterable[String]) = this(paths = immutableSeq(routeePaths))
 
@@ -401,7 +402,7 @@ final case class ConsistentHashingGroup(
   def withDispatcher(dispatcherId: String): ConsistentHashingGroup = copy(routerDispatcher = dispatcherId)
 
   /**
-   * Setting the number of virtual nodes per node, used in [[akka.routing.ConsistentHash]]
+   * Setting the number of virtual nodes per node, used in [[pekko.routing.ConsistentHash]]
    */
   def withVirtualNodesFactor(vnodes: Int): ConsistentHashingGroup = copy(virtualNodesFactor = vnodes)
 
@@ -430,7 +431,7 @@ final case class ConsistentHashingGroup(
  * isn't a good representation, because LocalActorRef doesn't include the
  * host and port.
  */
-private[akka] final case class ConsistentRoutee(routee: Routee, selfAddress: Address) {
+private[pekko] final case class ConsistentRoutee(routee: Routee, selfAddress: Address) {
 
   override def toString: String = routee match {
     case ActorRefRoutee(ref)       => toStringWithfullAddress(ref.path)
diff --git a/akka-actor/src/main/scala/akka/routing/Listeners.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/Listeners.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/routing/Listeners.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/Listeners.scala
index 19761832e8..c030e5e935 100644
--- a/akka-actor/src/main/scala/akka/routing/Listeners.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/Listeners.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.util.{ Set, TreeSet }
 
-import akka.actor.{ Actor, ActorRef }
+import org.apache.pekko.actor.{ Actor, ActorRef }
 
 sealed trait ListenerMessage
 final case class Listen(listener: ActorRef) extends ListenerMessage
diff --git a/akka-actor/src/main/scala/akka/routing/MurmurHash.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/MurmurHash.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/routing/MurmurHash.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/MurmurHash.scala
index a4e70268f3..bd6a011754 100644
--- a/akka-actor/src/main/scala/akka/routing/MurmurHash.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/MurmurHash.scala
@@ -17,13 +17,13 @@
  *  @version 2.9
  *  @since   2.9
  */
-package akka.routing
+package org.apache.pekko.routing
 
 import java.lang.Integer.{ rotateLeft => rotl }
 
 import scala.annotation.nowarn
 
-import akka.util.ccompat._
+import org.apache.pekko.util.ccompat._
 
 /**
  * An object designed to generate well-distributed non-cryptographic
diff --git a/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala
index 9579e6f098..ebf0f450e5 100644
--- a/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.time.LocalDateTime
 import java.util.concurrent.ThreadLocalRandom
@@ -13,9 +13,10 @@ import scala.concurrent.duration._
 import OptimalSizeExploringResizer._
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.annotation.InternalApi
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.InternalApi
+import pekko.util.JavaDurationConverters._
 
 trait OptimalSizeExploringResizer extends Resizer {
 
diff --git a/akka-actor/src/main/scala/akka/routing/Random.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/Random.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/routing/Random.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/Random.scala
index 08931631fc..d5085bd880 100644
--- a/akka-actor/src/main/scala/akka/routing/Random.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/Random.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -11,10 +11,11 @@ import scala.collection.immutable
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor.ActorSystem
-import akka.actor.SupervisorStrategy
-import akka.dispatch.Dispatchers
-import akka.japi.Util.immutableSeq
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.SupervisorStrategy
+import pekko.dispatch.Dispatchers
+import pekko.japi.Util.immutableSeq
 
 object RandomRoutingLogic {
   def apply(): RandomRoutingLogic = new RandomRoutingLogic
@@ -120,7 +121,7 @@ final case class RandomPool(
  * the router is defined in the configuration file for the actor being used.
  *
  * @param paths string representation of the actor paths of the routees, messages are
- *   sent with [[akka.actor.ActorSelection]] to these paths
+ *   sent with [[pekko.actor.ActorSelection]] to these paths
  *
  * @param routerDispatcher dispatcher to use for the router head actor, which handles
  *   router management messages
@@ -137,7 +138,7 @@ final case class RandomGroup(
   /**
    * Java API
    * @param routeePaths string representation of the actor paths of the routees, messages are
-   *   sent with [[akka.actor.ActorSelection]] to these paths
+   *   sent with [[pekko.actor.ActorSelection]] to these paths
    */
   def this(routeePaths: java.lang.Iterable[String]) = this(paths = immutableSeq(routeePaths))
 
diff --git a/akka-actor/src/main/scala/akka/routing/Resizer.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/routing/Resizer.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
index c5ce29a8b8..01c9ecbcaa 100644
--- a/akka-actor/src/main/scala/akka/routing/Resizer.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicLong
@@ -11,21 +11,22 @@ import scala.collection.immutable
 
 import com.typesafe.config.Config
 
-import akka.AkkaException
-import akka.actor.Actor
-import akka.actor.ActorCell
-import akka.actor.ActorInitializationException
-import akka.actor.ActorRefWithCell
-import akka.actor.ActorSystemImpl
-import akka.actor.InternalActorRef
-import akka.actor.Props
-import akka.actor.SupervisorStrategy
-import akka.dispatch.Envelope
-import akka.dispatch.MessageDispatcher
+import org.apache.pekko
+import pekko.AkkaException
+import pekko.actor.Actor
+import pekko.actor.ActorCell
+import pekko.actor.ActorInitializationException
+import pekko.actor.ActorRefWithCell
+import pekko.actor.ActorSystemImpl
+import pekko.actor.InternalActorRef
+import pekko.actor.Props
+import pekko.actor.SupervisorStrategy
+import pekko.dispatch.Envelope
+import pekko.dispatch.MessageDispatcher
 
 /**
  * [[Pool]] routers with dynamically resizable number of routees are implemented by providing a Resizer
- * implementation in the [[akka.routing.Pool]] configuration.
+ * implementation in the [[pekko.routing.Pool]] configuration.
  */
 trait Resizer {
 
@@ -251,7 +252,7 @@ case class DefaultResizer(
 /**
  * INTERNAL API
  */
-private[akka] final class ResizablePoolCell(
+private[pekko] final class ResizablePoolCell(
     _system: ActorSystemImpl,
     _ref: InternalActorRef,
     _routerProps: Props,
@@ -282,7 +283,7 @@ private[akka] final class ResizablePoolCell(
     super.sendMessage(envelope)
   }
 
-  private[akka] def resize(initial: Boolean): Unit = {
+  private[pekko] def resize(initial: Boolean): Unit = {
     if (resizeInProgress.get || initial)
       try {
         tryReportMessageCount()
@@ -313,14 +314,14 @@ private[akka] final class ResizablePoolCell(
 /**
  * INTERNAL API
  */
-private[akka] object ResizablePoolActor {
+private[pekko] object ResizablePoolActor {
   case object Resize extends RouterManagementMesssage
 }
 
 /**
  * INTERNAL API
  */
-private[akka] class ResizablePoolActor(supervisorStrategy: SupervisorStrategy)
+private[pekko] class ResizablePoolActor(supervisorStrategy: SupervisorStrategy)
     extends RouterPoolActor(supervisorStrategy) {
   import ResizablePoolActor._
 
diff --git a/akka-actor/src/main/scala/akka/routing/RoundRobin.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/routing/RoundRobin.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala
index 3194048dec..59575ff808 100644
--- a/akka-actor/src/main/scala/akka/routing/RoundRobin.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.util.concurrent.atomic.AtomicLong
 
@@ -11,10 +11,11 @@ import scala.collection.immutable
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor.ActorSystem
-import akka.actor.SupervisorStrategy
-import akka.dispatch.Dispatchers
-import akka.japi.Util.immutableSeq
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.SupervisorStrategy
+import pekko.dispatch.Dispatchers
+import pekko.japi.Util.immutableSeq
 
 object RoundRobinRoutingLogic {
   def apply(): RoundRobinRoutingLogic = new RoundRobinRoutingLogic
@@ -129,7 +130,7 @@ final case class RoundRobinPool(
  * the router is defined in the configuration file for the actor being used.
  *
  * @param paths string representation of the actor paths of the routees, messages are
- *   sent with [[akka.actor.ActorSelection]] to these paths
+ *   sent with [[pekko.actor.ActorSelection]] to these paths
  *
  * @param routerDispatcher dispatcher to use for the router head actor, which handles
  *   router management messages
@@ -146,7 +147,7 @@ final case class RoundRobinGroup(
   /**
    * Java API
    * @param routeePaths string representation of the actor paths of the routees, messages are
-   *   sent with [[akka.actor.ActorSelection]] to these paths
+   *   sent with [[pekko.actor.ActorSelection]] to these paths
    */
   def this(routeePaths: java.lang.Iterable[String]) = this(paths = immutableSeq(routeePaths))
 
diff --git a/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
similarity index 87%
rename from akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
index 7154b4d096..d3d5137250 100644
--- a/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
@@ -2,30 +2,31 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import scala.collection.immutable
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorCell
-import akka.actor.ActorInitializationException
-import akka.actor.ActorRef
-import akka.actor.ActorSystemImpl
-import akka.actor.IndirectActorProducer
-import akka.actor.InternalActorRef
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.actor.SupervisorStrategy
-import akka.actor.Terminated
-import akka.dispatch.Envelope
-import akka.dispatch.MessageDispatcher
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorCell
+import pekko.actor.ActorInitializationException
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystemImpl
+import pekko.actor.IndirectActorProducer
+import pekko.actor.InternalActorRef
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.actor.SupervisorStrategy
+import pekko.actor.Terminated
+import pekko.dispatch.Envelope
+import pekko.dispatch.MessageDispatcher
+import pekko.util.ccompat._
 
 /**
  * INTERNAL API
  */
-private[akka] object RoutedActorCell {
+private[pekko] object RoutedActorCell {
   class RouterActorCreator(routerConfig: RouterConfig) extends IndirectActorProducer {
     override def actorClass = classOf[RouterActor]
     override def produce() = routerConfig.createRouterActor()
@@ -37,7 +38,7 @@ private[akka] object RoutedActorCell {
  * INTERNAL API
  */
 @ccompatUsedUntil213
-private[akka] class RoutedActorCell(
+private[pekko] class RoutedActorCell(
     _system: ActorSystemImpl,
     _ref: InternalActorRef,
     _routerProps: Props,
@@ -46,7 +47,7 @@ private[akka] class RoutedActorCell(
     _supervisor: InternalActorRef)
     extends ActorCell(_system, _ref, _routerProps, _routerDispatcher, _supervisor) {
 
-  private[akka] val routerConfig = _routerProps.routerConfig
+  private[pekko] val routerConfig = _routerProps.routerConfig
 
   @volatile
   private var _router: Router = null // initialized in start, and then only updated from the actor
@@ -146,7 +147,7 @@ private[akka] class RoutedActorCell(
 /**
  * INTERNAL API
  */
-private[akka] class RouterActor extends Actor {
+private[pekko] class RouterActor extends Actor {
   val cell = context match {
     case x: RoutedActorCell => x
     case _ =>
@@ -184,7 +185,7 @@ private[akka] class RouterActor extends Actor {
 /**
  * INTERNAL API
  */
-private[akka] class RouterPoolActor(override val supervisorStrategy: SupervisorStrategy) extends RouterActor {
+private[pekko] class RouterPoolActor(override val supervisorStrategy: SupervisorStrategy) extends RouterActor {
 
   val pool = cell.routerConfig match {
     case x: Pool => x
diff --git a/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala
similarity index 75%
rename from akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala
index 9b29e2a597..c1421b5eef 100644
--- a/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import scala.annotation.nowarn
 
-import akka.ConfigurationException
-import akka.actor.ActorPath
-import akka.actor.ActorSystemImpl
-import akka.actor.Cell
-import akka.actor.InternalActorRef
-import akka.actor.Props
-import akka.actor.RepointableActorRef
-import akka.actor.UnstartedCell
-import akka.dispatch.BalancingDispatcher
-import akka.dispatch.MailboxType
-import akka.dispatch.MessageDispatcher
+import org.apache.pekko
+import pekko.ConfigurationException
+import pekko.actor.ActorPath
+import pekko.actor.ActorSystemImpl
+import pekko.actor.Cell
+import pekko.actor.InternalActorRef
+import pekko.actor.Props
+import pekko.actor.RepointableActorRef
+import pekko.actor.UnstartedCell
+import pekko.dispatch.BalancingDispatcher
+import pekko.dispatch.MailboxType
+import pekko.dispatch.MessageDispatcher
 
 /**
  * INTERNAL API
@@ -25,7 +26,7 @@ import akka.dispatch.MessageDispatcher
  * send a message to one (or more) of these actors.
  */
 @nowarn("msg=deprecated")
-private[akka] class RoutedActorRef(
+private[pekko] class RoutedActorRef(
     _system: ActorSystemImpl,
     _routerProps: Props,
     _routerDispatcher: MessageDispatcher,
diff --git a/akka-actor/src/main/scala/akka/routing/Router.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/Router.scala
similarity index 84%
rename from akka-actor/src/main/scala/akka/routing/Router.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/Router.scala
index 4d3471dceb..2527039073 100644
--- a/akka-actor/src/main/scala/akka/routing/Router.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/Router.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import scala.collection.immutable
 
-import akka.actor.ActorRef
-import akka.actor.ActorSelection
-import akka.actor.InternalActorRef
-import akka.actor.InvalidMessageException
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.WrappedMessage
-import akka.japi.Util.immutableSeq
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSelection
+import pekko.actor.InternalActorRef
+import pekko.actor.InvalidMessageException
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.WrappedMessage
+import pekko.japi.Util.immutableSeq
 
 /**
  * The interface of the routing logic that is used in a [[Router]] to select
@@ -43,7 +44,7 @@ trait Routee {
 }
 
 /**
- * [[Routee]] that sends the messages to an [[akka.actor.ActorRef]].
+ * [[Routee]] that sends the messages to an [[pekko.actor.ActorRef]].
  */
 final case class ActorRefRoutee(ref: ActorRef) extends Routee {
   override def send(message: Any, sender: ActorRef): Unit =
@@ -51,7 +52,7 @@ final case class ActorRefRoutee(ref: ActorRef) extends Routee {
 }
 
 /**
- * [[Routee]] that sends the messages to an [[akka.actor.ActorSelection]].
+ * [[Routee]] that sends the messages to an [[pekko.actor.ActorSelection]].
  */
 final case class ActorSelectionRoutee(selection: ActorSelection) extends Routee {
   override def send(message: Any, sender: ActorRef): Unit =
@@ -81,7 +82,7 @@ final case class SeveralRoutees(routees: immutable.IndexedSeq[Routee]) extends R
    * Java API
    */
   def getRoutees(): java.util.List[Routee] = {
-    import akka.util.ccompat.JavaConverters._
+    import org.apache.pekko.util.ccompat.JavaConverters._
     routees.asJava
   }
 
@@ -111,14 +112,14 @@ final case class Router(logic: RoutingLogic, routees: immutable.IndexedSeq[Route
 
   /**
    * Send the message to the destination [[Routee]] selected by the [[RoutingLogic]].
-   * If the message is a [[akka.routing.RouterEnvelope]] it will be unwrapped
+   * If the message is a [[pekko.routing.RouterEnvelope]] it will be unwrapped
    * before sent to the destinations.
    * Messages wrapped in a [[Broadcast]] envelope are always sent to all `routees`.
    */
   def route(message: Any, sender: ActorRef): Unit =
     message match {
-      case akka.routing.Broadcast(msg) => SeveralRoutees(routees).send(msg, sender)
-      case msg                         => send(logic.select(msg, routees), message, sender)
+      case pekko.routing.Broadcast(msg) => SeveralRoutees(routees).send(msg, sender)
+      case msg                          => send(logic.select(msg, routees), message, sender)
     }
 
   private def send(routee: Routee, msg: Any, sender: ActorRef): Unit = {
@@ -145,13 +146,13 @@ final case class Router(logic: RoutingLogic, routees: immutable.IndexedSeq[Route
 
   /**
    * Create a new instance with one more [[ActorRefRoutee]] for the
-   * specified [[akka.actor.ActorRef]] and the same [[RoutingLogic]].
+   * specified [[pekko.actor.ActorRef]] and the same [[RoutingLogic]].
    */
   def addRoutee(ref: ActorRef): Router = addRoutee(ActorRefRoutee(ref))
 
   /**
    * Create a new instance with one more [[ActorSelectionRoutee]] for the
-   * specified [[akka.actor.ActorSelection]] and the same [[RoutingLogic]].
+   * specified [[pekko.actor.ActorSelection]] and the same [[RoutingLogic]].
    */
   def addRoutee(sel: ActorSelection): Router = addRoutee(ActorSelectionRoutee(sel))
 
@@ -162,13 +163,13 @@ final case class Router(logic: RoutingLogic, routees: immutable.IndexedSeq[Route
 
   /**
    * Create a new instance without the [[ActorRefRoutee]] for the specified
-   * [[akka.actor.ActorRef]].
+   * [[pekko.actor.ActorRef]].
    */
   def removeRoutee(ref: ActorRef): Router = removeRoutee(ActorRefRoutee(ref))
 
   /**
    * Create a new instance without the [[ActorSelectionRoutee]] for the specified
-   * [[akka.actor.ActorSelection]].
+   * [[pekko.actor.ActorSelection]].
    */
   def removeRoutee(sel: ActorSelection): Router = removeRoutee(ActorSelectionRoutee(sel))
 
diff --git a/akka-actor/src/main/scala/akka/routing/RouterConfig.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala
similarity index 83%
rename from akka-actor/src/main/scala/akka/routing/RouterConfig.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala
index 10403d07ff..715eafb058 100644
--- a/akka-actor/src/main/scala/akka/routing/RouterConfig.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import scala.collection.immutable
 
 import scala.annotation.nowarn
 
-import akka.ConfigurationException
-import akka.actor.ActorContext
-import akka.actor.ActorPath
-import akka.actor.ActorSystem
-import akka.actor.AutoReceivedMessage
-import akka.actor.OneForOneStrategy
-import akka.actor.Props
-import akka.actor.SupervisorStrategy
-import akka.actor.Terminated
-import akka.dispatch.Dispatchers
-import akka.japi.Util.immutableSeq
-import akka.util.unused
+import org.apache.pekko
+import pekko.ConfigurationException
+import pekko.actor.ActorContext
+import pekko.actor.ActorPath
+import pekko.actor.ActorSystem
+import pekko.actor.AutoReceivedMessage
+import pekko.actor.OneForOneStrategy
+import pekko.actor.Props
+import pekko.actor.SupervisorStrategy
+import pekko.actor.Terminated
+import pekko.dispatch.Dispatchers
+import pekko.japi.Util.immutableSeq
+import pekko.util.unused
 
 /**
  * This trait represents a router factory: it produces the actual router actor
@@ -33,7 +34,7 @@ import akka.util.unused
  * the RoutedActorRef: either provide a reentrant (i.e. pure) implementation or
  * do the locking yourself!
  *
- * '''Caution:''' Please note that the [[akka.routing.Router]] which needs to
+ * '''Caution:''' Please note that the [[pekko.routing.Router]] which needs to
  * be returned by `createActor()` should not send a message to itself in its
  * constructor or `preStart()` or publish its self reference from there: if
  * someone tries sending a message to that reference before the constructor of
@@ -94,7 +95,7 @@ trait RouterConfig extends Serializable {
    * INTERNAL API
    * The router "head" actor.
    */
-  private[akka] def createRouterActor(): RouterActor
+  private[pekko] def createRouterActor(): RouterActor
 
 }
 
@@ -103,7 +104,7 @@ trait RouterConfig extends Serializable {
  *
  * Used to override unset configuration in a router.
  */
-private[akka] trait PoolOverrideUnsetConfig[T <: Pool] extends Pool {
+private[pekko] trait PoolOverrideUnsetConfig[T <: Pool] extends Pool {
 
   final def overrideUnsetConfig(other: RouterConfig): RouterConfig =
     if (other == NoRouter) this // NoRouter is the default, hence “neutral”
@@ -151,7 +152,7 @@ trait Group extends RouterConfig {
   def paths(system: ActorSystem): immutable.Iterable[String]
 
   /**
-   * [[akka.actor.Props]] for a group router based on the settings defined by
+   * [[pekko.actor.Props]] for a group router based on the settings defined by
    * this instance.
    */
   def props(): Props = Props.empty.withRouter(this)
@@ -159,13 +160,13 @@ trait Group extends RouterConfig {
   /**
    * INTERNAL API
    */
-  private[akka] def routeeFor(path: String, context: ActorContext): Routee =
+  private[pekko] def routeeFor(path: String, context: ActorContext): Routee =
     ActorSelectionRoutee(context.actorSelection(path))
 
   /**
    * INTERNAL API
    */
-  private[akka] override def createRouterActor(): RouterActor = new RouterActor
+  private[pekko] override def createRouterActor(): RouterActor = new RouterActor
 }
 
 object Pool {
@@ -200,13 +201,13 @@ trait Pool extends RouterConfig {
   /**
    * INTERNAL API
    */
-  private[akka] def newRoutee(routeeProps: Props, context: ActorContext): Routee =
+  private[pekko] def newRoutee(routeeProps: Props, context: ActorContext): Routee =
     ActorRefRoutee(context.actorOf(enrichWithPoolDispatcher(routeeProps, context)))
 
   /**
    * INTERNAL API
    */
-  private[akka] def enrichWithPoolDispatcher(routeeProps: Props, context: ActorContext): Props =
+  private[pekko] def enrichWithPoolDispatcher(routeeProps: Props, context: ActorContext): Props =
     if (usePoolDispatcher && routeeProps.dispatcher == Dispatchers.DefaultDispatcherId)
       routeeProps.withDispatcher(
         "akka.actor.deployment." + context.self.path.elements.drop(1).mkString("/", "/", "")
@@ -215,7 +216,7 @@ trait Pool extends RouterConfig {
       routeeProps
 
   /**
-   * Pool with dynamically resizable number of routees return the [[akka.routing.Resizer]]
+   * Pool with dynamically resizable number of routees return the [[pekko.routing.Resizer]]
    * to use. The resizer is invoked once when the router is created, before any messages can
    * be sent to it. Resize is also triggered when messages are sent to the routees, and the
    * resizer is invoked asynchronously, i.e. not necessarily before the message has been sent.
@@ -228,8 +229,8 @@ trait Pool extends RouterConfig {
   def supervisorStrategy: SupervisorStrategy
 
   /**
-   * [[akka.actor.Props]] for a pool router based on the settings defined by
-   * this instance and the supplied [[akka.actor.Props]] for the routees created by the
+   * [[pekko.actor.Props]] for a pool router based on the settings defined by
+   * this instance and the supplied [[pekko.actor.Props]] for the routees created by the
    * router.
    */
   def props(routeeProps: Props): Props = routeeProps.withRouter(this)
@@ -243,7 +244,7 @@ trait Pool extends RouterConfig {
   /**
    * INTERNAL API
    */
-  private[akka] override def createRouterActor(): RouterActor =
+  private[pekko] override def createRouterActor(): RouterActor =
     resizer match {
       case None    => new RouterPoolActor(supervisorStrategy)
       case Some(_) => new ResizablePoolActor(supervisorStrategy)
@@ -260,14 +261,14 @@ abstract class CustomRouterConfig extends RouterConfig {
   /**
    * INTERNAL API
    */
-  private[akka] override def createRouterActor(): RouterActor = new RouterActor
+  private[pekko] override def createRouterActor(): RouterActor = new RouterActor
 
   override def routerDispatcher: String = Dispatchers.DefaultDispatcherId
 }
 
 /**
- * Wraps a [[akka.actor.Props]] to mark the actor as externally configurable to be used with a router.
- * If a [[akka.actor.Props]] is not wrapped with [[FromConfig]] then the actor will ignore the router part of the deployment section
+ * Wraps a [[pekko.actor.Props]] to mark the actor as externally configurable to be used with a router.
+ * If a [[pekko.actor.Props]] is not wrapped with [[FromConfig]] then the actor will ignore the router part of the deployment section
  * in the configuration.
  */
 case object FromConfig extends FromConfig {
@@ -286,8 +287,8 @@ case object FromConfig extends FromConfig {
 }
 
 /**
- * Java API: Wraps a [[akka.actor.Props]] to mark the actor as externally configurable to be used with a router.
- * If a [[akka.actor.Props]] is not wrapped with [[FromConfig]] then the actor will ignore the router part of the deployment section
+ * Java API: Wraps a [[pekko.actor.Props]] to mark the actor as externally configurable to be used with a router.
+ * If a [[pekko.actor.Props]] is not wrapped with [[FromConfig]] then the actor will ignore the router part of the deployment section
  * in the configuration.
  *
  * This can be used when the dispatcher to be used for the head Router needs to be configured
@@ -308,7 +309,7 @@ class FromConfig(
   /**
    * INTERNAL API
    */
-  override private[akka] def createRouterActor(): RouterActor =
+  override private[pekko] def createRouterActor(): RouterActor =
     throw new UnsupportedOperationException("FromConfig must not create RouterActor")
 
   override def verifyConfig(path: ActorPath): Unit =
@@ -336,7 +337,7 @@ class FromConfig(
   override def nrOfInstances(sys: ActorSystem): Int = 0
 
   /**
-   * [[akka.actor.Props]] for a group router based on the settings defined by
+   * [[pekko.actor.Props]] for a group router based on the settings defined by
    * this instance.
    */
   def props(): Props = Props.empty.withRouter(this)
@@ -359,10 +360,10 @@ case object NoRouter extends NoRouter {
   /**
    * INTERNAL API
    */
-  override private[akka] def createRouterActor(): RouterActor =
+  override private[pekko] def createRouterActor(): RouterActor =
     throw new UnsupportedOperationException("NoRouter must not create RouterActor")
   override def routerDispatcher: String = throw new UnsupportedOperationException("NoRouter has no dispatcher")
-  override def withFallback(other: akka.routing.RouterConfig): akka.routing.RouterConfig = other
+  override def withFallback(other: pekko.routing.RouterConfig): pekko.routing.RouterConfig = other
 
   /**
    * Java API: get the singleton instance
@@ -378,7 +379,7 @@ case object NoRouter extends NoRouter {
  */
 @nowarn("msg=@SerialVersionUID has no effect")
 @SerialVersionUID(1L)
-private[akka] trait RouterManagementMesssage
+private[pekko] trait RouterManagementMesssage
 
 /**
  * Sending this message to a router will make it send back its currently used routees.
@@ -407,7 +408,7 @@ final case class Routees(routees: immutable.IndexedSeq[Routee]) {
    * Java API
    */
   def getRoutees: java.util.List[Routee] = {
-    import akka.util.ccompat.JavaConverters._
+    import org.apache.pekko.util.ccompat.JavaConverters._
     routees.asJava
   }
 }
@@ -423,7 +424,7 @@ final case class AddRoutee(routee: Routee) extends RouterManagementMesssage
  * Remove a specific routee by sending this message to the router.
  * It may be handled after other messages.
  *
- * For a pool, with child routees, the routee is stopped by sending a [[akka.actor.PoisonPill]]
+ * For a pool, with child routees, the routee is stopped by sending a [[pekko.actor.PoisonPill]]
  * to the routee. Precautions are taken reduce the risk of dropping messages that are concurrently
  * being routed to the removed routee, but there are no guarantees.
  */
@@ -436,7 +437,7 @@ final case class RemoveRoutee(routee: Routee) extends RouterManagementMesssage
  *
  * Positive `change` will add that number of routees to the [[Pool]].
  * Negative `change` will remove that number of routees from the [[Pool]].
- * Routees are stopped by sending a [[akka.actor.PoisonPill]] to the routee.
+ * Routees are stopped by sending a [[pekko.actor.PoisonPill]] to the routee.
  * Precautions are taken reduce the risk of dropping messages that are concurrently
  * being routed to the removed routee, but it is not guaranteed that messages are not
  * lost.
diff --git a/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala
similarity index 84%
rename from akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala
index cd06511dbe..452b28572a 100644
--- a/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.util.concurrent.TimeoutException
 
@@ -13,23 +13,24 @@ import scala.concurrent.duration.FiniteDuration
 
 import com.typesafe.config.Config
 
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.SupervisorStrategy
-import akka.dispatch.Dispatchers
-import akka.dispatch.ExecutionContexts
-import akka.japi.Util.immutableSeq
-import akka.pattern.ask
-import akka.pattern.pipe
-import akka.util.Helpers.ConfigOps
-import akka.util.JavaDurationConverters._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.SupervisorStrategy
+import pekko.dispatch.Dispatchers
+import pekko.dispatch.ExecutionContexts
+import pekko.japi.Util.immutableSeq
+import pekko.pattern.ask
+import pekko.pattern.pipe
+import pekko.util.Helpers.ConfigOps
+import pekko.util.JavaDurationConverters._
+import pekko.util.Timeout
 
 /**
  * Broadcasts the message to all routees, and replies with the first response.
  *
  * @param within expecting at least one reply within this duration, otherwise
- *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+ *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
  */
 @SerialVersionUID(1L)
 final case class ScatterGatherFirstCompletedRoutingLogic(within: FiniteDuration) extends RoutingLogic {
@@ -41,7 +42,7 @@ final case class ScatterGatherFirstCompletedRoutingLogic(within: FiniteDuration)
  * INTERNAL API
  */
 @SerialVersionUID(1L)
-private[akka] final case class ScatterGatherFirstCompletedRoutees(
+private[pekko] final case class ScatterGatherFirstCompletedRoutees(
     routees: immutable.IndexedSeq[Routee],
     within: FiniteDuration)
     extends Routee {
@@ -93,7 +94,7 @@ private[akka] final case class ScatterGatherFirstCompletedRoutees(
  * @param resizer optional resizer that dynamically adjust the pool size
  *
  * @param within expecting at least one reply within this duration, otherwise
- *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+ *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
  *
  * @param supervisorStrategy strategy for supervising the routees, see 'Supervision Setup'
  *
@@ -122,7 +123,7 @@ final case class ScatterGatherFirstCompletedPool(
    * Java API
    * @param nr initial number of routees in the pool
    * @param within expecting at least one reply within this duration, otherwise
-   *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+   *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
    */
   def this(nr: Int, within: FiniteDuration) = this(nrOfInstances = nr, within = within)
 
@@ -130,7 +131,7 @@ final case class ScatterGatherFirstCompletedPool(
    * Java API
    * @param nr initial number of routees in the pool
    * @param within expecting at least one reply within this duration, otherwise
-   *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+   *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
    */
   def this(nr: Int, within: java.time.Duration) = this(nr, within.asScala)
 
@@ -172,10 +173,10 @@ final case class ScatterGatherFirstCompletedPool(
  * the router is defined in the configuration file for the actor being used.
  *
  * @param paths string representation of the actor paths of the routees, messages are
- *   sent with [[akka.actor.ActorSelection]] to these paths
+ *   sent with [[pekko.actor.ActorSelection]] to these paths
  *
  * @param within expecting at least one reply within this duration, otherwise
- *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+ *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
  *
  * @param routerDispatcher dispatcher to use for the router head actor, which handles
  *   router management messages
@@ -193,9 +194,9 @@ final case class ScatterGatherFirstCompletedGroup(
   /**
    * Java API
    * @param routeePaths string representation of the actor paths of the routees, messages are
-   *   sent with [[akka.actor.ActorSelection]] to these paths
+   *   sent with [[pekko.actor.ActorSelection]] to these paths
    * @param within expecting at least one reply within this duration, otherwise
-   *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+   *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
    */
   def this(routeePaths: java.lang.Iterable[String], within: FiniteDuration) =
     this(paths = immutableSeq(routeePaths), within = within)
@@ -203,9 +204,9 @@ final case class ScatterGatherFirstCompletedGroup(
   /**
    * Java API
    * @param routeePaths string representation of the actor paths of the routees, messages are
-   *   sent with [[akka.actor.ActorSelection]] to these paths
+   *   sent with [[pekko.actor.ActorSelection]] to these paths
    * @param within expecting at least one reply within this duration, otherwise
-   *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+   *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
    */
   def this(routeePaths: java.lang.Iterable[String], within: java.time.Duration) =
     this(immutableSeq(routeePaths), within.asScala)
diff --git a/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala
index 0ce5ab9b79..0481292d5a 100644
--- a/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -12,11 +12,12 @@ import scala.collection.immutable
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor.ActorCell
-import akka.actor.ActorRefWithCell
-import akka.actor.ActorSystem
-import akka.actor.SupervisorStrategy
-import akka.dispatch.Dispatchers
+import org.apache.pekko
+import pekko.actor.ActorCell
+import pekko.actor.ActorRefWithCell
+import pekko.actor.ActorSystem
+import pekko.actor.SupervisorStrategy
+import pekko.dispatch.Dispatchers
 
 object SmallestMailboxRoutingLogic {
   def apply(): SmallestMailboxRoutingLogic = new SmallestMailboxRoutingLogic
diff --git a/akka-actor/src/main/scala/akka/routing/TailChopping.scala b/akka-actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala
similarity index 86%
rename from akka-actor/src/main/scala/akka/routing/TailChopping.scala
rename to akka-actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala
index 921fb9fdac..170c807c4d 100644
--- a/akka-actor/src/main/scala/akka/routing/TailChopping.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.routing
+package org.apache.pekko.routing
 
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -13,20 +13,21 @@ import scala.util.Random
 
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.dispatch.Dispatchers
-import akka.japi.Util.immutableSeq
-import akka.pattern.{ ask, pipe, AskTimeoutException }
-import akka.util.Helpers.ConfigOps
-import akka.util.JavaDurationConverters._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor._
+import pekko.dispatch.Dispatchers
+import pekko.japi.Util.immutableSeq
+import pekko.pattern.{ ask, pipe, AskTimeoutException }
+import pekko.util.Helpers.ConfigOps
+import pekko.util.JavaDurationConverters._
+import pekko.util.Timeout
 
 /**
  * As each message is sent to the router, the routees are randomly ordered. The message is sent to the
  * first routee. If no response is received before the `interval` has passed, the same message is sent
  * to the next routee. This process repeats until either a response is received from some routee, the
  * routees in the pool are exhausted, or the `within` duration has passed since the first send. If no
- * routee sends a response in time, a [[akka.actor.Status.Failure]] wrapping a [[akka.pattern.AskTimeoutException]]
+ * routee sends a response in time, a [[pekko.actor.Status.Failure]] wrapping a [[pekko.pattern.AskTimeoutException]]
  * is sent to the sender.
  *
  * The goal of this routing algorithm is to decrease tail latencies ("chop off the tail latency") in situations
@@ -40,7 +41,7 @@ import akka.util.Timeout
  * @param scheduler schedules sending messages to routees
  *
  * @param within expecting at least one reply within this duration, otherwise
- *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+ *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
  *
  * @param interval duration after which the message will be sent to the next routee
  *
@@ -63,7 +64,7 @@ final case class TailChoppingRoutingLogic(
  * INTERNAL API
  */
 @SerialVersionUID(1L)
-private[akka] final case class TailChoppingRoutees(
+private[pekko] final case class TailChoppingRoutees(
     scheduler: Scheduler,
     routees: immutable.IndexedSeq[Routee],
     within: FiniteDuration,
@@ -111,10 +112,10 @@ private[akka] final case class TailChoppingRoutees(
  * before the `interval` has passed, the same message is sent to the next routee. This process repeats
  * until either a response is received from some routee, the routees in the pool are exhausted, or
  * the `within` duration has passed since the first send. If no routee sends
- * a response in time, a [[akka.actor.Status.Failure]] wrapping a [[akka.pattern.AskTimeoutException]]
+ * a response in time, a [[pekko.actor.Status.Failure]] wrapping a [[pekko.pattern.AskTimeoutException]]
  * is sent to the sender.
  *
- * Refer to [[akka.routing.TailChoppingRoutingLogic]] for comments regarding the goal of this
+ * Refer to [[pekko.routing.TailChoppingRoutingLogic]] for comments regarding the goal of this
  * routing algorithm.
  *
  * The configuration parameter trumps the constructor arguments. This means that
@@ -140,7 +141,7 @@ private[akka] final case class TailChoppingRoutees(
  * @param resizer optional resizer that dynamically adjust the pool size
  *
  * @param within expecting at least one reply within this duration, otherwise
- *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+ *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
  *
  * @param interval duration after which the message will be sent to the next routee
  *
@@ -173,7 +174,7 @@ final case class TailChoppingPool(
    * Java API
    * @param nr initial number of routees in the pool
    * @param within expecting at least one reply within this duration, otherwise
-   *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+   *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
    * @param interval duration after which next routee will be picked
    */
   def this(nr: Int, within: FiniteDuration, interval: FiniteDuration) =
@@ -183,7 +184,7 @@ final case class TailChoppingPool(
    * Java API
    * @param nr initial number of routees in the pool
    * @param within expecting at least one reply within this duration, otherwise
-   *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+   *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
    * @param interval duration after which next routee will be picked
    */
   def this(nr: Int, within: java.time.Duration, interval: java.time.Duration) =
@@ -227,10 +228,10 @@ final case class TailChoppingPool(
  * before the `interval` has passed, the same message is sent to the next routee. This process repeats
  * until either a response is received from some routee, the routees in the group are exhausted, or
  * the `within` duration has passed since the first send. If no routee sends
- * a response in time, a [[akka.actor.Status.Failure]] wrapping a [[akka.pattern.AskTimeoutException]]
+ * a response in time, a [[pekko.actor.Status.Failure]] wrapping a [[pekko.pattern.AskTimeoutException]]
  * is sent to the sender.
  *
- * Refer to [[akka.routing.TailChoppingRoutingLogic]] for comments regarding the goal of this
+ * Refer to [[pekko.routing.TailChoppingRoutingLogic]] for comments regarding the goal of this
  * routing algorithm.
  *
  * The configuration parameter trumps the constructor arguments. This means that
@@ -238,10 +239,10 @@ final case class TailChoppingPool(
  * the router is defined in the configuration file for the actor being used.
  *
  * @param paths string representation of the actor paths of the routees, messages are
- *   sent with [[akka.actor.ActorSelection]] to these paths
+ *   sent with [[pekko.actor.ActorSelection]] to these paths
  *
  * @param within expecting at least one reply within this duration, otherwise
- *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+ *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
  *
  * @param interval duration after which the message will be sent to the next routee
  *
@@ -264,9 +265,9 @@ final case class TailChoppingGroup(
   /**
    * Java API
    * @param routeePaths string representation of the actor paths of the routees, messages are
-   *   sent with [[akka.actor.ActorSelection]] to these paths
+   *   sent with [[pekko.actor.ActorSelection]] to these paths
    * @param within expecting at least one reply within this duration, otherwise
-   *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+   *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
    * @param interval duration after which next routee will be picked
    */
   def this(routeePaths: java.lang.Iterable[String], within: FiniteDuration, interval: FiniteDuration) =
@@ -275,9 +276,9 @@ final case class TailChoppingGroup(
   /**
    * Java API
    * @param routeePaths string representation of the actor paths of the routees, messages are
-   *   sent with [[akka.actor.ActorSelection]] to these paths
+   *   sent with [[pekko.actor.ActorSelection]] to these paths
    * @param within expecting at least one reply within this duration, otherwise
-   *   it will reply with [[akka.pattern.AskTimeoutException]] in a [[akka.actor.Status.Failure]]
+   *   it will reply with [[pekko.pattern.AskTimeoutException]] in a [[pekko.actor.Status.Failure]]
    * @param interval duration after which next routee will be picked
    */
   def this(routeePaths: java.lang.Iterable[String], within: java.time.Duration, interval: java.time.Duration) =
diff --git a/akka-actor/src/main/scala/akka/serialization/AsyncSerializer.scala b/akka-actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/serialization/AsyncSerializer.scala
rename to akka-actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
index f0a04f97ea..4caab6b022 100644
--- a/akka-actor/src/main/scala/akka/serialization/AsyncSerializer.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.serialization
+package org.apache.pekko.serialization
 
 import java.util.concurrent.CompletionStage
 
 import scala.concurrent.{ Await, Future }
 import scala.concurrent.duration.Duration
 
-import akka.actor.ExtendedActorSystem
-import akka.event.Logging
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.event.Logging
 
 /**
  * Serializer that supports async serialization.
diff --git a/akka-actor/src/main/scala/akka/serialization/PrimitiveSerializers.scala b/akka-actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala
similarity index 90%
rename from akka-actor/src/main/scala/akka/serialization/PrimitiveSerializers.scala
rename to akka-actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala
index f2e5f6d8a9..e93c1fb459 100644
--- a/akka-actor/src/main/scala/akka/serialization/PrimitiveSerializers.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.serialization
+package org.apache.pekko.serialization
 
 import java.nio.{ BufferOverflowException, ByteBuffer }
 
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.InternalApi
+import pekko.util.ByteString
 
 /**
  * INTERNAL API: only public by configuration
  */
-@InternalApi private[akka] final class LongSerializer(val system: ExtendedActorSystem)
+@InternalApi private[pekko] final class LongSerializer(val system: ExtendedActorSystem)
     extends Serializer
     with ByteBufferSerializer {
   override def includeManifest: Boolean = false
@@ -55,7 +56,7 @@ import akka.util.ByteString
 /**
  * INTERNAL API: only public by configuration
  */
-@InternalApi private[akka] final class IntSerializer(val system: ExtendedActorSystem)
+@InternalApi private[pekko] final class IntSerializer(val system: ExtendedActorSystem)
     extends Serializer
     with ByteBufferSerializer {
   override def includeManifest: Boolean = false
@@ -93,7 +94,7 @@ import akka.util.ByteString
 /**
  * INTERNAL API: only public by configuration
  */
-@InternalApi private[akka] final class StringSerializer(val system: ExtendedActorSystem)
+@InternalApi private[pekko] final class StringSerializer(val system: ExtendedActorSystem)
     extends Serializer
     with ByteBufferSerializer {
   override def includeManifest: Boolean = false
@@ -117,7 +118,7 @@ import akka.util.ByteString
 /**
  * INTERNAL API: only public by configuration
  */
-@InternalApi private[akka] final class ByteStringSerializer(val system: ExtendedActorSystem)
+@InternalApi private[pekko] final class ByteStringSerializer(val system: ExtendedActorSystem)
     extends Serializer
     with ByteBufferSerializer {
   override def includeManifest: Boolean = false
@@ -151,7 +152,7 @@ import akka.util.ByteString
 /**
  * INTERNAL API: only public by configuration
  */
-@InternalApi private[akka] final class BooleanSerializer(val system: ExtendedActorSystem)
+@InternalApi private[pekko] final class BooleanSerializer(val system: ExtendedActorSystem)
     extends Serializer
     with ByteBufferSerializer {
 
diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/serialization/Serialization.scala
rename to akka-actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
index 65e3ae8c67..462bd355ad 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.serialization
+package org.apache.pekko.serialization
 
 import java.io.NotSerializableException
 import java.nio.ByteBuffer
@@ -19,10 +19,11 @@ import scala.util.control.NonFatal
 
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.annotation.InternalApi
-import akka.event.{ LogMarker, Logging, LoggingAdapter }
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.InternalApi
+import pekko.event.{ LogMarker, Logging, LoggingAdapter }
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object Serialization {
@@ -37,7 +38,7 @@ object Serialization {
    * serializing local actor refs, or if serializer library e.g. custom serializer/deserializer in
    * Jackson need access to the current `ActorSystem`.
    */
-  @InternalApi private[akka] val currentTransportInformation = new DynamicVariable[Information](null)
+  @InternalApi private[pekko] val currentTransportInformation = new DynamicVariable[Information](null)
 
   class Settings(val config: Config) {
     val Serializers: Map[String, String] = configToMap(config.getConfig("akka.actor.serializers"))
@@ -47,7 +48,7 @@ object Serialization {
     }
 
     private final def configToMap(cfg: Config): Map[String, String] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       cfg.root.unwrapped.asScala.toMap.map { case (k, v) => k -> v.toString }
     }
   }
@@ -146,7 +147,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
   private val manifestCache = new AtomicReference[Map[String, Option[Class[_]]]](Map.empty[String, Option[Class[_]]])
 
   /** INTERNAL API */
-  @InternalApi private[akka] def serializationInformation: Serialization.Information =
+  @InternalApi private[pekko] def serializationInformation: Serialization.Information =
     system.provider.serializationInformation
 
   private def withTransportInformation[T](f: () => T): T = {
@@ -288,7 +289,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
   /**
    * Returns the Serializer configured for the given object, returns the NullSerializer if it's null.
    *
-   * Throws akka.ConfigurationException if no `serialization-bindings` is configured for the
+   * Throws org.apache.pekko.ConfigurationException if no `serialization-bindings` is configured for the
    *   class of the object.
    */
   def findSerializerFor(o: AnyRef): Serializer =
@@ -370,7 +371,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
 
   /**
    * Tries to load the specified Serializer by the fully-qualified name; the actual
-   * loading is performed by the system’s [[akka.actor.DynamicAccess]].
+   * loading is performed by the system’s [[pekko.actor.DynamicAccess]].
    */
   def serializerOf(serializerFQN: String): Try[Serializer] = {
     serializerOf(bindingName = "", serializerFQN) // for backwards compatibility since it's a public method
@@ -378,7 +379,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
 
   /**
    * Tries to load the specified Serializer by the fully-qualified name; the actual
-   * loading is performed by the system’s [[akka.actor.DynamicAccess]].
+   * loading is performed by the system’s [[pekko.actor.DynamicAccess]].
    */
   private def serializerOf(bindingName: String, serializerFQN: String): Try[Serializer] = {
     // We override each instantiation of the JavaSerializer with the "disabled" serializer which will log warnings if used.
@@ -420,8 +421,8 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
     }
 
   /**
-   * A Map of serializer from alias to implementation (class implementing akka.serialization.Serializer)
-   * By default always contains the following mapping: "java" -> akka.serialization.JavaSerializer
+   * A Map of serializer from alias to implementation (class implementing org.apache.pekko.serialization.Serializer)
+   * By default always contains the following mapping: "java" -> org.apache.pekko.serialization.JavaSerializer
    */
   private val serializers: Map[String, Serializer] = {
     val fromConfig = for ((k: String, v: String) <- settings.Serializers) yield k -> serializerOf(k, v).get
@@ -434,7 +435,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
    *  bindings is a Seq of tuple representing the mapping from Class to Serializer.
    *  It is primarily ordered by the most specific classes first, and secondly in the configured order.
    */
-  private[akka] val bindings: immutable.Seq[ClassSerializer] = {
+  private[pekko] val bindings: immutable.Seq[ClassSerializer] = {
     val fromConfig = for {
       (className: String, alias: String) <- settings.SerializationBindings
       if alias != "none" && checkGoogleProtobuf(className) && checkAkkaProtobuf(className)
@@ -457,11 +458,11 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
   }
 
   private def warnUnexpectedNonAkkaSerializer(clazz: Class[_], ser: Serializer): Boolean = {
-    if (clazz.getName.startsWith("akka.") && !ser.getClass.getName.startsWith("akka.")) {
+    if (clazz.getName.startsWith("org.apache.pekko.") && !ser.getClass.getName.startsWith("org.apache.pekko.")) {
       log.warning(
         "Using serializer [{}] for message [{}]. Note that this serializer " +
-        "is not implemented by Akka. It's not recommended to replace serializers for messages " +
-        "provided by Akka.",
+        "is not implemented by Pekko. It's not recommended to replace serializers for messages " +
+        "provided by Pekko.",
         ser.getClass.getName,
         clazz.getName)
       true
@@ -476,7 +477,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
 
   // akka-protobuf is now not a dependency of remote so only load if user has explicitly added it
   // remove in 2.7
-  private def checkAkkaProtobuf(className: String): Boolean = checkClass("akka.protobuf", className)
+  private def checkAkkaProtobuf(className: String): Boolean = checkClass("org.apache.pekko.protobuf", className)
 
   private def checkClass(prefix: String, className: String): Boolean =
     !className.startsWith(prefix) || system.dynamicAccess.getClassFor[Any](className).isSuccess
@@ -559,7 +560,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def shouldWarnAboutJavaSerializer(serializedClass: Class[_], serializer: Serializer) = {
+  @InternalApi private[pekko] def shouldWarnAboutJavaSerializer(serializedClass: Class[_], serializer: Serializer) = {
 
     def suppressWarningOnNonSerializationVerification(serializedClass: Class[_]) = {
       // suppressed, only when warn-on-no-serialization-verification = off, and extending NoSerializationVerificationNeeded
@@ -568,7 +569,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
 
     isJavaSerializationWarningEnabled &&
     (serializer.isInstanceOf[JavaSerializer] || serializer.isInstanceOf[DisabledJavaSerializer]) &&
-    !serializedClass.getName.startsWith("akka.") &&
+    !serializedClass.getName.startsWith("org.apache.pekko.") &&
     !serializedClass.getName.startsWith("java.lang.") &&
     !suppressWarningOnNonSerializationVerification(serializedClass)
   }
diff --git a/akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala b/akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
similarity index 75%
rename from akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala
rename to akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
index 992c1c3cf1..886de23318 100644
--- a/akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.serialization
+package org.apache.pekko.serialization
 
-import akka.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider }
-import akka.actor.ClassicActorSystemProvider
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider }
+import pekko.actor.ClassicActorSystemProvider
 
 /**
  * SerializationExtension is an Akka Extension to interact with the Serialization
diff --git a/akka-actor/src/main/scala/akka/serialization/SerializationSetup.scala b/akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala
similarity index 89%
rename from akka-actor/src/main/scala/akka/serialization/SerializationSetup.scala
rename to akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala
index 2a7684347a..f19cb4cf2c 100644
--- a/akka-actor/src/main/scala/akka/serialization/SerializationSetup.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.serialization
+package org.apache.pekko.serialization
 
 import scala.collection.immutable
 
-import akka.actor.ExtendedActorSystem
-import akka.actor.setup.Setup
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.setup.Setup
+import pekko.util.ccompat.JavaConverters._
 
 object SerializationSetup {
 
@@ -24,7 +25,7 @@ object SerializationSetup {
    * Java API: Programmatic definition of serializers
    * @param createSerializers create pairs of serializer and the set of classes it should be used for
    */
-  def create(createSerializers: akka.japi.Function[ExtendedActorSystem, java.util.List[SerializerDetails]])
+  def create(createSerializers: pekko.japi.Function[ExtendedActorSystem, java.util.List[SerializerDetails]])
       : SerializationSetup =
     apply(sys => createSerializers(sys).asScala.toVector)
 
diff --git a/akka-actor/src/main/scala/akka/serialization/Serializer.scala b/akka-actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
similarity index 91%
rename from akka-actor/src/main/scala/akka/serialization/Serializer.scala
rename to akka-actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
index cf77c5d530..b01931ea56 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serializer.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.serialization
+package org.apache.pekko.serialization
 
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
@@ -14,28 +14,29 @@ import java.util.concurrent.Callable
 import scala.util.DynamicVariable
 import scala.util.control.NoStackTrace
 
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.event.LogMarker
-import akka.event.Logging
-import akka.util.ClassLoaderObjectInputStream
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.InternalApi
+import pekko.event.LogMarker
+import pekko.event.Logging
+import pekko.util.ClassLoaderObjectInputStream
 
 /**
  * A Serializer represents a bimap between an object and an array of bytes representing that object.
  *
- * Serializers are loaded using reflection during [[akka.actor.ActorSystem]]
+ * Serializers are loaded using reflection during [[pekko.actor.ActorSystem]]
  * start-up, where two constructors are tried in order:
  *
  * 
      
- * 
    • taking exactly one argument of type [[akka.actor.ExtendedActorSystem]];
+ * 
    • taking exactly one argument of type [[pekko.actor.ExtendedActorSystem]];
  * this should be the preferred one because all reflective loading of classes
  * during deserialization should use ExtendedActorSystem.dynamicAccess (see
- * [[akka.actor.DynamicAccess]]), and
      • 
+ * [[pekko.actor.DynamicAccess]]), and
  * 
    • without arguments, which is only an option if the serializer does not
  * load classes using reflection.
      • 
  * 
    
  *
- * Be sure to always use the [[akka.actor.DynamicAccess]] for loading classes! This is necessary to
+ * Be sure to always use the [[pekko.actor.DynamicAccess]] for loading classes! This is necessary to
  * avoid strange match errors and inequalities which arise from different class loaders loading
  * the same class.
  */
@@ -103,15 +104,15 @@ object Serializers {
  * system you change to `SerializerWithStringManifest` the manifest string will be the full class name if
  * you used `includeManifest=true`, otherwise it will be the empty string.
  *
- * Serializers are loaded using reflection during [[akka.actor.ActorSystem]]
+ * Serializers are loaded using reflection during [[pekko.actor.ActorSystem]]
  * start-up, where two constructors are tried in order:
  *
  * 
      
- * 
    • taking exactly one argument of type [[akka.actor.ExtendedActorSystem]], and
      • 
+ * 
    • taking exactly one argument of type [[pekko.actor.ExtendedActorSystem]], and
      • 
  * 
    • without arguments
      • 
  * 
    
  *
- * Be sure to always use the [[akka.actor.DynamicAccess]] for loading classes! This is necessary to
+ * Be sure to always use the [[pekko.actor.DynamicAccess]] for loading classes! This is necessary to
  * avoid strange match errors and inequalities which arise from different class loaders loading
  * the same class.
  */
@@ -175,7 +176,7 @@ abstract class SerializerWithStringManifest extends Serializer {
  * like this:
  * {{{
  *   // you need to know the maximum size in bytes of the serialized messages
- *   val pool = new akka.io.DirectByteBufferPool(defaultBufferSize = 1024 * 1024, maxPoolEntries = 10)
+ *   val pool = new org.apache.pekko.io.DirectByteBufferPool(defaultBufferSize = 1024 * 1024, maxPoolEntries = 10)
  *
  *  // Implement this method for compatibility with `SerializerWithStringManifest`.
  *  override def toBinary(o: AnyRef): Array[Byte] = {
@@ -230,7 +231,7 @@ trait BaseSerializer extends Serializer {
    * Configuration namespace of serialization identifiers in the `reference.conf`.
    *
    * Each serializer implementation must have an entry in the following format:
-   * `akka.actor.serialization-identifiers."FQCN" = ID`
+   * `org.apache.pekko.actor.serialization-identifiers."FQCN" = ID`
    * where `FQCN` is fully qualified class name of the serializer implementation
    * and `ID` is globally unique serializer identifier number.
    */
@@ -247,7 +248,7 @@ trait BaseSerializer extends Serializer {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def identifierFromConfig: Int =
+  private[pekko] def identifierFromConfig: Int =
     BaseSerializer.identifierFromConfig(getClass, system)
 }
 object BaseSerializer {
@@ -256,7 +257,7 @@ object BaseSerializer {
    * Configuration namespace of serialization identifiers in the `reference.conf`.
    *
    * Each serializer implementation must have an entry in the following format:
-   * `akka.actor.serialization-identifiers."FQCN" = ID`
+   * `org.apache.pekko.actor.serialization-identifiers."FQCN" = ID`
    * where `FQCN` is fully qualified class name of the serializer implementation
    * and `ID` is globally unique serializer identifier number.
    */
@@ -264,18 +265,18 @@ object BaseSerializer {
 
   /** INTERNAL API */
   @InternalApi
-  private[akka] def identifierFromConfig(clazz: Class[_], system: ExtendedActorSystem): Int =
+  private[pekko] def identifierFromConfig(clazz: Class[_], system: ExtendedActorSystem): Int =
     system.settings.config.getInt(s"""$SerializationIdentifiers."${clazz.getName}"""")
 
   /** INTERNAL API */
   @InternalApi
-  private[akka] def identifierFromConfig(bindingName: String, system: ExtendedActorSystem): Int =
+  private[pekko] def identifierFromConfig(bindingName: String, system: ExtendedActorSystem): Int =
     system.settings.config.getInt(s"""$SerializationIdentifiers."$bindingName"""")
 }
 
 /**
  * Java API for creating a Serializer: make sure to include a constructor which
- * takes exactly one argument of type [[akka.actor.ExtendedActorSystem]], because
+ * takes exactly one argument of type [[pekko.actor.ExtendedActorSystem]], because
  * that is the preferred constructor which will be invoked when reflectively instantiating
  * the JSerializer (also possible with empty constructor).
  */
@@ -352,7 +353,7 @@ class JavaSerializer(val system: ExtendedActorSystem) extends BaseSerializer {
 }
 
 /**
- * This Serializer is used when `akka.actor.java-serialization = off`
+ * This Serializer is used when `org.apache.pekko.actor.java-serialization = off`
  */
 final case class DisabledJavaSerializer(system: ExtendedActorSystem) extends Serializer with ByteBufferSerializer {
   import DisabledJavaSerializer._
diff --git a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala b/akka-actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
similarity index 99%
rename from akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
index dff4ee99b1..9b7ea91b0c 100644
--- a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.{ AbstractQueue, Collection, Iterator, Queue }
 import java.util.concurrent.{ BlockingQueue, TimeUnit }
diff --git a/akka-actor/src/main/scala/akka/util/BoxedType.scala b/akka-actor/src/main/scala/org/apache/pekko/util/BoxedType.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/util/BoxedType.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/BoxedType.scala
index eaeb49b685..ef443eb514 100644
--- a/akka-actor/src/main/scala/akka/util/BoxedType.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/BoxedType.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 object BoxedType {
   import java.{ lang => jl }
diff --git a/akka-actor/src/main/scala/akka/util/ClassLoaderObjectInputStream.scala b/akka-actor/src/main/scala/org/apache/pekko/util/ClassLoaderObjectInputStream.scala
similarity index 96%
rename from akka-actor/src/main/scala/akka/util/ClassLoaderObjectInputStream.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/ClassLoaderObjectInputStream.scala
index df0c394452..442576b961 100644
--- a/akka-actor/src/main/scala/akka/util/ClassLoaderObjectInputStream.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/ClassLoaderObjectInputStream.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.io.{ InputStream, ObjectInputStream, ObjectStreamClass }
 
diff --git a/akka-actor/src/main/scala/akka/util/Collections.scala b/akka-actor/src/main/scala/org/apache/pekko/util/Collections.scala
similarity index 96%
rename from akka-actor/src/main/scala/akka/util/Collections.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/Collections.scala
index f5d7468ac0..93a1d14c89 100644
--- a/akka-actor/src/main/scala/akka/util/Collections.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/Collections.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import scala.annotation.tailrec
 import scala.collection.immutable
@@ -10,7 +10,7 @@ import scala.collection.immutable
 /**
  * INTERNAL API
  */
-private[akka] object Collections {
+private[pekko] object Collections {
 
   case object EmptyImmutableSeq extends immutable.Seq[Nothing] {
     override final def iterator = Iterator.empty
diff --git a/akka-actor/src/main/scala/akka/util/ConstantFun.scala b/akka-actor/src/main/scala/org/apache/pekko/util/ConstantFun.scala
similarity index 89%
rename from akka-actor/src/main/scala/akka/util/ConstantFun.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/ConstantFun.scala
index 826a1c0316..507ba6bd29 100644
--- a/akka-actor/src/main/scala/akka/util/ConstantFun.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/ConstantFun.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.annotation.InternalApi
-import akka.japi.{ Pair => JPair }
-import akka.japi.function.{ Function => JFun, Function2 => JFun2 }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.japi.{ Pair => JPair }
+import pekko.japi.function.{ Function => JFun, Function2 => JFun2 }
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ConstantFun {
+@InternalApi private[pekko] object ConstantFun {
 
   private[this] val JavaIdentityFunction = new JFun[Any, Any] {
     @throws(classOf[Exception]) override def apply(param: Any): Any = param
diff --git a/akka-actor/src/main/scala/akka/util/DoubleLinkedList.scala b/akka-actor/src/main/scala/org/apache/pekko/util/DoubleLinkedList.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/util/DoubleLinkedList.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/DoubleLinkedList.scala
index 7c10e4a1b9..0d2f312848 100644
--- a/akka-actor/src/main/scala/akka/util/DoubleLinkedList.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/DoubleLinkedList.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 import scala.collection.AbstractIterator
 
@@ -14,7 +14,7 @@ import scala.collection.AbstractIterator
  * Mutable non-thread-safe double-linked list abstraction, with a flexible node type.
  */
 @InternalApi
-private[akka] final class DoubleLinkedList[Node](
+private[pekko] final class DoubleLinkedList[Node](
     getPrevious: Node => OptionVal[Node],
     getNext: Node => OptionVal[Node],
     setPrevious: (Node, OptionVal[Node]) => Unit,
diff --git a/akka-actor/src/main/scala/akka/util/ErrorMessages.scala b/akka-actor/src/main/scala/org/apache/pekko/util/ErrorMessages.scala
similarity index 73%
rename from akka-actor/src/main/scala/akka/util/ErrorMessages.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/ErrorMessages.scala
index 3b1c34d24f..0d38289518 100644
--- a/akka-actor/src/main/scala/akka/util/ErrorMessages.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/ErrorMessages.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 /**
  * INTERNAL API
  */
-private[akka] object ErrorMessages {
+private[pekko] object ErrorMessages {
   val RemoteDeploymentConfigErrorPrefix = "configuration requested remote deployment"
 }
diff --git a/akka-actor/src/main/scala/akka/util/FlightRecorderLoader.scala b/akka-actor/src/main/scala/org/apache/pekko/util/FlightRecorderLoader.scala
similarity index 82%
rename from akka-actor/src/main/scala/akka/util/FlightRecorderLoader.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/FlightRecorderLoader.scala
index 15c066cab2..965592e837 100644
--- a/akka-actor/src/main/scala/akka/util/FlightRecorderLoader.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/FlightRecorderLoader.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 import scala.reflect.ClassTag
 import scala.util.{ Failure, Success }
 
-import akka.actor.{ ClassicActorSystemProvider, ExtendedActorSystem }
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.{ ClassicActorSystemProvider, ExtendedActorSystem }
+import pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object FlightRecorderLoader {
+private[pekko] object FlightRecorderLoader {
   def load[T: ClassTag](casp: ClassicActorSystemProvider, fqcn: String, fallback: T): T = {
     val system = casp.classicSystem.asInstanceOf[ExtendedActorSystem]
     if (JavaVersion.majorVersion >= 11 && system.settings.config.getBoolean("akka.java-flight-recorder.enabled")) {
diff --git a/akka-actor/src/main/scala/akka/util/FrequencyList.scala b/akka-actor/src/main/scala/org/apache/pekko/util/FrequencyList.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/util/FrequencyList.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/FrequencyList.scala
index 28c434c4f1..b8d6b463aa 100644
--- a/akka-actor/src/main/scala/akka/util/FrequencyList.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/FrequencyList.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 import scala.collection.{ immutable, mutable }
 import scala.concurrent.duration.FiniteDuration
@@ -13,7 +13,7 @@ import scala.concurrent.duration.FiniteDuration
  * INTERNAL API
  */
 @InternalApi
-private[akka] object FrequencyList {
+private[pekko] object FrequencyList {
   def empty[A](dynamicAging: Boolean = false): FrequencyList[A] =
     new FrequencyList[A](dynamicAging, clock = OptionVal.None)
 
@@ -51,7 +51,7 @@ private[akka] object FrequencyList {
  * Dynamic aging can be enabled for least frequently used policies, to automatically 'age' the whole cache on evictions.
  */
 @InternalApi
-private[akka] final class FrequencyList[A](dynamicAging: Boolean, clock: OptionVal[RecencyList.Clock]) {
+private[pekko] final class FrequencyList[A](dynamicAging: Boolean, clock: OptionVal[RecencyList.Clock]) {
   import FrequencyList.{ FrequencyNode, Node }
 
   private val frequency = new DoubleLinkedList[FrequencyNode[A]](
diff --git a/akka-actor/src/main/scala/akka/util/FrequencySketch.scala b/akka-actor/src/main/scala/org/apache/pekko/util/FrequencySketch.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/util/FrequencySketch.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/FrequencySketch.scala
index 8930ff9b25..a128b8308e 100644
--- a/akka-actor/src/main/scala/akka/util/FrequencySketch.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/FrequencySketch.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 import scala.util.hashing.MurmurHash3
 
@@ -15,7 +15,7 @@ import scala.util.hashing.MurmurHash3
  * The frequency sketch includes the TinyLFU reset operation, which periodically halves all counters.
  */
 @InternalApi
-private[akka] object FrequencySketch {
+private[pekko] object FrequencySketch {
 
   /**
    * Create a new FrequencySketch based on the cache capacity (which will be increased to the nearest power of two).
@@ -96,7 +96,7 @@ private[akka] object FrequencySketch {
  * @param hasher the hash function for the element type
  */
 @InternalApi
-private[akka] final class FrequencySketch[A](
+private[pekko] final class FrequencySketch[A](
     depth: Int,
     width: Int,
     counterBits: Int,
@@ -218,7 +218,7 @@ private[akka] final class FrequencySketch[A](
  * INTERNAL API
  */
 @InternalApi
-private[akka] object FastFrequencySketch {
+private[pekko] object FastFrequencySketch {
 
   /**
    * Create a new FastFrequencySketch based on the cache capacity (which will be increased to the nearest power of two).
@@ -250,7 +250,7 @@ private[akka] object FastFrequencySketch {
  * @param resetSize the size (number of counter increments) to apply the reset operation
  */
 @InternalApi
-private[akka] final class FastFrequencySketch[A](width: Int, resetSize: Int) {
+private[pekko] final class FastFrequencySketch[A](width: Int, resetSize: Int) {
   require(FrequencySketch.Bits.isPowerOfTwo(width), "width must be a power of two")
 
   private final val Depth = 4
@@ -352,7 +352,7 @@ private[akka] final class FastFrequencySketch[A](width: Int, resetSize: Int) {
  * INTERNAL API
  */
 @InternalApi
-private[akka] object FrequencySketchUtil {
+private[pekko] object FrequencySketchUtil {
 
   /**
    * Create a pretty table with all the frequency sketch counters for debugging (smaller) sketches.
diff --git a/akka-actor/src/main/scala/akka/util/HashCode.scala b/akka-actor/src/main/scala/org/apache/pekko/util/HashCode.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/util/HashCode.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/HashCode.scala
index 3eace37756..715d9e3fba 100644
--- a/akka-actor/src/main/scala/akka/util/HashCode.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/HashCode.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.lang.{ Double => JDouble, Float => JFloat }
 import java.lang.reflect.{ Array => JArray }
diff --git a/akka-actor/src/main/scala/akka/util/Helpers.scala b/akka-actor/src/main/scala/org/apache/pekko/util/Helpers.scala
similarity index 96%
rename from akka-actor/src/main/scala/akka/util/Helpers.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/Helpers.scala
index 94db0fadfe..5bdeb7010b 100644
--- a/akka-actor/src/main/scala/akka/util/Helpers.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/Helpers.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.time.{ Instant, LocalDateTime, ZoneId }
 import java.time.format.DateTimeFormatter
@@ -112,7 +112,7 @@ object Helpers {
    *
    * An example adapted from `Predef`'s documentation:
    * {{{
-   * import akka.util.Helpers.Requiring
+   * import org.apache.pekko.util.Helpers.Requiring
    *
    * def addNaturals(nats: List[Int]): Int = {
    *   require(nats forall (_ >= 0), "List contains negative numbers")
@@ -152,7 +152,7 @@ object Helpers {
   /**
    * INTERNAL API
    */
-  private[akka] final implicit class ConfigOps(val config: Config) extends AnyVal {
+  private[pekko] final implicit class ConfigOps(val config: Config) extends AnyVal {
     def getMillisDuration(path: String): FiniteDuration = getDuration(path, TimeUnit.MILLISECONDS)
 
     def getNanosDuration(path: String): FiniteDuration = getDuration(path, TimeUnit.NANOSECONDS)
diff --git a/akka-actor/src/main/scala/akka/util/ImmutableIntMap.scala b/akka-actor/src/main/scala/org/apache/pekko/util/ImmutableIntMap.scala
similarity index 96%
rename from akka-actor/src/main/scala/akka/util/ImmutableIntMap.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/ImmutableIntMap.scala
index 7239b3c617..ab698ed96a 100644
--- a/akka-actor/src/main/scala/akka/util/ImmutableIntMap.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/ImmutableIntMap.scala
@@ -2,17 +2,17 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 import java.util.Arrays
 
 import scala.annotation.tailrec
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ImmutableIntMap {
+@InternalApi private[pekko] object ImmutableIntMap {
   final val empty: ImmutableIntMap = new ImmutableIntMap(Array.emptyIntArray, 0)
 }
 
@@ -22,7 +22,7 @@ import akka.annotation.InternalApi
  * Keys and values are encoded consecutively in a single Int array and does copy-on-write with no
  * structural sharing, it's intended for rather small maps (<1000 elements).
  */
-@InternalApi private[akka] final class ImmutableIntMap private (
+@InternalApi private[pekko] final class ImmutableIntMap private (
     private final val kvs: Array[Int],
     final val size: Int) {
 
diff --git a/akka-actor/src/main/scala/akka/util/Index.scala b/akka-actor/src/main/scala/org/apache/pekko/util/Index.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/util/Index.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/Index.scala
index a28180c810..853e04bdbb 100644
--- a/akka-actor/src/main/scala/akka/util/Index.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/Index.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.Comparator
 import java.util.concurrent.{ ConcurrentHashMap, ConcurrentSkipListSet }
@@ -12,7 +12,7 @@ import scala.collection.JavaConverters.collectionAsScalaIterableConverter
 import annotation.tailrec
 import scala.annotation.nowarn
 
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
 
 /**
  * An implementation of a ConcurrentMultiMap
diff --git a/akka-actor/src/main/scala/akka/util/JavaDurationConverters.scala b/akka-actor/src/main/scala/org/apache/pekko/util/JavaDurationConverters.scala
similarity index 82%
rename from akka-actor/src/main/scala/akka/util/JavaDurationConverters.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/JavaDurationConverters.scala
index ec296aa581..3a3199ad0e 100644
--- a/akka-actor/src/main/scala/akka/util/JavaDurationConverters.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/JavaDurationConverters.scala
@@ -2,18 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 import java.time.{ Duration => JDuration }
 
 import scala.concurrent.duration.{ Duration, FiniteDuration }
 
-import akka.annotation.InternalStableApi
+import org.apache.pekko.annotation.InternalStableApi
 
 /**
  * INTERNAL API
  */
 @InternalStableApi
-private[akka] object JavaDurationConverters {
+private[pekko] object JavaDurationConverters {
   def asFiniteDuration(duration: JDuration): FiniteDuration = duration.asScala
 
   final implicit class JavaDurationOps(val self: JDuration) extends AnyVal {
diff --git a/akka-actor/src/main/scala/akka/util/JavaVersion.scala b/akka-actor/src/main/scala/org/apache/pekko/util/JavaVersion.scala
similarity index 82%
rename from akka-actor/src/main/scala/akka/util/JavaVersion.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/JavaVersion.scala
index aebb47f80e..d6978f5aac 100644
--- a/akka-actor/src/main/scala/akka/util/JavaVersion.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/JavaVersion.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object JavaVersion {
+@InternalApi private[pekko] object JavaVersion {
 
   val majorVersion: Int = {
     // FIXME replace with Runtime.version() when we no longer support Java 8
diff --git a/akka-actor/src/main/scala/akka/util/LineNumbers.scala b/akka-actor/src/main/scala/org/apache/pekko/util/LineNumbers.scala
similarity index 99%
rename from akka-actor/src/main/scala/akka/util/LineNumbers.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/LineNumbers.scala
index 8a1d577a9b..a98b638874 100644
--- a/akka-actor/src/main/scala/akka/util/LineNumbers.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/LineNumbers.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.io.{ DataInputStream, InputStream }
 import java.lang.invoke.SerializedLambda
diff --git a/akka-actor/src/main/scala/akka/util/LockUtil.scala b/akka-actor/src/main/scala/org/apache/pekko/util/LockUtil.scala
similarity index 99%
rename from akka-actor/src/main/scala/akka/util/LockUtil.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/LockUtil.scala
index 5c2c57806c..34b57df1db 100644
--- a/akka-actor/src/main/scala/akka/util/LockUtil.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/LockUtil.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.locks.ReentrantLock
diff --git a/akka-actor/src/main/scala/akka/util/ManifestInfo.scala b/akka-actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/util/ManifestInfo.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala
index 5a8e2b6069..9eebc5d155 100644
--- a/akka-actor/src/main/scala/akka/util/ManifestInfo.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.io.IOException
 import java.util.jar.Attributes
@@ -12,13 +12,14 @@ import scala.collection.immutable
 
 import scala.annotation.nowarn
 
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.event.Logging
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.event.Logging
 
 /**
  * Akka extension that extracts [[ManifestInfo.Version]] information from META-INF/MANIFEST.MF in jar files
@@ -52,7 +53,7 @@ object ManifestInfo extends ExtensionId[ManifestInfo] with ExtensionIdProvider {
    * Comparable version information
    */
   final class Version(val version: String) extends Comparable[Version] {
-    private val impl = new akka.util.Version(version)
+    private val impl = new pekko.util.Version(version)
 
     override def compareTo(other: Version): Int =
       impl.compareTo(other.impl)
diff --git a/akka-actor/src/main/scala/akka/util/MessageBuffer.scala b/akka-actor/src/main/scala/org/apache/pekko/util/MessageBuffer.scala
similarity index 94%
rename from akka-actor/src/main/scala/akka/util/MessageBuffer.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/MessageBuffer.scala
index 1748b49c5b..61cf3ee0c6 100644
--- a/akka-actor/src/main/scala/akka/util/MessageBuffer.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/MessageBuffer.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.actor.{ ActorRef, Dropped }
-import akka.annotation.InternalApi
-import akka.japi.function.Procedure2
+import org.apache.pekko
+import pekko.actor.{ ActorRef, Dropped }
+import pekko.annotation.InternalApi
+import pekko.japi.function.Procedure2
 
 /**
  * A non thread safe mutable message buffer that can be used to buffer messages inside actors.
@@ -83,8 +84,8 @@ final class MessageBuffer private (private var _head: MessageBuffer.Node, privat
    *
    * @return the first element or an element containing null if the buffer is empty
    */
-  def getHead(): akka.japi.Pair[Any, ActorRef] = {
-    import akka.japi.Pair
+  def getHead(): pekko.japi.Pair[Any, ActorRef] = {
+    import org.apache.pekko.japi.Pair
     if (nonEmpty) Pair.create(_head.message, _head.ref)
     else Pair.create(null, null)
   }
@@ -114,7 +115,7 @@ final class MessageBuffer private (private var _head: MessageBuffer.Node, privat
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def filterNot(p: (Any, ActorRef) => Boolean): Unit = {
+  @InternalApi private[pekko] def filterNot(p: (Any, ActorRef) => Boolean): Unit = {
     // easiest to collect a new list, and then re-link the nodes
     var result = Vector.empty[Node]
     var node = _head
@@ -248,7 +249,7 @@ final class MessageBufferMap[I] {
   }
 
   /**
-   * Remove the buffer for an id, but publish a [[akka.actor.Dropped]] for each dropped buffered message
+   * Remove the buffer for an id, but publish a [[pekko.actor.Dropped]] for each dropped buffered message
    * @return how many buffered messages were dropped
    */
   def drop(id: I, reason: String, deadLetters: ActorRef): Int = {
diff --git a/akka-actor/src/main/scala/akka/util/OptionVal.scala b/akka-actor/src/main/scala/org/apache/pekko/util/OptionVal.scala
similarity index 91%
rename from akka-actor/src/main/scala/akka/util/OptionVal.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/OptionVal.scala
index 8dce46b222..1360685be5 100644
--- a/akka-actor/src/main/scala/akka/util/OptionVal.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/OptionVal.scala
@@ -2,15 +2,15 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.annotation.InternalStableApi
+import org.apache.pekko.annotation.InternalStableApi
 
 /**
  * INTERNAL API
  */
 @InternalStableApi
-private[akka] object OptionVal {
+private[pekko] object OptionVal {
 
   def apply[A](x: A): OptionVal[A] = new OptionVal(x)
 
@@ -37,7 +37,7 @@ private[akka] object OptionVal {
  * See https://hseeberger.wordpress.com/2013/10/04/name-based-extractors-in-scala-2-11/
  */
 @InternalStableApi
-private[akka] final class OptionVal[+A](val x: A) extends AnyVal {
+private[pekko] final class OptionVal[+A](val x: A) extends AnyVal {
 
   /**
    * Returns true if the option is `OptionVal.None`, false otherwise.
diff --git a/akka-actor/src/main/scala/akka/util/PrettyByteString.scala b/akka-actor/src/main/scala/org/apache/pekko/util/PrettyByteString.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/util/PrettyByteString.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/PrettyByteString.scala
index b8f8832453..0288913d7c 100644
--- a/akka-actor/src/main/scala/akka/util/PrettyByteString.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/PrettyByteString.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 /**
  * INTERNAL API: ByteString pretty printer, based on Johanes Rudolph's implementation from:
  * https://github.com/jrudolph/akka/commit/c889dddf37c8635c365a79a391eb18a709f36773#diff-947cbf07996eeb823cb9850cc2e81126R19
  */
-private[akka] object PrettyByteString {
+private[pekko] object PrettyByteString {
   private val indentDepth = 2
   private val indent = " " * (indentDepth + 1)
 
diff --git a/akka-actor/src/main/scala/akka/util/PrettyDuration.scala b/akka-actor/src/main/scala/org/apache/pekko/util/PrettyDuration.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/util/PrettyDuration.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/PrettyDuration.scala
index 6a601bdf04..f2e93991f5 100644
--- a/akka-actor/src/main/scala/akka/util/PrettyDuration.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/PrettyDuration.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.Locale
 
 import scala.concurrent.duration._
 
 /** INTERNAL API */
-private[akka] object PrettyDuration {
+private[pekko] object PrettyDuration {
 
   /**
    * JAVA API
diff --git a/akka-actor/src/main/scala/akka/util/RecencyList.scala b/akka-actor/src/main/scala/org/apache/pekko/util/RecencyList.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/util/RecencyList.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/RecencyList.scala
index a1e552d556..7c7b976e4f 100644
--- a/akka-actor/src/main/scala/akka/util/RecencyList.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/RecencyList.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 import scala.collection.{ immutable, mutable }
 import scala.concurrent.duration.FiniteDuration
@@ -13,7 +13,7 @@ import scala.concurrent.duration.FiniteDuration
  * INTERNAL API
  */
 @InternalApi
-private[akka] object RecencyList {
+private[pekko] object RecencyList {
   def empty[A]: RecencyList[A] = new RecencyList[A](new NanoClock)
 
   private final class Node[A](val value: A) {
@@ -40,7 +40,7 @@ private[akka] object RecencyList {
  * Implemented using a doubly-linked list plus hash map for lookup, so that all operations are constant time.
  */
 @InternalApi
-private[akka] final class RecencyList[A](clock: RecencyList.Clock) {
+private[pekko] final class RecencyList[A](clock: RecencyList.Clock) {
   import RecencyList.Node
 
   private val recency = new DoubleLinkedList[Node[A]](
diff --git a/akka-actor/src/main/scala/akka/util/Reflect.scala b/akka-actor/src/main/scala/org/apache/pekko/util/Reflect.scala
similarity index 87%
rename from akka-actor/src/main/scala/akka/util/Reflect.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/Reflect.scala
index 9afd1c3f9e..fe91c0c59d 100644
--- a/akka-actor/src/main/scala/akka/util/Reflect.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/Reflect.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 import java.lang.reflect.Constructor
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
@@ -12,7 +12,7 @@ import scala.collection.immutable
 import scala.util.Try
 import scala.util.control.NonFatal
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * Collection of internal reflection utilities which may or may not be
@@ -21,7 +21,7 @@ import akka.annotation.InternalApi
  * INTERNAL API
  */
 @InternalApi
-private[akka] object Reflect {
+private[pekko] object Reflect {
 
   /**
    * This optionally holds a function which looks N levels above itself
@@ -46,7 +46,7 @@ private[akka] object Reflect {
    * @param clazz the class which to instantiate an instance of
    * @return a new instance from the default constructor of the given class
    */
-  private[akka] def instantiate[T](clazz: Class[T]): T = {
+  private[pekko] def instantiate[T](clazz: Class[T]): T = {
     val ctor = clazz.getDeclaredConstructor()
     try ctor.newInstance()
     catch {
@@ -60,7 +60,7 @@ private[akka] object Reflect {
    * INTERNAL API
    * Calls findConstructor and invokes it with the given arguments.
    */
-  private[akka] def instantiate[T](clazz: Class[T], args: immutable.Seq[Any]): T = {
+  private[pekko] def instantiate[T](clazz: Class[T], args: immutable.Seq[Any]): T = {
     instantiate(findConstructor(clazz, args), args)
   }
 
@@ -68,7 +68,7 @@ private[akka] object Reflect {
    * INTERNAL API
    * Invokes the constructor with the given arguments.
    */
-  private[akka] def instantiate[T](constructor: Constructor[T], args: immutable.Seq[Any]): T = {
+  private[pekko] def instantiate[T](constructor: Constructor[T], args: immutable.Seq[Any]): T = {
     constructor.setAccessible(true)
     try constructor.newInstance(args.asInstanceOf[Seq[AnyRef]]: _*)
     catch {
@@ -83,7 +83,7 @@ private[akka] object Reflect {
    * Implements a primitive form of overload resolution a.k.a. finding the
    * right constructor.
    */
-  private[akka] def findConstructor[T](clazz: Class[T], args: immutable.Seq[Any]): Constructor[T] = {
+  private[pekko] def findConstructor[T](clazz: Class[T], args: immutable.Seq[Any]): Constructor[T] = {
     def error(msg: String): Nothing = {
       val argClasses = args.map(safeGetClass).mkString(", ")
       throw new IllegalArgumentException(s"$msg found on $clazz for arguments [$argClasses]")
@@ -122,7 +122,7 @@ private[akka] object Reflect {
    * @param clazz the class which to instantiate an instance of
    * @return a function which when applied will create a new instance from the default constructor of the given class
    */
-  private[akka] def instantiator[T](clazz: Class[T]): () => T = () => instantiate(clazz)
+  private[pekko] def instantiator[T](clazz: Class[T]): () => T = () => instantiate(clazz)
 
   def findMarker(root: Class[_], marker: Class[_]): Type = {
     @tailrec def rec(curr: Class[_]): Type = {
@@ -144,17 +144,17 @@ private[akka] object Reflect {
   /**
    * INTERNAL API
    */
-  private[akka] def findClassLoader(): ClassLoader = {
+  private[pekko] def findClassLoader(): ClassLoader = {
     def findCaller(get: Int => Class[_]): ClassLoader =
       Iterator
         .from(2 /*is the magic number, promise*/ )
         .map(get)
         .dropWhile { c =>
           c != null &&
-          (c.getName.startsWith("akka.actor.ActorSystem") ||
+          (c.getName.startsWith("org.apache.pekko.actor.ActorSystem") ||
           c.getName.startsWith("scala.Option") ||
           c.getName.startsWith("scala.collection.Iterator") ||
-          c.getName.startsWith("akka.util.Reflect"))
+          c.getName.startsWith("org.apache.pekko.util.Reflect"))
         }
         .next() match {
         case null => getClass.getClassLoader
diff --git a/akka-actor/src/main/scala/akka/util/SegmentedRecencyList.scala b/akka-actor/src/main/scala/org/apache/pekko/util/SegmentedRecencyList.scala
similarity index 96%
rename from akka-actor/src/main/scala/akka/util/SegmentedRecencyList.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/SegmentedRecencyList.scala
index 9eabd0531f..eab020e7f5 100644
--- a/akka-actor/src/main/scala/akka/util/SegmentedRecencyList.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/SegmentedRecencyList.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 import scala.collection.{ immutable, mutable }
 import scala.concurrent.duration.FiniteDuration
@@ -13,7 +13,7 @@ import scala.concurrent.duration.FiniteDuration
  * INTERNAL API
  */
 @InternalApi
-private[akka] object SegmentedRecencyList {
+private[pekko] object SegmentedRecencyList {
   def empty[A](limits: immutable.Seq[Int]): SegmentedRecencyList[A] =
     new SegmentedRecencyList[A](limits, OptionVal.None)
 
@@ -38,7 +38,7 @@ private[akka] object SegmentedRecencyList {
  * Implemented using doubly-linked lists plus hash map for lookup, so that all operations are constant time.
  */
 @InternalApi
-private[akka] final class SegmentedRecencyList[A](
+private[pekko] final class SegmentedRecencyList[A](
     initialLimits: immutable.Seq[Int],
     clock: OptionVal[RecencyList.Clock]) {
   import SegmentedRecencyList.Node
diff --git a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala b/akka-actor/src/main/scala/org/apache/pekko/util/SerializedSuspendableExecutionContext.scala
similarity index 92%
rename from akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/SerializedSuspendableExecutionContext.scala
index fff88965d3..f93a953fcb 100644
--- a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/SerializedSuspendableExecutionContext.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -10,9 +10,9 @@ import scala.annotation.{ switch, tailrec }
 import scala.concurrent.ExecutionContext
 import scala.util.control.NonFatal
 
-import akka.dispatch.AbstractNodeQueue
+import org.apache.pekko.dispatch.AbstractNodeQueue
 
-private[akka] object SerializedSuspendableExecutionContext {
+private[pekko] object SerializedSuspendableExecutionContext {
   final val Off = 0
   final val On = 1
   final val Suspended = 2
@@ -33,7 +33,7 @@ private[akka] object SerializedSuspendableExecutionContext {
  * @param throughput maximum number of tasks to be executed in serial before relinquishing the executing thread.
  * @param context the underlying context which will be used to actually execute the submitted tasks
  */
-private[akka] final class SerializedSuspendableExecutionContext(throughput: Int)(val context: ExecutionContext)
+private[pekko] final class SerializedSuspendableExecutionContext(throughput: Int)(val context: ExecutionContext)
     extends AbstractNodeQueue[Runnable]
     with Runnable
     with ExecutionContext {
diff --git a/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala b/akka-actor/src/main/scala/org/apache/pekko/util/StablePriorityQueue.scala
similarity index 99%
rename from akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/StablePriorityQueue.scala
index f99f318069..ecc036a10e 100644
--- a/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/StablePriorityQueue.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.{ AbstractQueue, Comparator, Iterator, PriorityQueue }
 import java.util.concurrent.PriorityBlockingQueue
diff --git a/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala b/akka-actor/src/main/scala/org/apache/pekko/util/SubclassifiedIndex.scala
similarity index 96%
rename from akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/SubclassifiedIndex.scala
index 3ceb0f46f8..b8de2f6f8c 100644
--- a/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/SubclassifiedIndex.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import scala.collection.immutable
 
-import akka.util.ccompat._
+import org.apache.pekko.util.ccompat._
 
 /**
  * Typeclass which describes a classification hierarchy. Observe the contract between `isEqual` and `isSubclass`!
@@ -24,7 +24,7 @@ trait Subclassification[K] {
   def isSubclass(x: K, y: K): Boolean
 }
 
-private[akka] object SubclassifiedIndex {
+private[pekko] object SubclassifiedIndex {
 
   class Nonroot[K, V](override val root: SubclassifiedIndex[K, V], val key: K, _values: Set[V])(
       implicit sc: Subclassification[K])
@@ -80,7 +80,8 @@ private[akka] object SubclassifiedIndex {
  * scan at each level. Therefore, no value traversals are published.
  */
 @ccompatUsedUntil213
-private[akka] class SubclassifiedIndex[K, V] private (protected var values: Set[V])(implicit sc: Subclassification[K]) {
+private[pekko] class SubclassifiedIndex[K, V] private (protected var values: Set[V])(
+    implicit sc: Subclassification[K]) {
 
   import SubclassifiedIndex._
 
diff --git a/akka-actor/src/main/scala/akka/util/Timeout.scala b/akka-actor/src/main/scala/org/apache/pekko/util/Timeout.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/util/Timeout.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/Timeout.scala
index 7281014da3..37ffded9b4 100644
--- a/akka-actor/src/main/scala/akka/util/Timeout.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/Timeout.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-actor/src/main/scala/akka/util/TokenBucket.scala b/akka-actor/src/main/scala/org/apache/pekko/util/TokenBucket.scala
similarity index 96%
rename from akka-actor/src/main/scala/akka/util/TokenBucket.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/TokenBucket.scala
index 00d1f0607d..22498a3feb 100644
--- a/akka-actor/src/main/scala/akka/util/TokenBucket.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/TokenBucket.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 /**
  * INTERNAL API
  */
-private[akka] abstract class TokenBucket(capacity: Long, nanosBetweenTokens: Long) {
+private[pekko] abstract class TokenBucket(capacity: Long, nanosBetweenTokens: Long) {
   require(capacity >= 0, "Capacity must be non-negative.")
   require(nanosBetweenTokens > 0, "Time between tokens must be larger than zero nanoseconds.")
 
diff --git a/akka-actor/src/main/scala/akka/util/TypedMultiMap.scala b/akka-actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala
similarity index 99%
rename from akka-actor/src/main/scala/akka/util/TypedMultiMap.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala
index eff4f479c4..444b91a924 100644
--- a/akka-actor/src/main/scala/akka/util/TypedMultiMap.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 /**
  * An immutable multi-map that expresses the value type as a type function of the key
diff --git a/akka-actor/src/main/scala/akka/util/UUIDComparator.scala b/akka-actor/src/main/scala/org/apache/pekko/util/UUIDComparator.scala
similarity index 98%
rename from akka-actor/src/main/scala/akka/util/UUIDComparator.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/UUIDComparator.scala
index a252b16a04..9870ab3188 100644
--- a/akka-actor/src/main/scala/akka/util/UUIDComparator.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/UUIDComparator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.Comparator
 import java.util.UUID
diff --git a/akka-actor/src/main/scala/akka/util/Unused.scala b/akka-actor/src/main/scala/org/apache/pekko/util/Unused.scala
similarity index 84%
rename from akka-actor/src/main/scala/akka/util/Unused.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/Unused.scala
index cab75132b1..e65b172f98 100644
--- a/akka-actor/src/main/scala/akka/util/Unused.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/Unused.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import scala.annotation.nowarn
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * Marker for explicit or implicit parameter known to be unused, yet
@@ -25,4 +25,4 @@ import akka.annotation.InternalApi
  * INTERNAL API
  */
 @nowarn("msg=deprecated")
-@InternalApi private[akka] class unused extends deprecated("unused", "")
+@InternalApi private[pekko] class unused extends deprecated("unused", "")
diff --git a/akka-actor/src/main/scala/akka/util/Version.scala b/akka-actor/src/main/scala/org/apache/pekko/util/Version.scala
similarity index 97%
rename from akka-actor/src/main/scala/akka/util/Version.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/Version.scala
index 35db4f39cd..590378ff2b 100644
--- a/akka-actor/src/main/scala/akka/util/Version.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/Version.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 object Version {
   val Zero: Version = Version("0.0.0")
@@ -43,7 +43,7 @@ final class Version(val version: String) extends Comparable[Version] {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def parse(): Version = {
+  @InternalApi private[pekko] def parse(): Version = {
     def parseLastPart(s: String): (Int, String) = {
       // for example 2, 2-SNAPSHOT or dynver 2+10-1234abcd
       if (s.length == 0) {
diff --git a/akka-actor/src/main/scala/akka/util/WallClock.scala b/akka-actor/src/main/scala/org/apache/pekko/util/WallClock.scala
similarity index 80%
rename from akka-actor/src/main/scala/akka/util/WallClock.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/WallClock.scala
index b716389e7f..5e788812d0 100644
--- a/akka-actor/src/main/scala/akka/util/WallClock.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/WallClock.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.atomic.AtomicLong
 import java.util.function.LongUnaryOperator
 
-import akka.annotation.ApiMayChange
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.annotation.ApiMayChange
+import pekko.annotation.InternalApi
 
 /**
  * A time source.
@@ -31,7 +32,7 @@ object WallClock {
  * INTERNAL API: Always increasing wall clock time.
  */
 @InternalApi
-private[akka] final class AlwaysIncreasingClock() extends AtomicLong with WallClock {
+private[pekko] final class AlwaysIncreasingClock() extends AtomicLong with WallClock {
 
   override def currentTimeMillis(): Long = {
     val currentSystemTime = System.currentTimeMillis()
diff --git a/akka-actor/src/main/scala/akka/util/WildcardIndex.scala b/akka-actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala
similarity index 95%
rename from akka-actor/src/main/scala/akka/util/WildcardIndex.scala
rename to akka-actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala
index 9a754547a0..4d92820dc7 100644
--- a/akka-actor/src/main/scala/akka/util/WildcardIndex.scala
+++ b/akka-actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import scala.annotation.tailrec
 import scala.collection.immutable.HashMap
 
-private[akka] final case class WildcardIndex[T](
+private[pekko] final case class WildcardIndex[T](
     wildcardTree: WildcardTree[T] = WildcardTree[T](),
     doubleWildcardTree: WildcardTree[T] = WildcardTree[T]()) {
 
@@ -37,12 +37,12 @@ private[akka] final case class WildcardIndex[T](
 
 }
 
-private[akka] object WildcardTree {
+private[pekko] object WildcardTree {
   private val empty = new WildcardTree[Nothing]()
   def apply[T](): WildcardTree[T] = empty.asInstanceOf[WildcardTree[T]]
 }
 
-private[akka] final case class WildcardTree[T](
+private[pekko] final case class WildcardTree[T](
     data: Option[T] = None,
     children: Map[String, WildcardTree[T]] = HashMap[String, WildcardTree[T]](),
     wildcardSuffixChildren: Map[String, WildcardTree[T]] = HashMap[String, WildcardTree[T]]()) {
diff --git a/akka-bench-jmh/src/main/java/akka/serialization/jackson/JavaMessages.java b/akka-bench-jmh/src/main/java/akka/serialization/jackson/JavaMessages.java
index c42b681937..8937ae15b7 100644
--- a/akka-bench-jmh/src/main/java/akka/serialization/jackson/JavaMessages.java
+++ b/akka-bench-jmh/src/main/java/akka/serialization/jackson/JavaMessages.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.serialization.jackson;
+package org.apache.pekko.serialization.jackson;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/akka-bench-jmh/src/main/scala/akka/BenchRunner.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
similarity index 93%
rename from akka-bench-jmh/src/main/scala/akka/BenchRunner.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
index f78cfc0114..4ebb0019cc 100644
--- a/akka-bench-jmh/src/main/scala/akka/BenchRunner.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka
+package org.apache.pekko
 
 import org.openjdk.jmh.results.RunResult
 import org.openjdk.jmh.runner.Runner
@@ -10,7 +10,7 @@ import org.openjdk.jmh.runner.options.CommandLineOptions
 
 object BenchRunner {
   def main(args: Array[String]) = {
-    import akka.util.ccompat.JavaConverters._
+    import org.apache.pekko.util.ccompat.JavaConverters._
 
     val args2 = args.toList.flatMap {
       case "quick"    => "-i 1 -wi 1 -f1 -t1".split(" ").toList
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorBenchmark.scala
similarity index 90%
rename from akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorBenchmark.scala
index 657adb6301..bfa0afe65c 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 
@@ -37,12 +37,12 @@ class ActorBenchmark {
   @Param(Array("50"))
   var batchSize = 0
 
-  // @Param(Array("akka.actor.ManyToOneArrayMailbox"))
+  // @Param(Array("org.apache.pekko.actor.ManyToOneArrayMailbox"))
   @Param(
     Array(
-      "akka.dispatch.SingleConsumerOnlyUnboundedMailbox",
-      "akka.actor.ManyToOneArrayMailbox",
-      "akka.actor.JCToolsMailbox"))
+      "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox",
+      "org.apache.pekko.actor.ManyToOneArrayMailbox",
+      "org.apache.pekko.actor.JCToolsMailbox"))
   var mailbox = ""
 
   @Param(Array("fjp-dispatcher")) //  @Param(Array("fjp-dispatcher", "affinity-dispatcher"))
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ActorCreationBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorCreationBenchmark.scala
similarity index 97%
rename from akka-bench-jmh/src/main/scala/akka/actor/ActorCreationBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorCreationBenchmark.scala
index 1df036cd9a..2054ff2166 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/ActorCreationBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorCreationBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ActorPathValidationBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorPathValidationBenchmark.scala
similarity index 98%
rename from akka-bench-jmh/src/main/scala/akka/actor/ActorPathValidationBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorPathValidationBenchmark.scala
index bb6301ac8d..f11e6abf40 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/ActorPathValidationBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorPathValidationBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala
similarity index 91%
rename from akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala
index ad3636ffab..f21e89319e 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.actor.BenchmarkActors._
-import akka.actor.ForkJoinActorBenchmark.cores
+import org.apache.pekko
+import pekko.actor.BenchmarkActors._
+import pekko.actor.ForkJoinActorBenchmark.cores
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -43,7 +44,7 @@ class AffinityPoolComparativeBenchmark {
     val mailboxConf = mailbox match {
       case "default" => ""
       case "SingleConsumerOnlyUnboundedMailbox" =>
-        s"""default-mailbox.mailbox-type = "${classOf[akka.dispatch.SingleConsumerOnlyUnboundedMailbox].getName}""""
+        s"""default-mailbox.mailbox-type = "${classOf[pekko.dispatch.SingleConsumerOnlyUnboundedMailbox].getName}""""
     }
 
     system = ActorSystem(
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolIdleCPULevelBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolIdleCPULevelBenchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolIdleCPULevelBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolIdleCPULevelBenchmark.scala
index c15d6b9589..ca2603b017 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolIdleCPULevelBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolIdleCPULevelBenchmark.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.actor.BenchmarkActors._
+import org.apache.pekko.actor.BenchmarkActors._
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.Throughput))
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala
similarity index 92%
rename from akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala
index 41e2430d5c..9b850c5bae 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.{ CountDownLatch, TimeUnit }
 
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.actor.BenchmarkActors._
-import akka.actor.ForkJoinActorBenchmark.cores
+import org.apache.pekko
+import pekko.actor.BenchmarkActors._
+import pekko.actor.ForkJoinActorBenchmark.cores
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -47,7 +48,7 @@ class AffinityPoolRequestResponseBenchmark {
     val mailboxConf = mailbox match {
       case "default" => ""
       case "SingleConsumerOnlyUnboundedMailbox" =>
-        s"""default-mailbox.mailbox-type = "${classOf[akka.dispatch.SingleConsumerOnlyUnboundedMailbox].getName}""""
+        s"""default-mailbox.mailbox-type = "${classOf[pekko.dispatch.SingleConsumerOnlyUnboundedMailbox].getName}""""
     }
 
     system = ActorSystem(
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/BenchmarkActors.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/BenchmarkActors.scala
similarity index 99%
rename from akka-bench-jmh/src/main/scala/akka/actor/BenchmarkActors.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/BenchmarkActors.scala
index 8ab8e5f73b..8e92778fb2 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/BenchmarkActors.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/BenchmarkActors.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.{ CountDownLatch, TimeUnit }
 
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/DirectByteBufferPoolBenchmark.scala
similarity index 95%
rename from akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/DirectByteBufferPoolBenchmark.scala
index dde5cbc42c..6c33664bec 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/DirectByteBufferPoolBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.nio.ByteBuffer
 import java.util.Random
@@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.io.DirectByteBufferPool
+import org.apache.pekko.io.DirectByteBufferPool
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.AverageTime))
@@ -24,7 +24,7 @@ class DirectByteBufferPoolBenchmark {
 
   val random = new Random
 
-  private[akka] var arteryPool: DirectByteBufferPool = _
+  private[pekko] var arteryPool: DirectByteBufferPool = _
 
   @Setup(Level.Trial)
   def setup(): Unit = {
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ForkJoinActorBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ForkJoinActorBenchmark.scala
similarity index 94%
rename from akka-bench-jmh/src/main/scala/akka/actor/ForkJoinActorBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ForkJoinActorBenchmark.scala
index 5129eb8ff3..ca5c67ef2b 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/ForkJoinActorBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ForkJoinActorBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 
@@ -14,7 +14,7 @@ import BenchmarkActors._
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.testkit.TestProbe
+import org.apache.pekko.testkit.TestProbe
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -33,9 +33,9 @@ class ForkJoinActorBenchmark {
 
   @Param(
     Array(
-      "akka.dispatch.SingleConsumerOnlyUnboundedMailbox",
-      "akka.actor.ManyToOneArrayMailbox",
-      "akka.actor.JCToolsMailbox"))
+      "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox",
+      "org.apache.pekko.actor.ManyToOneArrayMailbox",
+      "org.apache.pekko.actor.JCToolsMailbox"))
   var mailbox = ""
 
   implicit var system: ActorSystem = _
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/JCToolsMailbox.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/JCToolsMailbox.scala
similarity index 84%
rename from akka-bench-jmh/src/main/scala/akka/actor/JCToolsMailbox.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/JCToolsMailbox.scala
index 9f9ec728af..c956e80af6 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/JCToolsMailbox.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/JCToolsMailbox.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import scala.annotation.tailrec
 import scala.concurrent.duration.Duration
@@ -10,12 +10,13 @@ import scala.concurrent.duration.Duration
 import com.typesafe.config.Config
 import org.jctools.queues.MpscGrowableArrayQueue
 
-import akka.dispatch.BoundedMessageQueueSemantics
-import akka.dispatch.BoundedNodeMessageQueue
-import akka.dispatch.Envelope
-import akka.dispatch.MailboxType
-import akka.dispatch.MessageQueue
-import akka.dispatch.ProducesMessageQueue
+import org.apache.pekko
+import pekko.dispatch.BoundedMessageQueueSemantics
+import pekko.dispatch.BoundedNodeMessageQueue
+import pekko.dispatch.Envelope
+import pekko.dispatch.MailboxType
+import pekko.dispatch.MessageQueue
+import pekko.dispatch.ProducesMessageQueue
 
 case class JCToolsMailbox(val capacity: Int) extends MailboxType with ProducesMessageQueue[BoundedNodeMessageQueue] {
 
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ManyToOneArrayMailbox.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ManyToOneArrayMailbox.scala
similarity index 88%
rename from akka-bench-jmh/src/main/scala/akka/actor/ManyToOneArrayMailbox.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ManyToOneArrayMailbox.scala
index 8859017378..f936ed8709 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/ManyToOneArrayMailbox.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ManyToOneArrayMailbox.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import scala.annotation.tailrec
 import scala.concurrent.duration.Duration
@@ -10,12 +10,13 @@ import scala.concurrent.duration.Duration
 import com.typesafe.config.Config
 import org.agrona.concurrent.ManyToOneConcurrentArrayQueue
 
-import akka.dispatch.BoundedMessageQueueSemantics
-import akka.dispatch.BoundedNodeMessageQueue
-import akka.dispatch.Envelope
-import akka.dispatch.MailboxType
-import akka.dispatch.MessageQueue
-import akka.dispatch.ProducesMessageQueue
+import org.apache.pekko
+import pekko.dispatch.BoundedMessageQueueSemantics
+import pekko.dispatch.BoundedNodeMessageQueue
+import pekko.dispatch.Envelope
+import pekko.dispatch.MailboxType
+import pekko.dispatch.MessageQueue
+import pekko.dispatch.ProducesMessageQueue
 
 /**
  * ManyToOneArrayMailbox is a high-performance, multiple-producer single-consumer, bounded MailboxType,
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/RequestResponseActors.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala
similarity index 98%
rename from akka-bench-jmh/src/main/scala/akka/actor/RequestResponseActors.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala
index d95a935b98..6b590f64d1 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/RequestResponseActors.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.CountDownLatch
 
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/RouterPoolCreationBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RouterPoolCreationBenchmark.scala
similarity index 86%
rename from akka-bench-jmh/src/main/scala/akka/actor/RouterPoolCreationBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RouterPoolCreationBenchmark.scala
index 7bc9395233..e1cf52dac8 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/RouterPoolCreationBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RouterPoolCreationBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 
@@ -11,9 +11,10 @@ import scala.concurrent.duration._
 
 import org.openjdk.jmh.annotations._
 
-import akka.routing.RoundRobinPool
-import akka.testkit.TestActors
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.routing.RoundRobinPool
+import pekko.testkit.TestActors
+import pekko.testkit.TestProbe
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.SingleShotTime))
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ScheduleBenchmark.scala
similarity index 97%
rename from akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ScheduleBenchmark.scala
index 57215eb6bf..d115186d70 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ScheduleBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
@@ -13,7 +13,7 @@ import scala.concurrent.duration._
 
 import org.openjdk.jmh.annotations._
 
-import akka.util.Timeout
+import org.apache.pekko.util.Timeout
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.Throughput))
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/StashCreationBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/StashCreationBenchmark.scala
similarity index 95%
rename from akka-bench-jmh/src/main/scala/akka/actor/StashCreationBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/StashCreationBenchmark.scala
index 8f58093dcd..35b17c4595 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/StashCreationBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/StashCreationBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 
@@ -12,7 +12,7 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.testkit.TestProbe
+import org.apache.pekko.testkit.TestProbe
 
 object StashCreationBenchmark {
   class StashingActor extends Actor with Stash {
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/TellOnlyBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/TellOnlyBenchmark.scala
similarity index 90%
rename from akka-bench-jmh/src/main/scala/akka/actor/TellOnlyBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/TellOnlyBenchmark.scala
index eb3b115216..17ff2014f9 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/TellOnlyBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/TellOnlyBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.actor
+package org.apache.pekko.actor
 
 import java.util.concurrent.TimeUnit
 
@@ -12,9 +12,10 @@ import scala.concurrent.duration._
 import com.typesafe.config.{ Config, ConfigFactory }
 import org.openjdk.jmh.annotations._
 
-import akka.dispatch._
-import akka.testkit.TestProbe
-import akka.util.Helpers.ConfigOps
+import org.apache.pekko
+import pekko.dispatch._
+import pekko.testkit.TestProbe
+import pekko.util.Helpers.ConfigOps
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.SingleShotTime))
@@ -47,8 +48,8 @@ class TellOnlyBenchmark {
           | dropping-dispatcher {
           |   fork-join-executor.parallelism-min = 1
           |   fork-join-executor.parallelism-max = 1
-          |   type = "akka.actor.TellOnlyBenchmark$$DroppingDispatcherConfigurator"
-          |   mailbox-type = "akka.actor.TellOnlyBenchmark$$UnboundedDroppingMailbox"
+          |   type = "org.apache.pekko.actor.TellOnlyBenchmark$$DroppingDispatcherConfigurator"
+          |   mailbox-type = "org.apache.pekko.actor.TellOnlyBenchmark$$UnboundedDroppingMailbox"
           | }
           | """.stripMargin))
   }
@@ -138,7 +139,7 @@ object TellOnlyBenchmark {
         _executorServiceFactoryProvider,
         _shutdownTimeout) {
 
-    override protected[akka] def dispatch(receiver: ActorCell, invocation: Envelope): Unit = {
+    override protected[pekko] def dispatch(receiver: ActorCell, invocation: Envelope): Unit = {
       val mbox = receiver.mailbox
       mbox.enqueue(receiver.self, invocation)
       mbox.messageQueue match {
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedActorBenchmark.scala
similarity index 87%
rename from akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedActorBenchmark.scala
index 0ae4fdcbd6..05104e1e02 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedActorBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.actor.typed
+package org.apache.pekko.actor.typed
 
 import java.util.concurrent.TimeUnit
 
@@ -12,7 +12,8 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.actor.typed.scaladsl.AskPattern._
+import org.apache.pekko
+import pekko.actor.typed.scaladsl.AskPattern._
 
 object TypedActorBenchmark {
   // Constants because they are used in annotations
@@ -40,7 +41,7 @@ class TypedActorBenchmark {
   @Param(Array("50"))
   var batchSize = 0
 
-  @Param(Array("akka.dispatch.SingleConsumerOnlyUnboundedMailbox", "akka.dispatch.UnboundedMailbox"))
+  @Param(Array("pekko.dispatch.SingleConsumerOnlyUnboundedMailbox", "pekko.dispatch.UnboundedMailbox"))
   var mailbox = ""
 
   @Param(Array("fjp-dispatcher")) //  @Param(Array("fjp-dispatcher", "affinity-dispatcher"))
@@ -48,11 +49,11 @@ class TypedActorBenchmark {
 
   implicit var system: ActorSystem[Start] = _
 
-  implicit val askTimeout: akka.util.Timeout = akka.util.Timeout(timeout)
+  implicit val askTimeout: pekko.util.Timeout = pekko.util.Timeout(timeout)
 
   @Setup(Level.Trial)
   def setup(): Unit = {
-    akka.actor.BenchmarkActors.requireRightNumberOfCores(threads)
+    pekko.actor.BenchmarkActors.requireRightNumberOfCores(threads)
     system = ActorSystem(
       TypedBenchmarkActors.echoActorsSupervisor(numMessagesPerActorPair, numActors, dispatcher, batchSize),
       "TypedActorBenchmark",
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedBenchmarkActors.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedBenchmarkActors.scala
similarity index 97%
rename from akka-bench-jmh/src/main/scala/akka/actor/typed/TypedBenchmarkActors.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedBenchmarkActors.scala
index 85af865fcc..4a94008e0b 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedBenchmarkActors.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedBenchmarkActors.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.actor.typed
+package org.apache.pekko.actor.typed
 
 import java.util.concurrent.CountDownLatch
 
 import scala.concurrent.duration._
 
-import akka.Done
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
 
 object TypedBenchmarkActors {
 
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedForkJoinActorBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedForkJoinActorBenchmark.scala
similarity index 91%
rename from akka-bench-jmh/src/main/scala/akka/actor/typed/TypedForkJoinActorBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedForkJoinActorBenchmark.scala
index ff83c806ab..1b572df635 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedForkJoinActorBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedForkJoinActorBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.actor.typed
+package org.apache.pekko.actor.typed
 
 import java.util.concurrent.TimeUnit
 
@@ -26,7 +26,8 @@ import org.openjdk.jmh.annotations.TearDown
 import org.openjdk.jmh.annotations.Threads
 import org.openjdk.jmh.annotations.Warmup
 
-import akka.actor.typed.scaladsl.AskPattern._
+import org.apache.pekko
+import pekko.actor.typed.scaladsl.AskPattern._
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.Throughput))
@@ -46,17 +47,17 @@ class TypedForkJoinActorBenchmark {
 
   @Param(
     Array(
-      "akka.dispatch.UnboundedMailbox",
-      "akka.dispatch.SingleConsumerOnlyUnboundedMailbox",
-      "akka.actor.ManyToOneArrayMailbox",
-      "akka.actor.JCToolsMailbox"))
+      "pekko.dispatch.UnboundedMailbox",
+      "pekko.dispatch.SingleConsumerOnlyUnboundedMailbox",
+      "pekko.actor.ManyToOneArrayMailbox",
+      "pekko.actor.JCToolsMailbox"))
   var mailbox = ""
 
   implicit var system: ActorSystem[PingPongCommand] = _
 
   @Setup(Level.Trial)
   def setup(): Unit = {
-    akka.actor.BenchmarkActors.requireRightNumberOfCores(cores)
+    pekko.actor.BenchmarkActors.requireRightNumberOfCores(cores)
     system = ActorSystem(
       TypedBenchmarkActors.benchmarkPingPongSupervisor(),
       "TypedForkJoinActorBenchmark",
diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryBenchmark.scala
similarity index 94%
rename from akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryBenchmark.scala
index 5c5f0b64c2..16f004829f 100644
--- a/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.actor.typed.delivery
+package org.apache.pekko.actor.typed.delivery
 
 import java.util.UUID
 import java.util.concurrent.TimeUnit
@@ -15,14 +15,15 @@ import scala.util.Success
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.delivery.ProducerController.MessageWithConfirmation
-import akka.actor.typed.receptionist.ServiceKey
-import akka.actor.typed.scaladsl.AskPattern._
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.delivery.ProducerController.MessageWithConfirmation
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.actor.typed.scaladsl.AskPattern._
+import pekko.actor.typed.scaladsl.Behaviors
 
 object Producer {
   trait Command
@@ -31,7 +32,7 @@ object Producer {
   private case class WrappedRequestNext(r: ProducerController.RequestNext[Consumer.Command]) extends Command
   private case object AskReply extends Command
 
-  private implicit val askTimeout: akka.util.Timeout = 5.seconds
+  private implicit val askTimeout: pekko.util.Timeout = 5.seconds
 
   def apply(
       numberOfMessages: Int,
@@ -210,7 +211,7 @@ class ReliableDeliveryBenchmark {
 
   implicit var system: ActorSystem[Guardian.Command] = _
 
-  implicit val askTimeout: akka.util.Timeout = akka.util.Timeout(timeout)
+  implicit val askTimeout: pekko.util.Timeout = pekko.util.Timeout(timeout)
 
   @Setup(Level.Trial)
   def setup(): Unit = {
diff --git a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetMergeBenchmark.scala
similarity index 95%
rename from akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetMergeBenchmark.scala
index 7aaa42e9e0..632f4ae834 100644
--- a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetMergeBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.util.concurrent.TimeUnit
 
@@ -19,8 +19,9 @@ import org.openjdk.jmh.annotations.Setup
 import org.openjdk.jmh.annotations.State
 import org.openjdk.jmh.annotations.Warmup
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
 
 @Fork(2)
 @State(JmhScope.Benchmark)
diff --git a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetSerializationBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetSerializationBenchmark.scala
similarity index 90%
rename from akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetSerializationBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetSerializationBenchmark.scala
index 9d76f49e64..73898d8fb7 100644
--- a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetSerializationBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetSerializationBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.util.concurrent.TimeUnit
 
@@ -21,12 +21,13 @@ import org.openjdk.jmh.annotations.State
 import org.openjdk.jmh.annotations.TearDown
 import org.openjdk.jmh.annotations.Warmup
 
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.serialization.SerializationExtension
-import akka.serialization.Serializers
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.serialization.SerializationExtension
+import pekko.serialization.Serializers
 
 @Fork(2)
 @State(JmhScope.Benchmark)
diff --git a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/VersionVectorBenchmark.scala
similarity index 94%
rename from akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/VersionVectorBenchmark.scala
index c35924cff0..e0e509131f 100644
--- a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/VersionVectorBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.util.concurrent.TimeUnit
 
@@ -19,8 +19,9 @@ import org.openjdk.jmh.annotations.Setup
 import org.openjdk.jmh.annotations.State
 import org.openjdk.jmh.annotations.Warmup
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
 
 @Fork(2)
 @State(JmhScope.Benchmark)
diff --git a/akka-bench-jmh/src/main/scala/akka/dispatch/CachingConfigBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/CachingConfigBenchmark.scala
similarity index 95%
rename from akka-bench-jmh/src/main/scala/akka/dispatch/CachingConfigBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/CachingConfigBenchmark.scala
index 5328138f5d..c74b312263 100644
--- a/akka-bench-jmh/src/main/scala/akka/dispatch/CachingConfigBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/CachingConfigBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.dispatch
+package org.apache.pekko.dispatch
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/NodeQueueBenchmark.scala
similarity index 88%
rename from akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/NodeQueueBenchmark.scala
index 320861b29b..af5bfae1d0 100644
--- a/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/NodeQueueBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.dispatch
+package org.apache.pekko.dispatch
 
 import java.util.concurrent.TimeUnit
 
@@ -12,8 +12,9 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.actor._
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit.TestProbe
 
 object NodeQueueBenchmark {
   final val burst = 100000
@@ -38,7 +39,7 @@ dispatcher {
   }
 }
 mailbox {
-  mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+  mailbox-type = "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox"
   mailbox-capacity = 1000000
 }
 """).withFallback(ConfigFactory.load())
diff --git a/akka-bench-jmh/src/main/scala/akka/event/LogLevelAccessBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/event/LogLevelAccessBenchmark.scala
similarity index 89%
rename from akka-bench-jmh/src/main/scala/akka/event/LogLevelAccessBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/event/LogLevelAccessBenchmark.scala
index 4cd8489355..0b3e35c33b 100644
--- a/akka-bench-jmh/src/main/scala/akka/event/LogLevelAccessBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/event/LogLevelAccessBenchmark.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.event
+package org.apache.pekko.event
 
 import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.event.Logging.LogLevel
+import org.apache.pekko
+import pekko.event.Logging.LogLevel
 
 @Fork(3)
 @State(Scope.Benchmark)
@@ -33,7 +34,7 @@ class LogLevelAccessBenchmark {
     override def unsubscribe(subscriber: Subscriber): Unit = ()
   }
 
-  var log: BusLogging = akka.event.Logging(NoopBus, "").asInstanceOf[BusLogging]
+  var log: BusLogging = pekko.event.Logging(NoopBus, "").asInstanceOf[BusLogging]
 
   @Benchmark
   @GroupThreads(20)
diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/Common.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/Common.scala
similarity index 82%
rename from akka-bench-jmh/src/main/scala/akka/persistence/Common.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/Common.scala
index f63587c4df..87291ff87d 100644
--- a/akka-bench-jmh/src/main/scala/akka/persistence/Common.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/Common.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 
 /** only as a "the best we could possibly get" baseline, does not persist anything */
 class BaselineActor(respondAfter: Int) extends Actor {
diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/LevelDbBatchingBenchmark.scala
similarity index 93%
rename from akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/LevelDbBatchingBenchmark.scala
index fff1b08aba..04f02c3db8 100644
--- a/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/LevelDbBatchingBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.File
 import java.util.concurrent.TimeUnit
@@ -10,10 +10,11 @@ import scala.concurrent.Await
 import scala.concurrent.duration._
 import org.apache.commons.io.FileUtils
 import org.openjdk.jmh.annotations._
-import akka.actor._
-import akka.persistence.journal.AsyncWriteTarget._
-import akka.persistence.journal.leveldb.{ SharedLeveldbJournal, SharedLeveldbStore }
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.journal.AsyncWriteTarget._
+import pekko.persistence.journal.leveldb.{ SharedLeveldbJournal, SharedLeveldbStore }
+import pekko.testkit.TestProbe
 
 import scala.annotation.nowarn
 
diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistenceActorDeferBenchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistenceActorDeferBenchmark.scala
index b207d66f30..b99a425cb3 100644
--- a/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistenceActorDeferBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.File
 
@@ -13,8 +13,9 @@ import org.apache.commons.io.FileUtils
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.annotations.Scope
 
-import akka.actor._
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit.TestProbe
 
 /*
   # OS:   OSX 10.9.3
diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorBenchmark.scala
similarity index 97%
rename from akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorBenchmark.scala
index 96637519e1..8288c4548f 100644
--- a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.File
 
@@ -13,8 +13,9 @@ import org.apache.commons.io.FileUtils
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.annotations.Scope
 
-import akka.actor._
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit.TestProbe
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.Throughput))
diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
similarity index 98%
rename from akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
index e1aec25af5..7109381fce 100644
--- a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.File
 
@@ -13,8 +13,9 @@ import org.apache.commons.io.FileUtils
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.annotations.Scope
 
-import akka.actor._
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit.TestProbe
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.Throughput))
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/BenchTestSource.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/BenchTestSource.scala
similarity index 85%
rename from akka-bench-jmh/src/main/scala/akka/remote/artery/BenchTestSource.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/BenchTestSource.scala
index e08daf5adf..4c5fa708c0 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/artery/BenchTestSource.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/BenchTestSource.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
-import akka.stream.Attributes
-import akka.stream.Outlet
-import akka.stream.SourceShape
-import akka.stream.stage.GraphStage
-import akka.stream.stage.GraphStageLogic
-import akka.stream.stage.OutHandler
+import org.apache.pekko
+import pekko.stream.Attributes
+import pekko.stream.Outlet
+import pekko.stream.SourceShape
+import pekko.stream.stage.GraphStage
+import pekko.stream.stage.GraphStageLogic
+import pekko.stream.stage.OutHandler
 
 /**
  * Emits integers from 1 to the given `elementCount`. The `java.lang.Integer`
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/CodecBenchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/CodecBenchmark.scala
index 46aaffeed6..282cc2f241 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/CodecBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.io.IOException
 import java.nio.ByteBuffer
@@ -19,18 +19,19 @@ import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.Done
-import akka.NotUsed
-import akka.actor._
-import akka.remote._
-import akka.remote.artery.Decoder.InboundCompressionAccess
-import akka.remote.artery.compress._
-import akka.serialization.BaseSerializer
-import akka.serialization.ByteBufferSerializer
-import akka.serialization.SerializationExtension
-import akka.stream.SystemMaterializer
-import akka.stream.scaladsl._
-import akka.util.OptionVal
+import org.apache.pekko
+import pekko.Done
+import pekko.NotUsed
+import pekko.actor._
+import pekko.remote._
+import pekko.remote.artery.Decoder.InboundCompressionAccess
+import pekko.remote.artery.compress._
+import pekko.serialization.BaseSerializer
+import pekko.serialization.ByteBufferSerializer
+import pekko.serialization.SerializationExtension
+import pekko.stream.SystemMaterializer
+import pekko.stream.scaladsl._
+import pekko.util.OptionVal
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/LatchSink.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LatchSink.scala
similarity index 85%
rename from akka-bench-jmh/src/main/scala/akka/remote/artery/LatchSink.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LatchSink.scala
index ec19e19abb..d9f46d2ed2 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/artery/LatchSink.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LatchSink.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.CyclicBarrier
 
-import akka.stream.Attributes
-import akka.stream.Inlet
-import akka.stream.SinkShape
-import akka.stream.stage.GraphStage
-import akka.stream.stage.GraphStageLogic
-import akka.stream.stage.InHandler
+import org.apache.pekko
+import pekko.stream.Attributes
+import pekko.stream.Inlet
+import pekko.stream.SinkShape
+import pekko.stream.stage.GraphStage
+import pekko.stream.stage.GraphStageLogic
+import pekko.stream.stage.InHandler
 
 class LatchSink(countDownAfter: Int, latch: CountDownLatch) extends GraphStage[SinkShape[Any]] {
   val in: Inlet[Any] = Inlet("LatchSink")
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/LiteralEncodingBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LiteralEncodingBenchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/remote/artery/LiteralEncodingBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LiteralEncodingBenchmark.scala
index 9fa4924028..ce6d1651c4 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/artery/LiteralEncodingBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LiteralEncodingBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
@@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.util.Unsafe
+import org.apache.pekko.util.Unsafe
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/SendQueueBenchmark.scala
similarity index 93%
rename from akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/SendQueueBenchmark.scala
index 800dfcd29f..a3d98c53b1 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/SendQueueBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.CyclicBarrier
@@ -15,11 +15,12 @@ import com.typesafe.config.ConfigFactory
 import org.agrona.concurrent.ManyToOneConcurrentArrayQueue
 import org.openjdk.jmh.annotations._
 
-import akka.actor.ActorSystem
-import akka.stream.KillSwitches
-import akka.stream.OverflowStrategy
-import akka.stream.SystemMaterializer
-import akka.stream.scaladsl._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.stream.KillSwitches
+import pekko.stream.OverflowStrategy
+import pekko.stream.SystemMaterializer
+import pekko.stream.scaladsl._
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/CountMinSketchBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/CountMinSketchBenchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/remote/artery/compress/CountMinSketchBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/CountMinSketchBenchmark.scala
index 4a56a9d1f6..be0bee8568 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/CountMinSketchBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/CountMinSketchBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery.compress
+package org.apache.pekko.remote.artery.compress
 
 import java.util.Random
 
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/InvertCompressionTableBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/InvertCompressionTableBenchmark.scala
similarity index 95%
rename from akka-bench-jmh/src/main/scala/akka/remote/artery/compress/InvertCompressionTableBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/InvertCompressionTableBenchmark.scala
index 24c304838d..1c99edbdb6 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/InvertCompressionTableBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/InvertCompressionTableBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery.compress
+package org.apache.pekko.remote.artery.compress
 
 import java.util.concurrent.ThreadLocalRandom
 
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/SerializationFormatCacheBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala
similarity index 89%
rename from akka-bench-jmh/src/main/scala/akka/remote/artery/compress/SerializationFormatCacheBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala
index a4fa1099b1..70cedf6692 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/artery/compress/SerializationFormatCacheBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery.compress
+package org.apache.pekko.remote.artery.compress
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.pattern.PromiseActorRef
-import akka.remote.artery.SerializationFormatCache
-import akka.serialization.Serialization
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.pattern.PromiseActorRef
+import pekko.remote.artery.SerializationFormatCache
+import pekko.serialization.Serialization
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Fork
 import org.openjdk.jmh.annotations.Level
diff --git a/akka-bench-jmh/src/main/scala/akka/remote/compress/HeavyHittersBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/compress/HeavyHittersBenchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/remote/compress/HeavyHittersBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/remote/compress/HeavyHittersBenchmark.scala
index f0d70ffb7a..8be9c4bb10 100644
--- a/akka-bench-jmh/src/main/scala/akka/remote/compress/HeavyHittersBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/compress/HeavyHittersBenchmark.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.compress
+package org.apache.pekko.remote.compress
 
 import java.util.Random
 
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.infra.Blackhole
 
-import akka.remote.artery.compress.TopHeavyHitters
+import org.apache.pekko.remote.artery.compress.TopHeavyHitters
 
 /**
  * On Macbook pro:
diff --git a/akka-bench-jmh/src/main/scala/akka/serialization/jackson/JacksonSerializationBench.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializationBench.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/serialization/jackson/JacksonSerializationBench.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializationBench.scala
index 0c1caa3ce9..b02dc2b127 100644
--- a/akka-bench-jmh/src/main/scala/akka/serialization/jackson/JacksonSerializationBench.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializationBench.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.serialization.jackson
+package org.apache.pekko.serialization.jackson
 
 import java.time.{ Duration => JDuration }
 import java.time.Instant
@@ -17,10 +17,11 @@ import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.actor._
-import akka.serialization.Serialization
-import akka.serialization.SerializationExtension
-import akka.serialization.SerializerWithStringManifest
+import org.apache.pekko
+import pekko.actor._
+import pekko.serialization.Serialization
+import pekko.serialization.SerializationExtension
+import pekko.serialization.SerializerWithStringManifest
 
 object JacksonSerializationBench {
   trait TestMessage
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/AskBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/AskBenchmark.scala
similarity index 84%
rename from akka-bench-jmh/src/main/scala/akka/stream/AskBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/AskBenchmark.scala
index 7da7253d5b..d6636ded2f 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/AskBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/AskBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
@@ -13,16 +13,17 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.NotUsed
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.remote.artery.BenchTestSource
-import akka.remote.artery.LatchSink
-import akka.stream.scaladsl._
-import akka.stream.testkit.scaladsl.StreamTestKit
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Props
+import pekko.remote.artery.BenchTestSource
+import pekko.remote.artery.LatchSink
+import pekko.stream.scaladsl._
+import pekko.stream.testkit.scaladsl.StreamTestKit
+import pekko.util.Timeout
 
 object AskBenchmark {
   final val OperationsPerInvocation = 100000
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/EmptySourceBenchmark.scala
similarity index 89%
rename from akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/EmptySourceBenchmark.scala
index 979b03f4d6..fd03ec3332 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/EmptySourceBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.TimeUnit
 
@@ -11,8 +11,9 @@ import scala.concurrent.duration._
 
 import org.openjdk.jmh.annotations._
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.stream.scaladsl._
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FlatMapConcatBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapConcatBenchmark.scala
similarity index 89%
rename from akka-bench-jmh/src/main/scala/akka/stream/FlatMapConcatBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapConcatBenchmark.scala
index 626407a56a..73bf9b4269 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/FlatMapConcatBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapConcatBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
@@ -13,13 +13,14 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.remote.artery.BenchTestSource
-import akka.remote.artery.LatchSink
-import akka.stream.impl.fusing.GraphStages
-import akka.stream.scaladsl._
-import akka.stream.testkit.scaladsl.StreamTestKit
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.remote.artery.BenchTestSource
+import pekko.remote.artery.LatchSink
+import pekko.stream.impl.fusing.GraphStages
+import pekko.stream.scaladsl._
+import pekko.stream.testkit.scaladsl.StreamTestKit
 
 object FlatMapConcatBenchmark {
   final val OperationsPerInvocation = 100000
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FlatMapMergeBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapMergeBenchmark.scala
similarity index 88%
rename from akka-bench-jmh/src/main/scala/akka/stream/FlatMapMergeBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapMergeBenchmark.scala
index 3af6ff5759..650765e026 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/FlatMapMergeBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapMergeBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.TimeUnit
 
@@ -11,10 +11,11 @@ import scala.concurrent.duration._
 
 import org.openjdk.jmh.annotations._
 
-import akka.{ Done, NotUsed }
-import akka.actor.ActorSystem
-import akka.remote.artery.BenchTestSourceSameElement
-import akka.stream.scaladsl._
+import org.apache.pekko
+import pekko.{ Done, NotUsed }
+import pekko.actor.ActorSystem
+import pekko.remote.artery.BenchTestSourceSameElement
+import pekko.stream.scaladsl._
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FlowMapBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlowMapBenchmark.scala
similarity index 86%
rename from akka-bench-jmh/src/main/scala/akka/stream/FlowMapBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlowMapBenchmark.scala
index d5a84a6b68..b7ab450a26 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/FlowMapBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlowMapBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.Semaphore
 import java.util.concurrent.TimeUnit
@@ -14,11 +14,12 @@ import scala.util.Success
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.remote.artery.BenchTestSource
-import akka.stream.impl.fusing.GraphStages
-import akka.stream.scaladsl._
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.remote.artery.BenchTestSource
+import pekko.stream.impl.fusing.GraphStages
+import pekko.stream.scaladsl._
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.SECONDS)
@@ -37,7 +38,7 @@ class FlowMapBenchmark {
         }
 
         actor.default-mailbox {
-          mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+          mailbox-type = "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox"
         }
 
         test {
@@ -46,7 +47,7 @@ class FlowMapBenchmark {
           single-expect-default = 3s
           default-timeout = 5s
           calling-thread-dispatcher {
-            type = akka.testkit.CallingThreadDispatcherConfigurator
+            type = org.apache.pekko.testkit.CallingThreadDispatcherConfigurator
           }
         }
       }""".stripMargin).withFallback(ConfigFactory.load())
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FramingBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FramingBenchmark.scala
similarity index 82%
rename from akka-bench-jmh/src/main/scala/akka/stream/FramingBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FramingBenchmark.scala
index 529c0a8f35..a8fdb20d71 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/FramingBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FramingBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.Semaphore
 import java.util.concurrent.TimeUnit
@@ -15,13 +15,14 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.remote.artery.BenchTestSourceSameElement
-import akka.stream.scaladsl.Framing
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.remote.artery.BenchTestSourceSameElement
+import pekko.stream.scaladsl.Framing
+import pekko.stream.scaladsl.Sink
+import pekko.stream.scaladsl.Source
+import pekko.util.ByteString
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.SECONDS)
@@ -39,7 +40,7 @@ class FramingBenchmark {
           throughput = 1024
         }
         actor.default-mailbox {
-          mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+          mailbox-type = "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox"
         }
         test {
           timefactor =  1.0
@@ -47,7 +48,7 @@ class FramingBenchmark {
           single-expect-default = 3s
           default-timeout = 5s
           calling-thread-dispatcher {
-            type = akka.testkit.CallingThreadDispatcherConfigurator
+            type = org.apache.pekko.testkit.CallingThreadDispatcherConfigurator
           }
         }
       }""".stripMargin).withFallback(ConfigFactory.load())
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FusedGraphsBenchmark.scala
similarity index 98%
rename from akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FusedGraphsBenchmark.scala
index abeed4791c..7b56df65cd 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FusedGraphsBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
@@ -14,10 +14,11 @@ import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.annotations.OperationsPerInvocation
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl._
-import akka.stream.stage._
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.stream.scaladsl._
+import pekko.stream.stage._
 
 object FusedGraphsBenchmark {
   val ElementCount = 100 * 1000
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/GraphBuilderBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/GraphBuilderBenchmark.scala
similarity index 88%
rename from akka-bench-jmh/src/main/scala/akka/stream/GraphBuilderBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/GraphBuilderBenchmark.scala
index b3ab2cf6c6..1dcc6843f3 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/GraphBuilderBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/GraphBuilderBenchmark.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.NotUsed
-import akka.stream.scaladsl.RunnableGraph
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.scaladsl.RunnableGraph
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.SECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InterpreterBenchmark.scala
similarity index 85%
rename from akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InterpreterBenchmark.scala
index 076f30eaee..bdb7722838 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InterpreterBenchmark.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.event._
-import akka.stream.impl.fusing.GraphInterpreterSpecKit
-import akka.stream.impl.fusing.GraphInterpreter.{ DownstreamBoundaryStageLogic, UpstreamBoundaryStageLogic }
-import akka.stream.impl.fusing.GraphStages
-import akka.stream.stage._
+import org.apache.pekko
+import pekko.event._
+import pekko.stream.impl.fusing.GraphInterpreterSpecKit
+import pekko.stream.impl.fusing.GraphInterpreter.{ DownstreamBoundaryStageLogic, UpstreamBoundaryStageLogic }
+import pekko.stream.impl.fusing.GraphStages
+import pekko.stream.stage._
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
@@ -54,7 +55,7 @@ object InterpreterBenchmark {
 
   case class GraphDataSource[T](override val toString: String, data: Vector[T]) extends UpstreamBoundaryStageLogic[T] {
     var idx: Int = 0
-    override val out: akka.stream.Outlet[T] = Outlet[T]("out")
+    override val out: pekko.stream.Outlet[T] = Outlet[T]("out")
     out.id = 0
 
     setHandler(
@@ -74,7 +75,7 @@ object InterpreterBenchmark {
 
   case class GraphDataSink[T](override val toString: String, var expected: Int)
       extends DownstreamBoundaryStageLogic[T] {
-    override val in: akka.stream.Inlet[T] = Inlet[T]("in")
+    override val in: pekko.stream.Inlet[T] = Inlet[T]("in")
     in.id = 0
 
     setHandler(in,
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/InvokeWithFeedbackBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InvokeWithFeedbackBenchmark.scala
similarity index 91%
rename from akka-bench-jmh/src/main/scala/akka/stream/InvokeWithFeedbackBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InvokeWithFeedbackBenchmark.scala
index 49580666fc..1d852a15dd 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/InvokeWithFeedbackBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InvokeWithFeedbackBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.TimeUnit
 
@@ -11,8 +11,9 @@ import scala.concurrent.duration._
 
 import org.openjdk.jmh.annotations._
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.stream.scaladsl._
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.SECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/JsonFramingBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/JsonFramingBenchmark.scala
similarity index 92%
rename from akka-bench-jmh/src/main/scala/akka/stream/JsonFramingBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/JsonFramingBenchmark.scala
index eb10b840fd..646aa063d0 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/JsonFramingBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/JsonFramingBenchmark.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.stream.impl.JsonObjectParser
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.stream.impl.JsonObjectParser
+import pekko.util.ByteString
 
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.SECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/MapAsyncBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MapAsyncBenchmark.scala
similarity index 89%
rename from akka-bench-jmh/src/main/scala/akka/stream/MapAsyncBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MapAsyncBenchmark.scala
index fd7aedb9ea..c9ddde1350 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/MapAsyncBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MapAsyncBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
@@ -14,12 +14,13 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.remote.artery.BenchTestSource
-import akka.remote.artery.LatchSink
-import akka.stream.scaladsl._
-import akka.stream.testkit.scaladsl.StreamTestKit
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.remote.artery.BenchTestSource
+import pekko.remote.artery.LatchSink
+import pekko.stream.scaladsl._
+import pekko.stream.testkit.scaladsl.StreamTestKit
 
 object MapAsyncBenchmark {
   final val OperationsPerInvocation = 100000
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MaterializationBenchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MaterializationBenchmark.scala
index 5a3f8e82dc..dfe2846dea 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MaterializationBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.TimeUnit
 
@@ -12,10 +12,11 @@ import scala.concurrent.duration._
 
 import org.openjdk.jmh.annotations._
 
-import akka.Done
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl._
+import org.apache.pekko
+import pekko.Done
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.stream.scaladsl._
 
 object MaterializationBenchmark {
 
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/NewLayoutBenchmark.template b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/NewLayoutBenchmark.template
similarity index 98%
rename from akka-bench-jmh/src/main/scala/akka/stream/NewLayoutBenchmark.template
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/NewLayoutBenchmark.template
index 31e34c5e98..13dec8aec1 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/NewLayoutBenchmark.template
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/NewLayoutBenchmark.template
@@ -2,14 +2,14 @@
  * Copyright (C) 2018-2019 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util
 import java.util.concurrent.TimeUnit
 
-import akka.stream.impl.MaterializerSession
-import akka.stream.impl.NewLayout._
-import akka.stream.impl.StreamLayout.{ AtomicModule, Module }
+import org.apache.pekko.stream.impl.MaterializerSession
+import org.apache.pekko.stream.impl.NewLayout._
+import org.apache.pekko.stream.impl.StreamLayout.{ AtomicModule, Module }
 import org.openjdk.jmh.annotations._
 import org.reactivestreams.{ Publisher, Subscriber, Subscription }
 
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/PartitionHubBenchmark.scala
similarity index 88%
rename from akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/PartitionHubBenchmark.scala
index ee664256dd..74fa135d97 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/PartitionHubBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
@@ -13,14 +13,15 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.remote.artery.BenchTestSource
-import akka.remote.artery.FixedSizePartitionHub
-import akka.remote.artery.LatchSink
-import akka.stream.scaladsl._
-import akka.stream.scaladsl.PartitionHub
-import akka.stream.testkit.scaladsl.StreamTestKit
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.remote.artery.BenchTestSource
+import pekko.remote.artery.FixedSizePartitionHub
+import pekko.remote.artery.LatchSink
+import pekko.stream.scaladsl._
+import pekko.stream.scaladsl.PartitionHub
+import pekko.stream.testkit.scaladsl.StreamTestKit
 
 object PartitionHubBenchmark {
   final val OperationsPerInvocation = 100000
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/SourceRefBenchmark.scala
similarity index 91%
rename from akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/SourceRefBenchmark.scala
index bdf5a2230f..b844ac1ccd 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/SourceRefBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream
+package org.apache.pekko.stream
 
 import java.util.concurrent.Semaphore
 import java.util.concurrent.TimeUnit
@@ -14,9 +14,10 @@ import scala.util.Success
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations._
 
-import akka.actor.ActorSystem
-import akka.remote.artery.BenchTestSource
-import akka.stream.scaladsl._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.remote.artery.BenchTestSource
+import pekko.stream.scaladsl._
 
 /*
    Just a brief reference run (3.1 GHz Intel Core i7, MacBook Pro late 2017):
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/impl/OutputStreamSourceStageBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/impl/OutputStreamSourceStageBenchmark.scala
similarity index 85%
rename from akka-bench-jmh/src/main/scala/akka/stream/impl/OutputStreamSourceStageBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/impl/OutputStreamSourceStageBenchmark.scala
index 55e21e374d..ae54f4b419 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/impl/OutputStreamSourceStageBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/impl/OutputStreamSourceStageBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.stream.impl
+package org.apache.pekko.stream.impl
 
 import java.util.concurrent.TimeUnit
 
@@ -12,10 +12,11 @@ import scala.concurrent.duration._
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.annotations.TearDown
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Keep
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.StreamConverters
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.stream.scaladsl.Keep
+import pekko.stream.scaladsl.Sink
+import pekko.stream.scaladsl.StreamConverters
 
 object OutputStreamSourceStageBenchmark {
   final val WritesPerBench = 10000
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesBenchmark.scala
similarity index 91%
rename from akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesBenchmark.scala
index d291d7534d..e2d5ceb226 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream.io
+package org.apache.pekko.stream.io
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -15,13 +15,14 @@ import scala.concurrent.duration._
 
 import org.openjdk.jmh.annotations._
 
-import akka.Done
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.Attributes
-import akka.stream.IOResult
-import akka.stream.scaladsl._
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.Done
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.stream.Attributes
+import pekko.stream.IOResult
+import pekko.stream.scaladsl._
+import pekko.util.ByteString
 
 /**
  * Benchmark                         (bufSize)  Mode  Cnt    Score    Error  Units
diff --git a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesScaleBenchmark.scala
similarity index 92%
rename from akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesScaleBenchmark.scala
index fd7ba2e453..ed35c3c2ea 100644
--- a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesScaleBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.stream.io
+package org.apache.pekko.stream.io
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -17,10 +17,11 @@ import org.openjdk.jmh.annotations.BenchmarkMode
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
 
-import akka.actor.ActorSystem
-import akka.stream.IOResult
-import akka.stream.scaladsl._
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.stream.IOResult
+import pekko.stream.scaladsl._
+import pekko.util.ByteString
 
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(Mode.AverageTime))
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_append_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_append_Benchmark.scala
similarity index 98%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_append_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_append_Benchmark.scala
index c893025329..bb9b4f355d 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_append_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_append_Benchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_apply_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_apply_Benchmark.scala
similarity index 93%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_apply_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_apply_Benchmark.scala
index 961c8aee47..a98f8488f2 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_apply_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_apply_Benchmark.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.util.ByteString.{ ByteString1, ByteStrings }
+import org.apache.pekko.util.ByteString.{ ByteString1, ByteStrings }
 
 @State(Scope.Benchmark)
 @Measurement(timeUnit = TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_copyToBuffer_Benchmark.scala
similarity index 85%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_copyToBuffer_Benchmark.scala
index 5fb1d59f59..ec9f8fc142 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_copyToBuffer_Benchmark.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.nio.ByteBuffer
 import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.util.ByteString.{ ByteString1C, ByteStrings }
+import org.apache.pekko.util.ByteString.{ ByteString1C, ByteStrings }
 
 @State(Scope.Benchmark)
 @Measurement(timeUnit = TimeUnit.MILLISECONDS)
@@ -43,20 +43,20 @@ class ByteString_copyToBuffer_Benchmark {
     [info]  35.9%  35.9% scala.collection.Iterator$class.toStream
     [info]  20.2%  20.2% scala.collection.immutable.Stream.foldLeft
     [info]  11.6%  11.6% scala.collection.immutable.Stream$StreamBuilder.
-    [info]  10.9%  10.9% akka.util.ByteIterator.
+    [info]  10.9%  10.9% org.apache.pekko.util.ByteIterator.
     [info]   6.1%   6.1% scala.collection.mutable.ListBuffer.
-    [info]   5.2%   5.2% akka.util.ByteString.copyToBuffer
+    [info]   5.2%   5.2% org.apache.pekko.util.ByteString.copyToBuffer
     [info]   5.2%   5.2% scala.collection.AbstractTraversable.
     [info]   2.2%   2.2% scala.collection.immutable.VectorIterator.initFrom
-    [info]   1.2%   1.2% akka.util.generated.ByteStringBenchmark_bss_large_copyToBuffer.bss_large_copyToBuffer_thrpt_jmhStub
-    [info]   0.3%   0.3% akka.util.ByteIterator$MultiByteArrayIterator.copyToBuffer
+    [info]   1.2%   1.2% org.apache.pekko.util.generated.ByteStringBenchmark_bss_large_copyToBuffer.bss_large_copyToBuffer_thrpt_jmhStub
+    [info]   0.3%   0.3% org.apache.pekko.util.ByteIterator$MultiByteArrayIterator.copyToBuffer
     [info]   1.2%   1.2% 
 
 
     AFTER specializing impls
 
     [info] ....[Thread state: RUNNABLE]........................................................................
-    [info]  99.5%  99.6% akka.util.generated.ByteStringBenchmark_bss_large_copyToBuffer_jmhTest.bss_large_copyToBuffer_thrpt_jmhStub
+    [info]  99.5%  99.6% org.apache.pekko.util.generated.ByteStringBenchmark_bss_large_copyToBuffer_jmhTest.bss_large_copyToBuffer_thrpt_jmhStub
     [info]   0.1%   0.1% java.util.concurrent.CountDownLatch.countDown
     [info]   0.1%   0.1% sun.reflect.NativeMethodAccessorImpl.invoke0
     [info]   0.1%   0.1% sun.misc.Unsafe.putObject
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_decode_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_decode_Benchmark.scala
similarity index 95%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_decode_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_decode_Benchmark.scala
index 7f283e7bb6..944b3c0acd 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_decode_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_decode_Benchmark.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.nio.charset.Charset
 import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.util.ByteString.{ ByteString1C, ByteStrings }
+import org.apache.pekko.util.ByteString.{ ByteString1C, ByteStrings }
 
 @State(Scope.Benchmark)
 @Measurement(timeUnit = TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropRight_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropRight_Benchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_dropRight_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropRight_Benchmark.scala
index 7f1675171e..7b816ea993 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropRight_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropRight_Benchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
@@ -10,7 +10,7 @@ import scala.util.Random
 
 import org.openjdk.jmh.annotations._
 
-import akka.util.ByteString.{ ByteString1, ByteStrings }
+import org.apache.pekko.util.ByteString.{ ByteString1, ByteStrings }
 
 @State(Scope.Benchmark)
 @Measurement(timeUnit = TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropSliceTake_Benchmark.scala
similarity index 98%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropSliceTake_Benchmark.scala
index 0c90953664..9304b30cc2 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropSliceTake_Benchmark.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import akka.util.ByteString.{ ByteString1C, ByteStrings }
+import org.apache.pekko.util.ByteString.{ ByteString1C, ByteStrings }
 
 @State(Scope.Benchmark)
 @Measurement(timeUnit = TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_drop_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_drop_Benchmark.scala
similarity index 95%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_drop_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_drop_Benchmark.scala
index 0a481ad2a4..7b4671866a 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_drop_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_drop_Benchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
@@ -10,7 +10,7 @@ import scala.util.Random
 
 import org.openjdk.jmh.annotations._
 
-import akka.util.ByteString.{ ByteString1, ByteStrings }
+import org.apache.pekko.util.ByteString.{ ByteString1, ByteStrings }
 
 @State(Scope.Benchmark)
 @Measurement(timeUnit = TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_grouped_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_grouped_Benchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_grouped_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_grouped_Benchmark.scala
index 3ff8912728..b8e012f698 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_grouped_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_grouped_Benchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_indexOf_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_indexOf_Benchmark.scala
similarity index 98%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_indexOf_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_indexOf_Benchmark.scala
index 67b34f03ea..cb1601459c 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_indexOf_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_indexOf_Benchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_take_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_take_Benchmark.scala
similarity index 96%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_take_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_take_Benchmark.scala
index 4285232f1c..3e7a7f91e4 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_take_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_take_Benchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
@@ -10,7 +10,7 @@ import scala.util.Random
 
 import org.openjdk.jmh.annotations.{ Benchmark, Measurement, Scope, State }
 
-import akka.util.ByteString.{ ByteString1, ByteStrings }
+import org.apache.pekko.util.ByteString.{ ByteString1, ByteStrings }
 
 @State(Scope.Benchmark)
 @Measurement(timeUnit = TimeUnit.MILLISECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_toArray_Benchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_toArray_Benchmark.scala
similarity index 98%
rename from akka-bench-jmh/src/main/scala/akka/util/ByteString_toArray_Benchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_toArray_Benchmark.scala
index a56bc35a2c..5f664cfc83 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_toArray_Benchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_toArray_Benchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-bench-jmh/src/main/scala/akka/util/FastFrequencySketchBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/FastFrequencySketchBenchmark.scala
similarity index 97%
rename from akka-bench-jmh/src/main/scala/akka/util/FastFrequencySketchBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/FastFrequencySketchBenchmark.scala
index ff05ba8634..b29299e9a1 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/FastFrequencySketchBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/FastFrequencySketchBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Fork
diff --git a/akka-bench-jmh/src/main/scala/akka/util/FrequencySketchBenchmark.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/FrequencySketchBenchmark.scala
similarity index 97%
rename from akka-bench-jmh/src/main/scala/akka/util/FrequencySketchBenchmark.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/FrequencySketchBenchmark.scala
index 19f35f5068..513811e3cc 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/FrequencySketchBenchmark.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/FrequencySketchBenchmark.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Fork
diff --git a/akka-bench-jmh/src/main/scala/akka/util/ImmutableIntMapBench.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ImmutableIntMapBench.scala
similarity index 99%
rename from akka-bench-jmh/src/main/scala/akka/util/ImmutableIntMapBench.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/ImmutableIntMapBench.scala
index 69036b0ff6..5285e16026 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/ImmutableIntMapBench.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ImmutableIntMapBench.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-bench-jmh/src/main/scala/akka/util/LruBoundedCacheBench.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/LruBoundedCacheBench.scala
similarity index 95%
rename from akka-bench-jmh/src/main/scala/akka/util/LruBoundedCacheBench.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/LruBoundedCacheBench.scala
index 667a370286..f77416219e 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/LruBoundedCacheBench.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/LruBoundedCacheBench.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ import scala.util.Random
 
 import org.openjdk.jmh.annotations.{ Param, _ }
 
-import akka.remote.artery.LruBoundedCache
+import org.apache.pekko.remote.artery.LruBoundedCache
 
 @State(Scope.Benchmark)
 @Measurement(timeUnit = TimeUnit.MICROSECONDS)
diff --git a/akka-bench-jmh/src/main/scala/akka/util/StackBench.scala b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/StackBench.scala
similarity index 95%
rename from akka-bench-jmh/src/main/scala/akka/util/StackBench.scala
rename to akka-bench-jmh/src/main/scala/org/apache/pekko/util/StackBench.scala
index 1b01679d31..9b7275e56a 100644
--- a/akka-bench-jmh/src/main/scala/akka/util/StackBench.scala
+++ b/akka-bench-jmh/src/main/scala/org/apache/pekko/util/StackBench.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.util
+package org.apache.pekko.util
 
 import java.util.concurrent.TimeUnit
 
diff --git a/akka-cluster-metrics/src/main/java/akka/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java b/akka-cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
similarity index 60%
rename from akka-cluster-metrics/src/main/java/akka/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
rename to akka-cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
index ccbae28484..a6cae886ba 100644
--- a/akka-cluster-metrics/src/main/java/akka/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
+++ b/akka-cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
@@ -5,22 +5,22 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ClusterMetricsMessages.proto
 
-package akka.cluster.metrics.protobuf.msg;
+package org.apache.pekko.cluster.metrics.protobuf.msg;
 
 public final class ClusterMetricsMessages {
   private ClusterMetricsMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface MetricsGossipEnvelopeOrBuilder extends
       // @@protoc_insertion_point(interface_extends:MetricsGossipEnvelope)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Address from = 1;
@@ -31,11 +31,11 @@ public final class ClusterMetricsMessages {
      * required .Address from = 1;
      * @return The from.
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getFrom();
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getFrom();
     /**
      * required .Address from = 1;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getFromOrBuilder();
 
     /**
      * required .MetricsGossip gossip = 2;
@@ -46,11 +46,11 @@ public final class ClusterMetricsMessages {
      * required .MetricsGossip gossip = 2;
      * @return The gossip.
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getGossip();
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getGossip();
     /**
      * required .MetricsGossip gossip = 2;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder getGossipOrBuilder();
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder getGossipOrBuilder();
 
     /**
      * required bool reply = 3;
@@ -72,12 +72,12 @@ public final class ClusterMetricsMessages {
    * Protobuf type {@code MetricsGossipEnvelope}
    */
   public  static final class MetricsGossipEnvelope extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MetricsGossipEnvelope)
       MetricsGossipEnvelopeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use MetricsGossipEnvelope.newBuilder() to construct.
-    private MetricsGossipEnvelope(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private MetricsGossipEnvelope(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private MetricsGossipEnvelope() {
@@ -86,26 +86,26 @@ public final class ClusterMetricsMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new MetricsGossipEnvelope();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private MetricsGossipEnvelope(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -115,11 +115,11 @@ public final class ClusterMetricsMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder subBuilder = null;
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -128,11 +128,11 @@ public final class ClusterMetricsMessages {
               break;
             }
             case 18: {
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder subBuilder = null;
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = gossip_.toBuilder();
               }
-              gossip_ = input.readMessage(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.PARSER, extensionRegistry);
+              gossip_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(gossip_);
                 gossip_ = subBuilder.buildPartial();
@@ -154,32 +154,32 @@ public final class ClusterMetricsMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_descriptor;
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_fieldAccessorTable
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.Builder.class);
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address from_;
+    private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address from_;
     /**
      * required .Address from = 1;
      * @return Whether the from field is set.
@@ -191,18 +191,18 @@ public final class ClusterMetricsMessages {
      * required .Address from = 1;
      * @return The from.
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getFrom() {
-      return from_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getFrom() {
+      return from_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_;
     }
     /**
      * required .Address from = 1;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_;
     }
 
     public static final int GOSSIP_FIELD_NUMBER = 2;
-    private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip gossip_;
+    private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip gossip_;
     /**
      * required .MetricsGossip gossip = 2;
      * @return Whether the gossip field is set.
@@ -214,14 +214,14 @@ public final class ClusterMetricsMessages {
      * required .MetricsGossip gossip = 2;
      * @return The gossip.
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getGossip() {
-      return gossip_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_;
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getGossip() {
+      return gossip_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_;
     }
     /**
      * required .MetricsGossip gossip = 2;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder getGossipOrBuilder() {
-      return gossip_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_;
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder getGossipOrBuilder() {
+      return gossip_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_;
     }
 
     public static final int REPLY_FIELD_NUMBER = 3;
@@ -273,7 +273,7 @@ public final class ClusterMetricsMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
@@ -294,15 +294,15 @@ public final class ClusterMetricsMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getGossip());
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, reply_);
       }
       size += unknownFields.getSerializedSize();
@@ -315,10 +315,10 @@ public final class ClusterMetricsMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope)) {
+      if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope)) {
         return super.equals(obj);
       }
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope) obj;
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -356,7 +356,7 @@ public final class ClusterMetricsMessages {
       }
       if (hasReply()) {
         hash = (37 * hash) + REPLY_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getReply());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -364,73 +364,73 @@ public final class ClusterMetricsMessages {
       return hash;
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseDelimitedFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -439,7 +439,7 @@ public final class ClusterMetricsMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -450,7 +450,7 @@ public final class ClusterMetricsMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -463,34 +463,34 @@ public final class ClusterMetricsMessages {
      * Protobuf type {@code MetricsGossipEnvelope}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:MetricsGossipEnvelope)
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelopeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelopeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.Builder.class);
       }
 
-      // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.newBuilder()
+      // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
           getGossipFieldBuilder();
@@ -517,19 +517,19 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossipEnvelope_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope getDefaultInstanceForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.getDefaultInstance();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope build() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope result = buildPartial();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope build() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -537,8 +537,8 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope buildPartial() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope(this);
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope buildPartial() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -572,44 +572,44 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope) {
-          return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope) {
+          return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope other) {
-        if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope other) {
+        if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -646,14 +646,14 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parsedMessage = null;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -664,9 +664,9 @@ public final class ClusterMetricsMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder> fromBuilder_;
       /**
        * required .Address from = 1;
        * @return Whether the from field is set.
@@ -678,9 +678,9 @@ public final class ClusterMetricsMessages {
        * required .Address from = 1;
        * @return The from.
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getFrom() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -688,7 +688,7 @@ public final class ClusterMetricsMessages {
       /**
        * required .Address from = 1;
        */
-      public Builder setFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
+      public Builder setFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -705,7 +705,7 @@ public final class ClusterMetricsMessages {
        * required .Address from = 1;
        */
       public Builder setFrom(
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder builderForValue) {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -718,13 +718,13 @@ public final class ClusterMetricsMessages {
       /**
        * required .Address from = 1;
        */
-      public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
+      public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance()) {
+              from_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance()) {
             from_ =
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -751,7 +751,7 @@ public final class ClusterMetricsMessages {
       /**
        * required .Address from = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder getFromBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -759,23 +759,23 @@ public final class ClusterMetricsMessages {
       /**
        * required .Address from = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_;
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance() : from_;
         }
       }
       /**
        * required .Address from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -784,9 +784,9 @@ public final class ClusterMetricsMessages {
         return fromBuilder_;
       }
 
-      private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip gossip_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder> gossipBuilder_;
+      private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip gossip_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder> gossipBuilder_;
       /**
        * required .MetricsGossip gossip = 2;
        * @return Whether the gossip field is set.
@@ -798,9 +798,9 @@ public final class ClusterMetricsMessages {
        * required .MetricsGossip gossip = 2;
        * @return The gossip.
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getGossip() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getGossip() {
         if (gossipBuilder_ == null) {
-          return gossip_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_;
+          return gossip_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_;
         } else {
           return gossipBuilder_.getMessage();
         }
@@ -808,7 +808,7 @@ public final class ClusterMetricsMessages {
       /**
        * required .MetricsGossip gossip = 2;
        */
-      public Builder setGossip(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip value) {
+      public Builder setGossip(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip value) {
         if (gossipBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -825,7 +825,7 @@ public final class ClusterMetricsMessages {
        * required .MetricsGossip gossip = 2;
        */
       public Builder setGossip(
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder builderForValue) {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder builderForValue) {
         if (gossipBuilder_ == null) {
           gossip_ = builderForValue.build();
           onChanged();
@@ -838,13 +838,13 @@ public final class ClusterMetricsMessages {
       /**
        * required .MetricsGossip gossip = 2;
        */
-      public Builder mergeGossip(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip value) {
+      public Builder mergeGossip(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip value) {
         if (gossipBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               gossip_ != null &&
-              gossip_ != akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance()) {
+              gossip_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance()) {
             gossip_ =
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.newBuilder(gossip_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.newBuilder(gossip_).mergeFrom(value).buildPartial();
           } else {
             gossip_ = value;
           }
@@ -871,7 +871,7 @@ public final class ClusterMetricsMessages {
       /**
        * required .MetricsGossip gossip = 2;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder getGossipBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder getGossipBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getGossipFieldBuilder().getBuilder();
@@ -879,23 +879,23 @@ public final class ClusterMetricsMessages {
       /**
        * required .MetricsGossip gossip = 2;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder getGossipOrBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder getGossipOrBuilder() {
         if (gossipBuilder_ != null) {
           return gossipBuilder_.getMessageOrBuilder();
         } else {
           return gossip_ == null ?
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_;
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance() : gossip_;
         }
       }
       /**
        * required .MetricsGossip gossip = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder> 
           getGossipFieldBuilder() {
         if (gossipBuilder_ == null) {
-          gossipBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder>(
+          gossipBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder>(
                   getGossip(),
                   getParentForChildren(),
                   isClean());
@@ -942,13 +942,13 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -957,37 +957,37 @@ public final class ClusterMetricsMessages {
     }
 
     // @@protoc_insertion_point(class_scope:MetricsGossipEnvelope)
-    private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope();
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope getDefaultInstance() {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public MetricsGossipEnvelope parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new MetricsGossipEnvelope(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipEnvelope getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -995,17 +995,17 @@ public final class ClusterMetricsMessages {
 
   public interface MetricsGossipOrBuilder extends
       // @@protoc_insertion_point(interface_extends:MetricsGossip)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .Address allAddresses = 1;
      */
-    java.util.List 
+    java.util.List 
         getAllAddressesList();
     /**
      * repeated .Address allAddresses = 1;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getAllAddresses(int index);
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getAllAddresses(int index);
     /**
      * repeated .Address allAddresses = 1;
      */
@@ -1013,12 +1013,12 @@ public final class ClusterMetricsMessages {
     /**
      * repeated .Address allAddresses = 1;
      */
-    java.util.List 
+    java.util.List 
         getAllAddressesOrBuilderList();
     /**
      * repeated .Address allAddresses = 1;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getAllAddressesOrBuilder(
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getAllAddressesOrBuilder(
         int index);
 
     /**
@@ -1043,18 +1043,18 @@ public final class ClusterMetricsMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allMetricNames at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getAllMetricNamesBytes(int index);
 
     /**
      * repeated .NodeMetrics nodeMetrics = 3;
      */
-    java.util.List 
+    java.util.List 
         getNodeMetricsList();
     /**
      * repeated .NodeMetrics nodeMetrics = 3;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getNodeMetrics(int index);
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getNodeMetrics(int index);
     /**
      * repeated .NodeMetrics nodeMetrics = 3;
      */
@@ -1062,12 +1062,12 @@ public final class ClusterMetricsMessages {
     /**
      * repeated .NodeMetrics nodeMetrics = 3;
      */
-    java.util.List 
+    java.util.List 
         getNodeMetricsOrBuilderList();
     /**
      * repeated .NodeMetrics nodeMetrics = 3;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder getNodeMetricsOrBuilder(
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder getNodeMetricsOrBuilder(
         int index);
   }
   /**
@@ -1079,43 +1079,43 @@ public final class ClusterMetricsMessages {
    * Protobuf type {@code MetricsGossip}
    */
   public  static final class MetricsGossip extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MetricsGossip)
       MetricsGossipOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use MetricsGossip.newBuilder() to construct.
-    private MetricsGossip(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private MetricsGossip(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private MetricsGossip() {
       allAddresses_ = java.util.Collections.emptyList();
-      allMetricNames_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       nodeMetrics_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new MetricsGossip();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private MetricsGossip(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1126,17 +1126,17 @@ public final class ClusterMetricsMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                allAddresses_ = new java.util.ArrayList();
+                allAddresses_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               allAddresses_.add(
-                  input.readMessage(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.PARSER, extensionRegistry));
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                allMetricNames_ = new akka.protobufv3.internal.LazyStringArrayList();
+                allMetricNames_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               allMetricNames_.add(bs);
@@ -1144,11 +1144,11 @@ public final class ClusterMetricsMessages {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                nodeMetrics_ = new java.util.ArrayList();
+                nodeMetrics_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               nodeMetrics_.add(
-                  input.readMessage(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -1160,10 +1160,10 @@ public final class ClusterMetricsMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -1179,31 +1179,31 @@ public final class ClusterMetricsMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_descriptor;
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_fieldAccessorTable
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder.class);
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder.class);
     }
 
     public static final int ALLADDRESSES_FIELD_NUMBER = 1;
-    private java.util.List allAddresses_;
+    private java.util.List allAddresses_;
     /**
      * repeated .Address allAddresses = 1;
      */
-    public java.util.List getAllAddressesList() {
+    public java.util.List getAllAddressesList() {
       return allAddresses_;
     }
     /**
      * repeated .Address allAddresses = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getAllAddressesOrBuilderList() {
       return allAddresses_;
     }
@@ -1216,24 +1216,24 @@ public final class ClusterMetricsMessages {
     /**
      * repeated .Address allAddresses = 1;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getAllAddresses(int index) {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getAllAddresses(int index) {
       return allAddresses_.get(index);
     }
     /**
      * repeated .Address allAddresses = 1;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getAllAddressesOrBuilder(
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getAllAddressesOrBuilder(
         int index) {
       return allAddresses_.get(index);
     }
 
     public static final int ALLMETRICNAMES_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList allMetricNames_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList allMetricNames_;
     /**
      * repeated string allMetricNames = 2;
      * @return A list containing the allMetricNames.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getAllMetricNamesList() {
       return allMetricNames_;
     }
@@ -1257,23 +1257,23 @@ public final class ClusterMetricsMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allMetricNames at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getAllMetricNamesBytes(int index) {
       return allMetricNames_.getByteString(index);
     }
 
     public static final int NODEMETRICS_FIELD_NUMBER = 3;
-    private java.util.List nodeMetrics_;
+    private java.util.List nodeMetrics_;
     /**
      * repeated .NodeMetrics nodeMetrics = 3;
      */
-    public java.util.List getNodeMetricsList() {
+    public java.util.List getNodeMetricsList() {
       return nodeMetrics_;
     }
     /**
      * repeated .NodeMetrics nodeMetrics = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getNodeMetricsOrBuilderList() {
       return nodeMetrics_;
     }
@@ -1286,13 +1286,13 @@ public final class ClusterMetricsMessages {
     /**
      * repeated .NodeMetrics nodeMetrics = 3;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getNodeMetrics(int index) {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getNodeMetrics(int index) {
       return nodeMetrics_.get(index);
     }
     /**
      * repeated .NodeMetrics nodeMetrics = 3;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder getNodeMetricsOrBuilder(
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder getNodeMetricsOrBuilder(
         int index) {
       return nodeMetrics_.get(index);
     }
@@ -1321,13 +1321,13 @@ public final class ClusterMetricsMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < allAddresses_.size(); i++) {
         output.writeMessage(1, allAddresses_.get(i));
       }
       for (int i = 0; i < allMetricNames_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, allMetricNames_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, allMetricNames_.getRaw(i));
       }
       for (int i = 0; i < nodeMetrics_.size(); i++) {
         output.writeMessage(3, nodeMetrics_.get(i));
@@ -1342,7 +1342,7 @@ public final class ClusterMetricsMessages {
 
       size = 0;
       for (int i = 0; i < allAddresses_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, allAddresses_.get(i));
       }
       {
@@ -1354,7 +1354,7 @@ public final class ClusterMetricsMessages {
         size += 1 * getAllMetricNamesList().size();
       }
       for (int i = 0; i < nodeMetrics_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, nodeMetrics_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -1367,10 +1367,10 @@ public final class ClusterMetricsMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip)) {
+      if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip)) {
         return super.equals(obj);
       }
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip) obj;
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip) obj;
 
       if (!getAllAddressesList()
           .equals(other.getAllAddressesList())) return false;
@@ -1406,73 +1406,73 @@ public final class ClusterMetricsMessages {
       return hash;
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseDelimitedFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1481,7 +1481,7 @@ public final class ClusterMetricsMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1492,7 +1492,7 @@ public final class ClusterMetricsMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1505,34 +1505,34 @@ public final class ClusterMetricsMessages {
      * Protobuf type {@code MetricsGossip}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:MetricsGossip)
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossipOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.Builder.class);
       }
 
-      // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.newBuilder()
+      // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAllAddressesFieldBuilder();
           getNodeMetricsFieldBuilder();
@@ -1547,7 +1547,7 @@ public final class ClusterMetricsMessages {
         } else {
           allAddressesBuilder_.clear();
         }
-        allMetricNames_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         if (nodeMetricsBuilder_ == null) {
           nodeMetrics_ = java.util.Collections.emptyList();
@@ -1559,19 +1559,19 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsGossip_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getDefaultInstanceForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip build() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip result = buildPartial();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip build() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1579,8 +1579,8 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip buildPartial() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip(this);
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip buildPartial() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip(this);
         int from_bitField0_ = bitField0_;
         if (allAddressesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -1615,44 +1615,44 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip) {
-          return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip) {
+          return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip other) {
-        if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip other) {
+        if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip.getDefaultInstance()) return this;
         if (allAddressesBuilder_ == null) {
           if (!other.allAddresses_.isEmpty()) {
             if (allAddresses_.isEmpty()) {
@@ -1672,7 +1672,7 @@ public final class ClusterMetricsMessages {
               allAddresses_ = other.allAddresses_;
               bitField0_ = (bitField0_ & ~0x00000001);
               allAddressesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getAllAddressesFieldBuilder() : null;
             } else {
               allAddressesBuilder_.addAllMessages(other.allAddresses_);
@@ -1708,7 +1708,7 @@ public final class ClusterMetricsMessages {
               nodeMetrics_ = other.nodeMetrics_;
               bitField0_ = (bitField0_ & ~0x00000004);
               nodeMetricsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getNodeMetricsFieldBuilder() : null;
             } else {
               nodeMetricsBuilder_.addAllMessages(other.nodeMetrics_);
@@ -1737,14 +1737,14 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parsedMessage = null;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1755,22 +1755,22 @@ public final class ClusterMetricsMessages {
       }
       private int bitField0_;
 
-      private java.util.List allAddresses_ =
+      private java.util.List allAddresses_ =
         java.util.Collections.emptyList();
       private void ensureAllAddressesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          allAddresses_ = new java.util.ArrayList(allAddresses_);
+          allAddresses_ = new java.util.ArrayList(allAddresses_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder> allAddressesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder> allAddressesBuilder_;
 
       /**
        * repeated .Address allAddresses = 1;
        */
-      public java.util.List getAllAddressesList() {
+      public java.util.List getAllAddressesList() {
         if (allAddressesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(allAddresses_);
         } else {
@@ -1790,7 +1790,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .Address allAddresses = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getAllAddresses(int index) {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getAllAddresses(int index) {
         if (allAddressesBuilder_ == null) {
           return allAddresses_.get(index);
         } else {
@@ -1801,7 +1801,7 @@ public final class ClusterMetricsMessages {
        * repeated .Address allAddresses = 1;
        */
       public Builder setAllAddresses(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
         if (allAddressesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1818,7 +1818,7 @@ public final class ClusterMetricsMessages {
        * repeated .Address allAddresses = 1;
        */
       public Builder setAllAddresses(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder builderForValue) {
         if (allAddressesBuilder_ == null) {
           ensureAllAddressesIsMutable();
           allAddresses_.set(index, builderForValue.build());
@@ -1831,7 +1831,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .Address allAddresses = 1;
        */
-      public Builder addAllAddresses(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
+      public Builder addAllAddresses(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
         if (allAddressesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1848,7 +1848,7 @@ public final class ClusterMetricsMessages {
        * repeated .Address allAddresses = 1;
        */
       public Builder addAllAddresses(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address value) {
         if (allAddressesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1865,7 +1865,7 @@ public final class ClusterMetricsMessages {
        * repeated .Address allAddresses = 1;
        */
       public Builder addAllAddresses(
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder builderForValue) {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder builderForValue) {
         if (allAddressesBuilder_ == null) {
           ensureAllAddressesIsMutable();
           allAddresses_.add(builderForValue.build());
@@ -1879,7 +1879,7 @@ public final class ClusterMetricsMessages {
        * repeated .Address allAddresses = 1;
        */
       public Builder addAllAddresses(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder builderForValue) {
         if (allAddressesBuilder_ == null) {
           ensureAllAddressesIsMutable();
           allAddresses_.add(index, builderForValue.build());
@@ -1893,10 +1893,10 @@ public final class ClusterMetricsMessages {
        * repeated .Address allAddresses = 1;
        */
       public Builder addAllAllAddresses(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (allAddressesBuilder_ == null) {
           ensureAllAddressesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, allAddresses_);
           onChanged();
         } else {
@@ -1933,14 +1933,14 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .Address allAddresses = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder getAllAddressesBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder getAllAddressesBuilder(
           int index) {
         return getAllAddressesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Address allAddresses = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getAllAddressesOrBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder getAllAddressesOrBuilder(
           int index) {
         if (allAddressesBuilder_ == null) {
           return allAddresses_.get(index);  } else {
@@ -1950,7 +1950,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .Address allAddresses = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getAllAddressesOrBuilderList() {
         if (allAddressesBuilder_ != null) {
           return allAddressesBuilder_.getMessageOrBuilderList();
@@ -1961,31 +1961,31 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .Address allAddresses = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder addAllAddressesBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder addAllAddressesBuilder() {
         return getAllAddressesFieldBuilder().addBuilder(
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance());
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance());
       }
       /**
        * repeated .Address allAddresses = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder addAllAddressesBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder addAllAddressesBuilder(
           int index) {
         return getAllAddressesFieldBuilder().addBuilder(
-            index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance());
+            index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance());
       }
       /**
        * repeated .Address allAddresses = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getAllAddressesBuilderList() {
         return getAllAddressesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder> 
           getAllAddressesFieldBuilder() {
         if (allAddressesBuilder_ == null) {
-          allAddressesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder>(
+          allAddressesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder>(
                   allAddresses_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -1995,10 +1995,10 @@ public final class ClusterMetricsMessages {
         return allAddressesBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList allMetricNames_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureAllMetricNamesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          allMetricNames_ = new akka.protobufv3.internal.LazyStringArrayList(allMetricNames_);
+          allMetricNames_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allMetricNames_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -2006,7 +2006,7 @@ public final class ClusterMetricsMessages {
        * repeated string allMetricNames = 2;
        * @return A list containing the allMetricNames.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAllMetricNamesList() {
         return allMetricNames_.getUnmodifiableView();
       }
@@ -2030,7 +2030,7 @@ public final class ClusterMetricsMessages {
        * @param index The index of the value to return.
        * @return The bytes of the allMetricNames at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getAllMetricNamesBytes(int index) {
         return allMetricNames_.getByteString(index);
       }
@@ -2073,7 +2073,7 @@ public final class ClusterMetricsMessages {
       public Builder addAllAllMetricNames(
           java.lang.Iterable values) {
         ensureAllMetricNamesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, allMetricNames_);
         onChanged();
         return this;
@@ -2083,7 +2083,7 @@ public final class ClusterMetricsMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllMetricNames() {
-        allMetricNames_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allMetricNames_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -2094,7 +2094,7 @@ public final class ClusterMetricsMessages {
        * @return This builder for chaining.
        */
       public Builder addAllMetricNamesBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2104,22 +2104,22 @@ public final class ClusterMetricsMessages {
         return this;
       }
 
-      private java.util.List nodeMetrics_ =
+      private java.util.List nodeMetrics_ =
         java.util.Collections.emptyList();
       private void ensureNodeMetricsIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          nodeMetrics_ = new java.util.ArrayList(nodeMetrics_);
+          nodeMetrics_ = new java.util.ArrayList(nodeMetrics_);
           bitField0_ |= 0x00000004;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder> nodeMetricsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder> nodeMetricsBuilder_;
 
       /**
        * repeated .NodeMetrics nodeMetrics = 3;
        */
-      public java.util.List getNodeMetricsList() {
+      public java.util.List getNodeMetricsList() {
         if (nodeMetricsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(nodeMetrics_);
         } else {
@@ -2139,7 +2139,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics nodeMetrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getNodeMetrics(int index) {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getNodeMetrics(int index) {
         if (nodeMetricsBuilder_ == null) {
           return nodeMetrics_.get(index);
         } else {
@@ -2150,7 +2150,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics nodeMetrics = 3;
        */
       public Builder setNodeMetrics(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics value) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics value) {
         if (nodeMetricsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2167,7 +2167,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics nodeMetrics = 3;
        */
       public Builder setNodeMetrics(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder builderForValue) {
         if (nodeMetricsBuilder_ == null) {
           ensureNodeMetricsIsMutable();
           nodeMetrics_.set(index, builderForValue.build());
@@ -2180,7 +2180,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics nodeMetrics = 3;
        */
-      public Builder addNodeMetrics(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics value) {
+      public Builder addNodeMetrics(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics value) {
         if (nodeMetricsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2197,7 +2197,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics nodeMetrics = 3;
        */
       public Builder addNodeMetrics(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics value) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics value) {
         if (nodeMetricsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2214,7 +2214,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics nodeMetrics = 3;
        */
       public Builder addNodeMetrics(
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder builderForValue) {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder builderForValue) {
         if (nodeMetricsBuilder_ == null) {
           ensureNodeMetricsIsMutable();
           nodeMetrics_.add(builderForValue.build());
@@ -2228,7 +2228,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics nodeMetrics = 3;
        */
       public Builder addNodeMetrics(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder builderForValue) {
         if (nodeMetricsBuilder_ == null) {
           ensureNodeMetricsIsMutable();
           nodeMetrics_.add(index, builderForValue.build());
@@ -2242,10 +2242,10 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics nodeMetrics = 3;
        */
       public Builder addAllNodeMetrics(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (nodeMetricsBuilder_ == null) {
           ensureNodeMetricsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, nodeMetrics_);
           onChanged();
         } else {
@@ -2282,14 +2282,14 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics nodeMetrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder getNodeMetricsBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder getNodeMetricsBuilder(
           int index) {
         return getNodeMetricsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .NodeMetrics nodeMetrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder getNodeMetricsOrBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder getNodeMetricsOrBuilder(
           int index) {
         if (nodeMetricsBuilder_ == null) {
           return nodeMetrics_.get(index);  } else {
@@ -2299,7 +2299,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics nodeMetrics = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getNodeMetricsOrBuilderList() {
         if (nodeMetricsBuilder_ != null) {
           return nodeMetricsBuilder_.getMessageOrBuilderList();
@@ -2310,31 +2310,31 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics nodeMetrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder addNodeMetricsBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder addNodeMetricsBuilder() {
         return getNodeMetricsFieldBuilder().addBuilder(
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDefaultInstance());
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDefaultInstance());
       }
       /**
        * repeated .NodeMetrics nodeMetrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder addNodeMetricsBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder addNodeMetricsBuilder(
           int index) {
         return getNodeMetricsFieldBuilder().addBuilder(
-            index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDefaultInstance());
+            index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDefaultInstance());
       }
       /**
        * repeated .NodeMetrics nodeMetrics = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getNodeMetricsBuilderList() {
         return getNodeMetricsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder> 
           getNodeMetricsFieldBuilder() {
         if (nodeMetricsBuilder_ == null) {
-          nodeMetricsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder>(
+          nodeMetricsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder>(
                   nodeMetrics_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
@@ -2345,13 +2345,13 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2360,37 +2360,37 @@ public final class ClusterMetricsMessages {
     }
 
     // @@protoc_insertion_point(class_scope:MetricsGossip)
-    private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip();
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getDefaultInstance() {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public MetricsGossip parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new MetricsGossip(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsGossip getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2398,7 +2398,7 @@ public final class ClusterMetricsMessages {
 
   public interface NodeMetricsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:NodeMetrics)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int32 addressIndex = 1;
@@ -2425,12 +2425,12 @@ public final class ClusterMetricsMessages {
     /**
      * repeated .NodeMetrics.Metric metrics = 3;
      */
-    java.util.List 
+    java.util.List 
         getMetricsList();
     /**
      * repeated .NodeMetrics.Metric metrics = 3;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getMetrics(int index);
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getMetrics(int index);
     /**
      * repeated .NodeMetrics.Metric metrics = 3;
      */
@@ -2438,12 +2438,12 @@ public final class ClusterMetricsMessages {
     /**
      * repeated .NodeMetrics.Metric metrics = 3;
      */
-    java.util.List 
+    java.util.List 
         getMetricsOrBuilderList();
     /**
      * repeated .NodeMetrics.Metric metrics = 3;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder getMetricsOrBuilder(
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder getMetricsOrBuilder(
         int index);
   }
   /**
@@ -2455,12 +2455,12 @@ public final class ClusterMetricsMessages {
    * Protobuf type {@code NodeMetrics}
    */
   public  static final class NodeMetrics extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:NodeMetrics)
       NodeMetricsOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use NodeMetrics.newBuilder() to construct.
-    private NodeMetrics(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private NodeMetrics(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private NodeMetrics() {
@@ -2470,26 +2470,26 @@ public final class ClusterMetricsMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new NodeMetrics();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private NodeMetrics(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2510,11 +2510,11 @@ public final class ClusterMetricsMessages {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                metrics_ = new java.util.ArrayList();
+                metrics_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               metrics_.add(
-                  input.readMessage(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -2526,10 +2526,10 @@ public final class ClusterMetricsMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
@@ -2539,24 +2539,24 @@ public final class ClusterMetricsMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_descriptor;
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_fieldAccessorTable
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder.class);
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder.class);
     }
 
     /**
      * Protobuf enum {@code NodeMetrics.NumberType}
      */
     public enum NumberType
-        implements akka.protobufv3.internal.ProtocolMessageEnum {
+        implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
       /**
        * Serialized = 0;
        */
@@ -2630,35 +2630,35 @@ public final class ClusterMetricsMessages {
         }
       }
 
-      public static akka.protobufv3.internal.Internal.EnumLiteMap
+      public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
           internalGetValueMap() {
         return internalValueMap;
       }
-      private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+      private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
           NumberType> internalValueMap =
-            new akka.protobufv3.internal.Internal.EnumLiteMap() {
+            new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
               public NumberType findValueByNumber(int number) {
                 return NumberType.forNumber(number);
               }
             };
 
-      public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+      public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(ordinal());
       }
-      public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+      public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDescriptor().getEnumTypes().get(0);
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final NumberType[] VALUES = values();
 
       public static NumberType valueOf(
-          akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+          org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
           throw new java.lang.IllegalArgumentException(
             "EnumValueDescriptor is not for this type.");
@@ -2677,7 +2677,7 @@ public final class ClusterMetricsMessages {
 
     public interface NumberOrBuilder extends
         // @@protoc_insertion_point(interface_extends:NodeMetrics.Number)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required .NodeMetrics.NumberType type = 1;
@@ -2688,7 +2688,7 @@ public final class ClusterMetricsMessages {
        * required .NodeMetrics.NumberType type = 1;
        * @return The type.
        */
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType getType();
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType getType();
 
       /**
        * optional uint32 value32 = 2;
@@ -2721,48 +2721,48 @@ public final class ClusterMetricsMessages {
        * optional bytes serialized = 4;
        * @return The serialized.
        */
-      akka.protobufv3.internal.ByteString getSerialized();
+      org.apache.pekko.protobufv3.internal.ByteString getSerialized();
     }
     /**
      * Protobuf type {@code NodeMetrics.Number}
      */
     public  static final class Number extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:NodeMetrics.Number)
         NumberOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Number.newBuilder() to construct.
-      private Number(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Number(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Number() {
         type_ = 0;
-        serialized_ = akka.protobufv3.internal.ByteString.EMPTY;
+        serialized_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       }
 
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Number();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Number(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -2774,7 +2774,7 @@ public final class ClusterMetricsMessages {
               case 8: {
                 int rawValue = input.readEnum();
                   @SuppressWarnings("deprecation")
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType value = akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.valueOf(rawValue);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType value = org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.valueOf(rawValue);
                 if (value == null) {
                   unknownFields.mergeVarintField(1, rawValue);
                 } else {
@@ -2807,27 +2807,27 @@ public final class ClusterMetricsMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder.class);
       }
 
       private int bitField0_;
@@ -2844,10 +2844,10 @@ public final class ClusterMetricsMessages {
        * required .NodeMetrics.NumberType type = 1;
        * @return The type.
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType getType() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType getType() {
         @SuppressWarnings("deprecation")
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType result = akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.valueOf(type_);
-        return result == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.Serialized : result;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType result = org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.valueOf(type_);
+        return result == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.Serialized : result;
       }
 
       public static final int VALUE32_FIELD_NUMBER = 2;
@@ -2885,7 +2885,7 @@ public final class ClusterMetricsMessages {
       }
 
       public static final int SERIALIZED_FIELD_NUMBER = 4;
-      private akka.protobufv3.internal.ByteString serialized_;
+      private org.apache.pekko.protobufv3.internal.ByteString serialized_;
       /**
        * optional bytes serialized = 4;
        * @return Whether the serialized field is set.
@@ -2897,7 +2897,7 @@ public final class ClusterMetricsMessages {
        * optional bytes serialized = 4;
        * @return The serialized.
        */
-      public akka.protobufv3.internal.ByteString getSerialized() {
+      public org.apache.pekko.protobufv3.internal.ByteString getSerialized() {
         return serialized_;
       }
 
@@ -2917,7 +2917,7 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeEnum(1, type_);
@@ -2941,19 +2941,19 @@ public final class ClusterMetricsMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeEnumSize(1, type_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeUInt32Size(2, value32_);
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeUInt64Size(3, value64_);
         }
         if (((bitField0_ & 0x00000008) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeBytesSize(4, serialized_);
         }
         size += unknownFields.getSerializedSize();
@@ -2966,10 +2966,10 @@ public final class ClusterMetricsMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number)) {
+        if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number)) {
           return super.equals(obj);
         }
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number) obj;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number) obj;
 
         if (hasType() != other.hasType()) return false;
         if (hasType()) {
@@ -3011,7 +3011,7 @@ public final class ClusterMetricsMessages {
         }
         if (hasValue64()) {
           hash = (37 * hash) + VALUE64_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getValue64());
         }
         if (hasSerialized()) {
@@ -3023,73 +3023,73 @@ public final class ClusterMetricsMessages {
         return hash;
       }
 
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseDelimitedFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -3098,7 +3098,7 @@ public final class ClusterMetricsMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -3109,7 +3109,7 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -3117,34 +3117,34 @@ public final class ClusterMetricsMessages {
        * Protobuf type {@code NodeMetrics.Number}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
           // @@protoc_insertion_point(builder_implements:NodeMetrics.Number)
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_descriptor;
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_fieldAccessorTable
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder.class);
+                  org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder.class);
         }
 
-        // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.newBuilder()
+        // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
           }
         }
@@ -3157,25 +3157,25 @@ public final class ClusterMetricsMessages {
           bitField0_ = (bitField0_ & ~0x00000002);
           value64_ = 0L;
           bitField0_ = (bitField0_ & ~0x00000004);
-          serialized_ = akka.protobufv3.internal.ByteString.EMPTY;
+          serialized_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
           bitField0_ = (bitField0_ & ~0x00000008);
           return this;
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_descriptor;
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Number_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getDefaultInstanceForType() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance();
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number build() {
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number result = buildPartial();
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number build() {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -3183,8 +3183,8 @@ public final class ClusterMetricsMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number buildPartial() {
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number(this);
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number buildPartial() {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3214,44 +3214,44 @@ public final class ClusterMetricsMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number) {
-            return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number) {
+            return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number other) {
-          if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number other) {
+          if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance()) return this;
           if (other.hasType()) {
             setType(other.getType());
           }
@@ -3279,14 +3279,14 @@ public final class ClusterMetricsMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parsedMessage = null;
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -3309,17 +3309,17 @@ public final class ClusterMetricsMessages {
          * required .NodeMetrics.NumberType type = 1;
          * @return The type.
          */
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType getType() {
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType getType() {
           @SuppressWarnings("deprecation")
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType result = akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.valueOf(type_);
-          return result == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.Serialized : result;
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType result = org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.valueOf(type_);
+          return result == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType.Serialized : result;
         }
         /**
          * required .NodeMetrics.NumberType type = 1;
          * @param value The type to set.
          * @return This builder for chaining.
          */
-        public Builder setType(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType value) {
+        public Builder setType(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberType value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -3413,7 +3413,7 @@ public final class ClusterMetricsMessages {
           return this;
         }
 
-        private akka.protobufv3.internal.ByteString serialized_ = akka.protobufv3.internal.ByteString.EMPTY;
+        private org.apache.pekko.protobufv3.internal.ByteString serialized_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         /**
          * optional bytes serialized = 4;
          * @return Whether the serialized field is set.
@@ -3425,7 +3425,7 @@ public final class ClusterMetricsMessages {
          * optional bytes serialized = 4;
          * @return The serialized.
          */
-        public akka.protobufv3.internal.ByteString getSerialized() {
+        public org.apache.pekko.protobufv3.internal.ByteString getSerialized() {
           return serialized_;
         }
         /**
@@ -3433,7 +3433,7 @@ public final class ClusterMetricsMessages {
          * @param value The serialized to set.
          * @return This builder for chaining.
          */
-        public Builder setSerialized(akka.protobufv3.internal.ByteString value) {
+        public Builder setSerialized(org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -3454,13 +3454,13 @@ public final class ClusterMetricsMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -3469,37 +3469,37 @@ public final class ClusterMetricsMessages {
       }
 
       // @@protoc_insertion_point(class_scope:NodeMetrics.Number)
-      private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number DEFAULT_INSTANCE;
+      private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number();
       }
 
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getDefaultInstance() {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Number parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Number(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -3507,7 +3507,7 @@ public final class ClusterMetricsMessages {
 
     public interface EWMAOrBuilder extends
         // @@protoc_insertion_point(interface_extends:NodeMetrics.EWMA)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required double value = 1;
@@ -3535,12 +3535,12 @@ public final class ClusterMetricsMessages {
      * Protobuf type {@code NodeMetrics.EWMA}
      */
     public  static final class EWMA extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:NodeMetrics.EWMA)
         EWMAOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use EWMA.newBuilder() to construct.
-      private EWMA(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private EWMA(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private EWMA() {
@@ -3549,26 +3549,26 @@ public final class ClusterMetricsMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new EWMA();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private EWMA(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -3596,27 +3596,27 @@ public final class ClusterMetricsMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder.class);
       }
 
       private int bitField0_;
@@ -3674,7 +3674,7 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeDouble(1, value_);
@@ -3692,11 +3692,11 @@ public final class ClusterMetricsMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeDoubleSize(1, value_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeDoubleSize(2, alpha_);
         }
         size += unknownFields.getSerializedSize();
@@ -3709,10 +3709,10 @@ public final class ClusterMetricsMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA)) {
+        if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA)) {
           return super.equals(obj);
         }
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA) obj;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA) obj;
 
         if (hasValue() != other.hasValue()) return false;
         if (hasValue()) {
@@ -3739,12 +3739,12 @@ public final class ClusterMetricsMessages {
         hash = (19 * hash) + getDescriptor().hashCode();
         if (hasValue()) {
           hash = (37 * hash) + VALUE_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               java.lang.Double.doubleToLongBits(getValue()));
         }
         if (hasAlpha()) {
           hash = (37 * hash) + ALPHA_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               java.lang.Double.doubleToLongBits(getAlpha()));
         }
         hash = (29 * hash) + unknownFields.hashCode();
@@ -3752,73 +3752,73 @@ public final class ClusterMetricsMessages {
         return hash;
       }
 
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseDelimitedFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -3827,7 +3827,7 @@ public final class ClusterMetricsMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -3838,7 +3838,7 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -3846,34 +3846,34 @@ public final class ClusterMetricsMessages {
        * Protobuf type {@code NodeMetrics.EWMA}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
           // @@protoc_insertion_point(builder_implements:NodeMetrics.EWMA)
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_descriptor;
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_fieldAccessorTable
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder.class);
+                  org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder.class);
         }
 
-        // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.newBuilder()
+        // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
           }
         }
@@ -3888,19 +3888,19 @@ public final class ClusterMetricsMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_descriptor;
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_EWMA_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getDefaultInstanceForType() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance();
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA build() {
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA result = buildPartial();
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA build() {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -3908,8 +3908,8 @@ public final class ClusterMetricsMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA buildPartial() {
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA(this);
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA buildPartial() {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3931,44 +3931,44 @@ public final class ClusterMetricsMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA) {
-            return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA) {
+            return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA other) {
-          if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA other) {
+          if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance()) return this;
           if (other.hasValue()) {
             setValue(other.getValue());
           }
@@ -3993,14 +3993,14 @@ public final class ClusterMetricsMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parsedMessage = null;
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -4086,13 +4086,13 @@ public final class ClusterMetricsMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -4101,37 +4101,37 @@ public final class ClusterMetricsMessages {
       }
 
       // @@protoc_insertion_point(class_scope:NodeMetrics.EWMA)
-      private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA DEFAULT_INSTANCE;
+      private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA();
       }
 
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getDefaultInstance() {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public EWMA parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new EWMA(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -4139,7 +4139,7 @@ public final class ClusterMetricsMessages {
 
     public interface MetricOrBuilder extends
         // @@protoc_insertion_point(interface_extends:NodeMetrics.Metric)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required int32 nameIndex = 1;
@@ -4161,11 +4161,11 @@ public final class ClusterMetricsMessages {
        * required .NodeMetrics.Number number = 2;
        * @return The number.
        */
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getNumber();
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getNumber();
       /**
        * required .NodeMetrics.Number number = 2;
        */
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder getNumberOrBuilder();
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder getNumberOrBuilder();
 
       /**
        * optional .NodeMetrics.EWMA ewma = 3;
@@ -4176,22 +4176,22 @@ public final class ClusterMetricsMessages {
        * optional .NodeMetrics.EWMA ewma = 3;
        * @return The ewma.
        */
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getEwma();
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getEwma();
       /**
        * optional .NodeMetrics.EWMA ewma = 3;
        */
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder getEwmaOrBuilder();
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder getEwmaOrBuilder();
     }
     /**
      * Protobuf type {@code NodeMetrics.Metric}
      */
     public  static final class Metric extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:NodeMetrics.Metric)
         MetricOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Metric.newBuilder() to construct.
-      private Metric(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Metric(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Metric() {
@@ -4200,26 +4200,26 @@ public final class ClusterMetricsMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Metric();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Metric(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -4234,11 +4234,11 @@ public final class ClusterMetricsMessages {
                 break;
               }
               case 18: {
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder subBuilder = null;
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = number_.toBuilder();
                 }
-                number_ = input.readMessage(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.PARSER, extensionRegistry);
+                number_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(number_);
                   number_ = subBuilder.buildPartial();
@@ -4247,11 +4247,11 @@ public final class ClusterMetricsMessages {
                 break;
               }
               case 26: {
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder subBuilder = null;
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000004) != 0)) {
                   subBuilder = ewma_.toBuilder();
                 }
-                ewma_ = input.readMessage(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.PARSER, extensionRegistry);
+                ewma_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(ewma_);
                   ewma_ = subBuilder.buildPartial();
@@ -4268,27 +4268,27 @@ public final class ClusterMetricsMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder.class);
       }
 
       private int bitField0_;
@@ -4310,7 +4310,7 @@ public final class ClusterMetricsMessages {
       }
 
       public static final int NUMBER_FIELD_NUMBER = 2;
-      private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number number_;
+      private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number number_;
       /**
        * required .NodeMetrics.Number number = 2;
        * @return Whether the number field is set.
@@ -4322,18 +4322,18 @@ public final class ClusterMetricsMessages {
        * required .NodeMetrics.Number number = 2;
        * @return The number.
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getNumber() {
-        return number_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_;
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getNumber() {
+        return number_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_;
       }
       /**
        * required .NodeMetrics.Number number = 2;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder getNumberOrBuilder() {
-        return number_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_;
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder getNumberOrBuilder() {
+        return number_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_;
       }
 
       public static final int EWMA_FIELD_NUMBER = 3;
-      private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA ewma_;
+      private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA ewma_;
       /**
        * optional .NodeMetrics.EWMA ewma = 3;
        * @return Whether the ewma field is set.
@@ -4345,14 +4345,14 @@ public final class ClusterMetricsMessages {
        * optional .NodeMetrics.EWMA ewma = 3;
        * @return The ewma.
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getEwma() {
-        return ewma_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_;
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getEwma() {
+        return ewma_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_;
       }
       /**
        * optional .NodeMetrics.EWMA ewma = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder getEwmaOrBuilder() {
-        return ewma_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_;
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder getEwmaOrBuilder() {
+        return ewma_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -4385,7 +4385,7 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeInt32(1, nameIndex_);
@@ -4406,15 +4406,15 @@ public final class ClusterMetricsMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt32Size(1, nameIndex_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getNumber());
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(3, getEwma());
         }
         size += unknownFields.getSerializedSize();
@@ -4427,10 +4427,10 @@ public final class ClusterMetricsMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric)) {
+        if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric)) {
           return super.equals(obj);
         }
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric) obj;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric) obj;
 
         if (hasNameIndex() != other.hasNameIndex()) return false;
         if (hasNameIndex()) {
@@ -4475,73 +4475,73 @@ public final class ClusterMetricsMessages {
         return hash;
       }
 
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseDelimitedFrom(
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -4550,7 +4550,7 @@ public final class ClusterMetricsMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -4561,7 +4561,7 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -4569,34 +4569,34 @@ public final class ClusterMetricsMessages {
        * Protobuf type {@code NodeMetrics.Metric}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
           // @@protoc_insertion_point(builder_implements:NodeMetrics.Metric)
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_descriptor;
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_fieldAccessorTable
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder.class);
+                  org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder.class);
         }
 
-        // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.newBuilder()
+        // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getNumberFieldBuilder();
             getEwmaFieldBuilder();
@@ -4623,19 +4623,19 @@ public final class ClusterMetricsMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_descriptor;
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_Metric_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getDefaultInstanceForType() {
-          return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.getDefaultInstance();
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric build() {
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric result = buildPartial();
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric build() {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -4643,8 +4643,8 @@ public final class ClusterMetricsMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric buildPartial() {
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric(this);
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric buildPartial() {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4678,44 +4678,44 @@ public final class ClusterMetricsMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric) {
-            return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric) {
+            return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric other) {
-          if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric other) {
+          if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.getDefaultInstance()) return this;
           if (other.hasNameIndex()) {
             setNameIndex(other.getNameIndex());
           }
@@ -4751,14 +4751,14 @@ public final class ClusterMetricsMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parsedMessage = null;
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -4806,9 +4806,9 @@ public final class ClusterMetricsMessages {
           return this;
         }
 
-        private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number number_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder> numberBuilder_;
+        private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number number_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder> numberBuilder_;
         /**
          * required .NodeMetrics.Number number = 2;
          * @return Whether the number field is set.
@@ -4820,9 +4820,9 @@ public final class ClusterMetricsMessages {
          * required .NodeMetrics.Number number = 2;
          * @return The number.
          */
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getNumber() {
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number getNumber() {
           if (numberBuilder_ == null) {
-            return number_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_;
+            return number_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_;
           } else {
             return numberBuilder_.getMessage();
           }
@@ -4830,7 +4830,7 @@ public final class ClusterMetricsMessages {
         /**
          * required .NodeMetrics.Number number = 2;
          */
-        public Builder setNumber(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number value) {
+        public Builder setNumber(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number value) {
           if (numberBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4847,7 +4847,7 @@ public final class ClusterMetricsMessages {
          * required .NodeMetrics.Number number = 2;
          */
         public Builder setNumber(
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder builderForValue) {
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder builderForValue) {
           if (numberBuilder_ == null) {
             number_ = builderForValue.build();
             onChanged();
@@ -4860,13 +4860,13 @@ public final class ClusterMetricsMessages {
         /**
          * required .NodeMetrics.Number number = 2;
          */
-        public Builder mergeNumber(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number value) {
+        public Builder mergeNumber(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number value) {
           if (numberBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 number_ != null &&
-                number_ != akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance()) {
+                number_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance()) {
               number_ =
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.newBuilder(number_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.newBuilder(number_).mergeFrom(value).buildPartial();
             } else {
               number_ = value;
             }
@@ -4893,7 +4893,7 @@ public final class ClusterMetricsMessages {
         /**
          * required .NodeMetrics.Number number = 2;
          */
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder getNumberBuilder() {
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder getNumberBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getNumberFieldBuilder().getBuilder();
@@ -4901,23 +4901,23 @@ public final class ClusterMetricsMessages {
         /**
          * required .NodeMetrics.Number number = 2;
          */
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder getNumberOrBuilder() {
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder getNumberOrBuilder() {
           if (numberBuilder_ != null) {
             return numberBuilder_.getMessageOrBuilder();
           } else {
             return number_ == null ?
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_;
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.getDefaultInstance() : number_;
           }
         }
         /**
          * required .NodeMetrics.Number number = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder> 
             getNumberFieldBuilder() {
           if (numberBuilder_ == null) {
-            numberBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder>(
+            numberBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Number.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.NumberOrBuilder>(
                     getNumber(),
                     getParentForChildren(),
                     isClean());
@@ -4926,9 +4926,9 @@ public final class ClusterMetricsMessages {
           return numberBuilder_;
         }
 
-        private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA ewma_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder> ewmaBuilder_;
+        private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA ewma_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder> ewmaBuilder_;
         /**
          * optional .NodeMetrics.EWMA ewma = 3;
          * @return Whether the ewma field is set.
@@ -4940,9 +4940,9 @@ public final class ClusterMetricsMessages {
          * optional .NodeMetrics.EWMA ewma = 3;
          * @return The ewma.
          */
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getEwma() {
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA getEwma() {
           if (ewmaBuilder_ == null) {
-            return ewma_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_;
+            return ewma_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_;
           } else {
             return ewmaBuilder_.getMessage();
           }
@@ -4950,7 +4950,7 @@ public final class ClusterMetricsMessages {
         /**
          * optional .NodeMetrics.EWMA ewma = 3;
          */
-        public Builder setEwma(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA value) {
+        public Builder setEwma(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA value) {
           if (ewmaBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4967,7 +4967,7 @@ public final class ClusterMetricsMessages {
          * optional .NodeMetrics.EWMA ewma = 3;
          */
         public Builder setEwma(
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder builderForValue) {
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder builderForValue) {
           if (ewmaBuilder_ == null) {
             ewma_ = builderForValue.build();
             onChanged();
@@ -4980,13 +4980,13 @@ public final class ClusterMetricsMessages {
         /**
          * optional .NodeMetrics.EWMA ewma = 3;
          */
-        public Builder mergeEwma(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA value) {
+        public Builder mergeEwma(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA value) {
           if (ewmaBuilder_ == null) {
             if (((bitField0_ & 0x00000004) != 0) &&
                 ewma_ != null &&
-                ewma_ != akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance()) {
+                ewma_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance()) {
               ewma_ =
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.newBuilder(ewma_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.newBuilder(ewma_).mergeFrom(value).buildPartial();
             } else {
               ewma_ = value;
             }
@@ -5013,7 +5013,7 @@ public final class ClusterMetricsMessages {
         /**
          * optional .NodeMetrics.EWMA ewma = 3;
          */
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder getEwmaBuilder() {
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder getEwmaBuilder() {
           bitField0_ |= 0x00000004;
           onChanged();
           return getEwmaFieldBuilder().getBuilder();
@@ -5021,23 +5021,23 @@ public final class ClusterMetricsMessages {
         /**
          * optional .NodeMetrics.EWMA ewma = 3;
          */
-        public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder getEwmaOrBuilder() {
+        public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder getEwmaOrBuilder() {
           if (ewmaBuilder_ != null) {
             return ewmaBuilder_.getMessageOrBuilder();
           } else {
             return ewma_ == null ?
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_;
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.getDefaultInstance() : ewma_;
           }
         }
         /**
          * optional .NodeMetrics.EWMA ewma = 3;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder> 
             getEwmaFieldBuilder() {
           if (ewmaBuilder_ == null) {
-            ewmaBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder>(
+            ewmaBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMA.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.EWMAOrBuilder>(
                     getEwma(),
                     getParentForChildren(),
                     isClean());
@@ -5047,13 +5047,13 @@ public final class ClusterMetricsMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -5062,37 +5062,37 @@ public final class ClusterMetricsMessages {
       }
 
       // @@protoc_insertion_point(class_scope:NodeMetrics.Metric)
-      private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric DEFAULT_INSTANCE;
+      private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric();
       }
 
-      public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getDefaultInstance() {
+      public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Metric parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Metric(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -5134,17 +5134,17 @@ public final class ClusterMetricsMessages {
     }
 
     public static final int METRICS_FIELD_NUMBER = 3;
-    private java.util.List metrics_;
+    private java.util.List metrics_;
     /**
      * repeated .NodeMetrics.Metric metrics = 3;
      */
-    public java.util.List getMetricsList() {
+    public java.util.List getMetricsList() {
       return metrics_;
     }
     /**
      * repeated .NodeMetrics.Metric metrics = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getMetricsOrBuilderList() {
       return metrics_;
     }
@@ -5157,13 +5157,13 @@ public final class ClusterMetricsMessages {
     /**
      * repeated .NodeMetrics.Metric metrics = 3;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getMetrics(int index) {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getMetrics(int index) {
       return metrics_.get(index);
     }
     /**
      * repeated .NodeMetrics.Metric metrics = 3;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder getMetricsOrBuilder(
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder getMetricsOrBuilder(
         int index) {
       return metrics_.get(index);
     }
@@ -5194,7 +5194,7 @@ public final class ClusterMetricsMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt32(1, addressIndex_);
@@ -5215,15 +5215,15 @@ public final class ClusterMetricsMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(1, addressIndex_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(2, timestamp_);
       }
       for (int i = 0; i < metrics_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, metrics_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -5236,10 +5236,10 @@ public final class ClusterMetricsMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics)) {
+      if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics)) {
         return super.equals(obj);
       }
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics) obj;
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics) obj;
 
       if (hasAddressIndex() != other.hasAddressIndex()) return false;
       if (hasAddressIndex()) {
@@ -5270,7 +5270,7 @@ public final class ClusterMetricsMessages {
       }
       if (hasTimestamp()) {
         hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimestamp());
       }
       if (getMetricsCount() > 0) {
@@ -5282,73 +5282,73 @@ public final class ClusterMetricsMessages {
       return hash;
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseDelimitedFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5357,7 +5357,7 @@ public final class ClusterMetricsMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5368,7 +5368,7 @@ public final class ClusterMetricsMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5381,34 +5381,34 @@ public final class ClusterMetricsMessages {
      * Protobuf type {@code NodeMetrics}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:NodeMetrics)
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetricsOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Builder.class);
       }
 
-      // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.newBuilder()
+      // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getMetricsFieldBuilder();
         }
@@ -5430,19 +5430,19 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_NodeMetrics_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getDefaultInstanceForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDefaultInstance();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics build() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics result = buildPartial();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics build() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5450,8 +5450,8 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics buildPartial() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics(this);
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics buildPartial() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5482,44 +5482,44 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics) {
-          return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics) {
+          return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics other) {
-        if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics other) {
+        if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.getDefaultInstance()) return this;
         if (other.hasAddressIndex()) {
           setAddressIndex(other.getAddressIndex());
         }
@@ -5545,7 +5545,7 @@ public final class ClusterMetricsMessages {
               metrics_ = other.metrics_;
               bitField0_ = (bitField0_ & ~0x00000004);
               metricsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getMetricsFieldBuilder() : null;
             } else {
               metricsBuilder_.addAllMessages(other.metrics_);
@@ -5575,14 +5575,14 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parsedMessage = null;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5667,22 +5667,22 @@ public final class ClusterMetricsMessages {
         return this;
       }
 
-      private java.util.List metrics_ =
+      private java.util.List metrics_ =
         java.util.Collections.emptyList();
       private void ensureMetricsIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          metrics_ = new java.util.ArrayList(metrics_);
+          metrics_ = new java.util.ArrayList(metrics_);
           bitField0_ |= 0x00000004;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder> metricsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder> metricsBuilder_;
 
       /**
        * repeated .NodeMetrics.Metric metrics = 3;
        */
-      public java.util.List getMetricsList() {
+      public java.util.List getMetricsList() {
         if (metricsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(metrics_);
         } else {
@@ -5702,7 +5702,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics.Metric metrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getMetrics(int index) {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric getMetrics(int index) {
         if (metricsBuilder_ == null) {
           return metrics_.get(index);
         } else {
@@ -5713,7 +5713,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics.Metric metrics = 3;
        */
       public Builder setMetrics(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric value) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric value) {
         if (metricsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5730,7 +5730,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics.Metric metrics = 3;
        */
       public Builder setMetrics(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder builderForValue) {
         if (metricsBuilder_ == null) {
           ensureMetricsIsMutable();
           metrics_.set(index, builderForValue.build());
@@ -5743,7 +5743,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics.Metric metrics = 3;
        */
-      public Builder addMetrics(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric value) {
+      public Builder addMetrics(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric value) {
         if (metricsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5760,7 +5760,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics.Metric metrics = 3;
        */
       public Builder addMetrics(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric value) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric value) {
         if (metricsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5777,7 +5777,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics.Metric metrics = 3;
        */
       public Builder addMetrics(
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder builderForValue) {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder builderForValue) {
         if (metricsBuilder_ == null) {
           ensureMetricsIsMutable();
           metrics_.add(builderForValue.build());
@@ -5791,7 +5791,7 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics.Metric metrics = 3;
        */
       public Builder addMetrics(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder builderForValue) {
         if (metricsBuilder_ == null) {
           ensureMetricsIsMutable();
           metrics_.add(index, builderForValue.build());
@@ -5805,10 +5805,10 @@ public final class ClusterMetricsMessages {
        * repeated .NodeMetrics.Metric metrics = 3;
        */
       public Builder addAllMetrics(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (metricsBuilder_ == null) {
           ensureMetricsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, metrics_);
           onChanged();
         } else {
@@ -5845,14 +5845,14 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics.Metric metrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder getMetricsBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder getMetricsBuilder(
           int index) {
         return getMetricsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .NodeMetrics.Metric metrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder getMetricsOrBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder getMetricsOrBuilder(
           int index) {
         if (metricsBuilder_ == null) {
           return metrics_.get(index);  } else {
@@ -5862,7 +5862,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics.Metric metrics = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getMetricsOrBuilderList() {
         if (metricsBuilder_ != null) {
           return metricsBuilder_.getMessageOrBuilderList();
@@ -5873,31 +5873,31 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .NodeMetrics.Metric metrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder addMetricsBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder addMetricsBuilder() {
         return getMetricsFieldBuilder().addBuilder(
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.getDefaultInstance());
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.getDefaultInstance());
       }
       /**
        * repeated .NodeMetrics.Metric metrics = 3;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder addMetricsBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder addMetricsBuilder(
           int index) {
         return getMetricsFieldBuilder().addBuilder(
-            index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.getDefaultInstance());
+            index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.getDefaultInstance());
       }
       /**
        * repeated .NodeMetrics.Metric metrics = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getMetricsBuilderList() {
         return getMetricsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder> 
           getMetricsFieldBuilder() {
         if (metricsBuilder_ == null) {
-          metricsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder>(
+          metricsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.Metric.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics.MetricOrBuilder>(
                   metrics_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
@@ -5908,13 +5908,13 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -5923,37 +5923,37 @@ public final class ClusterMetricsMessages {
     }
 
     // @@protoc_insertion_point(class_scope:NodeMetrics)
-    private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics();
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getDefaultInstance() {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public NodeMetrics parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new NodeMetrics(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.NodeMetrics getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5961,7 +5961,7 @@ public final class ClusterMetricsMessages {
 
   public interface AddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Address)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string system = 1;
@@ -5977,7 +5977,7 @@ public final class ClusterMetricsMessages {
      * required string system = 1;
      * @return The bytes for system.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes();
 
     /**
@@ -5994,7 +5994,7 @@ public final class ClusterMetricsMessages {
      * required string hostname = 2;
      * @return The bytes for hostname.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes();
 
     /**
@@ -6022,7 +6022,7 @@ public final class ClusterMetricsMessages {
      * optional string protocol = 4;
      * @return The bytes for protocol.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes();
   }
   /**
@@ -6034,12 +6034,12 @@ public final class ClusterMetricsMessages {
    * Protobuf type {@code Address}
    */
   public  static final class Address extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Address.newBuilder() to construct.
-    private Address(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Address(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Address() {
@@ -6051,26 +6051,26 @@ public final class ClusterMetricsMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Address();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Address(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6080,13 +6080,13 @@ public final class ClusterMetricsMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               system_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               hostname_ = bs;
               break;
@@ -6097,7 +6097,7 @@ public final class ClusterMetricsMessages {
               break;
             }
             case 34: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000008;
               protocol_ = bs;
               break;
@@ -6111,27 +6111,27 @@ public final class ClusterMetricsMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_descriptor;
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_fieldAccessorTable
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder.class);
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder.class);
     }
 
     private int bitField0_;
@@ -6153,8 +6153,8 @@ public final class ClusterMetricsMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           system_ = s;
@@ -6166,17 +6166,17 @@ public final class ClusterMetricsMessages {
      * required string system = 1;
      * @return The bytes for system.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         system_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -6198,8 +6198,8 @@ public final class ClusterMetricsMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           hostname_ = s;
@@ -6211,17 +6211,17 @@ public final class ClusterMetricsMessages {
      * required string hostname = 2;
      * @return The bytes for hostname.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         hostname_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -6260,8 +6260,8 @@ public final class ClusterMetricsMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           protocol_ = s;
@@ -6273,17 +6273,17 @@ public final class ClusterMetricsMessages {
      * optional string protocol = 4;
      * @return The bytes for protocol.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         protocol_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -6311,19 +6311,19 @@ public final class ClusterMetricsMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, system_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, system_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, hostname_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, hostname_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeUInt32(3, port_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_);
       }
       unknownFields.writeTo(output);
     }
@@ -6335,17 +6335,17 @@ public final class ClusterMetricsMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, system_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, system_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, hostname_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, hostname_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(3, port_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -6357,10 +6357,10 @@ public final class ClusterMetricsMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address)) {
+      if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address)) {
         return super.equals(obj);
       }
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address) obj;
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address) obj;
 
       if (hasSystem() != other.hasSystem()) return false;
       if (hasSystem()) {
@@ -6414,73 +6414,73 @@ public final class ClusterMetricsMessages {
       return hash;
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseDelimitedFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -6489,7 +6489,7 @@ public final class ClusterMetricsMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6500,7 +6500,7 @@ public final class ClusterMetricsMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -6513,34 +6513,34 @@ public final class ClusterMetricsMessages {
      * Protobuf type {@code Address}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Address)
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.Builder.class);
       }
 
-      // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.newBuilder()
+      // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -6559,19 +6559,19 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getDefaultInstanceForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address build() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address result = buildPartial();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address build() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6579,8 +6579,8 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address buildPartial() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address(this);
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address buildPartial() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6610,44 +6610,44 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address) {
-          return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address) {
+          return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address other) {
-        if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address other) {
+        if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address.getDefaultInstance()) return this;
         if (other.hasSystem()) {
           bitField0_ |= 0x00000001;
           system_ = other.system_;
@@ -6687,14 +6687,14 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parsedMessage = null;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6720,8 +6720,8 @@ public final class ClusterMetricsMessages {
       public java.lang.String getSystem() {
         java.lang.Object ref = system_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             system_ = s;
@@ -6735,17 +6735,17 @@ public final class ClusterMetricsMessages {
        * required string system = 1;
        * @return The bytes for system.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getSystemBytes() {
         java.lang.Object ref = system_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           system_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -6779,7 +6779,7 @@ public final class ClusterMetricsMessages {
        * @return This builder for chaining.
        */
       public Builder setSystemBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -6804,8 +6804,8 @@ public final class ClusterMetricsMessages {
       public java.lang.String getHostname() {
         java.lang.Object ref = hostname_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             hostname_ = s;
@@ -6819,17 +6819,17 @@ public final class ClusterMetricsMessages {
        * required string hostname = 2;
        * @return The bytes for hostname.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getHostnameBytes() {
         java.lang.Object ref = hostname_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           hostname_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -6863,7 +6863,7 @@ public final class ClusterMetricsMessages {
        * @return This builder for chaining.
        */
       public Builder setHostnameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -6925,8 +6925,8 @@ public final class ClusterMetricsMessages {
       public java.lang.String getProtocol() {
         java.lang.Object ref = protocol_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             protocol_ = s;
@@ -6940,17 +6940,17 @@ public final class ClusterMetricsMessages {
        * optional string protocol = 4;
        * @return The bytes for protocol.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getProtocolBytes() {
         java.lang.Object ref = protocol_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           protocol_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -6984,7 +6984,7 @@ public final class ClusterMetricsMessages {
        * @return This builder for chaining.
        */
       public Builder setProtocolBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -6995,13 +6995,13 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -7010,37 +7010,37 @@ public final class ClusterMetricsMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Address)
-    private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address();
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getDefaultInstance() {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
    
-        PARSER = new akka.protobufv3.internal.AbstractParser
    () {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
    
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser
    () {
       @java.lang.Override
       public Address parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Address(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser
     parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser
     parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser
     getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser
     getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.Address getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7048,7 +7048,7 @@ public final class ClusterMetricsMessages {
 
   public interface AdaptiveLoadBalancingPoolOrBuilder extends
       // @@protoc_insertion_point(interface_extends:AdaptiveLoadBalancingPool)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * 
    @@ -7067,7 +7067,7 @@ public final class ClusterMetricsMessages {
      * optional .MetricsSelector metricsSelector = 1;
      * @return The metricsSelector.
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getMetricsSelector();
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getMetricsSelector();
     /**
      * 
          * omitted if default
@@ -7075,7 +7075,7 @@ public final class ClusterMetricsMessages {
      *
      * optional .MetricsSelector metricsSelector = 1;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getMetricsSelectorOrBuilder();
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getMetricsSelectorOrBuilder();
 
     /**
      * required uint32 nrOfInstances = 2;
@@ -7114,7 +7114,7 @@ public final class ClusterMetricsMessages {
      * optional string routerDispatcher = 3;
      * @return The bytes for routerDispatcher.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRouterDispatcherBytes();
 
     /**
@@ -7132,12 +7132,12 @@ public final class ClusterMetricsMessages {
    * Protobuf type {@code AdaptiveLoadBalancingPool}
    */
   public  static final class AdaptiveLoadBalancingPool extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AdaptiveLoadBalancingPool)
       AdaptiveLoadBalancingPoolOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use AdaptiveLoadBalancingPool.newBuilder() to construct.
-    private AdaptiveLoadBalancingPool(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private AdaptiveLoadBalancingPool(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private AdaptiveLoadBalancingPool() {
@@ -7147,26 +7147,26 @@ public final class ClusterMetricsMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new AdaptiveLoadBalancingPool();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private AdaptiveLoadBalancingPool(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7176,11 +7176,11 @@ public final class ClusterMetricsMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder subBuilder = null;
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = metricsSelector_.toBuilder();
               }
-              metricsSelector_ = input.readMessage(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.PARSER, extensionRegistry);
+              metricsSelector_ = input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(metricsSelector_);
                 metricsSelector_ = subBuilder.buildPartial();
@@ -7194,7 +7194,7 @@ public final class ClusterMetricsMessages {
               break;
             }
             case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000004;
               routerDispatcher_ = bs;
               break;
@@ -7213,32 +7213,32 @@ public final class ClusterMetricsMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_descriptor;
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_fieldAccessorTable
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.Builder.class);
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.Builder.class);
     }
 
     private int bitField0_;
     public static final int METRICSSELECTOR_FIELD_NUMBER = 1;
-    private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector metricsSelector_;
+    private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector metricsSelector_;
     /**
      * 
          * omitted if default
@@ -7258,8 +7258,8 @@ public final class ClusterMetricsMessages {
      * optional .MetricsSelector metricsSelector = 1;
      * @return The metricsSelector.
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getMetricsSelector() {
-      return metricsSelector_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_;
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getMetricsSelector() {
+      return metricsSelector_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_;
     }
     /**
      * 
    @@ -7268,8 +7268,8 @@ public final class ClusterMetricsMessages {
      *
      * optional .MetricsSelector metricsSelector = 1;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getMetricsSelectorOrBuilder() {
-      return metricsSelector_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_;
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getMetricsSelectorOrBuilder() {
+      return metricsSelector_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_;
     }
 
     public static final int NROFINSTANCES_FIELD_NUMBER = 2;
@@ -7315,8 +7315,8 @@ public final class ClusterMetricsMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           routerDispatcher_ = s;
@@ -7332,17 +7332,17 @@ public final class ClusterMetricsMessages {
      * optional string routerDispatcher = 3;
      * @return The bytes for routerDispatcher.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRouterDispatcherBytes() {
       java.lang.Object ref = routerDispatcher_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         routerDispatcher_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -7389,7 +7389,7 @@ public final class ClusterMetricsMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getMetricsSelector());
@@ -7398,7 +7398,7 @@ public final class ClusterMetricsMessages {
         output.writeUInt32(2, nrOfInstances_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, routerDispatcher_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, routerDispatcher_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeBool(4, usePoolDispatcher_);
@@ -7413,18 +7413,18 @@ public final class ClusterMetricsMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getMetricsSelector());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(2, nrOfInstances_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, routerDispatcher_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, routerDispatcher_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(4, usePoolDispatcher_);
       }
       size += unknownFields.getSerializedSize();
@@ -7437,10 +7437,10 @@ public final class ClusterMetricsMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool)) {
+      if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool)) {
         return super.equals(obj);
       }
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool) obj;
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool) obj;
 
       if (hasMetricsSelector() != other.hasMetricsSelector()) return false;
       if (hasMetricsSelector()) {
@@ -7487,7 +7487,7 @@ public final class ClusterMetricsMessages {
       }
       if (hasUsePoolDispatcher()) {
         hash = (37 * hash) + USEPOOLDISPATCHER_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getUsePoolDispatcher());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -7495,73 +7495,73 @@ public final class ClusterMetricsMessages {
       return hash;
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseDelimitedFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -7570,7 +7570,7 @@ public final class ClusterMetricsMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7581,7 +7581,7 @@ public final class ClusterMetricsMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -7589,34 +7589,34 @@ public final class ClusterMetricsMessages {
      * Protobuf type {@code AdaptiveLoadBalancingPool}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:AdaptiveLoadBalancingPool)
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPoolOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPoolOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.Builder.class);
       }
 
-      // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.newBuilder()
+      // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getMetricsSelectorFieldBuilder();
         }
@@ -7640,19 +7640,19 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_AdaptiveLoadBalancingPool_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool getDefaultInstanceForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.getDefaultInstance();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool build() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool result = buildPartial();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool build() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7660,8 +7660,8 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool buildPartial() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool(this);
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool buildPartial() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7695,44 +7695,44 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool) {
-          return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool) {
+          return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool other) {
-        if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool other) {
+        if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool.getDefaultInstance()) return this;
         if (other.hasMetricsSelector()) {
           mergeMetricsSelector(other.getMetricsSelector());
         }
@@ -7770,14 +7770,14 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parsedMessage = null;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7788,9 +7788,9 @@ public final class ClusterMetricsMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector metricsSelector_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder> metricsSelectorBuilder_;
+      private org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector metricsSelector_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder> metricsSelectorBuilder_;
       /**
        * 
            * omitted if default
@@ -7810,9 +7810,9 @@ public final class ClusterMetricsMessages {
        * optional .MetricsSelector metricsSelector = 1;
        * @return The metricsSelector.
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getMetricsSelector() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getMetricsSelector() {
         if (metricsSelectorBuilder_ == null) {
-          return metricsSelector_ == null ? akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_;
+          return metricsSelector_ == null ? org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_;
         } else {
           return metricsSelectorBuilder_.getMessage();
         }
@@ -7824,7 +7824,7 @@ public final class ClusterMetricsMessages {
        *
        * optional .MetricsSelector metricsSelector = 1;
        */
-      public Builder setMetricsSelector(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
+      public Builder setMetricsSelector(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
         if (metricsSelectorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7845,7 +7845,7 @@ public final class ClusterMetricsMessages {
        * optional .MetricsSelector metricsSelector = 1;
        */
       public Builder setMetricsSelector(
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder builderForValue) {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder builderForValue) {
         if (metricsSelectorBuilder_ == null) {
           metricsSelector_ = builderForValue.build();
           onChanged();
@@ -7862,13 +7862,13 @@ public final class ClusterMetricsMessages {
        *
        * optional .MetricsSelector metricsSelector = 1;
        */
-      public Builder mergeMetricsSelector(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
+      public Builder mergeMetricsSelector(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
         if (metricsSelectorBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               metricsSelector_ != null &&
-              metricsSelector_ != akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance()) {
+              metricsSelector_ != org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance()) {
             metricsSelector_ =
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.newBuilder(metricsSelector_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.newBuilder(metricsSelector_).mergeFrom(value).buildPartial();
           } else {
             metricsSelector_ = value;
           }
@@ -7903,7 +7903,7 @@ public final class ClusterMetricsMessages {
        *
        * optional .MetricsSelector metricsSelector = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder getMetricsSelectorBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder getMetricsSelectorBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getMetricsSelectorFieldBuilder().getBuilder();
@@ -7915,12 +7915,12 @@ public final class ClusterMetricsMessages {
        *
        * optional .MetricsSelector metricsSelector = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getMetricsSelectorOrBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getMetricsSelectorOrBuilder() {
         if (metricsSelectorBuilder_ != null) {
           return metricsSelectorBuilder_.getMessageOrBuilder();
         } else {
           return metricsSelector_ == null ?
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_;
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance() : metricsSelector_;
         }
       }
       /**
@@ -7930,12 +7930,12 @@ public final class ClusterMetricsMessages {
        *
        * optional .MetricsSelector metricsSelector = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder> 
           getMetricsSelectorFieldBuilder() {
         if (metricsSelectorBuilder_ == null) {
-          metricsSelectorBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder>(
+          metricsSelectorBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder>(
                   getMetricsSelector(),
                   getParentForChildren(),
                   isClean());
@@ -8004,8 +8004,8 @@ public final class ClusterMetricsMessages {
       public java.lang.String getRouterDispatcher() {
         java.lang.Object ref = routerDispatcher_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             routerDispatcher_ = s;
@@ -8023,17 +8023,17 @@ public final class ClusterMetricsMessages {
        * optional string routerDispatcher = 3;
        * @return The bytes for routerDispatcher.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRouterDispatcherBytes() {
         java.lang.Object ref = routerDispatcher_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           routerDispatcher_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -8079,7 +8079,7 @@ public final class ClusterMetricsMessages {
        * @return This builder for chaining.
        */
       public Builder setRouterDispatcherBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8127,13 +8127,13 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -8142,37 +8142,37 @@ public final class ClusterMetricsMessages {
     }
 
     // @@protoc_insertion_point(class_scope:AdaptiveLoadBalancingPool)
-    private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool();
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool getDefaultInstance() {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public AdaptiveLoadBalancingPool parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new AdaptiveLoadBalancingPool(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.AdaptiveLoadBalancingPool getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8180,7 +8180,7 @@ public final class ClusterMetricsMessages {
 
   public interface MetricsSelectorOrBuilder extends
       // @@protoc_insertion_point(interface_extends:MetricsSelector)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required uint32 serializerId = 1;
@@ -8207,7 +8207,7 @@ public final class ClusterMetricsMessages {
      * required string manifest = 2;
      * @return The bytes for manifest.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getManifestBytes();
 
     /**
@@ -8219,7 +8219,7 @@ public final class ClusterMetricsMessages {
      * required bytes data = 3;
      * @return The data.
      */
-    akka.protobufv3.internal.ByteString getData();
+    org.apache.pekko.protobufv3.internal.ByteString getData();
   }
   /**
    * 
    @@ -8229,42 +8229,42 @@ public final class ClusterMetricsMessages {
    * Protobuf type {@code MetricsSelector}
    */
   public  static final class MetricsSelector extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MetricsSelector)
       MetricsSelectorOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use MetricsSelector.newBuilder() to construct.
-    private MetricsSelector(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private MetricsSelector(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private MetricsSelector() {
       manifest_ = "";
-      data_ = akka.protobufv3.internal.ByteString.EMPTY;
+      data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new MetricsSelector();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private MetricsSelector(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8279,7 +8279,7 @@ public final class ClusterMetricsMessages {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               manifest_ = bs;
               break;
@@ -8298,27 +8298,27 @@ public final class ClusterMetricsMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_descriptor;
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_fieldAccessorTable
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder.class);
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder.class);
     }
 
     private int bitField0_;
@@ -8357,8 +8357,8 @@ public final class ClusterMetricsMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           manifest_ = s;
@@ -8370,22 +8370,22 @@ public final class ClusterMetricsMessages {
      * required string manifest = 2;
      * @return The bytes for manifest.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getManifestBytes() {
       java.lang.Object ref = manifest_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         manifest_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int DATA_FIELD_NUMBER = 3;
-    private akka.protobufv3.internal.ByteString data_;
+    private org.apache.pekko.protobufv3.internal.ByteString data_;
     /**
      * required bytes data = 3;
      * @return Whether the data field is set.
@@ -8397,7 +8397,7 @@ public final class ClusterMetricsMessages {
      * required bytes data = 3;
      * @return The data.
      */
-    public akka.protobufv3.internal.ByteString getData() {
+    public org.apache.pekko.protobufv3.internal.ByteString getData() {
       return data_;
     }
 
@@ -8425,13 +8425,13 @@ public final class ClusterMetricsMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt32(1, serializerId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, manifest_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, manifest_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(3, data_);
@@ -8446,14 +8446,14 @@ public final class ClusterMetricsMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(1, serializerId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, manifest_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, manifest_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, data_);
       }
       size += unknownFields.getSerializedSize();
@@ -8466,10 +8466,10 @@ public final class ClusterMetricsMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector)) {
+      if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector)) {
         return super.equals(obj);
       }
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector) obj;
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector) obj;
 
       if (hasSerializerId() != other.hasSerializerId()) return false;
       if (hasSerializerId()) {
@@ -8514,73 +8514,73 @@ public final class ClusterMetricsMessages {
       return hash;
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseDelimitedFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -8589,7 +8589,7 @@ public final class ClusterMetricsMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8600,7 +8600,7 @@ public final class ClusterMetricsMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -8612,34 +8612,34 @@ public final class ClusterMetricsMessages {
      * Protobuf type {@code MetricsSelector}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:MetricsSelector)
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder.class);
       }
 
-      // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.newBuilder()
+      // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -8650,25 +8650,25 @@ public final class ClusterMetricsMessages {
         bitField0_ = (bitField0_ & ~0x00000001);
         manifest_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
-        data_ = akka.protobufv3.internal.ByteString.EMPTY;
+        data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MetricsSelector_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getDefaultInstanceForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector build() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector result = buildPartial();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector build() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8676,8 +8676,8 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector buildPartial() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector(this);
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector buildPartial() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -8703,44 +8703,44 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector) {
-          return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector) {
+          return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector other) {
-        if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector other) {
+        if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance()) return this;
         if (other.hasSerializerId()) {
           setSerializerId(other.getSerializerId());
         }
@@ -8773,14 +8773,14 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parsedMessage = null;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -8843,8 +8843,8 @@ public final class ClusterMetricsMessages {
       public java.lang.String getManifest() {
         java.lang.Object ref = manifest_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             manifest_ = s;
@@ -8858,17 +8858,17 @@ public final class ClusterMetricsMessages {
        * required string manifest = 2;
        * @return The bytes for manifest.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getManifestBytes() {
         java.lang.Object ref = manifest_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           manifest_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -8902,7 +8902,7 @@ public final class ClusterMetricsMessages {
        * @return This builder for chaining.
        */
       public Builder setManifestBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8912,7 +8912,7 @@ public final class ClusterMetricsMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.ByteString data_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes data = 3;
        * @return Whether the data field is set.
@@ -8924,7 +8924,7 @@ public final class ClusterMetricsMessages {
        * required bytes data = 3;
        * @return The data.
        */
-      public akka.protobufv3.internal.ByteString getData() {
+      public org.apache.pekko.protobufv3.internal.ByteString getData() {
         return data_;
       }
       /**
@@ -8932,7 +8932,7 @@ public final class ClusterMetricsMessages {
        * @param value The data to set.
        * @return This builder for chaining.
        */
-      public Builder setData(akka.protobufv3.internal.ByteString value) {
+      public Builder setData(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8953,13 +8953,13 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -8968,37 +8968,37 @@ public final class ClusterMetricsMessages {
     }
 
     // @@protoc_insertion_point(class_scope:MetricsSelector)
-    private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector();
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getDefaultInstance() {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public MetricsSelector parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new MetricsSelector(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -9006,17 +9006,17 @@ public final class ClusterMetricsMessages {
 
   public interface MixMetricsSelectorOrBuilder extends
       // @@protoc_insertion_point(interface_extends:MixMetricsSelector)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .MetricsSelector selectors = 1;
      */
-    java.util.List 
+    java.util.List 
         getSelectorsList();
     /**
      * repeated .MetricsSelector selectors = 1;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getSelectors(int index);
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getSelectors(int index);
     /**
      * repeated .MetricsSelector selectors = 1;
      */
@@ -9024,24 +9024,24 @@ public final class ClusterMetricsMessages {
     /**
      * repeated .MetricsSelector selectors = 1;
      */
-    java.util.List 
+    java.util.List 
         getSelectorsOrBuilderList();
     /**
      * repeated .MetricsSelector selectors = 1;
      */
-    akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getSelectorsOrBuilder(
+    org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getSelectorsOrBuilder(
         int index);
   }
   /**
    * Protobuf type {@code MixMetricsSelector}
    */
   public  static final class MixMetricsSelector extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MixMetricsSelector)
       MixMetricsSelectorOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use MixMetricsSelector.newBuilder() to construct.
-    private MixMetricsSelector(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private MixMetricsSelector(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private MixMetricsSelector() {
@@ -9051,26 +9051,26 @@ public final class ClusterMetricsMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new MixMetricsSelector();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private MixMetricsSelector(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9081,11 +9081,11 @@ public final class ClusterMetricsMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                selectors_ = new java.util.ArrayList();
+                selectors_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               selectors_.add(
-                  input.readMessage(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -9097,10 +9097,10 @@ public final class ClusterMetricsMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -9110,31 +9110,31 @@ public final class ClusterMetricsMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_descriptor;
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_fieldAccessorTable
+      return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.Builder.class);
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.Builder.class);
     }
 
     public static final int SELECTORS_FIELD_NUMBER = 1;
-    private java.util.List selectors_;
+    private java.util.List selectors_;
     /**
      * repeated .MetricsSelector selectors = 1;
      */
-    public java.util.List getSelectorsList() {
+    public java.util.List getSelectorsList() {
       return selectors_;
     }
     /**
      * repeated .MetricsSelector selectors = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getSelectorsOrBuilderList() {
       return selectors_;
     }
@@ -9147,13 +9147,13 @@ public final class ClusterMetricsMessages {
     /**
      * repeated .MetricsSelector selectors = 1;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getSelectors(int index) {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getSelectors(int index) {
       return selectors_.get(index);
     }
     /**
      * repeated .MetricsSelector selectors = 1;
      */
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getSelectorsOrBuilder(
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getSelectorsOrBuilder(
         int index) {
       return selectors_.get(index);
     }
@@ -9176,7 +9176,7 @@ public final class ClusterMetricsMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < selectors_.size(); i++) {
         output.writeMessage(1, selectors_.get(i));
@@ -9191,7 +9191,7 @@ public final class ClusterMetricsMessages {
 
       size = 0;
       for (int i = 0; i < selectors_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, selectors_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -9204,10 +9204,10 @@ public final class ClusterMetricsMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector)) {
+      if (!(obj instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector)) {
         return super.equals(obj);
       }
-      akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector other = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector) obj;
+      org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector other = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector) obj;
 
       if (!getSelectorsList()
           .equals(other.getSelectorsList())) return false;
@@ -9231,73 +9231,73 @@ public final class ClusterMetricsMessages {
       return hash;
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseDelimitedFrom(
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -9306,7 +9306,7 @@ public final class ClusterMetricsMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -9317,7 +9317,7 @@ public final class ClusterMetricsMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -9325,34 +9325,34 @@ public final class ClusterMetricsMessages {
      * Protobuf type {@code MixMetricsSelector}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:MixMetricsSelector)
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelectorOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelectorOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_fieldAccessorTable
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.class, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.Builder.class);
+                org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.class, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.Builder.class);
       }
 
-      // Construct using akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.newBuilder()
+      // Construct using org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getSelectorsFieldBuilder();
         }
@@ -9370,19 +9370,19 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_descriptor;
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.internal_static_MixMetricsSelector_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector getDefaultInstanceForType() {
-        return akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.getDefaultInstance();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector build() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector result = buildPartial();
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector build() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9390,8 +9390,8 @@ public final class ClusterMetricsMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector buildPartial() {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector result = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector(this);
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector buildPartial() {
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector result = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector(this);
         int from_bitField0_ = bitField0_;
         if (selectorsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -9412,44 +9412,44 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector) {
-          return mergeFrom((akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector) {
+          return mergeFrom((org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector other) {
-        if (other == akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector other) {
+        if (other == org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector.getDefaultInstance()) return this;
         if (selectorsBuilder_ == null) {
           if (!other.selectors_.isEmpty()) {
             if (selectors_.isEmpty()) {
@@ -9469,7 +9469,7 @@ public final class ClusterMetricsMessages {
               selectors_ = other.selectors_;
               bitField0_ = (bitField0_ & ~0x00000001);
               selectorsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getSelectorsFieldBuilder() : null;
             } else {
               selectorsBuilder_.addAllMessages(other.selectors_);
@@ -9493,14 +9493,14 @@ public final class ClusterMetricsMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parsedMessage = null;
+        org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -9511,22 +9511,22 @@ public final class ClusterMetricsMessages {
       }
       private int bitField0_;
 
-      private java.util.List selectors_ =
+      private java.util.List selectors_ =
         java.util.Collections.emptyList();
       private void ensureSelectorsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          selectors_ = new java.util.ArrayList(selectors_);
+          selectors_ = new java.util.ArrayList(selectors_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder> selectorsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder> selectorsBuilder_;
 
       /**
        * repeated .MetricsSelector selectors = 1;
        */
-      public java.util.List getSelectorsList() {
+      public java.util.List getSelectorsList() {
         if (selectorsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(selectors_);
         } else {
@@ -9546,7 +9546,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .MetricsSelector selectors = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getSelectors(int index) {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector getSelectors(int index) {
         if (selectorsBuilder_ == null) {
           return selectors_.get(index);
         } else {
@@ -9557,7 +9557,7 @@ public final class ClusterMetricsMessages {
        * repeated .MetricsSelector selectors = 1;
        */
       public Builder setSelectors(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
         if (selectorsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9574,7 +9574,7 @@ public final class ClusterMetricsMessages {
        * repeated .MetricsSelector selectors = 1;
        */
       public Builder setSelectors(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder builderForValue) {
         if (selectorsBuilder_ == null) {
           ensureSelectorsIsMutable();
           selectors_.set(index, builderForValue.build());
@@ -9587,7 +9587,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .MetricsSelector selectors = 1;
        */
-      public Builder addSelectors(akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
+      public Builder addSelectors(org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
         if (selectorsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9604,7 +9604,7 @@ public final class ClusterMetricsMessages {
        * repeated .MetricsSelector selectors = 1;
        */
       public Builder addSelectors(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector value) {
         if (selectorsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9621,7 +9621,7 @@ public final class ClusterMetricsMessages {
        * repeated .MetricsSelector selectors = 1;
        */
       public Builder addSelectors(
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder builderForValue) {
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder builderForValue) {
         if (selectorsBuilder_ == null) {
           ensureSelectorsIsMutable();
           selectors_.add(builderForValue.build());
@@ -9635,7 +9635,7 @@ public final class ClusterMetricsMessages {
        * repeated .MetricsSelector selectors = 1;
        */
       public Builder addSelectors(
-          int index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder builderForValue) {
         if (selectorsBuilder_ == null) {
           ensureSelectorsIsMutable();
           selectors_.add(index, builderForValue.build());
@@ -9649,10 +9649,10 @@ public final class ClusterMetricsMessages {
        * repeated .MetricsSelector selectors = 1;
        */
       public Builder addAllSelectors(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (selectorsBuilder_ == null) {
           ensureSelectorsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, selectors_);
           onChanged();
         } else {
@@ -9689,14 +9689,14 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .MetricsSelector selectors = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder getSelectorsBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder getSelectorsBuilder(
           int index) {
         return getSelectorsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .MetricsSelector selectors = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getSelectorsOrBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder getSelectorsOrBuilder(
           int index) {
         if (selectorsBuilder_ == null) {
           return selectors_.get(index);  } else {
@@ -9706,7 +9706,7 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .MetricsSelector selectors = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getSelectorsOrBuilderList() {
         if (selectorsBuilder_ != null) {
           return selectorsBuilder_.getMessageOrBuilderList();
@@ -9717,31 +9717,31 @@ public final class ClusterMetricsMessages {
       /**
        * repeated .MetricsSelector selectors = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder addSelectorsBuilder() {
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder addSelectorsBuilder() {
         return getSelectorsFieldBuilder().addBuilder(
-            akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance());
+            org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance());
       }
       /**
        * repeated .MetricsSelector selectors = 1;
        */
-      public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder addSelectorsBuilder(
+      public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder addSelectorsBuilder(
           int index) {
         return getSelectorsFieldBuilder().addBuilder(
-            index, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance());
+            index, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.getDefaultInstance());
       }
       /**
        * repeated .MetricsSelector selectors = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getSelectorsBuilderList() {
         return getSelectorsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder> 
           getSelectorsFieldBuilder() {
         if (selectorsBuilder_ == null) {
-          selectorsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder>(
+          selectorsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelector.Builder, org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MetricsSelectorOrBuilder>(
                   selectors_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -9752,13 +9752,13 @@ public final class ClusterMetricsMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -9767,98 +9767,98 @@ public final class ClusterMetricsMessages {
     }
 
     // @@protoc_insertion_point(class_scope:MixMetricsSelector)
-    private static final akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector();
     }
 
-    public static akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector getDefaultInstance() {
+    public static org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public MixMetricsSelector parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new MixMetricsSelector(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.metrics.protobuf.msg.ClusterMetricsMessages.MixMetricsSelector getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_MetricsGossipEnvelope_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_MetricsGossipEnvelope_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_MetricsGossip_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_MetricsGossip_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_NodeMetrics_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_NodeMetrics_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_NodeMetrics_Number_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_NodeMetrics_Number_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_NodeMetrics_EWMA_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_NodeMetrics_EWMA_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_NodeMetrics_Metric_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_NodeMetrics_Metric_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Address_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Address_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_AdaptiveLoadBalancingPool_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_AdaptiveLoadBalancingPool_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_MetricsSelector_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_MetricsSelector_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_MixMetricsSelector_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_MixMetricsSelector_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -9887,71 +9887,71 @@ public final class ClusterMetricsMessages {
       "csSelector\022\024\n\014serializerId\030\001 \002(\r\022\020\n\010mani" +
       "fest\030\002 \002(\t\022\014\n\004data\030\003 \002(\014\"9\n\022MixMetricsSe" +
       "lector\022#\n\tselectors\030\001 \003(\0132\020.MetricsSelec" +
-      "torB%\n!akka.cluster.metrics.protobuf.msg" +
-      "H\001"
+      "torB1\n-org.apache.pekko.cluster.metrics." +
+      "protobuf.msgH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_MetricsGossipEnvelope_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_MetricsGossipEnvelope_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MetricsGossipEnvelope_descriptor,
         new java.lang.String[] { "From", "Gossip", "Reply", });
     internal_static_MetricsGossip_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_MetricsGossip_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MetricsGossip_descriptor,
         new java.lang.String[] { "AllAddresses", "AllMetricNames", "NodeMetrics", });
     internal_static_NodeMetrics_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_NodeMetrics_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_NodeMetrics_descriptor,
         new java.lang.String[] { "AddressIndex", "Timestamp", "Metrics", });
     internal_static_NodeMetrics_Number_descriptor =
       internal_static_NodeMetrics_descriptor.getNestedTypes().get(0);
     internal_static_NodeMetrics_Number_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_NodeMetrics_Number_descriptor,
         new java.lang.String[] { "Type", "Value32", "Value64", "Serialized", });
     internal_static_NodeMetrics_EWMA_descriptor =
       internal_static_NodeMetrics_descriptor.getNestedTypes().get(1);
     internal_static_NodeMetrics_EWMA_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_NodeMetrics_EWMA_descriptor,
         new java.lang.String[] { "Value", "Alpha", });
     internal_static_NodeMetrics_Metric_descriptor =
       internal_static_NodeMetrics_descriptor.getNestedTypes().get(2);
     internal_static_NodeMetrics_Metric_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_NodeMetrics_Metric_descriptor,
         new java.lang.String[] { "NameIndex", "Number", "Ewma", });
     internal_static_Address_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_Address_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Address_descriptor,
         new java.lang.String[] { "System", "Hostname", "Port", "Protocol", });
     internal_static_AdaptiveLoadBalancingPool_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_AdaptiveLoadBalancingPool_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AdaptiveLoadBalancingPool_descriptor,
         new java.lang.String[] { "MetricsSelector", "NrOfInstances", "RouterDispatcher", "UsePoolDispatcher", });
     internal_static_MetricsSelector_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_MetricsSelector_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MetricsSelector_descriptor,
         new java.lang.String[] { "SerializerId", "Manifest", "Data", });
     internal_static_MixMetricsSelector_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_MixMetricsSelector_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MixMetricsSelector_descriptor,
         new java.lang.String[] { "Selectors", });
   }
diff --git a/akka-cluster-metrics/src/main/protobuf/ClusterMetricsMessages.proto b/akka-cluster-metrics/src/main/protobuf/ClusterMetricsMessages.proto
index a24230606b..8115e34fd5 100644
--- a/akka-cluster-metrics/src/main/protobuf/ClusterMetricsMessages.proto
+++ b/akka-cluster-metrics/src/main/protobuf/ClusterMetricsMessages.proto
@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-option java_package = "akka.cluster.metrics.protobuf.msg";
+option java_package = "org.apache.pekko.cluster.metrics.protobuf.msg";
 option optimize_for = SPEED;
 
 /****************************************
diff --git a/akka-cluster-metrics/src/main/resources/reference.conf b/akka-cluster-metrics/src/main/resources/reference.conf
index a3f83682bc..9f665e3f5c 100644
--- a/akka-cluster-metrics/src/main/resources/reference.conf
+++ b/akka-cluster-metrics/src/main/resources/reference.conf
@@ -35,10 +35,10 @@ akka.cluster.metrics {
     # Supervision strategy.
     strategy {
       #
-      # FQCN of class providing `akka.actor.SupervisorStrategy`.
+      # FQCN of class providing `org.apache.pekko.actor.SupervisorStrategy`.
       # Must have a constructor with signature `(com.typesafe.config.Config)`.
       # Default metrics strategy provider is a configurable extension of `OneForOneStrategy`.
-      provider = "akka.cluster.metrics.ClusterMetricsStrategy"
+      provider = "org.apache.pekko.cluster.metrics.ClusterMetricsStrategy"
       #
       # Configuration of the default strategy provider.
       # Replace with custom settings when overriding the provider.
@@ -56,11 +56,11 @@ akka.cluster.metrics {
   collector {
     # Enable or disable metrics collector for load-balancing nodes.
     # Metrics collection can also be controlled at runtime by sending control messages
-    # to /system/cluster-metrics actor: `akka.cluster.metrics.{CollectionStartMessage,CollectionStopMessage}`
+    # to /system/cluster-metrics actor: `org.apache.pekko.cluster.metrics.{CollectionStartMessage,CollectionStopMessage}`
     enabled = on
     # FQCN of the metrics collector implementation.
-    # It must implement `akka.cluster.metrics.MetricsCollector` and
-    # have public constructor with akka.actor.ActorSystem parameter.
+    # It must implement `org.apache.pekko.cluster.metrics.MetricsCollector` and
+    # have public constructor with org.apache.pekko.actor.ActorSystem parameter.
     # Will try to load in the following order of priority:
     # 1) configured custom collector 2) internal `SigarMetricsCollector` 3) internal `JmxMetricsCollector`
     provider = ""
@@ -88,24 +88,24 @@ akka.cluster.metrics {
 akka.actor {
   # Protobuf serializer for remote cluster metrics messages.
   serializers {
-    akka-cluster-metrics = "akka.cluster.metrics.protobuf.MessageSerializer"
+    akka-cluster-metrics = "org.apache.pekko.cluster.metrics.protobuf.MessageSerializer"
   }
   # Interface binding for remote cluster metrics messages.
   serialization-bindings {
-    "akka.cluster.metrics.ClusterMetricsMessage" = akka-cluster-metrics
-    "akka.cluster.metrics.AdaptiveLoadBalancingPool" = akka-cluster-metrics
-    "akka.cluster.metrics.MixMetricsSelector" = akka-cluster-metrics
-    "akka.cluster.metrics.CpuMetricsSelector$" = akka-cluster-metrics
-    "akka.cluster.metrics.HeapMetricsSelector$" = akka-cluster-metrics
-    "akka.cluster.metrics.SystemLoadAverageMetricsSelector$" = akka-cluster-metrics
+    "org.apache.pekko.cluster.metrics.ClusterMetricsMessage" = akka-cluster-metrics
+    "org.apache.pekko.cluster.metrics.AdaptiveLoadBalancingPool" = akka-cluster-metrics
+    "org.apache.pekko.cluster.metrics.MixMetricsSelector" = akka-cluster-metrics
+    "org.apache.pekko.cluster.metrics.CpuMetricsSelector$" = akka-cluster-metrics
+    "org.apache.pekko.cluster.metrics.HeapMetricsSelector$" = akka-cluster-metrics
+    "org.apache.pekko.cluster.metrics.SystemLoadAverageMetricsSelector$" = akka-cluster-metrics
   }
   # Globally unique metrics extension serializer identifier.
   serialization-identifiers {
-    "akka.cluster.metrics.protobuf.MessageSerializer" = 10
+    "org.apache.pekko.cluster.metrics.protobuf.MessageSerializer" = 10
   }
   #  Provide routing of messages based on cluster metrics.
   router.type-mapping {
-    cluster-metrics-adaptive-pool  = "akka.cluster.metrics.AdaptiveLoadBalancingPool"
-    cluster-metrics-adaptive-group = "akka.cluster.metrics.AdaptiveLoadBalancingGroup"
+    cluster-metrics-adaptive-pool  = "org.apache.pekko.cluster.metrics.AdaptiveLoadBalancingPool"
+    cluster-metrics-adaptive-group = "org.apache.pekko.cluster.metrics.AdaptiveLoadBalancingGroup"
   }
 }
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
similarity index 94%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
index 7c2949c9b7..7e9e4c85eb 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -10,15 +10,16 @@ import scala.collection.immutable
 
 import scala.annotation.nowarn
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.Address
-import akka.actor.DeadLetterSuppression
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent
-import akka.cluster.Member
-import akka.cluster.MemberStatus
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.Address
+import pekko.actor.DeadLetterSuppression
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
 
 /**
  *  Runtime collection management commands.
@@ -221,7 +222,7 @@ private[metrics] class ClusterMetricsCollector extends Actor with ActorLogging {
   }
 
   /**
-   * Updates the initial node ring for those nodes that are [[akka.cluster.MemberStatus]] `Up`.
+   * Updates the initial node ring for those nodes that are [[pekko.cluster.MemberStatus]] `Up`.
    */
   def receiveState(state: CurrentClusterState): Unit =
     nodes = state.members.diff(state.unreachable).collect {
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala
similarity index 86%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala
index 2541ad8c1d..298f554600 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import scala.collection.immutable
 
 import com.typesafe.config.Config
 
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.Deploy
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.actor.Props
-import akka.actor.SupervisorStrategy
-import akka.event.Logging
-import akka.event.LoggingAdapter
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.Deploy
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.actor.Props
+import pekko.actor.SupervisorStrategy
+import pekko.event.Logging
+import pekko.event.LoggingAdapter
 
 /**
  * Cluster metrics extension.
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
similarity index 94%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
index 8c0dad2b43..a42b0eb4df 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import java.util.Arrays
 import java.util.concurrent.ThreadLocalRandom
@@ -14,18 +14,19 @@ import scala.collection.immutable
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor.Actor
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.DynamicAccess
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.Props
-import akka.actor.SupervisorStrategy
-import akka.cluster.Cluster
-import akka.cluster.routing.ClusterRouterSettingsBase
-import akka.dispatch.Dispatchers
-import akka.japi.Util.immutableSeq
-import akka.routing._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.DynamicAccess
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.Props
+import pekko.actor.SupervisorStrategy
+import pekko.cluster.Cluster
+import pekko.cluster.routing.ClusterRouterSettingsBase
+import pekko.dispatch.Dispatchers
+import pekko.japi.Util.immutableSeq
+import pekko.routing._
 
 /**
  * Load balancing of messages to cluster nodes based on cluster metric data.
@@ -206,7 +207,7 @@ final case class AdaptiveLoadBalancingPool(
  *   on remaining capacity as indicated by the node metrics
  *
  * @param paths string representation of the actor paths of the routees, messages are
- *   sent with [[akka.actor.ActorSelection]] to these paths
+ *   sent with [[pekko.actor.ActorSelection]] to these paths
  *
  * @param routerDispatcher dispatcher to use for the router head actor, which handles
  *   router management messages
@@ -228,7 +229,7 @@ final case class AdaptiveLoadBalancingGroup(
    * @param metricsSelector decides what probability to use for selecting a routee, based
    *   on remaining capacity as indicated by the node metrics
    * @param routeesPaths string representation of the actor paths of the routees, messages are
-   *   sent with [[akka.actor.ActorSelection]] to these paths
+   *   sent with [[pekko.actor.ActorSelection]] to these paths
    */
   def this(metricsSelector: MetricsSelector, routeesPaths: java.lang.Iterable[String]) =
     this(paths = immutableSeq(routeesPaths))
@@ -258,7 +259,7 @@ final case class AdaptiveLoadBalancingGroup(
  */
 @SerialVersionUID(1L)
 case object HeapMetricsSelector extends CapacityMetricsSelector {
-  import akka.cluster.metrics.StandardMetrics.HeapMemory
+  import pekko.cluster.metrics.StandardMetrics.HeapMemory
 
   /**
    * Java API: get the singleton instance
@@ -287,7 +288,7 @@ case object HeapMetricsSelector extends CapacityMetricsSelector {
  */
 @SerialVersionUID(1L)
 case object CpuMetricsSelector extends CapacityMetricsSelector {
-  import akka.cluster.metrics.StandardMetrics.Cpu
+  import pekko.cluster.metrics.StandardMetrics.Cpu
 
   /**
    * Java API: get the singleton instance
@@ -326,7 +327,7 @@ case object CpuMetricsSelector extends CapacityMetricsSelector {
  */
 @SerialVersionUID(1L)
 case object SystemLoadAverageMetricsSelector extends CapacityMetricsSelector {
-  import akka.cluster.metrics.StandardMetrics.Cpu
+  import pekko.cluster.metrics.StandardMetrics.Cpu
 
   /**
    * Java API: get the singleton instance
@@ -343,8 +344,8 @@ case object SystemLoadAverageMetricsSelector extends CapacityMetricsSelector {
 }
 
 /**
- * Singleton instance of the default MixMetricsSelector, which uses [akka.cluster.routing.HeapMetricsSelector],
- * [akka.cluster.routing.CpuMetricsSelector], and [akka.cluster.routing.SystemLoadAverageMetricsSelector]
+ * Singleton instance of the default MixMetricsSelector, which uses [org.apache.pekko.cluster.routing.HeapMetricsSelector],
+ * [org.apache.pekko.cluster.routing.CpuMetricsSelector], and [org.apache.pekko.cluster.routing.SystemLoadAverageMetricsSelector]
  */
 @SerialVersionUID(1L)
 object MixMetricsSelector
@@ -358,8 +359,8 @@ object MixMetricsSelector
 
 /**
  * MetricsSelector that combines other selectors and aggregates their capacity
- * values. By default it uses [akka.cluster.routing.HeapMetricsSelector],
- * [akka.cluster.routing.CpuMetricsSelector], and [akka.cluster.routing.SystemLoadAverageMetricsSelector]
+ * values. By default it uses [org.apache.pekko.cluster.routing.HeapMetricsSelector],
+ * [org.apache.pekko.cluster.routing.CpuMetricsSelector], and [org.apache.pekko.cluster.routing.SystemLoadAverageMetricsSelector]
  */
 @SerialVersionUID(1L)
 final case class MixMetricsSelector(selectors: immutable.IndexedSeq[CapacityMetricsSelector])
@@ -409,7 +410,7 @@ object MetricsSelector {
             case exception =>
               throw new IllegalArgumentException(
                 s"Cannot instantiate metrics-selector [$fqn], " +
-                "make sure it extends [akka.cluster.routing.MetricsSelector] and " +
+                "make sure it extends [org.apache.pekko.cluster.routing.MetricsSelector] and " +
                 "has constructor with [com.typesafe.config.Config] parameter",
                 exception)
           }
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsSettings.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettings.scala
similarity index 92%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsSettings.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettings.scala
index 1161fe1339..bcd95713e1 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsSettings.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettings.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import scala.concurrent.duration.Duration
 import scala.concurrent.duration.FiniteDuration
 
 import com.typesafe.config.Config
 
-import akka.util.Helpers.ConfigOps
-import akka.util.Helpers.Requiring
+import org.apache.pekko
+import pekko.util.Helpers.ConfigOps
+import pekko.util.Helpers.Requiring
 
 /**
  * Metrics extension settings. Documented in: `src/main/resources/reference.conf`.
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsStrategy.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsStrategy.scala
similarity index 66%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsStrategy.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsStrategy.scala
index 972afddca3..ec6db24d26 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsStrategy.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsStrategy.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import com.typesafe.config.Config
 
-import akka.actor.OneForOneStrategy
-import akka.util.Helpers.ConfigOps
+import org.apache.pekko
+import pekko.actor.OneForOneStrategy
+import pekko.util.Helpers.ConfigOps
 
 /**
  * Default [[ClusterMetricsSupervisor]] strategy:
- * A configurable [[akka.actor.OneForOneStrategy]] with restart-on-throwable decider.
+ * A configurable [[pekko.actor.OneForOneStrategy]] with restart-on-throwable decider.
  */
 class ClusterMetricsStrategy(config: Config)
     extends OneForOneStrategy(
@@ -23,11 +24,11 @@ class ClusterMetricsStrategy(config: Config)
  * Provide custom metrics strategy resources.
  */
 object ClusterMetricsStrategy {
-  import akka.actor._
-  import akka.actor.SupervisorStrategy._
+  import pekko.actor._
+  import pekko.actor.SupervisorStrategy._
 
   /**
-   * [[akka.actor.SupervisorStrategy]] `Decider` which allows to survive intermittent Sigar native method calls failures.
+   * [[pekko.actor.SupervisorStrategy]] `Decider` which allows to survive intermittent Sigar native method calls failures.
    */
   val metricsDecider: SupervisorStrategy.Decider = {
     case _: ActorInitializationException => Stop
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/EWMA.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/EWMA.scala
similarity index 94%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/EWMA.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/EWMA.scala
index 76fa25c2dc..e5d5a6ff16 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/EWMA.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/EWMA.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import scala.concurrent.duration.FiniteDuration
 
@@ -51,7 +51,7 @@ object EWMA {
   private val LogOf2 = 0.69315
 
   /**
-   * Calculate the alpha (decay factor) used in [[akka.cluster.EWMA]]
+   * Calculate the alpha (decay factor) used in [[org.apache.pekko.cluster.metrics.EWMA]]
    * from specified half-life and interval between observations.
    * Half-life is the interval over which the weights decrease by a factor of two.
    * The relevance of each data sample is halved for every passing half-life duration,
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala
similarity index 96%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala
index c2f0d88c2e..0e709e4d30 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import scala.util.Failure
 import scala.util.Success
@@ -10,7 +10,8 @@ import scala.util.Try
 
 import scala.annotation.nowarn
 
-import akka.actor.Address
+import org.apache.pekko
+import pekko.actor.Address
 
 /**
  * Metrics key/value.
@@ -159,7 +160,7 @@ object StandardMetrics {
    * A memory allocation may fail if it attempts to increase the used memory such that used > committed
    * even if used <= max is true (e.g. when the system virtual memory is low).
    *
-   * @param address [[akka.actor.Address]] of the node the metrics are gathered at
+   * @param address [[pekko.actor.Address]] of the node the metrics are gathered at
    * @param timestamp the time of sampling, in milliseconds since midnight, January 1, 1970 UTC
    * @param used the current sum of heap memory used from all heap memory pools (in bytes)
    * @param committed the current sum of heap memory guaranteed to be available to the JVM
@@ -207,7 +208,7 @@ object StandardMetrics {
   }
 
   /**
-   * @param address [[akka.actor.Address]] of the node the metrics are gathered at
+   * @param address [[pekko.actor.Address]] of the node the metrics are gathered at
    * @param timestamp the time of sampling, in milliseconds since midnight, January 1, 1970 UTC
    * @param systemLoadAverage OS-specific average load on the CPUs in the system, for the past 1 minute,
    *    The system is possibly nearing a bottleneck if the system load average is nearing number of cpus/cores.
@@ -244,7 +245,7 @@ object StandardMetrics {
  * INTERNAL API
  *
  * Encapsulates evaluation of validity of metric values, conversion of an actual metric value to
- * a [[akka.cluster.metrics.Metric]] for consumption by subscribed cluster entities.
+ * a [[pekko.cluster.metrics.Metric]] for consumption by subscribed cluster entities.
  */
 private[metrics] trait MetricNumericConverter {
 
@@ -279,9 +280,9 @@ private[metrics] trait MetricNumericConverter {
  *
  * Equality of NodeMetrics is based on its address.
  *
- * @param address [[akka.actor.Address]] of the node the metrics are gathered at
+ * @param address [[pekko.actor.Address]] of the node the metrics are gathered at
  * @param timestamp the time of sampling, in milliseconds since midnight, January 1, 1970 UTC
- * @param metrics the set of sampled [[akka.cluster.metrics.Metric]]
+ * @param metrics the set of sampled [[pekko.cluster.metrics.Metric]]
  */
 @SerialVersionUID(1L)
 final case class NodeMetrics(address: Address, timestamp: Long, metrics: Set[Metric] = Set.empty[Metric]) {
@@ -358,7 +359,7 @@ private[metrics] object MetricsGossip {
 private[metrics] final case class MetricsGossip(nodes: Set[NodeMetrics]) {
 
   /**
-   * Removes nodes if their correlating node ring members are not [[akka.cluster.MemberStatus]] `Up`.
+   * Removes nodes if their correlating node ring members are not [[pekko.cluster.MemberStatus]] `Up`.
    */
   def remove(node: Address): MetricsGossip = copy(nodes = nodes.filterNot(_.address == node))
 
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala
similarity index 95%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala
index 81a134448a..c2377f7b41 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import java.io.Closeable
 import java.lang.System.{ currentTimeMillis => newTimestamp }
@@ -13,12 +13,13 @@ import java.lang.management.OperatingSystemMXBean
 
 import org.hyperic.sigar.SigarProxy
 
-import akka.ConfigurationException
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.cluster.Cluster
-import akka.event.Logging
+import org.apache.pekko
+import pekko.ConfigurationException
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.Cluster
+import pekko.event.Logging
 
 /**
  * Metrics sampler.
@@ -86,7 +87,7 @@ private[metrics] object MetricsCollector {
 /**
  * Loads JVM and system metrics through JMX monitoring beans.
  *
- * @param address The [[akka.actor.Address]] of the node being sampled
+ * @param address The [[pekko.actor.Address]] of the node being sampled
  * @param decayFactor how quickly the exponential weighting of past data is decayed
  */
 class JmxMetricsCollector(address: Address, decayFactor: Double) extends MetricsCollector {
@@ -178,7 +179,7 @@ class JmxMetricsCollector(address: Address, decayFactor: Double) extends Metrics
  * The constructor will by design throw exception if org.hyperic.sigar.Sigar can't be loaded, due
  * to missing classes or native libraries.
  *
- * @param address The [[akka.actor.Address]] of the node being sampled
+ * @param address The [[pekko.actor.Address]] of the node being sampled
  * @param decayFactor how quickly the exponential weighting of past data is decayed
  * @param sigar the org.hyperic.Sigar instance
  */
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Provision.scala
similarity index 98%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Provision.scala
index 454fa052c2..45823a583a 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Provision.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import java.io.File
 
diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala
similarity index 95%
rename from akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala
rename to akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala
index d0c9e6f33b..12007c66da 100644
--- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala
+++ b/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics.protobuf
+package org.apache.pekko.cluster.metrics.protobuf
 
 import java.{ lang => jl }
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, ObjectOutputStream }
@@ -10,19 +10,20 @@ import java.io.NotSerializableException
 import java.util.zip.{ GZIPInputStream, GZIPOutputStream }
 import scala.annotation.tailrec
 import scala.collection.immutable
-import akka.actor.{ Address, ExtendedActorSystem }
-import akka.cluster.metrics._
-import akka.cluster.metrics.protobuf.msg.{ ClusterMetricsMessages => cm }
-import akka.dispatch.Dispatchers
-import akka.protobufv3.internal.MessageLite
-import akka.remote.ByteStringUtils
-import akka.serialization.{ BaseSerializer, SerializationExtension, SerializerWithStringManifest, Serializers }
-import akka.util.ClassLoaderObjectInputStream
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.{ Address, ExtendedActorSystem }
+import pekko.cluster.metrics._
+import pekko.cluster.metrics.protobuf.msg.{ ClusterMetricsMessages => cm }
+import pekko.dispatch.Dispatchers
+import pekko.protobufv3.internal.MessageLite
+import pekko.remote.ByteStringUtils
+import pekko.serialization.{ BaseSerializer, SerializationExtension, SerializerWithStringManifest, Serializers }
+import pekko.util.ClassLoaderObjectInputStream
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 /**
- * Protobuf serializer for [[akka.cluster.metrics.ClusterMetricsMessage]] types.
+ * Protobuf serializer for [[pekko.cluster.metrics.ClusterMetricsMessage]] types.
  */
 @ccompatUsedUntil213
 class MessageSerializer(val system: ExtendedActorSystem) extends SerializerWithStringManifest with BaseSerializer {
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
similarity index 91%
rename from akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala
rename to akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
index fa9e5f326b..4f991f70b6 100644
--- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala
+++ b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import scala.concurrent.duration._
 import scala.language.postfixOps
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.MemberStatus
-import akka.cluster.MultiNodeClusterSpec
-import akka.remote.testkit.MultiNodeConfig
+import org.apache.pekko
+import pekko.cluster.MemberStatus
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
 
 trait ClusterMetricsCommonConfig extends MultiNodeConfig {
   import ConfigFactory._
@@ -33,19 +34,19 @@ trait ClusterMetricsCommonConfig extends MultiNodeConfig {
 
   // Enable metrics extension in akka-cluster-metrics.
   def enableMetricsExtension = parseString("""
-    akka.extensions=["akka.cluster.metrics.ClusterMetricsExtension"]
+    akka.extensions=["org.apache.pekko.cluster.metrics.ClusterMetricsExtension"]
     akka.cluster.metrics.collector.enabled = on
     """)
 
   // Disable metrics extension in akka-cluster-metrics.
   def disableMetricsExtension = parseString("""
-    akka.extensions=["akka.cluster.metrics.ClusterMetricsExtension"]
+    akka.extensions=["org.apache.pekko.cluster.metrics.ClusterMetricsExtension"]
     akka.cluster.metrics.collector.enabled = off
     """)
 
   // Activate slf4j logging along with test listener.
   def customLogging = parseString("""
-      akka.loggers=["akka.testkit.TestEventListener","akka.event.slf4j.Slf4jLogger"]
+      akka.loggers=["org.apache.pekko.testkit.TestEventListener","org.apache.pekko.event.slf4j.Slf4jLogger"]
       akka.logger-startup-timeout = 15s
     """)
 }
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
similarity index 90%
rename from akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala
rename to akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
index 819d4b2703..e8bc32ab00 100644
--- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala
+++ b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import java.lang.management.ManagementFactory
 
@@ -14,21 +14,22 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor._
-import akka.cluster.Cluster
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.routing.ClusterRouterPool
-import akka.cluster.routing.ClusterRouterPoolSettings
-import akka.pattern.ask
-import akka.remote.testkit.MultiNodeConfig
-import akka.routing.ActorRefRoutee
-import akka.routing.FromConfig
-import akka.routing.GetRoutees
-import akka.routing.Routees
-import akka.serialization.jackson.CborSerializable
-import akka.testkit.GHExcludeTest
-import akka.testkit.{ DefaultTimeout, ImplicitSender, LongRunningTest }
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.Cluster
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.routing.ClusterRouterPool
+import pekko.cluster.routing.ClusterRouterPoolSettings
+import pekko.pattern.ask
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.routing.ActorRefRoutee
+import pekko.routing.FromConfig
+import pekko.routing.GetRoutees
+import pekko.routing.Routees
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit.GHExcludeTest
+import pekko.testkit.{ DefaultTimeout, ImplicitSender, LongRunningTest }
+import pekko.util.unused
 
 object AdaptiveLoadBalancingRouterConfig extends MultiNodeConfig {
 
@@ -77,7 +78,7 @@ object AdaptiveLoadBalancingRouterConfig extends MultiNodeConfig {
     debugConfig(on = false)
       .withFallback(ConfigFactory.parseString("""
       # Enable metrics estension.
-      akka.extensions=["akka.cluster.metrics.ClusterMetricsExtension"]
+      akka.extensions=["org.apache.pekko.cluster.metrics.ClusterMetricsExtension"]
 
       akka.cluster.failure-detector.acceptable-heartbeat-pause = 10s
 
@@ -99,7 +100,7 @@ object AdaptiveLoadBalancingRouterConfig extends MultiNodeConfig {
         }
         /router4 = {
           router = cluster-metrics-adaptive-pool
-          metrics-selector = "akka.cluster.metrics.TestCustomMetricsSelector"
+          metrics-selector = "org.apache.pekko.cluster.metrics.TestCustomMetricsSelector"
           nr-of-instances = 10
           cluster {
             enabled = on
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsMessages.scala b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala
similarity index 73%
rename from akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsMessages.scala
rename to akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala
index 530dccc797..249b11b502 100644
--- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsMessages.scala
+++ b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics.sample
+package org.apache.pekko.cluster.metrics.sample
 
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko.serialization.jackson.CborSerializable
 
 //#messages
 final case class StatsJob(text: String) extends CborSerializable
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala
similarity index 90%
rename from akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala
rename to akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala
index f438b141db..56ea772e88 100644
--- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala
+++ b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics.sample
+package org.apache.pekko.cluster.metrics.sample
 
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.{ CurrentClusterState, MemberUp }
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent.{ CurrentClusterState, MemberUp }
 
 import scala.concurrent.duration._
 import scala.language.postfixOps
 
 //#MultiNodeConfig
-import akka.remote.testkit.MultiNodeConfig
+import org.apache.pekko.remote.testkit.MultiNodeConfig
 import com.typesafe.config.ConfigFactory
 
 object StatsSampleSpecConfig extends MultiNodeConfig {
@@ -28,7 +29,7 @@ object StatsSampleSpecConfig extends MultiNodeConfig {
     nodeConfig(role) {
       ConfigFactory.parseString(s"""
       # Enable metrics extension in akka-cluster-metrics.
-      akka.extensions=["akka.cluster.metrics.ClusterMetricsExtension"]
+      akka.extensions=["org.apache.pekko.cluster.metrics.ClusterMetricsExtension"]
       # Sigar native library extract location during tests.
       akka.cluster.metrics.native-library-extract-folder=target/native/${role.name}
       """)
@@ -67,8 +68,9 @@ class StatsSampleSpecMultiJvmNode3 extends StatsSampleSpec
 //#concrete-tests
 
 //#abstract-test
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit.ImplicitSender
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala
similarity index 80%
rename from akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala
rename to akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala
index 7dbdb2a61b..5ad2038c6f 100644
--- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala
+++ b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics.sample
+package org.apache.pekko.cluster.metrics.sample
 
 import scala.concurrent.duration._
 
-import akka.actor.{ Actor, ActorRef, Props, ReceiveTimeout }
-import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope
-import akka.routing.FromConfig
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, Props, ReceiveTimeout }
+import pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope
+import pekko.routing.FromConfig
 
 //#service
 class StatsService extends Actor {
@@ -51,8 +52,9 @@ class StatsAggregator(expectedResults: Int, replyTo: ActorRef) extends Actor {
 // not used, only for documentation
 abstract class StatsService2 extends Actor {
   // #router-lookup-in-code
-  import akka.cluster.routing.{ ClusterRouterGroup, ClusterRouterGroupSettings }
-  import akka.routing.ConsistentHashingGroup
+  import org.apache.pekko
+  import pekko.cluster.routing.{ ClusterRouterGroup, ClusterRouterGroupSettings }
+  import pekko.routing.ConsistentHashingGroup
 
   val workerRouter = context.actorOf(
     ClusterRouterGroup(
@@ -69,8 +71,9 @@ abstract class StatsService2 extends Actor {
 // not used, only for documentation
 abstract class StatsService3 extends Actor {
   // #router-deploy-in-code
-  import akka.cluster.routing.{ ClusterRouterPool, ClusterRouterPoolSettings }
-  import akka.routing.ConsistentHashingPool
+  import org.apache.pekko
+  import pekko.cluster.routing.{ ClusterRouterPool, ClusterRouterPoolSettings }
+  import pekko.routing.ConsistentHashingPool
 
   val workerRouter = context.actorOf(
     ClusterRouterPool(
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsWorker.scala b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala
similarity index 83%
rename from akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsWorker.scala
rename to akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala
index 49174de4de..11aea0f6a2 100644
--- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsWorker.scala
+++ b/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics.sample
+package org.apache.pekko.cluster.metrics.sample
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 
 //#worker
 class StatsWorker extends Actor {
diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
similarity index 95%
rename from akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala
rename to akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
index 7995a6db77..1ea1fa4d1a 100644
--- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala
+++ b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import scala.concurrent.duration._
 import scala.language.postfixOps
 
-import akka.cluster.Cluster
-import akka.cluster.metrics.StandardMetrics._
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.cluster.metrics.StandardMetrics._
+import pekko.testkit._
 
 class ClusterMetricsExtensionSpec
     extends AkkaSpec(MetricsConfig.clusterSigarMock)
diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
similarity index 96%
rename from akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala
rename to akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
index 62a33ba6ab..91ca187dbf 100644
--- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala
+++ b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.metrics.StandardMetrics._
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.metrics.StandardMetrics._
 
 class MetricsSelectorSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettingsSpec.scala
similarity index 90%
rename from akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala
rename to akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettingsSpec.scala
index cfd2c30e66..f7b0440262 100644
--- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala
+++ b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettingsSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.dispatch.Dispatchers
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.dispatch.Dispatchers
+import pekko.testkit.AkkaSpec
 
 class ClusterMetricsSettingsSpec extends AkkaSpec {
 
diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala
similarity index 97%
rename from akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala
rename to akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala
index ac44f6c487..632f9c9731 100644
--- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala
+++ b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -10,7 +10,7 @@ import scala.concurrent.duration._
 
 import scala.annotation.nowarn
 
-import akka.testkit.{ AkkaSpec, LongRunningTest }
+import org.apache.pekko.testkit.{ AkkaSpec, LongRunningTest }
 
 @nowarn
 class EWMASpec extends AkkaSpec(MetricsConfig.defaultEnabled) with MetricsCollectorFactory {
diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricSpec.scala b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricSpec.scala
similarity index 97%
rename from akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricSpec.scala
rename to akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricSpec.scala
index 1768e7dee8..31102b0817 100644
--- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricSpec.scala
+++ b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import java.lang.System.{ currentTimeMillis => newTimestamp }
 
@@ -12,10 +12,11 @@ import scala.annotation.nowarn
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.metrics.StandardMetrics._
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.metrics.StandardMetrics._
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
 
 @nowarn
 class MetricNumericConverterSpec extends AnyWordSpec with Matchers with MetricNumericConverter {
@@ -240,7 +241,7 @@ class MetricsGossipSpec
 
 @nowarn
 class MetricValuesSpec extends AkkaSpec(MetricsConfig.defaultEnabled) with MetricsCollectorFactory {
-  import akka.cluster.metrics.StandardMetrics._
+  import pekko.cluster.metrics.StandardMetrics._
 
   val collector = createMetricsCollector
 
diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala
similarity index 96%
rename from akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala
rename to akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala
index 384cdbd12e..b3a5f5a4f7 100644
--- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala
+++ b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import scala.concurrent.duration._
 import scala.language.postfixOps
@@ -10,8 +10,9 @@ import scala.util.Try
 
 import scala.annotation.nowarn
 
-import akka.cluster.metrics.StandardMetrics._
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.metrics.StandardMetrics._
+import pekko.testkit._
 
 @nowarn
 class MetricsCollectorSpec
diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala
similarity index 91%
rename from akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala
rename to akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala
index 9b3afce6ef..6dc0808b31 100644
--- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala
+++ b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import java.io.Closeable
 import java.util.logging.LogManager
@@ -12,20 +12,21 @@ import scala.language.postfixOps
 import org.scalatestplus.mockito.MockitoSugar
 import org.slf4j.bridge.SLF4JBridgeHandler
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Deploy
-import akka.actor.ExtendedActorSystem
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.dispatch.Dispatchers
-import akka.dispatch.RequiresMessageQueue
-import akka.dispatch.UnboundedMessageQueueSemantics
-import akka.remote.RARP
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Deploy
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.dispatch.Dispatchers
+import pekko.dispatch.RequiresMessageQueue
+import pekko.dispatch.UnboundedMessageQueueSemantics
+import pekko.remote.RARP
+import pekko.testkit.AkkaSpec
 
 /**
  * Redirect different logging sources to SLF4J.
@@ -182,7 +183,7 @@ object MetricsConfig {
         enabled = off
         sample-interval = 200ms
         gossip-interval = 200ms
-        provider = "akka.cluster.metrics.MockitoSigarMetricsCollector"
+        provider = "org.apache.pekko.cluster.metrics.MockitoSigarMetricsCollector"
         fallback = false
       }
     }
diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/WeightedRouteesSpec.scala b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/WeightedRouteesSpec.scala
similarity index 92%
rename from akka-cluster-metrics/src/test/scala/akka/cluster/metrics/WeightedRouteesSpec.scala
rename to akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/WeightedRouteesSpec.scala
index bbce7d27c4..b8476f06ee 100644
--- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/WeightedRouteesSpec.scala
+++ b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/WeightedRouteesSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics
+package org.apache.pekko.cluster.metrics
 
 import scala.Vector
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Address
-import akka.actor.RootActorPath
-import akka.remote.RARP
-import akka.routing.ActorRefRoutee
-import akka.routing.ActorSelectionRoutee
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.actor.RootActorPath
+import pekko.remote.RARP
+import pekko.routing.ActorRefRoutee
+import pekko.routing.ActorSelectionRoutee
+import pekko.testkit.AkkaSpec
 
 class WeightedRouteesSpec extends AkkaSpec(ConfigFactory.parseString("""
       akka.actor.provider = "cluster"
diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializerSpec.scala
similarity index 90%
rename from akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala
rename to akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializerSpec.scala
index 8a721c9c02..8f71f40f64 100644
--- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala
+++ b/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializerSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.metrics.protobuf
+package org.apache.pekko.cluster.metrics.protobuf
 
-import akka.actor.{ Address, ExtendedActorSystem }
-import akka.cluster.MemberStatus
-import akka.cluster.TestMember
-import akka.cluster.metrics._
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.{ Address, ExtendedActorSystem }
+import pekko.cluster.MemberStatus
+import pekko.cluster.TestMember
+import pekko.cluster.metrics._
+import pekko.testkit.AkkaSpec
 
 class MessageSerializerSpec extends AkkaSpec("""
      akka.actor.provider = cluster
diff --git a/akka-cluster-sharding-typed/src/main/java/akka/cluster/sharding/typed/internal/protobuf/ShardingMessages.java b/akka-cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
similarity index 53%
rename from akka-cluster-sharding-typed/src/main/java/akka/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
rename to akka-cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
index baa643f184..b2fe22d730 100644
--- a/akka-cluster-sharding-typed/src/main/java/akka/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
+++ b/akka-cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
@@ -5,22 +5,22 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ShardingMessages.proto
 
-package akka.cluster.sharding.typed.internal.protobuf;
+package org.apache.pekko.cluster.sharding.typed.internal.protobuf;
 
 public final class ShardingMessages {
   private ShardingMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface ShardingEnvelopeOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.sharding.typed.ShardingEnvelope)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.sharding.typed.ShardingEnvelope)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string entityId = 1;
@@ -36,7 +36,7 @@ public final class ShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes();
 
     /**
@@ -48,22 +48,22 @@ public final class ShardingMessages {
      * required .Payload message = 2;
      * @return The message.
      */
-    akka.remote.ContainerFormats.Payload getMessage();
+    org.apache.pekko.remote.ContainerFormats.Payload getMessage();
     /**
      * required .Payload message = 2;
      */
-    akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.sharding.typed.ShardingEnvelope}
+   * Protobuf type {@code org.apache.pekko.cluster.sharding.typed.ShardingEnvelope}
    */
   public  static final class ShardingEnvelope extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.sharding.typed.ShardingEnvelope)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.sharding.typed.ShardingEnvelope)
       ShardingEnvelopeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ShardingEnvelope.newBuilder() to construct.
-    private ShardingEnvelope(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ShardingEnvelope(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ShardingEnvelope() {
@@ -73,26 +73,26 @@ public final class ShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardingEnvelope();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ShardingEnvelope(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -102,17 +102,17 @@ public final class ShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               entityId_ = bs;
               break;
             }
             case 18: {
-              akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = message_.toBuilder();
               }
-              message_ = input.readMessage(akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+              message_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(message_);
                 message_ = subBuilder.buildPartial();
@@ -129,27 +129,27 @@ public final class ShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
+      return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.class, akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.Builder.class);
+              org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.class, org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.Builder.class);
     }
 
     private int bitField0_;
@@ -171,8 +171,8 @@ public final class ShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           entityId_ = s;
@@ -184,22 +184,22 @@ public final class ShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         entityId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int MESSAGE_FIELD_NUMBER = 2;
-    private akka.remote.ContainerFormats.Payload message_;
+    private org.apache.pekko.remote.ContainerFormats.Payload message_;
     /**
      * required .Payload message = 2;
      * @return Whether the message field is set.
@@ -211,14 +211,14 @@ public final class ShardingMessages {
      * required .Payload message = 2;
      * @return The message.
      */
-    public akka.remote.ContainerFormats.Payload getMessage() {
-      return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+    public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
+      return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
     /**
      * required .Payload message = 2;
      */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
-      return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
+      return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -245,10 +245,10 @@ public final class ShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getMessage());
@@ -263,10 +263,10 @@ public final class ShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getMessage());
       }
       size += unknownFields.getSerializedSize();
@@ -279,10 +279,10 @@ public final class ShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope other = (akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope) obj;
+      org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope other = (org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope) obj;
 
       if (hasEntityId() != other.hasEntityId()) return false;
       if (hasEntityId()) {
@@ -318,73 +318,73 @@ public final class ShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -393,7 +393,7 @@ public final class ShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -404,42 +404,42 @@ public final class ShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.sharding.typed.ShardingEnvelope}
+     * Protobuf type {@code org.apache.pekko.cluster.sharding.typed.ShardingEnvelope}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.sharding.typed.ShardingEnvelope)
-        akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelopeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.sharding.typed.ShardingEnvelope)
+        org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelopeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
+        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.class, akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.Builder.class);
+                org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.class, org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getMessageFieldBuilder();
         }
@@ -459,19 +459,19 @@ public final class ShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
+        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope getDefaultInstanceForType() {
-        return akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope build() {
-        akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope result = buildPartial();
+      public org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope build() {
+        org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -479,8 +479,8 @@ public final class ShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope buildPartial() {
-        akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope result = new akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope(this);
+      public org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope buildPartial() {
+        org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope result = new org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -506,44 +506,44 @@ public final class ShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope) {
-          return mergeFrom((akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope other) {
-        if (other == akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope other) {
+        if (other == org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
           bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
@@ -573,14 +573,14 @@ public final class ShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parsedMessage = null;
+        org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -606,8 +606,8 @@ public final class ShardingMessages {
       public java.lang.String getEntityId() {
         java.lang.Object ref = entityId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             entityId_ = s;
@@ -621,17 +621,17 @@ public final class ShardingMessages {
        * required string entityId = 1;
        * @return The bytes for entityId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntityIdBytes() {
         java.lang.Object ref = entityId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           entityId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -665,7 +665,7 @@ public final class ShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setEntityIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -675,9 +675,9 @@ public final class ShardingMessages {
         return this;
       }
 
-      private akka.remote.ContainerFormats.Payload message_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> messageBuilder_;
+      private org.apache.pekko.remote.ContainerFormats.Payload message_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> messageBuilder_;
       /**
        * required .Payload message = 2;
        * @return Whether the message field is set.
@@ -689,9 +689,9 @@ public final class ShardingMessages {
        * required .Payload message = 2;
        * @return The message.
        */
-      public akka.remote.ContainerFormats.Payload getMessage() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
         if (messageBuilder_ == null) {
-          return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+          return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
         } else {
           return messageBuilder_.getMessage();
         }
@@ -699,7 +699,7 @@ public final class ShardingMessages {
       /**
        * required .Payload message = 2;
        */
-      public Builder setMessage(akka.remote.ContainerFormats.Payload value) {
+      public Builder setMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -716,7 +716,7 @@ public final class ShardingMessages {
        * required .Payload message = 2;
        */
       public Builder setMessage(
-          akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
           onChanged();
@@ -729,13 +729,13 @@ public final class ShardingMessages {
       /**
        * required .Payload message = 2;
        */
-      public Builder mergeMessage(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergeMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               message_ != null &&
-              message_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             message_ =
-              akka.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
           } else {
             message_ = value;
           }
@@ -762,7 +762,7 @@ public final class ShardingMessages {
       /**
        * required .Payload message = 2;
        */
-      public akka.remote.ContainerFormats.Payload.Builder getMessageBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getMessageBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getMessageFieldBuilder().getBuilder();
@@ -770,23 +770,23 @@ public final class ShardingMessages {
       /**
        * required .Payload message = 2;
        */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
         if (messageBuilder_ != null) {
           return messageBuilder_.getMessageOrBuilder();
         } else {
           return message_ == null ?
-              akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+              org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
         }
       }
       /**
        * required .Payload message = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> 
           getMessageFieldBuilder() {
         if (messageBuilder_ == null) {
-          messageBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder>(
+          messageBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getMessage(),
                   getParentForChildren(),
                   isClean());
@@ -796,89 +796,89 @@ public final class ShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.sharding.typed.ShardingEnvelope)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.sharding.typed.ShardingEnvelope)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.sharding.typed.ShardingEnvelope)
-    private static final akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.sharding.typed.ShardingEnvelope)
+    private static final org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope();
     }
 
-    public static akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ShardingEnvelope parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ShardingEnvelope(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026ShardingMessages.proto\022\033akka.cluster.s" +
+      "\n\026ShardingMessages.proto\022\033org.apache.pekko.cluster.s" +
       "harding.typed\032\026ContainerFormats.proto\"?\n" +
       "\020ShardingEnvelope\022\020\n\010entityId\030\001 \002(\t\022\031\n\007m" +
-      "essage\030\002 \002(\0132\010.PayloadB1\n-akka.cluster.s" +
+      "essage\030\002 \002(\0132\010.PayloadB1\n-org.apache.pekko.cluster.s" +
       "harding.typed.internal.protobufH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
-          akka.remote.ContainerFormats.getDescriptor(),
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
+          org.apache.pekko.remote.ContainerFormats.getDescriptor(),
         });
     internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor,
         new java.lang.String[] { "EntityId", "Message", });
-    akka.remote.ContainerFormats.getDescriptor();
+    org.apache.pekko.remote.ContainerFormats.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/akka-cluster-sharding-typed/src/main/protobuf/ShardingMessages.proto b/akka-cluster-sharding-typed/src/main/protobuf/ShardingMessages.proto
index 9d03c8ec24..fef4f3b877 100644
--- a/akka-cluster-sharding-typed/src/main/protobuf/ShardingMessages.proto
+++ b/akka-cluster-sharding-typed/src/main/protobuf/ShardingMessages.proto
@@ -4,9 +4,9 @@
 
 syntax = "proto2";
 
-package akka.cluster.sharding.typed;
+package org.apache.pekko.cluster.sharding.typed;
 
-option java_package = "akka.cluster.sharding.typed.internal.protobuf";
+option java_package = "org.apache.pekko.cluster.sharding.typed.internal.protobuf";
 option optimize_for = SPEED;
 import "ContainerFormats.proto";
 
diff --git a/akka-cluster-sharding-typed/src/main/resources/reference.conf b/akka-cluster-sharding-typed/src/main/resources/reference.conf
index b108f9cc6b..efa8f72c6f 100644
--- a/akka-cluster-sharding-typed/src/main/resources/reference.conf
+++ b/akka-cluster-sharding-typed/src/main/resources/reference.conf
@@ -29,18 +29,18 @@ akka.cluster.sharded-daemon-process {
 }
 
 akka.cluster.configuration-compatibility-check.checkers {
-  akka-cluster-sharding-hash-extractor = "akka.cluster.sharding.typed.internal.JoinConfigCompatCheckerClusterSharding"
+  akka-cluster-sharding-hash-extractor = "org.apache.pekko.cluster.sharding.typed.internal.JoinConfigCompatCheckerClusterSharding"
 }
 
 akka.actor {
   serializers {
-    typed-sharding = "akka.cluster.sharding.typed.internal.ShardingSerializer"
+    typed-sharding = "org.apache.pekko.cluster.sharding.typed.internal.ShardingSerializer"
   }
   serialization-identifiers {
-    "akka.cluster.sharding.typed.internal.ShardingSerializer" = 25
+    "org.apache.pekko.cluster.sharding.typed.internal.ShardingSerializer" = 25
   }
   serialization-bindings {
-    "akka.cluster.sharding.typed.ShardingEnvelope" = typed-sharding
+    "org.apache.pekko.cluster.sharding.typed.ShardingEnvelope" = typed-sharding
   }
 }
 
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingQuery.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingQuery.scala
similarity index 86%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingQuery.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingQuery.scala
index 9926208c77..523db7f1ea 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingQuery.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingQuery.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import scala.concurrent.duration.FiniteDuration
 
-import akka.actor.typed.ActorRef
-import akka.cluster.sharding.ShardRegion.ClusterShardingStats
-import akka.cluster.sharding.ShardRegion.CurrentShardRegionState
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.util.JavaDurationConverters
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.cluster.sharding.ShardRegion.ClusterShardingStats
+import pekko.cluster.sharding.ShardRegion.CurrentShardRegionState
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.util.JavaDurationConverters
 
 /**
  * Protocol for querying sharding state e.g. A ShardRegion's state
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingSettings.scala
similarity index 97%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingSettings.scala
index a000d2c3b4..96c5ee15f9 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingSettings.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import scala.collection.immutable
 import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.actor.typed.ActorSystem
-import akka.annotation.{ ApiMayChange, InternalApi }
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.sharding.typed.ClusterShardingSettings.RememberEntitiesStoreModeDData
-import akka.cluster.sharding.{ ClusterShardingSettings => ClassicShardingSettings }
-import akka.cluster.singleton.{ ClusterSingletonManagerSettings => ClassicClusterSingletonManagerSettings }
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.ClusterSingletonManagerSettings
-import akka.coordination.lease.LeaseUsageSettings
-import akka.japi.Util.immutableSeq
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.annotation.{ ApiMayChange, InternalApi }
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.sharding.typed.ClusterShardingSettings.RememberEntitiesStoreModeDData
+import pekko.cluster.sharding.{ ClusterShardingSettings => ClassicShardingSettings }
+import pekko.cluster.singleton.{ ClusterSingletonManagerSettings => ClassicClusterSingletonManagerSettings }
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.ClusterSingletonManagerSettings
+import pekko.coordination.lease.LeaseUsageSettings
+import pekko.japi.Util.immutableSeq
+import pekko.util.JavaDurationConverters._
 
 object ClusterShardingSettings {
 
@@ -38,7 +39,7 @@ object ClusterShardingSettings {
     apply(system)
 
   /** INTERNAL API: Intended only for internal use, it is not recommended to keep converting between the setting types */
-  private[akka] def fromClassicSettings(
+  private[pekko] def fromClassicSettings(
       numberOfShards: Int,
       classicSettings: ClassicShardingSettings): ClusterShardingSettings = {
     new ClusterShardingSettings(
@@ -64,7 +65,7 @@ object ClusterShardingSettings {
   }
 
   /** INTERNAL API: Intended only for internal use, it is not recommended to keep converting between the setting types */
-  private[akka] def toClassicSettings(settings: ClusterShardingSettings): ClassicShardingSettings = {
+  private[pekko] def toClassicSettings(settings: ClusterShardingSettings): ClassicShardingSettings = {
     new ClassicShardingSettings(
       role = settings.role,
       rememberEntities = settings.rememberEntities,
@@ -174,9 +175,9 @@ object ClusterShardingSettings {
       val activeEntityLimit: Option[Int],
       val replacementPolicySettings: Option[PassivationStrategySettings.PolicySettings],
       val admissionSettings: Option[PassivationStrategySettings.AdmissionSettings],
-      private[akka] val oldSettingUsed: Boolean) {
+      private[pekko] val oldSettingUsed: Boolean) {
 
-    private[akka] def this(
+    private[pekko] def this(
         idleEntitySettings: Option[PassivationStrategySettings.IdleSettings],
         activeEntityLimit: Option[Int],
         replacementPolicySettings: Option[PassivationStrategySettings.PolicySettings],
@@ -238,7 +239,7 @@ object ClusterShardingSettings {
     def withAdmission(settings: AdmissionSettings): PassivationStrategySettings =
       copy(admissionSettings = Some(settings))
 
-    private[akka] def withOldIdleStrategy(timeout: FiniteDuration): PassivationStrategySettings =
+    private[pekko] def withOldIdleStrategy(timeout: FiniteDuration): PassivationStrategySettings =
       copy(
         idleEntitySettings = Some(new IdleSettings(timeout, None)),
         activeEntityLimit = None,
@@ -640,7 +641,7 @@ object ClusterShardingSettings {
         new AdmissionSettings(filter, window)
     }
 
-    private[akka] def oldDefault(idleTimeout: FiniteDuration): PassivationStrategySettings =
+    private[pekko] def oldDefault(idleTimeout: FiniteDuration): PassivationStrategySettings =
       disabled.withOldIdleStrategy(idleTimeout)
   }
 
@@ -952,7 +953,7 @@ final class ClusterShardingSettings(
    * It's checking if the `role` and `dataCenter` are matching.
    */
   @InternalApi
-  private[akka] def shouldHostShard(cluster: Cluster): Boolean =
+  private[pekko] def shouldHostShard(cluster: Cluster): Boolean =
     role.forall(cluster.selfMember.roles.contains) &&
     dataCenter.forall(_ == cluster.selfMember.dataCenter)
 
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/Murmur2MessageExtractor.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/Murmur2MessageExtractor.scala
similarity index 80%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/Murmur2MessageExtractor.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/Murmur2MessageExtractor.scala
index 865a911cf5..8a38e5c645 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/Murmur2MessageExtractor.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/Murmur2MessageExtractor.scala
@@ -2,9 +2,10 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
-import akka.cluster.sharding.typed.internal.Murmur2
+import org.apache.pekko
+import pekko.cluster.sharding.typed.internal.Murmur2
 
 abstract class Murmur2NoEnvelopeMessageExtractor[M](val numberOfShards: Int) extends ShardingMessageExtractor[M, M] {
   override def shardId(entityId: String): String = Murmur2.shardId(entityId, numberOfShards)
@@ -14,7 +15,7 @@ abstract class Murmur2NoEnvelopeMessageExtractor[M](val numberOfShards: Int) ext
 /**
  * The murmur2 message extractor uses the same algorithm as the default kafka partitioner
  * allowing kafka partitions to be mapped to shards.
- * This can be used with the [[akka.cluster.sharding.external.ExternalShardAllocationStrategy]] to have messages
+ * This can be used with the [[pekko.cluster.sharding.external.ExternalShardAllocationStrategy]] to have messages
  * processed locally.
  *
  * Extend [[Murmur2NoEnvelopeMessageExtractor]] to not use a message envelope extractor.
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ReplicatedEntityProvider.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala
similarity index 77%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ReplicatedEntityProvider.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala
index 1087f1df18..686a4c894d 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ReplicatedEntityProvider.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.cluster.sharding.typed.javadsl.{ Entity => JEntity, EntityTypeKey => JEntityTypeKey }
-import akka.persistence.typed.ReplicaId
+import org.apache.pekko
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.sharding.typed.javadsl.{ Entity => JEntity, EntityTypeKey => JEntityTypeKey }
+import pekko.persistence.typed.ReplicaId
 
 import scala.collection.immutable
 import scala.reflect.ClassTag
-import akka.util.ccompat.JavaConverters._
+import pekko.util.ccompat.JavaConverters._
 import java.util.{ Set => JSet }
 
-import akka.actor.typed.Behavior
-import akka.cluster.sharding.typed.internal.EntityTypeKeyImpl
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.ReplicationId.Separator
+import pekko.actor.typed.Behavior
+import pekko.cluster.sharding.typed.internal.EntityTypeKeyImpl
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.ReplicationId.Separator
 
 object ReplicatedEntityProvider {
 
@@ -33,7 +34,7 @@ object ReplicatedEntityProvider {
       messageClass: Class[M],
       typeName: String,
       allReplicaIds: JSet[ReplicaId],
-      settingsPerReplicaFactory: akka.japi.function.Function2[JEntityTypeKey[M], ReplicaId, ReplicatedEntity[M]])
+      settingsPerReplicaFactory: pekko.japi.function.Function2[JEntityTypeKey[M], ReplicaId, ReplicatedEntity[M]])
       : ReplicatedEntityProvider[M] = {
     implicit val classTag: ClassTag[M] = ClassTag(messageClass)
     apply[M](typeName, allReplicaIds.asScala.toSet)((key, replica) =>
@@ -127,7 +128,7 @@ object ReplicatedEntityProvider {
       messageClass: Class[M],
       typeName: String,
       allReplicaIds: JSet[ReplicaId],
-      createBehavior: akka.japi.function.Function[ReplicationId, Behavior[M]]): ReplicatedEntityProvider[M] = {
+      createBehavior: pekko.japi.function.Function[ReplicationId, Behavior[M]]): ReplicatedEntityProvider[M] = {
     implicit val classTag: ClassTag[M] = ClassTag(messageClass)
     apply(typeName, allReplicaIds.asScala.toSet) { (typeKey, replicaId) =>
       ReplicatedEntity(replicaId,
@@ -147,8 +148,8 @@ final class ReplicatedEntityProvider[M] private (
 
   /**
    * Start direct replication over sharding when replicated sharding starts up, requires the entities
-   * to also have it enabled through [[akka.persistence.typed.scaladsl.EventSourcedBehavior.withEventPublishing]]
-   * or [[akka.persistence.typed.javadsl.ReplicatedEventSourcedBehavior.withEventPublishing]]
+   * to also have it enabled through [[pekko.persistence.typed.scaladsl.EventSourcedBehavior.withEventPublishing]]
+   * or [[pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior.withEventPublishing]]
    * to work.
    */
   def withDirectReplication(enabled: Boolean): ReplicatedEntityProvider[M] =
@@ -159,18 +160,18 @@ final class ReplicatedEntityProvider[M] private (
 object ReplicatedEntity {
 
   /**
-   * Java API: Defines the [[akka.cluster.sharding.typed.javadsl.Entity]] to use for a given replica, note that the behavior
-   * can be a [[akka.persistence.typed.javadsl.ReplicatedEventSourcedBehavior]] or an arbitrary non persistent
-   * [[akka.actor.typed.Behavior]] but must never be a regular [[akka.persistence.typed.javadsl.EventSourcedBehavior]]
+   * Java API: Defines the [[pekko.cluster.sharding.typed.javadsl.Entity]] to use for a given replica, note that the behavior
+   * can be a [[pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior]] or an arbitrary non persistent
+   * [[pekko.actor.typed.Behavior]] but must never be a regular [[pekko.persistence.typed.javadsl.EventSourcedBehavior]]
    * as that requires a single writer and that would cause it to have multiple writers.
    */
   def create[M](replicaId: ReplicaId, entity: JEntity[M, ShardingEnvelope[M]]): ReplicatedEntity[M] =
     apply(replicaId, entity.toScala)
 
   /**
-   * Scala API: Defines the [[akka.cluster.sharding.typed.scaladsl.Entity]] to use for a given replica, note that the behavior
-   * can be a behavior created with [[akka.persistence.typed.scaladsl.ReplicatedEventSourcing]] or an arbitrary non persistent
-   * [[akka.actor.typed.Behavior]] but must never be a regular [[akka.persistence.typed.scaladsl.EventSourcedBehavior]]
+   * Scala API: Defines the [[pekko.cluster.sharding.typed.scaladsl.Entity]] to use for a given replica, note that the behavior
+   * can be a behavior created with [[pekko.persistence.typed.scaladsl.ReplicatedEventSourcing]] or an arbitrary non persistent
+   * [[pekko.actor.typed.Behavior]] but must never be a regular [[pekko.persistence.typed.scaladsl.EventSourcedBehavior]]
    * as that requires a single writer and that would cause it to have multiple writers.
    */
   def apply[M](replicaId: ReplicaId, entity: Entity[M, ShardingEnvelope[M]]): ReplicatedEntity[M] =
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ReplicatedShardingExtension.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingExtension.scala
similarity index 85%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ReplicatedShardingExtension.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingExtension.scala
index aec7b9f528..c8bb9b4aa1 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ReplicatedShardingExtension.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingExtension.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Extension
-import akka.actor.typed.ExtensionId
-import akka.annotation.DoNotInherit
-import akka.cluster.sharding.typed.internal.ReplicatedShardingExtensionImpl
-import akka.cluster.sharding.typed.scaladsl.EntityRef
-import akka.persistence.typed.ReplicaId
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Extension
+import pekko.actor.typed.ExtensionId
+import pekko.annotation.DoNotInherit
+import pekko.cluster.sharding.typed.internal.ReplicatedShardingExtensionImpl
+import pekko.cluster.sharding.typed.scaladsl.EntityRef
+import pekko.persistence.typed.ReplicaId
 import java.util.{ Map => JMap }
 
 /**
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSettings.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSettings.scala
similarity index 91%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSettings.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSettings.scala
index 21eb47e01e..4353f3a3b5 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSettings.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSettings.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import java.time.Duration
 
@@ -10,9 +10,10 @@ import scala.concurrent.duration.FiniteDuration
 
 import com.typesafe.config.Config
 
-import akka.actor.typed.ActorSystem
-import akka.annotation.InternalApi
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.annotation.InternalApi
+import pekko.util.JavaDurationConverters._
 
 object ShardedDaemonProcessSettings {
 
@@ -39,7 +40,7 @@ object ShardedDaemonProcessSettings {
 /**
  * Not for user constructions, use factory methods to instanciate.
  */
-final class ShardedDaemonProcessSettings @InternalApi private[akka] (
+final class ShardedDaemonProcessSettings @InternalApi private[pekko] (
     val keepAliveInterval: FiniteDuration,
     val shardingSettings: Option[ClusterShardingSettings],
     val role: Option[String]) {
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardingDirectReplication.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingDirectReplication.scala
similarity index 77%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardingDirectReplication.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingDirectReplication.scala
index e5a39bc63e..3047ef1be4 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardingDirectReplication.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingDirectReplication.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.eventstream.EventStream
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.persistence.typed.PublishedEvent
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.eventstream.EventStream
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.PublishedEvent
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
 
 /**
  * INTERNAL API
@@ -23,8 +24,8 @@ import akka.persistence.typed.ReplicationId
  * Akka Cluster.
  *
  * This actor should be started once on each node where Replicated Event Sourced entities will run (the same nodes that you start
- * sharding on). The entities should be set up with [[akka.persistence.typed.scaladsl.EventSourcedBehavior.withEventPublishing]]
- * or [[akka.persistence.typed.javadsl.ReplicatedEventSourcedBehavior#withEventPublishing()]]
+ * sharding on). The entities should be set up with [[pekko.persistence.typed.scaladsl.EventSourcedBehavior.withEventPublishing]]
+ * or [[pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior#withEventPublishing()]]
  * If using [[ReplicatedSharding]] the replication can be enabled through [[ReplicatedEntityProvider.withDirectReplication]]
  * instead of starting this actor manually.
  *
@@ -33,11 +34,11 @@ import akka.persistence.typed.ReplicationId
  * for the cross replica queries. Note that since message delivery is at-most-once this can not be the only
  * channel for replica events - the entities must still tail events from the journals of other replicas.
  *
- * The events are forwarded as [[akka.cluster.sharding.typed.ShardingEnvelope]] this will work out of the box both
+ * The events are forwarded as [[pekko.cluster.sharding.typed.ShardingEnvelope]] this will work out of the box both
  * by default and with a custom extractor since the envelopes are handled internally.
  */
 @InternalApi
-private[akka] object ShardingDirectReplication {
+private[pekko] object ShardingDirectReplication {
 
   /**
    * Not for user extension
@@ -49,7 +50,7 @@ private[akka] object ShardingDirectReplication {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] case class VerifyStarted(replyTo: ActorRef[Done]) extends Command
+  private[pekko] case class VerifyStarted(replyTo: ActorRef[Done]) extends Command
 
   private final case class WrappedPublishedEvent(publishedEvent: PublishedEvent) extends Command
 
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardingMessageExtractor.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingMessageExtractor.scala
similarity index 92%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardingMessageExtractor.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingMessageExtractor.scala
index 40dc023f02..b1d25dbbc4 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardingMessageExtractor.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingMessageExtractor.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
-import akka.actor.{ InvalidMessageException, WrappedMessage }
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.{ InvalidMessageException, WrappedMessage }
+import pekko.util.unused
 
 object ShardingMessageExtractor {
 
@@ -75,7 +76,7 @@ final class HashCodeMessageExtractor[M](val numberOfShards: Int)
 
   override def entityId(envelope: ShardingEnvelope[M]): String = envelope.entityId
   override def shardId(entityId: String): String =
-    akka.cluster.sharding.ShardRegion.HashCodeMessageExtractor.shardId(entityId, numberOfShards)
+    pekko.cluster.sharding.ShardRegion.HashCodeMessageExtractor.shardId(entityId, numberOfShards)
   override def unwrapMessage(envelope: ShardingEnvelope[M]): M = envelope.message
 }
 
@@ -90,7 +91,7 @@ final class HashCodeMessageExtractor[M](val numberOfShards: Int)
 abstract class HashCodeNoEnvelopeMessageExtractor[M](val numberOfShards: Int) extends ShardingMessageExtractor[M, M] {
 
   override def shardId(entityId: String): String =
-    akka.cluster.sharding.ShardRegion.HashCodeMessageExtractor.shardId(entityId, numberOfShards)
+    pekko.cluster.sharding.ShardRegion.HashCodeMessageExtractor.shardId(entityId, numberOfShards)
   override final def unwrapMessage(message: M): M = message
 
   override def toString = s"HashCodeNoEnvelopeMessageExtractor($numberOfShards)"
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingConsumerController.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala
similarity index 93%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingConsumerController.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala
index 9d73a56d55..b546538cf2 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingConsumerController.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.delivery
+package org.apache.pekko.cluster.sharding.typed.delivery
 
 import java.util.function.{ Function => JFunction }
 
 import com.typesafe.config.Config
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.scaladsl.Behaviors
-import akka.annotation.ApiMayChange
-import akka.cluster.sharding.typed.delivery.internal.ShardingConsumerControllerImpl
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.annotation.ApiMayChange
+import pekko.cluster.sharding.typed.delivery.internal.ShardingConsumerControllerImpl
 
 /**
  * `ShardingConsumerController` is used together with [[ShardingProducerController]]. See the description
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingProducerController.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala
similarity index 95%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingProducerController.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala
index 4668e6335d..d2d555b868 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingProducerController.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.delivery
+package org.apache.pekko.cluster.sharding.typed.delivery
 
 import java.util.Optional
 
@@ -12,18 +12,19 @@ import scala.reflect.ClassTag
 
 import com.typesafe.config.Config
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.DurableProducerQueue
-import akka.actor.typed.delivery.ProducerController
-import akka.actor.typed.scaladsl.Behaviors
-import akka.annotation.ApiMayChange
-import akka.cluster.sharding.typed.ShardingEnvelope
-import akka.cluster.sharding.typed.delivery.internal.ShardingProducerControllerImpl
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.DurableProducerQueue
+import pekko.actor.typed.delivery.ProducerController
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.annotation.ApiMayChange
+import pekko.cluster.sharding.typed.ShardingEnvelope
+import pekko.cluster.sharding.typed.delivery.internal.ShardingProducerControllerImpl
+import pekko.util.JavaDurationConverters._
 
 /**
  * Reliable delivery between a producer actor sending messages to sharded consumer
@@ -142,13 +143,13 @@ object ShardingProducerController {
 
     /** Java API */
     def getEntitiesWithDemand: java.util.Set[String] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       entitiesWithDemand.asJava
     }
 
     /** Java API */
     def getBufferedForEntitiesWithoutDemand: java.util.Map[String, Integer] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       bufferedForEntitiesWithoutDemand.iterator.map { case (k, v) => k -> v.asInstanceOf[Integer] }.toMap.asJava
     }
   }
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala
similarity index 85%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala
index 0f6f156a76..a7fb6d9dc9 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala
@@ -2,30 +2,31 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.delivery.internal
+package org.apache.pekko.cluster.sharding.typed.delivery.internal
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.DispatcherSelector
-import akka.actor.typed.Terminated
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.internal.ConsumerControllerImpl
-import akka.actor.typed.delivery.internal.ProducerControllerImpl
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.annotation.InternalApi
-import akka.cluster.sharding.typed.delivery.ShardingConsumerController
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.DispatcherSelector
+import pekko.actor.typed.Terminated
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.internal.ConsumerControllerImpl
+import pekko.actor.typed.delivery.internal.ProducerControllerImpl
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.typed.delivery.ShardingConsumerController
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ShardingConsumerControllerImpl {
+@InternalApi private[pekko] object ShardingConsumerControllerImpl {
   def apply[A, B](
       consumerBehavior: ActorRef[ConsumerController.Start[A]] => Behavior[B],
       settings: ShardingConsumerController.Settings): Behavior[ConsumerController.SequencedMessage[A]] = {
     Behaviors
       .setup[ConsumerController.Command[A]] { context =>
-        context.setLoggerName("akka.cluster.sharding.typed.delivery.ShardingConsumerController")
+        context.setLoggerName("org.apache.pekko.cluster.sharding.typed.delivery.ShardingConsumerController")
         val consumer = context.spawn(consumerBehavior(context.self), name = "consumer")
         context.watch(consumer)
         waitForStart(context, settings, consumer)
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
similarity index 95%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
index f3c421cd6e..14cf72f0f7 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.delivery.internal
+package org.apache.pekko.cluster.sharding.typed.delivery.internal
 
 import java.util.concurrent.TimeoutException
 
@@ -10,29 +10,30 @@ import scala.reflect.ClassTag
 import scala.util.Failure
 import scala.util.Success
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.DispatcherSelector
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.DurableProducerQueue
-import akka.actor.typed.delivery.DurableProducerQueue.ConfirmationQualifier
-import akka.actor.typed.delivery.DurableProducerQueue.SeqNr
-import akka.actor.typed.delivery.ProducerController
-import akka.actor.typed.delivery.internal.ProducerControllerImpl
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.actor.typed.scaladsl.StashBuffer
-import akka.annotation.InternalApi
-import akka.cluster.sharding.typed.ShardingEnvelope
-import akka.cluster.sharding.typed.delivery.ShardingProducerController
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.DispatcherSelector
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.DurableProducerQueue
+import pekko.actor.typed.delivery.DurableProducerQueue.ConfirmationQualifier
+import pekko.actor.typed.delivery.DurableProducerQueue.SeqNr
+import pekko.actor.typed.delivery.ProducerController
+import pekko.actor.typed.delivery.internal.ProducerControllerImpl
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.actor.typed.scaladsl.StashBuffer
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.typed.ShardingEnvelope
+import pekko.cluster.sharding.typed.delivery.ShardingProducerController
+import pekko.util.Timeout
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ShardingProducerControllerImpl {
+@InternalApi private[pekko] object ShardingProducerControllerImpl {
 
   import ShardingProducerController.Command
   import ShardingProducerController.EntityId
@@ -106,7 +107,7 @@ import akka.util.Timeout
       .withStash[InternalCommand](settings.bufferSize) { stashBuffer =>
         Behaviors.setup[InternalCommand] { context =>
           Behaviors.withMdc(staticMdc = Map("producerId" -> producerId)) {
-            context.setLoggerName("akka.cluster.sharding.typed.delivery.ShardingProducerController")
+            context.setLoggerName("org.apache.pekko.cluster.sharding.typed.delivery.ShardingProducerController")
 
             val durableQueue = askLoadState(context, durableQueueBehavior, settings)
 
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ClusterShardingImpl.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala
similarity index 84%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ClusterShardingImpl.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala
index 8c7a3aebc0..dc09da9525 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ClusterShardingImpl.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 package internal
 
 import java.net.URLEncoder
@@ -13,43 +13,44 @@ import java.util.concurrent.ConcurrentHashMap
 import scala.compat.java8.FutureConverters._
 import scala.concurrent.Future
 
-import akka.actor.ActorRefProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.InternalActorRef
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.Props
-import akka.actor.typed.TypedActorContext
-import akka.actor.typed.internal.InternalRecipientRef
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.internal.PoisonPillInterceptor
-import akka.actor.typed.internal.adapter.ActorRefAdapter
-import akka.actor.typed.internal.adapter.ActorSystemAdapter
-import akka.actor.typed.scaladsl.Behaviors
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.sharding.ShardCoordinator
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.ShardRegion
-import akka.cluster.sharding.ShardRegion.{ StartEntity => ClassicStartEntity }
-import akka.cluster.sharding.typed.scaladsl.EntityContext
-import akka.cluster.typed.Cluster
-import akka.event.Logging
-import akka.event.LoggingAdapter
-import akka.japi.function.{ Function => JFunction }
-import akka.pattern.AskTimeoutException
-import akka.pattern.PromiseActorRef
-import akka.pattern.StatusReply
-import akka.util.{ unused, ByteString, Timeout }
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.ActorRefProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.InternalActorRef
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Props
+import pekko.actor.typed.TypedActorContext
+import pekko.actor.typed.internal.InternalRecipientRef
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.internal.PoisonPillInterceptor
+import pekko.actor.typed.internal.adapter.ActorRefAdapter
+import pekko.actor.typed.internal.adapter.ActorSystemAdapter
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.sharding.ShardCoordinator
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.ShardRegion
+import pekko.cluster.sharding.ShardRegion.{ StartEntity => ClassicStartEntity }
+import pekko.cluster.sharding.typed.scaladsl.EntityContext
+import pekko.cluster.typed.Cluster
+import pekko.event.Logging
+import pekko.event.LoggingAdapter
+import pekko.japi.function.{ Function => JFunction }
+import pekko.pattern.AskTimeoutException
+import pekko.pattern.PromiseActorRef
+import pekko.pattern.StatusReply
+import pekko.util.{ unused, ByteString, Timeout }
+import pekko.util.JavaDurationConverters._
 
 /**
  * INTERNAL API
  * Extracts entityId and unwraps ShardingEnvelope and StartEntity messages.
  * Other messages are delegated to the given `ShardingMessageExtractor`.
  */
-@InternalApi private[akka] class ExtractorAdapter[E, M](delegate: ShardingMessageExtractor[E, M])
+@InternalApi private[pekko] class ExtractorAdapter[E, M](delegate: ShardingMessageExtractor[E, M])
     extends ShardingMessageExtractor[Any, M] {
   override def entityId(message: Any): String = {
     message match {
@@ -80,21 +81,21 @@ import akka.util.JavaDurationConverters._
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] final case class EntityTypeKeyImpl[T](name: String, messageClassName: String)
+@InternalApi private[pekko] final case class EntityTypeKeyImpl[T](name: String, messageClassName: String)
     extends javadsl.EntityTypeKey[T]
     with scaladsl.EntityTypeKey[T] {
 
   override def toString: String = s"EntityTypeKey[$messageClassName]($name)"
 
-  private[akka] def asJava: javadsl.EntityTypeKey[T] = this
+  private[pekko] def asJava: javadsl.EntityTypeKey[T] = this
 }
 
 /** INTERNAL API */
-@InternalApi private[akka] final class ClusterShardingImpl(system: ActorSystem[_])
+@InternalApi private[pekko] final class ClusterShardingImpl(system: ActorSystem[_])
     extends javadsl.ClusterSharding
     with scaladsl.ClusterSharding {
 
-  import akka.actor.typed.scaladsl.adapter._
+  import pekko.actor.typed.scaladsl.adapter._
 
   require(
     system.isInstanceOf[ActorSystemAdapter[_]],
@@ -102,7 +103,7 @@ import akka.util.JavaDurationConverters._
 
   private val cluster = Cluster(system)
   private val classicSystem: ExtendedActorSystem = system.toClassic.asInstanceOf[ExtendedActorSystem]
-  private val classicSharding = akka.cluster.sharding.ClusterSharding(classicSystem)
+  private val classicSharding = pekko.cluster.sharding.ClusterSharding(classicSystem)
   private val log: LoggingAdapter = Logging(classicSystem, classOf[scaladsl.ClusterSharding])
 
   // typeKey.name to messageClassName
@@ -200,7 +201,7 @@ import akka.util.JavaDurationConverters._
           }
         }
 
-        val classicEntityPropsFactory: String => akka.actor.Props = { entityId =>
+        val classicEntityPropsFactory: String => pekko.actor.Props = { entityId =>
           val behv = behavior(new EntityContext(typeKey, entityId, shardCommandDelegator))
           PropsAdapter(poisonPillInterceptor(behv), entityProps)
         }
@@ -298,7 +299,7 @@ import akka.util.JavaDurationConverters._
   }
 
   override lazy val shardState: ActorRef[ClusterShardingQuery] = {
-    import akka.actor.typed.scaladsl.adapter._
+    import pekko.actor.typed.scaladsl.adapter._
     val behavior = ShardingState.behavior(classicSharding)
     classicSystem.systemActorOf(PropsAdapter(behavior), "typedShardState")
   }
@@ -308,8 +309,8 @@ import akka.util.JavaDurationConverters._
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] final class EntityRefImpl[M](
-    shardRegion: akka.actor.ActorRef,
+@InternalApi private[pekko] final class EntityRefImpl[M](
+    shardRegion: pekko.actor.ActorRef,
     override val entityId: String,
     override val typeKey: EntityTypeKeyImpl[M],
     override val dataCenter: Option[String] = None)
@@ -351,10 +352,10 @@ import akka.util.JavaDurationConverters._
   override def askWithStatus[Res](f: ActorRef[StatusReply[Res]] => M, timeout: Duration): CompletionStage[Res] =
     askWithStatus(f.apply)(timeout.asScala).toJava
 
-  /** Similar to [[akka.actor.typed.scaladsl.AskPattern.PromiseRef]] but for an `EntityRef` target. */
+  /** Similar to [[pekko.actor.typed.scaladsl.AskPattern.PromiseRef]] but for an `EntityRef` target. */
   @InternalApi
   private final class EntityPromiseRef[U](classic: InternalActorRef, timeout: Timeout, refPathPrefix: String) {
-    import akka.actor.typed.internal.{ adapter => adapt }
+    import pekko.actor.typed.internal.{ adapter => adapt }
 
     // Note: _promiseRef mustn't have a type pattern, since it can be null
     private[this] val (_ref: ActorRef[U], _future: Future[U], _promiseRef) =
@@ -389,8 +390,8 @@ import akka.util.JavaDurationConverters._
     val promiseRef: PromiseActorRef = _promiseRef
 
     @InternalStableApi
-    private[akka] def ask[T](
-        shardRegion: akka.actor.ActorRef,
+    private[pekko] def ask[T](
+        shardRegion: pekko.actor.ActorRef,
         entityId: String,
         message: T,
         @unused timeout: Timeout): Future[U] = {
@@ -401,13 +402,13 @@ import akka.util.JavaDurationConverters._
 
   // impl InternalRecipientRef
   override def provider: ActorRefProvider = {
-    import akka.actor.typed.scaladsl.adapter._
+    import pekko.actor.typed.scaladsl.adapter._
     shardRegion.toTyped.asInstanceOf[InternalRecipientRef[_]].provider
   }
 
   // impl InternalRecipientRef
   def isTerminated: Boolean = {
-    import akka.actor.typed.scaladsl.adapter._
+    import pekko.actor.typed.scaladsl.adapter._
     shardRegion.toTyped.asInstanceOf[InternalRecipientRef[_]].isTerminated
   }
 
@@ -416,7 +417,7 @@ import akka.util.JavaDurationConverters._
   /**
    * INTERNAL API
    */
-  override private[akka] def asJava: javadsl.EntityRef[M] = this
+  override private[pekko] def asJava: javadsl.EntityRef[M] = this
 
   private[internal] def withDataCenter(dataCenter: Option[String]): EntityRefImpl[M] =
     new EntityRefImpl[M](shardRegion, entityId, typeKey, dataCenter)
@@ -425,9 +426,9 @@ import akka.util.JavaDurationConverters._
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ShardCommandActor {
-  import akka.actor.typed.scaladsl.adapter._
-  import akka.cluster.sharding.ShardRegion.{ Passivate => ClassicPassivate }
+@InternalApi private[pekko] object ShardCommandActor {
+  import pekko.actor.typed.scaladsl.adapter._
+  import pekko.cluster.sharding.ShardRegion.{ Passivate => ClassicPassivate }
 
   def behavior(stopMessage: Any): Behavior[scaladsl.ClusterSharding.ShardCommand] = {
     def sendClassicPassivate(entity: ActorRef[_], ctx: TypedActorContext[_]): Unit = {
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala
similarity index 67%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala
index f82682598f..8c6ca26c2e 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.internal
+package org.apache.pekko.cluster.sharding.typed.internal
 
 import scala.collection.{ immutable => im }
 
 import com.typesafe.config.Config
 
-import akka.annotation.InternalApi
-import akka.cluster.{ ConfigValidation, JoinConfigCompatChecker, Valid }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.{ ConfigValidation, JoinConfigCompatChecker, Valid }
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class JoinConfigCompatCheckerClusterSharding extends JoinConfigCompatChecker {
+private[pekko] final class JoinConfigCompatCheckerClusterSharding extends JoinConfigCompatChecker {
 
   override def requiredKeys: im.Seq[String] =
     im.Seq("akka.cluster.sharding.number-of-shards")
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/Murmur2.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2.scala
similarity index 96%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/Murmur2.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2.scala
index 7bccc73471..e5873d9a29 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/Murmur2.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2.scala
@@ -18,11 +18,11 @@
  * limitations under the License.
  */
 
-package akka.cluster.sharding.typed.internal
+package org.apache.pekko.cluster.sharding.typed.internal
 
 import java.nio.charset.StandardCharsets
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
similarity index 74%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
index fff43fc300..c9b651ca7c 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
@@ -2,32 +2,33 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.internal
+package org.apache.pekko.cluster.sharding.typed.internal
 
 import java.util.concurrent.atomic.AtomicLong
 import java.util.{ Map => JMap }
 
-import akka.actor.typed.ActorSystem
-import akka.annotation.InternalApi
-import akka.cluster.sharding.typed.ReplicatedShardingExtension
-import akka.cluster.sharding.typed.ReplicatedSharding
-import akka.cluster.sharding.typed.ReplicatedEntityProvider
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.EntityRef
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.persistence.typed.ReplicaId
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.typed.ReplicatedShardingExtension
+import pekko.cluster.sharding.typed.ReplicatedSharding
+import pekko.cluster.sharding.typed.ReplicatedEntityProvider
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.EntityRef
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.persistence.typed.ReplicaId
 import org.slf4j.LoggerFactory
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.sharding.typed.ShardingDirectReplication
-import akka.persistence.typed.ReplicationId
-import akka.util.ccompat.JavaConverters._
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.sharding.typed.ShardingDirectReplication
+import pekko.persistence.typed.ReplicationId
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class ReplicatedShardingExtensionImpl(system: ActorSystem[_]) extends ReplicatedShardingExtension {
+private[pekko] final class ReplicatedShardingExtensionImpl(system: ActorSystem[_]) extends ReplicatedShardingExtension {
 
   private val counter = new AtomicLong(0)
 
@@ -81,7 +82,7 @@ private[akka] final class ReplicatedShardingExtensionImpl(system: ActorSystem[_]
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class ReplicatedShardingImpl[M](
+private[pekko] final class ReplicatedShardingImpl[M](
     sharding: ClusterSharding,
     replicaTypeKeys: Map[ReplicaId, (EntityTypeKey[M], Option[DataCenter], String)])
     extends ReplicatedSharding[M] {
@@ -96,7 +97,7 @@ private[akka] final class ReplicatedShardingImpl[M](
         })
     }
 
-  override def getEntityRefsFor(entityId: String): JMap[ReplicaId, akka.cluster.sharding.typed.javadsl.EntityRef[M]] =
+  override def getEntityRefsFor(entityId: String): JMap[ReplicaId, pekko.cluster.sharding.typed.javadsl.EntityRef[M]] =
     entityRefsFor(entityId).transform((_, v) => v.asJava).asJava
 
 }
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala
similarity index 83%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala
index 7ed3742f1c..73716951f8 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala
@@ -2,42 +2,43 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.internal
+package org.apache.pekko.cluster.sharding.typed.internal
 
 import java.util.function.IntFunction
 import java.util.Optional
 
 import scala.compat.java8.OptionConverters._
 import scala.reflect.ClassTag
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.ShardRegion.EntityId
-import akka.cluster.sharding.typed.ClusterShardingSettings
-import akka.cluster.sharding.typed.ClusterShardingSettings.{ RememberEntitiesStoreModeDData, StateStoreModeDData }
-import akka.cluster.sharding.typed.ShardedDaemonProcessSettings
-import akka.cluster.sharding.typed.ShardingEnvelope
-import akka.cluster.sharding.typed.ShardingMessageExtractor
-import akka.cluster.sharding.typed.javadsl
-import akka.cluster.sharding.typed.scaladsl
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.cluster.sharding.typed.scaladsl.StartEntity
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.SelfUp
-import akka.cluster.typed.Subscribe
-import akka.util.PrettyDuration
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.ShardRegion.EntityId
+import pekko.cluster.sharding.typed.ClusterShardingSettings
+import pekko.cluster.sharding.typed.ClusterShardingSettings.{ RememberEntitiesStoreModeDData, StateStoreModeDData }
+import pekko.cluster.sharding.typed.ShardedDaemonProcessSettings
+import pekko.cluster.sharding.typed.ShardingEnvelope
+import pekko.cluster.sharding.typed.ShardingMessageExtractor
+import pekko.cluster.sharding.typed.javadsl
+import pekko.cluster.sharding.typed.scaladsl
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.sharding.typed.scaladsl.StartEntity
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.SelfUp
+import pekko.cluster.typed.Subscribe
+import pekko.util.PrettyDuration
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object ShardedDaemonProcessImpl {
+private[pekko] object ShardedDaemonProcessImpl {
 
   object KeepAlivePinger {
     sealed trait Event
@@ -91,7 +92,7 @@ private[akka] object ShardedDaemonProcessImpl {
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class ShardedDaemonProcessImpl(system: ActorSystem[_])
+private[pekko] final class ShardedDaemonProcessImpl(system: ActorSystem[_])
     extends javadsl.ShardedDaemonProcess
     with scaladsl.ShardedDaemonProcess {
 
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingSerializer.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala
similarity index 81%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingSerializer.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala
index 55ef42cded..59ab5ad1d4 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingSerializer.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.internal
+package org.apache.pekko.cluster.sharding.typed.internal
 
 import java.io.NotSerializableException
-import akka.annotation.InternalApi
-import akka.cluster.sharding.typed.ShardingEnvelope
-import akka.cluster.sharding.typed.internal.protobuf.ShardingMessages
-import akka.protobufv3.internal.CodedOutputStream
-import akka.remote.serialization.WrappedPayloadSupport
-import akka.serialization.BaseSerializer
-import akka.serialization.ByteBufferSerializer
-import akka.serialization.SerializerWithStringManifest
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.typed.ShardingEnvelope
+import pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages
+import pekko.protobufv3.internal.CodedOutputStream
+import pekko.remote.serialization.WrappedPayloadSupport
+import pekko.serialization.BaseSerializer
+import pekko.serialization.ByteBufferSerializer
+import pekko.serialization.SerializerWithStringManifest
 
 import java.nio.ByteBuffer
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class ShardingSerializer(val system: akka.actor.ExtendedActorSystem)
+@InternalApi private[pekko] class ShardingSerializer(val system: pekko.actor.ExtendedActorSystem)
     extends SerializerWithStringManifest
     with ByteBufferSerializer
     with BaseSerializer {
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingState.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingState.scala
similarity index 73%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingState.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingState.scala
index d83bc84d04..ba5550e277 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingState.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingState.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.internal
+package org.apache.pekko.cluster.sharding.typed.internal
 
-import akka.actor.typed.Behavior
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ClusterSharding
-import akka.cluster.sharding.ShardRegion
-import akka.cluster.sharding.ShardRegion.CurrentShardRegionState
-import akka.cluster.sharding.typed.ClusterShardingQuery
-import akka.cluster.sharding.typed.GetClusterShardingStats
-import akka.cluster.sharding.typed.GetShardRegionState
+import org.apache.pekko
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ClusterSharding
+import pekko.cluster.sharding.ShardRegion
+import pekko.cluster.sharding.ShardRegion.CurrentShardRegionState
+import pekko.cluster.sharding.typed.ClusterShardingQuery
+import pekko.cluster.sharding.typed.GetClusterShardingStats
+import pekko.cluster.sharding.typed.GetShardRegionState
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ShardingState {
+@InternalApi private[pekko] object ShardingState {
 
   def behavior(classicSharding: ClusterSharding): Behavior[ClusterShardingQuery] = {
     Behaviors
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala
similarity index 66%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala
index 4fe9b53e7c..340ee1705a 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala
@@ -2,30 +2,31 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.internal.testkit
+package org.apache.pekko.cluster.sharding.typed.internal.testkit
 
 import java.time.Duration
 import java.util.concurrent.CompletionStage
 
 import scala.concurrent.Future
 import scala.compat.java8.FutureConverters._
-import akka.actor.ActorRefProvider
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Scheduler
-import akka.actor.typed.internal.InternalRecipientRef
-import akka.annotation.InternalApi
-import akka.cluster.sharding.typed.javadsl
-import akka.cluster.sharding.typed.javadsl.EntityRef
-import akka.cluster.sharding.typed.scaladsl
-import akka.japi.function.{ Function => JFunction }
-import akka.pattern.StatusReply
-import akka.util.JavaDurationConverters._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.ActorRefProvider
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Scheduler
+import pekko.actor.typed.internal.InternalRecipientRef
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.typed.javadsl
+import pekko.cluster.sharding.typed.javadsl.EntityRef
+import pekko.cluster.sharding.typed.scaladsl
+import pekko.japi.function.{ Function => JFunction }
+import pekko.pattern.StatusReply
+import pekko.util.JavaDurationConverters._
+import pekko.util.Timeout
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] final class TestEntityRefImpl[M](
+@InternalApi private[pekko] final class TestEntityRefImpl[M](
     override val entityId: String,
     probe: ActorRef[M],
     override val typeKey: scaladsl.EntityTypeKey[M])
@@ -33,7 +34,7 @@ import akka.util.Timeout
     with scaladsl.EntityRef[M]
     with InternalRecipientRef[M] {
 
-  import akka.actor.typed.scaladsl.adapter._
+  import pekko.actor.typed.scaladsl.adapter._
 
   override def dataCenter: Option[String] = None
 
@@ -41,7 +42,7 @@ import akka.util.Timeout
     probe ! msg
 
   override def ask[U](message: ActorRef[U] => M)(implicit timeout: Timeout): Future[U] = {
-    import akka.actor.typed.scaladsl.AskPattern._
+    import pekko.actor.typed.scaladsl.AskPattern._
     implicit val scheduler: Scheduler = provider.guardian.underlying.system.scheduler.toTyped
     probe.ask(message)
   }
@@ -67,5 +68,5 @@ import akka.util.Timeout
 
   override def toString: String = s"TestEntityRef($entityId)"
 
-  override private[akka] def asJava: EntityRef[M] = this
+  override private[pekko] def asJava: EntityRef[M] = this
 }
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ClusterSharding.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
similarity index 91%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ClusterSharding.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
index bee8ee58f1..2738357791 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ClusterSharding.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 package javadsl
 
 import java.time.Duration
@@ -10,18 +10,19 @@ import java.util.Optional
 import java.util.concurrent.CompletionStage
 
 import scala.annotation.nowarn
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.Props
-import akka.actor.typed.RecipientRef
-import akka.actor.typed.internal.InternalRecipientRef
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.typed.internal.EntityTypeKeyImpl
-import akka.japi.function.{ Function => JFunction }
-import akka.pattern.StatusReply
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Props
+import pekko.actor.typed.RecipientRef
+import pekko.actor.typed.internal.InternalRecipientRef
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.typed.internal.EntityTypeKeyImpl
+import pekko.japi.function.{ Function => JFunction }
+import pekko.pattern.StatusReply
 import scala.compat.java8.OptionConverters._
 @FunctionalInterface
 trait EntityFactory[M] {
@@ -85,7 +86,7 @@ object ClusterSharding {
  * to extract the entity identifier and the shard identifier from incoming messages.
  * A shard is a group of entities that will be managed together. For the first message in a
  * specific shard the `ShardRegion` requests the location of the shard from a central coordinator,
- * the [[akka.cluster.sharding.ShardCoordinator]]. The `ShardCoordinator` decides which `ShardRegion`
+ * the [[pekko.cluster.sharding.ShardCoordinator]]. The `ShardCoordinator` decides which `ShardRegion`
  * owns the shard. The `ShardRegion` receives the decided home of the shard
  * and if that is the `ShardRegion` instance itself it will create a local child
  * actor representing the entity and direct all messages for that entity to it.
@@ -100,7 +101,7 @@ object ClusterSharding {
  * are located. Therefore the shard allocation decisions are taken by the central
  * `ShardCoordinator`, which is running as a cluster singleton, i.e. one instance on
  * the oldest member among all cluster nodes or a group of nodes tagged with a specific
- * role. The oldest member can be determined by [[akka.cluster.Member#isOlderThan]].
+ * role. The oldest member can be determined by [[pekko.cluster.Member#isOlderThan]].
  *
  * To be able to use newly added members in the cluster the coordinator facilitates rebalancing
  * of shards, i.e. migrate entities from one node to another. In the rebalance process the
@@ -259,7 +260,7 @@ final class Entity[M, E] private (
     val dataCenter: Optional[String]) {
 
   /**
-   * [[akka.actor.typed.Props]] of the entity actors, such as dispatcher settings.
+   * [[pekko.actor.typed.Props]] of the entity actors, such as dispatcher settings.
    */
   def withEntityProps(newEntityProps: Props): Entity[M, E] =
     copy(entityProps = newEntityProps)
@@ -344,8 +345,8 @@ final class Entity[M, E] private (
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def toScala: akka.cluster.sharding.typed.scaladsl.Entity[M, E] =
-    new akka.cluster.sharding.typed.scaladsl.Entity(
+  private[pekko] def toScala: pekko.cluster.sharding.typed.scaladsl.Entity[M, E] =
+    new pekko.cluster.sharding.typed.scaladsl.Entity(
       eCtx => createBehavior(eCtx.toJava),
       typeKey.asScala,
       stopMessage.asScala,
@@ -361,8 +362,8 @@ final class Entity[M, E] private (
 /**
  * Parameter to `createBehavior` function in [[Entity.of]].
  *
- * Cluster Sharding is often used together with [[akka.persistence.typed.javadsl.EventSourcedBehavior]]
- * for the entities. See more considerations in [[akka.persistence.typed.PersistenceId]].
+ * Cluster Sharding is often used together with [[pekko.persistence.typed.javadsl.EventSourcedBehavior]]
+ * for the entities. See more considerations in [[pekko.persistence.typed.PersistenceId]].
  * The `PersistenceId` of the `EventSourcedBehavior` can typically be constructed with:
  * {{{
  * PersistenceId.of(entityContext.getEntityTypeKey().name(), entityContext.getEntityId())
@@ -411,7 +412,7 @@ object StartEntity {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def asScala: scaladsl.EntityTypeKey[T] = scaladslSelf
+  @InternalApi private[pekko] def asScala: scaladsl.EntityTypeKey[T] = scaladslSelf
 
 }
 
@@ -466,9 +467,9 @@ object EntityTypeKey {
 
   /**
    * Allows to "ask" the [[EntityRef]] for a reply.
-   * See [[akka.actor.typed.javadsl.AskPattern]] for a complete write-up of this pattern
+   * See [[pekko.actor.typed.javadsl.AskPattern]] for a complete write-up of this pattern
    *
-   * Note that if you are inside of an actor you should prefer [[akka.actor.typed.javadsl.ActorContext.ask]]
+   * Note that if you are inside of an actor you should prefer [[pekko.actor.typed.javadsl.ActorContext.ask]]
    * as that provides better safety.
    *
    * @tparam Res The response protocol, what the other actor sends back
@@ -476,16 +477,16 @@ object EntityTypeKey {
   def ask[Res](message: JFunction[ActorRef[Res], M], timeout: Duration): CompletionStage[Res]
 
   /**
-   * The same as [[ask]] but only for requests that result in a response of type [[akka.pattern.StatusReply]].
-   * If the response is a [[akka.pattern.StatusReply#success]] the returned future is completed successfully with the wrapped response.
-   * If the status response is a [[akka.pattern.StatusReply#error]] the returned future will be failed with the
-   * exception in the error (normally a [[akka.pattern.StatusReply.ErrorMessage]]).
+   * The same as [[ask]] but only for requests that result in a response of type [[pekko.pattern.StatusReply]].
+   * If the response is a [[pekko.pattern.StatusReply#success]] the returned future is completed successfully with the wrapped response.
+   * If the status response is a [[pekko.pattern.StatusReply#error]] the returned future will be failed with the
+   * exception in the error (normally a [[pekko.pattern.StatusReply.ErrorMessage]]).
    */
   def askWithStatus[Res](f: ActorRef[StatusReply[Res]] => M, timeout: Duration): CompletionStage[Res]
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def asScala: scaladsl.EntityRef[M] = scaladslSelf
+  @InternalApi private[pekko] def asScala: scaladsl.EntityRef[M] = scaladslSelf
 
 }
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala
similarity index 89%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala
index 67bf4e80d0..6b4f941e91 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.javadsl
+package org.apache.pekko.cluster.sharding.typed.javadsl
 
 import java.util.function.IntFunction
 import java.util.Optional
 
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.annotation.DoNotInherit
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.typed.ShardedDaemonProcessSettings
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.annotation.DoNotInherit
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.typed.ShardedDaemonProcessSettings
 
 object ShardedDaemonProcess {
   def get(system: ActorSystem[_]): ShardedDaemonProcess =
-    akka.cluster.sharding.typed.scaladsl.ShardedDaemonProcess(system).asJava
+    pekko.cluster.sharding.typed.scaladsl.ShardedDaemonProcess(system).asJava
 }
 
 /**
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
similarity index 88%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
index 0e4a9812a8..a2c2726542 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
@@ -2,29 +2,30 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 package scaladsl
 
 import scala.concurrent.Future
 import scala.reflect.ClassTag
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.Extension
-import akka.actor.typed.ExtensionId
-import akka.actor.typed.ExtensionSetup
-import akka.actor.typed.Props
-import akka.actor.typed.RecipientRef
-import akka.actor.typed.internal.InternalRecipientRef
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.ShardRegion.{ StartEntity => ClassicStartEntity }
-import akka.cluster.sharding.typed.internal.ClusterShardingImpl
-import akka.cluster.sharding.typed.internal.EntityTypeKeyImpl
-import akka.pattern.StatusReply
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Extension
+import pekko.actor.typed.ExtensionId
+import pekko.actor.typed.ExtensionSetup
+import pekko.actor.typed.Props
+import pekko.actor.typed.RecipientRef
+import pekko.actor.typed.internal.InternalRecipientRef
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.ShardRegion.{ StartEntity => ClassicStartEntity }
+import pekko.cluster.sharding.typed.internal.ClusterShardingImpl
+import pekko.cluster.sharding.typed.internal.EntityTypeKeyImpl
+import pekko.pattern.StatusReply
+import pekko.util.Timeout
 
 object ClusterSharding extends ExtensionId[ClusterSharding] {
 
@@ -85,7 +86,7 @@ object ClusterSharding extends ExtensionId[ClusterSharding] {
  * to extract the entity identifier and the shard identifier from incoming messages.
  * A shard is a group of entities that will be managed together. For the first message in a
  * specific shard the `ShardRegion` requests the location of the shard from a central coordinator,
- * the [[akka.cluster.sharding.ShardCoordinator]]. The `ShardCoordinator` decides which `ShardRegion`
+ * the [[pekko.cluster.sharding.ShardCoordinator]]. The `ShardCoordinator` decides which `ShardRegion`
  * owns the shard. The `ShardRegion` receives the decided home of the shard
  * and if that is the `ShardRegion` instance itself it will create a local child
  * actor representing the entity and direct all messages for that entity to it.
@@ -100,7 +101,7 @@ object ClusterSharding extends ExtensionId[ClusterSharding] {
  * are located. Therefore the shard allocation decisions are taken by the central
  * `ShardCoordinator`, which is running as a cluster singleton, i.e. one instance on
  * the oldest member among all cluster nodes or a group of nodes tagged with a specific
- * role. The oldest member can be determined by [[akka.cluster.Member#isOlderThan]].
+ * role. The oldest member can be determined by [[pekko.cluster.Member#isOlderThan]].
  *
  * To be able to use newly added members in the cluster the coordinator facilitates rebalancing
  * of shards, i.e. migrate entities from one node to another. In the rebalance process the
@@ -119,7 +120,7 @@ object ClusterSharding extends ExtensionId[ClusterSharding] {
  * location.
  *
  * The logic that decides which shards to rebalance is defined in a plugable shard
- * allocation strategy. The default implementation [[akka.cluster.sharding.ShardCoordinator.LeastShardAllocationStrategy]]
+ * allocation strategy. The default implementation [[pekko.cluster.sharding.ShardCoordinator.LeastShardAllocationStrategy]]
  * picks shards for handoff from the `ShardRegion` with most number of previously allocated shards.
  * They will then be allocated to the `ShardRegion` with least number of previously allocated shards,
  * i.e. new members in the cluster. There is a configurable threshold of how large the difference
@@ -220,7 +221,7 @@ trait ClusterSharding extends Extension { javadslSelf: javadsl.ClusterSharding =
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def asJava: javadsl.ClusterSharding = javadslSelf
+  @InternalApi private[pekko] def asJava: javadsl.ClusterSharding = javadslSelf
 
 }
 
@@ -242,7 +243,7 @@ object Entity {
 /**
  * Defines how the entity should be created. Used in [[ClusterSharding#init]].
  */
-final class Entity[M, E] private[akka] (
+final class Entity[M, E] private[pekko] (
     val createBehavior: EntityContext[M] => Behavior[M],
     val typeKey: EntityTypeKey[M],
     val stopMessage: Option[M],
@@ -254,7 +255,7 @@ final class Entity[M, E] private[akka] (
     val dataCenter: Option[DataCenter]) {
 
   /**
-   * [[akka.actor.typed.Props]] of the entity actors, such as dispatcher settings.
+   * [[pekko.actor.typed.Props]] of the entity actors, such as dispatcher settings.
    */
   def withEntityProps(newEntityProps: Props): Entity[M, E] =
     copy(entityProps = newEntityProps)
@@ -339,8 +340,8 @@ final class Entity[M, E] private[akka] (
 /**
  * Parameter to `createBehavior` function in [[Entity.apply]].
  *
- * Cluster Sharding is often used together with [[akka.persistence.typed.scaladsl.EventSourcedBehavior]]
- * for the entities. See more considerations in [[akka.persistence.typed.PersistenceId]].
+ * Cluster Sharding is often used together with [[pekko.persistence.typed.scaladsl.EventSourcedBehavior]]
+ * for the entities. See more considerations in [[pekko.persistence.typed.PersistenceId]].
  * The `PersistenceId` of the `EventSourcedBehavior` can typically be constructed with:
  * {{{
  * PersistenceId(entityContext.entityTypeKey.name, entityContext.entityId)
@@ -358,8 +359,8 @@ final class EntityContext[M](
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def toJava: akka.cluster.sharding.typed.javadsl.EntityContext[M] =
-    new akka.cluster.sharding.typed.javadsl.EntityContext[M](
+  private[pekko] def toJava: pekko.cluster.sharding.typed.javadsl.EntityContext[M] =
+    new pekko.cluster.sharding.typed.javadsl.EntityContext[M](
       entityTypeKey.asInstanceOf[EntityTypeKeyImpl[M]],
       entityId,
       shard)
@@ -390,7 +391,7 @@ object StartEntity {
    */
   def name: String
 
-  private[akka] def asJava: javadsl.EntityTypeKey[T]
+  private[pekko] def asJava: javadsl.EntityTypeKey[T]
 }
 
 object EntityTypeKey {
@@ -464,9 +465,9 @@ object EntityTypeKey {
 
   /**
    * Allows to "ask" the [[EntityRef]] for a reply.
-   * See [[akka.actor.typed.scaladsl.AskPattern]] for a complete write-up of this pattern
+   * See [[pekko.actor.typed.scaladsl.AskPattern]] for a complete write-up of this pattern
    *
-   * Note that if you are inside of an actor you should prefer [[akka.actor.typed.scaladsl.ActorContext.ask]]
+   * Note that if you are inside of an actor you should prefer [[pekko.actor.typed.scaladsl.ActorContext.ask]]
    * as that provides better safety.
    *
    * Example usage:
@@ -479,25 +480,25 @@ object EntityTypeKey {
    * val f: Future[Reply] = target.ask(Request("hello", _))
    * }}}
    *
-   * Please note that an implicit [[akka.util.Timeout]] must be available to use this pattern.
+   * Please note that an implicit [[pekko.util.Timeout]] must be available to use this pattern.
    *
    * @tparam Res The response protocol, what the other actor sends back
    */
   def ask[Res](f: ActorRef[Res] => M)(implicit timeout: Timeout): Future[Res]
 
   /**
-   * The same as [[ask]] but only for requests that result in a response of type [[akka.pattern.StatusReply]].
-   * If the response is a [[akka.pattern.StatusReply.Success]] the returned future is completed successfully with the wrapped response.
-   * If the status response is a [[akka.pattern.StatusReply.Error]] the returned future will be failed with the
-   * exception in the error (normally a [[akka.pattern.StatusReply.ErrorMessage]]).
+   * The same as [[ask]] but only for requests that result in a response of type [[pekko.pattern.StatusReply]].
+   * If the response is a [[pekko.pattern.StatusReply.Success]] the returned future is completed successfully with the wrapped response.
+   * If the status response is a [[pekko.pattern.StatusReply.Error]] the returned future will be failed with the
+   * exception in the error (normally a [[pekko.pattern.StatusReply.ErrorMessage]]).
    */
   def askWithStatus[Res](f: ActorRef[StatusReply[Res]] => M)(implicit timeout: Timeout): Future[Res]
 
   /**
    * Allows to "ask" the [[EntityRef]] for a reply.
-   * See [[akka.actor.typed.scaladsl.AskPattern]] for a complete write-up of this pattern
+   * See [[pekko.actor.typed.scaladsl.AskPattern]] for a complete write-up of this pattern
    *
-   * Note that if you are inside of an actor you should prefer [[akka.actor.typed.scaladsl.ActorContext.ask]]
+   * Note that if you are inside of an actor you should prefer [[pekko.actor.typed.scaladsl.ActorContext.ask]]
    * as that provides better safety.
    *
    * Example usage:
@@ -510,7 +511,7 @@ object EntityTypeKey {
    * val f: Future[Reply] = target ? (replyTo => Request("hello", replyTo))
    * }}}
    *
-   * Please note that an implicit [[akka.util.Timeout]] must be available to use this pattern.
+   * Please note that an implicit [[pekko.util.Timeout]] must be available to use this pattern.
    *
    * Note: it is preferable to use the non-symbolic ask method as it easier allows for wildcards for
    * the `replyTo: ActorRef`.
@@ -523,7 +524,7 @@ object EntityTypeKey {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def asJava: javadsl.EntityRef[M]
+  @InternalApi private[pekko] def asJava: javadsl.EntityRef[M]
 
 }
 
@@ -534,7 +535,7 @@ object ClusterShardingSetup {
 }
 
 /**
- * Can be used in [[akka.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]]
+ * Can be used in [[pekko.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]]
  * to replace the default implementation of the [[ClusterSharding]] extension. Intended
  * for tests that need to replace extension with stub/mock implementations.
  */
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala
similarity index 84%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala
index ff052fc8c8..6c8611d5b7 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.scaladsl
+package org.apache.pekko.cluster.sharding.typed.scaladsl
 
 import scala.reflect.ClassTag
 
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.Extension
-import akka.actor.typed.ExtensionId
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.typed.ShardedDaemonProcessSettings
-import akka.cluster.sharding.typed.internal.ShardedDaemonProcessImpl
-import akka.cluster.sharding.typed.javadsl
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Extension
+import pekko.actor.typed.ExtensionId
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.typed.ShardedDaemonProcessSettings
+import pekko.cluster.sharding.typed.internal.ShardedDaemonProcessImpl
+import pekko.cluster.sharding.typed.javadsl
 
 object ShardedDaemonProcess extends ExtensionId[ShardedDaemonProcess] {
   override def createExtension(system: ActorSystem[_]): ShardedDaemonProcess = new ShardedDaemonProcessImpl(system)
@@ -86,6 +87,6 @@ trait ShardedDaemonProcess extends Extension { javadslSelf: javadsl.ShardedDaemo
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def asJava: javadsl.ShardedDaemonProcess = javadslSelf
+  @InternalApi private[pekko] def asJava: javadsl.ShardedDaemonProcess = javadslSelf
 
 }
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/testkit/javadsl/EntityRef.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/javadsl/EntityRef.scala
similarity index 56%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/testkit/javadsl/EntityRef.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/javadsl/EntityRef.scala
index fede474d1e..179983d97f 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/testkit/javadsl/EntityRef.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/javadsl/EntityRef.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.testkit.javadsl
+package org.apache.pekko.cluster.sharding.typed.testkit.javadsl
 
-import akka.actor.typed.ActorRef
-import akka.cluster.sharding.typed.internal.testkit.TestEntityRefImpl
-import akka.cluster.sharding.typed.javadsl.EntityRef
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.cluster.sharding.typed.internal.testkit.TestEntityRefImpl
+import pekko.cluster.sharding.typed.javadsl.EntityRef
+import pekko.cluster.sharding.typed.javadsl.EntityTypeKey
 
 /**
  * For testing purposes this `EntityRef` can be used in place of a real [[EntityRef]].
diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala
similarity index 56%
rename from akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala
rename to akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala
index e9d1824cd3..1e565f5e94 100644
--- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala
+++ b/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.testkit.scaladsl
+package org.apache.pekko.cluster.sharding.typed.testkit.scaladsl
 
-import akka.actor.typed.ActorRef
-import akka.cluster.sharding.typed.internal.testkit.TestEntityRefImpl
-import akka.cluster.sharding.typed.scaladsl.EntityRef
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.cluster.sharding.typed.internal.testkit.TestEntityRefImpl
+import pekko.cluster.sharding.typed.scaladsl.EntityRef
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
 
 /**
  * For testing purposes this `EntityRef` can be used in place of a real [[EntityRef]].
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
similarity index 97%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
rename to akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
index 495c9d3f44..2cb63bb198 100644
--- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
+++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import java.nio.file.Paths
 import java.util.concurrent.TimeUnit.NANOSECONDS
 import java.util.concurrent.atomic.AtomicInteger
 
-import akka.actor._
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.ShardRegion.{ CurrentShardRegionState, GetShardRegionState, Passivate }
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.ShardRegion.{ CurrentShardRegionState, GetShardRegionState, Passivate }
+import pekko.testkit._
+import pekko.util.ccompat._
 import com.typesafe.config.ConfigFactory
 import org.HdrHistogram.Histogram
 
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala
similarity index 80%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala
rename to akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala
index e423a15015..311fca4c77 100644
--- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala
+++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.util.ccompat._
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.MemberStatus
-import akka.cluster.MemberStatus.Removed
-import akka.cluster.sharding.typed.ClusterShardingPreparingForShutdownSpec.Pinger.Command
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.cluster.typed.Leave
-import akka.cluster.typed.MultiNodeTypedClusterSpec
-import akka.cluster.typed.PrepareForFullClusterShutdown
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.util.ccompat._
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.MemberStatus
+import pekko.cluster.MemberStatus.Removed
+import pekko.cluster.sharding.typed.ClusterShardingPreparingForShutdownSpec.Pinger.Command
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.typed.Leave
+import pekko.cluster.typed.MultiNodeTypedClusterSpec
+import pekko.cluster.typed.PrepareForFullClusterShutdown
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.serialization.jackson.CborSerializable
 import com.typesafe.config.ConfigFactory
 
 import scala.concurrent.duration._
@@ -34,7 +35,7 @@ object ClusterShardingPreparingForShutdownSpec extends MultiNodeConfig {
     akka.loglevel = DEBUG 
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = off
     akka.cluster.leader-actions-interval = 100ms
     """))
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ClusterShardingStatsSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingStatsSpec.scala
similarity index 79%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ClusterShardingStatsSpec.scala
rename to akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingStatsSpec.scala
index cd6b558ca6..2a19f5b86f 100644
--- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ClusterShardingStatsSpec.scala
+++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingStatsSpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.ScalaFutures
 
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.sharding.ShardRegion.ClusterShardingStats
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.cluster.typed.MultiNodeTypedClusterSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.sharding.ShardRegion.ClusterShardingStats
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.typed.MultiNodeTypedClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.serialization.jackson.CborSerializable
 
 object ClusterShardingStatsSpecConfig extends MultiNodeConfig {
 
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/MultiDcClusterShardingSpec.scala
similarity index 88%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala
rename to akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/MultiDcClusterShardingSpec.scala
index 8b26f38e2e..84612ae458 100644
--- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala
+++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/MultiDcClusterShardingSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.ScalaFutures
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.cluster.typed.{ MultiDcPinger, MultiNodeTypedClusterSpec }
-import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.typed.{ MultiDcPinger, MultiNodeTypedClusterSpec }
+import pekko.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
+import pekko.util.Timeout
 
 object MultiDcClusterShardingSpecConfig extends MultiNodeConfig {
   val first = role("first")
@@ -57,7 +58,7 @@ abstract class MultiDcClusterShardingSpec
   import MultiDcPinger._
 
   override implicit def patienceConfig: PatienceConfig = {
-    import akka.testkit.TestDuration
+    import pekko.testkit.TestDuration
     PatienceConfig(testKitSettings.DefaultTimeout.duration.dilated, 100.millis)
   }
 
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
similarity index 82%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala
rename to akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
index df7de3bc53..5c1aac20ef 100644
--- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala
+++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
@@ -2,30 +2,31 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.sharding.typed.ReplicatedShardingSpec.TestRES.GetState
-import akka.cluster.sharding.typed.ReplicatedShardingSpec.TestRES.State
-import akka.cluster.sharding.typed.ReplicatedShardingSpec.TestRES.StoreMe
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.typed.MultiNodeTypedClusterSpec
-import akka.persistence.journal.PersistencePluginProxy
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.sharding.typed.ReplicatedShardingSpec.TestRES.GetState
+import pekko.cluster.sharding.typed.ReplicatedShardingSpec.TestRES.State
+import pekko.cluster.sharding.typed.ReplicatedShardingSpec.TestRES.StoreMe
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.typed.MultiNodeTypedClusterSpec
+import pekko.persistence.journal.PersistencePluginProxy
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.serialization.jackson.CborSerializable
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.Eventually
 import org.scalatest.concurrent.ScalaFutures
@@ -120,7 +121,7 @@ abstract class ReplicatedShardingSpec
   import ReplicatedShardingSpec._
 
   implicit val patience: PatienceConfig = {
-    import akka.testkit.TestDuration
+    import pekko.testkit.TestDuration
     PatienceConfig(testKitSettings.DefaultTimeout.duration.dilated * 2, Span(500, org.scalatest.time.Millis))
   }
 
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSpec.scala
similarity index 82%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSpec.scala
rename to akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSpec.scala
index 944eb42cdf..eb4a7f6f6e 100644
--- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSpec.scala
+++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.ScalaFutures
 
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.Behavior
-import akka.actor.typed.receptionist.Receptionist
-import akka.actor.typed.receptionist.ServiceKey
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.Routers
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.sharding.typed.scaladsl.ShardedDaemonProcess
-import akka.cluster.typed.MultiNodeTypedClusterSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.receptionist.Receptionist
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.Routers
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.sharding.typed.scaladsl.ShardedDaemonProcess
+import pekko.cluster.typed.MultiNodeTypedClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.serialization.jackson.CborSerializable
 
 object ShardedDaemonProcessSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
similarity index 92%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
rename to akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
index 5b53dade0f..57d10dd5e6 100644
--- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
+++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.delivery
+package org.apache.pekko.cluster.sharding.typed.delivery
 
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit.NANOSECONDS
@@ -11,29 +11,30 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.ProducerController
-import akka.actor.typed.delivery.WorkPullingProducerController
-import akka.actor.typed.receptionist.ServiceKey
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.sharding.typed.ShardingEnvelope
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.cluster.typed.MultiNodeTypedClusterSpec
-import akka.remote.artery.BenchmarkFileReporter
-import akka.remote.artery.PlotResult
-import akka.remote.artery.TestRateReporter
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.PerfFlamesSupport
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.ProducerController
+import pekko.actor.typed.delivery.WorkPullingProducerController
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.sharding.typed.ShardingEnvelope
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.typed.MultiNodeTypedClusterSpec
+import pekko.remote.artery.BenchmarkFileReporter
+import pekko.remote.artery.PlotResult
+import pekko.remote.artery.TestRateReporter
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.PerfFlamesSupport
+import pekko.serialization.jackson.CborSerializable
 
 object DeliveryThroughputSpec extends MultiNodeConfig {
   val first = role("first")
@@ -44,7 +45,7 @@ object DeliveryThroughputSpec extends MultiNodeConfig {
 
   val cfg = ConfigFactory.parseString(s"""
      # for serious measurements you should increase the totalMessagesFactor (30)
-     akka.test.DeliveryThroughputSpec.totalMessagesFactor = 10.0
+     org.apache.pekko.test.DeliveryThroughputSpec.totalMessagesFactor = 10.0
      akka.reliable-delivery {
        consumer-controller.flow-control-window = 50
        sharding.consumer-controller.flow-control-window = 50
@@ -304,7 +305,7 @@ abstract class DeliveryThroughputSpec
   import DeliveryThroughputSpec._
 
   private val totalMessagesFactor =
-    system.settings.config.getDouble("akka.test.DeliveryThroughputSpec.totalMessagesFactor")
+    system.settings.config.getDouble("org.apache.pekko.test.DeliveryThroughputSpec.totalMessagesFactor")
 
   private var plot = PlotResult()
 
@@ -321,7 +322,7 @@ abstract class DeliveryThroughputSpec
   }
 
   private val settingsToReport = List(
-    "akka.test.DeliveryThroughputSpec.totalMessagesFactor",
+    "org.apache.pekko.test.DeliveryThroughputSpec.totalMessagesFactor",
     "akka.reliable-delivery.consumer-controller.flow-control-window")
   private val resultReporter = BenchmarkFileReporter("DeliveryThroughputSpec", system, settingsToReport)
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/PointToPointDocExample.java b/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/PointToPointDocExample.java
index 8b0a5e1203..d7cb5db23c 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/PointToPointDocExample.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/PointToPointDocExample.java
@@ -5,24 +5,24 @@
 package jdocs.delivery;
 
 // #imports
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.delivery.ProducerController;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.delivery.ProducerController;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 import java.math.BigInteger;
 import java.util.Optional;
 
 // #imports
 
 // #consumer
-import akka.actor.typed.delivery.ConsumerController;
+import org.apache.pekko.actor.typed.delivery.ConsumerController;
 
 // #consumer
 
-import akka.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.ActorSystem;
 
 import java.util.UUID;
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/ShardingDocExample.java b/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/ShardingDocExample.java
index 839e435383..b981c5a72f 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/ShardingDocExample.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/ShardingDocExample.java
@@ -5,15 +5,15 @@
 package jdocs.delivery;
 
 // #imports
-import akka.Done;
-import akka.actor.Address;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.delivery.ConsumerController;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.Address;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.delivery.ConsumerController;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -25,18 +25,18 @@ import java.util.concurrent.CompletionStage;
 // #imports
 
 // #producer
-import akka.cluster.sharding.typed.delivery.ShardingProducerController;
+import org.apache.pekko.cluster.sharding.typed.delivery.ShardingProducerController;
 
 // #producer
 
 // #init
-import akka.cluster.sharding.typed.delivery.ShardingConsumerController;
-import akka.cluster.sharding.typed.ShardingEnvelope;
-import akka.cluster.sharding.typed.javadsl.ClusterSharding;
-import akka.cluster.sharding.typed.javadsl.Entity;
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey;
-import akka.cluster.typed.Cluster;
-import akka.actor.typed.ActorSystem;
+import org.apache.pekko.cluster.sharding.typed.delivery.ShardingConsumerController;
+import org.apache.pekko.cluster.sharding.typed.ShardingEnvelope;
+import org.apache.pekko.cluster.sharding.typed.javadsl.ClusterSharding;
+import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
+import org.apache.pekko.cluster.typed.Cluster;
+import org.apache.pekko.actor.typed.ActorSystem;
 
 // #init
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/WorkPullingDocExample.java b/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/WorkPullingDocExample.java
index 01e9b2fe26..c06a7d8582 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/WorkPullingDocExample.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/WorkPullingDocExample.java
@@ -5,12 +5,12 @@
 package jdocs.delivery;
 
 // #imports
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.delivery.ConsumerController;
-import akka.actor.typed.delivery.DurableProducerQueue;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.delivery.ConsumerController;
+import org.apache.pekko.actor.typed.delivery.DurableProducerQueue;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
 
 import java.time.Duration;
 import java.util.Optional;
@@ -19,19 +19,19 @@ import java.util.UUID;
 // #imports
 
 // #producer
-import akka.actor.typed.delivery.WorkPullingProducerController;
-import akka.Done;
+import org.apache.pekko.actor.typed.delivery.WorkPullingProducerController;
+import org.apache.pekko.Done;
 
 // #producer
 
 // #durable-queue
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.delivery.EventSourcedProducerQueue;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.delivery.EventSourcedProducerQueue;
 
 // #durable-queue
 
-import akka.actor.typed.javadsl.StashBuffer;
-import akka.actor.typed.receptionist.ServiceKey;
+import org.apache.pekko.actor.typed.javadsl.StashBuffer;
+import org.apache.pekko.actor.typed.receptionist.ServiceKey;
 
 interface WorkPullingDocExample {
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleDocTest.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocTest.java
similarity index 86%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleDocTest.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocTest.java
index d9fbdad3c6..77ba23af59 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleDocTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocTest.java
@@ -2,23 +2,23 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.Done;
-import akka.pattern.StatusReply;
+import org.apache.pekko.Done;
+import org.apache.pekko.pattern.StatusReply;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static jdocs.akka.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity;
+import static jdocs.org.apache.pekko.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity;
 import static org.junit.Assert.*;
 
 // #test
 import java.math.BigDecimal;
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.typed.ActorRef;
-import akka.persistence.testkit.javadsl.EventSourcedBehaviorTestKit;
-import akka.persistence.testkit.javadsl.EventSourcedBehaviorTestKit.CommandResultWithReply;
-import akka.persistence.typed.PersistenceId;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.persistence.testkit.javadsl.EventSourcedBehaviorTestKit;
+import org.apache.pekko.persistence.testkit.javadsl.EventSourcedBehaviorTestKit.CommandResultWithReply;
+import org.apache.pekko.persistence.typed.PersistenceId;
 
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleTest.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java
similarity index 88%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleTest.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java
index 5f08209e61..d12206e25c 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java
@@ -2,19 +2,19 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.Done;
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.cluster.sharding.typed.javadsl.ClusterSharding;
-import akka.cluster.sharding.typed.javadsl.Entity;
-import akka.cluster.sharding.typed.javadsl.EntityRef;
-import akka.cluster.typed.Cluster;
-import akka.cluster.typed.Join;
-import akka.pattern.StatusReply;
-import akka.persistence.typed.PersistenceId;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.cluster.sharding.typed.javadsl.ClusterSharding;
+import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
+import org.apache.pekko.cluster.typed.Cluster;
+import org.apache.pekko.cluster.typed.Join;
+import org.apache.pekko.pattern.StatusReply;
+import org.apache.pekko.persistence.typed.PersistenceId;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
@@ -27,9 +27,9 @@ import java.time.Duration;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 
-import static akka.Done.done;
-import static jdocs.akka.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity;
-import static jdocs.akka.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity.*;
+import static org.apache.pekko.Done.done;
+import static jdocs.org.apache.pekko.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity;
+import static jdocs.org.apache.pekko.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
similarity index 90%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
index 904f4ec1b9..dad53b577b 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
@@ -2,20 +2,20 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey;
-import akka.pattern.StatusReply;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.CommandHandlerWithReply;
-import akka.persistence.typed.javadsl.CommandHandlerWithReplyBuilder;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.EventHandlerBuilder;
-import akka.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies;
-import akka.persistence.typed.javadsl.ReplyEffect;
-import akka.serialization.jackson.CborSerializable;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
+import org.apache.pekko.pattern.StatusReply;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandlerWithReply;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandlerWithReplyBuilder;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventHandlerBuilder;
+import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies;
+import org.apache.pekko.persistence.typed.javadsl.ReplyEffect;
+import org.apache.pekko.serialization.jackson.CborSerializable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 import java.math.BigDecimal;
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithMutableState.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java
similarity index 90%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithMutableState.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java
index 7e924bd7a9..aeafe8069e 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithMutableState.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java
@@ -2,20 +2,20 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey;
-import akka.pattern.StatusReply;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.CommandHandlerWithReply;
-import akka.persistence.typed.javadsl.CommandHandlerWithReplyBuilder;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.EventHandlerBuilder;
-import akka.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies;
-import akka.persistence.typed.javadsl.ReplyEffect;
-import akka.serialization.jackson.CborSerializable;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
+import org.apache.pekko.pattern.StatusReply;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandlerWithReply;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandlerWithReplyBuilder;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventHandlerBuilder;
+import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies;
+import org.apache.pekko.persistence.typed.javadsl.ReplyEffect;
+import org.apache.pekko.serialization.jackson.CborSerializable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 import java.math.BigDecimal;
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullDurableState.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java
similarity index 90%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullDurableState.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java
index b748f45da9..180ead80d1 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullDurableState.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java
@@ -2,18 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey;
-import akka.pattern.StatusReply;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.state.javadsl.CommandHandlerWithReply;
-import akka.persistence.typed.state.javadsl.CommandHandlerWithReplyBuilder;
-import akka.persistence.typed.state.javadsl.DurableStateBehaviorWithEnforcedReplies;
-import akka.persistence.typed.state.javadsl.ReplyEffect;
-import akka.serialization.jackson.CborSerializable;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
+import org.apache.pekko.pattern.StatusReply;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.state.javadsl.CommandHandlerWithReply;
+import org.apache.pekko.persistence.typed.state.javadsl.CommandHandlerWithReplyBuilder;
+import org.apache.pekko.persistence.typed.state.javadsl.DurableStateBehaviorWithEnforcedReplies;
+import org.apache.pekko.persistence.typed.state.javadsl.ReplyEffect;
+import org.apache.pekko.serialization.jackson.CborSerializable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 import java.math.BigDecimal;
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullState.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java
similarity index 90%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullState.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java
index abf19e1989..b688e2c4b1 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullState.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java
@@ -2,20 +2,20 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey;
-import akka.pattern.StatusReply;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.CommandHandlerWithReply;
-import akka.persistence.typed.javadsl.CommandHandlerWithReplyBuilder;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.EventHandlerBuilder;
-import akka.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies;
-import akka.persistence.typed.javadsl.ReplyEffect;
-import akka.serialization.jackson.CborSerializable;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
+import org.apache.pekko.pattern.StatusReply;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandlerWithReply;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandlerWithReplyBuilder;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventHandlerBuilder;
+import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies;
+import org.apache.pekko.persistence.typed.javadsl.ReplyEffect;
+import org.apache.pekko.serialization.jackson.CborSerializable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 import java.math.BigDecimal;
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java
similarity index 69%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java
index 118898bb79..0f309be925 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java
@@ -2,18 +2,18 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.persistence.query.Offset;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.persistence.query.Offset;
+import org.apache.pekko.stream.javadsl.Source;
 
 // #get-durable-state-store-query-example
-import akka.persistence.state.DurableStateStoreRegistry;
-import akka.persistence.query.javadsl.DurableStateStoreQuery;
-import akka.persistence.query.DurableStateChange;
-import akka.persistence.query.UpdatedDurableState;
+import org.apache.pekko.persistence.state.DurableStateStoreRegistry;
+import org.apache.pekko.persistence.query.javadsl.DurableStateStoreQuery;
+import org.apache.pekko.persistence.query.DurableStateChange;
+import org.apache.pekko.persistence.query.UpdatedDurableState;
 
 // #get-durable-state-store-query-example
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
similarity index 53%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
index e595c196a0..0d597cdfc8 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
@@ -2,22 +2,22 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.Done;
-import akka.actor.Address;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.cluster.sharding.external.ExternalShardAllocation;
-import akka.cluster.sharding.external.javadsl.ExternalShardAllocationClient;
-import akka.cluster.sharding.typed.ShardingEnvelope;
-import akka.cluster.sharding.typed.javadsl.ClusterSharding;
-import akka.cluster.sharding.typed.javadsl.Entity;
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.Address;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.cluster.sharding.external.ExternalShardAllocation;
+import org.apache.pekko.cluster.sharding.external.javadsl.ExternalShardAllocationClient;
+import org.apache.pekko.cluster.sharding.typed.ShardingEnvelope;
+import org.apache.pekko.cluster.sharding.typed.javadsl.ClusterSharding;
+import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
 
 import java.util.concurrent.CompletionStage;
 
-import static jdocs.akka.cluster.sharding.typed.ShardingCompileOnlyTest.Counter;
+import static jdocs.org.apache.pekko.cluster.sharding.typed.ShardingCompileOnlyTest.Counter;
 
 public class ExternalShardAllocationCompileOnlyTest {
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
similarity index 81%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
index d02b2d1544..6c2755ff3e 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
@@ -2,17 +2,17 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.cluster.sharding.typed.javadsl.ClusterSharding;
-import akka.cluster.sharding.typed.javadsl.EntityRef;
-import akka.cluster.sharding.typed.javadsl.Entity;
-import akka.cluster.typed.Cluster;
-import akka.cluster.typed.Join;
-import akka.persistence.typed.PersistenceId;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.cluster.sharding.typed.javadsl.ClusterSharding;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
+import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
+import org.apache.pekko.cluster.typed.Cluster;
+import org.apache.pekko.cluster.typed.Join;
+import org.apache.pekko.persistence.typed.PersistenceId;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
@@ -20,7 +20,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static jdocs.akka.cluster.sharding.typed.HelloWorldPersistentEntityExample.*;
+import static jdocs.org.apache.pekko.cluster.sharding.typed.HelloWorldPersistentEntityExample.*;
 import static org.junit.Assert.assertEquals;
 
 public class HelloWorldEventSourcedEntityExampleTest extends JUnitSuite {
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.java
similarity index 81%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.java
index ad344973d0..a78e375e3a 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.java
@@ -2,12 +2,12 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.HashSet;
@@ -15,21 +15,21 @@ import java.util.Set;
 import java.util.concurrent.CompletionStage;
 
 // #persistent-entity-import
-import akka.actor.typed.javadsl.Behaviors;
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.Effect;
-import akka.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.Effect;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
 // #persistent-entity-import
 
 // #persistent-entity-usage-import
-import akka.cluster.sharding.typed.javadsl.ClusterSharding;
-import akka.cluster.sharding.typed.javadsl.EntityRef;
-import akka.cluster.sharding.typed.javadsl.Entity;
-import akka.persistence.typed.javadsl.EventSourcedBehavior;
-import akka.serialization.jackson.CborSerializable;
-import akka.util.Timeout;
+import org.apache.pekko.cluster.sharding.typed.javadsl.ClusterSharding;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
+import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
+import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
+import org.apache.pekko.serialization.jackson.CborSerializable;
+import org.apache.pekko.util.Timeout;
 import com.fasterxml.jackson.annotation.JsonCreator;
 // #persistent-entity-usage-import
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
similarity index 86%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
index a211d51b73..85d08e31ad 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
@@ -2,15 +2,15 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.cluster.sharding.typed.*;
-import akka.cluster.sharding.typed.javadsl.Entity;
-import akka.cluster.sharding.typed.javadsl.EntityRef;
-import akka.persistence.typed.ReplicaId;
-import akka.persistence.typed.ReplicationId;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.cluster.sharding.typed.*;
+import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
+import org.apache.pekko.persistence.typed.ReplicaId;
+import org.apache.pekko.persistence.typed.ReplicationId;
 
 import java.util.*;
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java
similarity index 87%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java
index c67b983374..9ed09d43c5 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java
@@ -2,40 +2,40 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
 import java.time.Duration;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 // #import
-import akka.cluster.sharding.typed.ShardingEnvelope;
-import akka.cluster.sharding.typed.javadsl.ClusterSharding;
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey;
-import akka.cluster.sharding.typed.javadsl.EntityRef;
-import akka.cluster.sharding.typed.javadsl.Entity;
-import akka.persistence.typed.PersistenceId;
+import org.apache.pekko.cluster.sharding.typed.ShardingEnvelope;
+import org.apache.pekko.cluster.sharding.typed.javadsl.ClusterSharding;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
+import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
+import org.apache.pekko.persistence.typed.PersistenceId;
 
 // #import
 
 // #get-shard-region-state
-import akka.cluster.sharding.typed.GetShardRegionState;
-import akka.cluster.sharding.ShardRegion.CurrentShardRegionState;
+import org.apache.pekko.cluster.sharding.typed.GetShardRegionState;
+import org.apache.pekko.cluster.sharding.ShardRegion.CurrentShardRegionState;
 
 // #get-shard-region-state
 // #get-cluster-sharding-stats
-import akka.cluster.sharding.typed.GetClusterShardingStats;
-import akka.cluster.sharding.ShardRegion.ClusterShardingStats;
+import org.apache.pekko.cluster.sharding.typed.GetClusterShardingStats;
+import org.apache.pekko.cluster.sharding.ShardRegion.ClusterShardingStats;
 
 // #get-cluster-sharding-stats
 
-import jdocs.akka.persistence.typed.BlogPostEntity;
+import jdocs.org.apache.pekko.persistence.typed.BlogPostEntity;
 
 interface ShardingCompileOnlyTest {
 
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java
similarity index 79%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java
rename to akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java
index 0eb5c4a6a1..3a061122e5 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java
@@ -2,16 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.sharding.typed;
+package jdocs.org.apache.pekko.cluster.sharding.typed;
 
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
-import akka.cluster.sharding.typed.javadsl.ClusterSharding;
-import akka.cluster.sharding.typed.javadsl.EntityRef;
-import akka.cluster.sharding.typed.javadsl.EntityTypeKey;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
+import org.apache.pekko.cluster.sharding.typed.javadsl.ClusterSharding;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
 
 interface ShardingReplyCompileOnlyTest {
 
diff --git a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/ReplicatedShardingTest.java b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
similarity index 85%
rename from akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/ReplicatedShardingTest.java
rename to akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
index 2f0e7d0867..a9647a4b6d 100644
--- a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/ReplicatedShardingTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
@@ -2,27 +2,27 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed;
+package org.apache.pekko.cluster.sharding.typed;
 
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
-import akka.cluster.MemberStatus;
-import akka.cluster.sharding.typed.javadsl.Entity;
-import akka.cluster.sharding.typed.javadsl.EntityRef;
-import akka.cluster.typed.Cluster;
-import akka.cluster.typed.Join;
-import akka.persistence.testkit.PersistenceTestKitPlugin;
-import akka.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
-import akka.persistence.typed.ReplicaId;
-import akka.persistence.typed.ReplicationId;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
+import org.apache.pekko.cluster.MemberStatus;
+import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
+import org.apache.pekko.cluster.typed.Cluster;
+import org.apache.pekko.cluster.typed.Join;
+import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin;
+import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
+import org.apache.pekko.persistence.typed.ReplicaId;
+import org.apache.pekko.persistence.typed.ReplicationId;
+import org.apache.pekko.persistence.typed.javadsl.*;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -33,7 +33,7 @@ import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 
-import static akka.cluster.sharding.typed.ReplicatedShardingTest.ProxyActor.ALL_REPLICAS;
+import static org.apache.pekko.cluster.sharding.typed.ReplicatedShardingTest.ProxyActor.ALL_REPLICAS;
 import static org.junit.Assert.assertEquals;
 
 public class ReplicatedShardingTest extends JUnitSuite {
@@ -212,7 +212,7 @@ public class ReplicatedShardingTest extends JUnitSuite {
       new TestKitJunitResource(
           ConfigFactory.parseString(
                   " akka.loglevel = DEBUG\n"
-                      + "      akka.loggers = [\"akka.testkit.SilenceAllTestEventListener\"]\n"
+                      + "      akka.loggers = [\"org.apache.pekko.testkit.SilenceAllTestEventListener\"]\n"
                       + "      akka.actor.provider = \"cluster\"\n"
                       + "      # pretend we're a node in all dc:s\n"
                       + "      akka.cluster.roles = [\"DC-A\", \"DC-B\", \"DC-C\"]\n"
diff --git a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
similarity index 87%
rename from akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
rename to akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
index 2548e38914..9157259d1e 100644
--- a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
@@ -2,20 +2,20 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.javadsl;
+package org.apache.pekko.cluster.sharding.typed.javadsl;
 
-import akka.Done;
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
-import akka.cluster.typed.Cluster;
-import akka.cluster.typed.Join;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.Effect;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.EventSourcedBehavior;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.cluster.typed.Cluster;
+import org.apache.pekko.cluster.typed.Join;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.Effect;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
diff --git a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java
similarity index 73%
rename from akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java
rename to akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java
index f2604b52e0..dbb31a04a3 100644
--- a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java
+++ b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java
@@ -2,10 +2,10 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.javadsl;
+package org.apache.pekko.cluster.sharding.typed.javadsl;
 
-import akka.actor.typed.ActorSystem;
-import akka.cluster.sharding.typed.ClusterShardingSettings;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings;
 
 public class ClusterShardingSettingsCompileOnly {
 
diff --git a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
similarity index 81%
rename from akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
rename to akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
index b8110338b0..258aab1b1d 100644
--- a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.javadsl;
+package org.apache.pekko.cluster.sharding.typed.javadsl;
 
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.cluster.sharding.typed.ShardedDaemonProcessSettings;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.cluster.sharding.typed.ShardedDaemonProcessSettings;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java
similarity index 84%
rename from akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java
rename to akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java
index 5f3889172b..5cb4f6117e 100644
--- a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java
@@ -2,16 +2,16 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.javadsl;
+package org.apache.pekko.cluster.sharding.typed.javadsl;
 
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.cluster.typed.Cluster;
-import akka.cluster.typed.Join;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.cluster.typed.Cluster;
+import org.apache.pekko.cluster.typed.Join;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.*;
 import org.junit.ClassRule;
 import org.junit.Rule;
 
diff --git a/akka-cluster-sharding-typed/src/test/resources/logback-test.xml b/akka-cluster-sharding-typed/src/test/resources/logback-test.xml
index 3d08c776bd..e9a7bb1ad0 100644
--- a/akka-cluster-sharding-typed/src/test/resources/logback-test.xml
+++ b/akka-cluster-sharding-typed/src/test/resources/logback-test.xml
@@ -12,16 +12,16 @@
     
-    
+    
 
     
-    
+    
         
     
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/delivery/PointToPointDocExample.scala b/akka-cluster-sharding-typed/src/test/scala/docs/delivery/PointToPointDocExample.scala
index 33d7421db4..177f276c50 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/delivery/PointToPointDocExample.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/delivery/PointToPointDocExample.scala
@@ -8,13 +8,14 @@ import java.util.UUID
 
 import scala.annotation.nowarn
 
-import akka.actor.typed.ActorSystem
+import org.apache.pekko.actor.typed.ActorSystem
 
 //#imports
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.delivery.ProducerController
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.delivery.ProducerController
+import pekko.actor.typed.scaladsl.Behaviors
 
 //#imports
 
@@ -54,7 +55,7 @@ object PointToPointDocExample {
   // #producer
 
   // #consumer
-  import akka.actor.typed.delivery.ConsumerController
+  import pekko.actor.typed.delivery.ConsumerController
 
   object FibonacciConsumer {
     sealed trait Command
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/delivery/ShardingDocExample.scala b/akka-cluster-sharding-typed/src/test/scala/docs/delivery/ShardingDocExample.scala
index 77354eed0f..0f7d17bf17 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/delivery/ShardingDocExample.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/delivery/ShardingDocExample.scala
@@ -10,14 +10,15 @@ import scala.concurrent.duration._
 import scala.util.Failure
 import scala.util.Success
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.sharding.typed.delivery.ShardingConsumerController
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.sharding.typed.delivery.ShardingConsumerController
+import pekko.util.Timeout
 
 //#imports
 
@@ -105,7 +106,7 @@ object ShardingDocExample {
   // #consumer
 
   // #producer
-  import akka.cluster.sharding.typed.delivery.ShardingProducerController
+  import pekko.cluster.sharding.typed.delivery.ShardingProducerController
 
   object TodoService {
     sealed trait Command
@@ -187,10 +188,11 @@ object ShardingDocExample {
   def illustrateInit(): Unit = {
     Behaviors.setup[Nothing] { context =>
       // #init
-      import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-      import akka.cluster.sharding.typed.scaladsl.Entity
-      import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-      import akka.cluster.typed.Cluster
+      import org.apache.pekko
+      import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+      import pekko.cluster.sharding.typed.scaladsl.Entity
+      import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+      import pekko.cluster.typed.Cluster
 
       val db: DB = ???
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/delivery/WorkPullingDocExample.scala b/akka-cluster-sharding-typed/src/test/scala/docs/delivery/WorkPullingDocExample.scala
index 0dd1af132b..1dd390f19e 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/delivery/WorkPullingDocExample.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/delivery/WorkPullingDocExample.scala
@@ -10,21 +10,23 @@ import scala.concurrent.duration._
 import scala.util.Failure
 import scala.util.Success
 
-import akka.Done
-import akka.actor.typed.ActorRef
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
 import scala.annotation.nowarn
 
 @nowarn("msg=never used")
 object WorkPullingDocExample {
 
   // #imports
-  import akka.actor.typed.scaladsl.Behaviors
-  import akka.actor.typed.Behavior
+  import org.apache.pekko
+  import pekko.actor.typed.scaladsl.Behaviors
+  import pekko.actor.typed.Behavior
   // #imports
 
   // #consumer
-  import akka.actor.typed.delivery.ConsumerController
-  import akka.actor.typed.receptionist.ServiceKey
+  import pekko.actor.typed.delivery.ConsumerController
+  import pekko.actor.typed.receptionist.ServiceKey
 
   object ImageConverter {
     sealed trait Command
@@ -62,9 +64,10 @@ object WorkPullingDocExample {
   // #consumer
 
   // #producer
-  import akka.actor.typed.delivery.WorkPullingProducerController
-  import akka.actor.typed.scaladsl.ActorContext
-  import akka.actor.typed.scaladsl.StashBuffer
+  import org.apache.pekko
+  import pekko.actor.typed.delivery.WorkPullingProducerController
+  import pekko.actor.typed.scaladsl.ActorContext
+  import pekko.actor.typed.scaladsl.StashBuffer
 
   object ImageWorkManager {
     sealed trait Command
@@ -107,8 +110,9 @@ object WorkPullingDocExample {
           "producerController")
         // #producer
         // #durable-queue
-        import akka.persistence.typed.delivery.EventSourcedProducerQueue
-        import akka.persistence.typed.PersistenceId
+        import org.apache.pekko
+        import pekko.persistence.typed.delivery.EventSourcedProducerQueue
+        import pekko.persistence.typed.PersistenceId
 
         val durableQueue =
           EventSourcedProducerQueue[ImageConverter.ConversionJob](PersistenceId.ofUniqueId("ImageWorkManager"))
@@ -173,7 +177,7 @@ object WorkPullingDocExample {
       // #ask
 
       import WorkPullingProducerController.MessageWithConfirmation
-      import akka.util.Timeout
+      import pekko.util.Timeout
 
       implicit val askTimeout: Timeout = 5.seconds
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleDocSpec.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocSpec.scala
similarity index 84%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleDocSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocSpec.scala
index f9c497048d..70bf5bf1be 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleDocSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
 //#test
-import akka.Done
-import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit
-import akka.persistence.typed.PersistenceId
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.pattern.StatusReply
+import org.apache.pekko
+import pekko.Done
+import pekko.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit
+import pekko.persistence.typed.PersistenceId
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.pattern.StatusReply
 import org.scalatest.BeforeAndAfterEach
 import org.scalatest.wordspec.AnyWordSpecLike
 
 //#test
 
-import docs.akka.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity
+import docs.org.apache.pekko.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity
 
 //#test
 //#testkit
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleSpec.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleSpec.scala
similarity index 91%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleSpec.scala
index 44d780235c..125b970fb4 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
-import akka.Done
+import org.apache.pekko.Done
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Join
-import akka.pattern.StatusReply
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Join
+import pekko.pattern.StatusReply
+import pekko.persistence.typed.PersistenceId
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
similarity index 88%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
index 2b8bf6c42c..d6f9a615df 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.pattern.StatusReply
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.state.scaladsl.Effect
-import akka.persistence.typed.state.scaladsl.DurableStateBehavior
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.pattern.StatusReply
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.state.scaladsl.Effect
+import pekko.persistence.typed.state.scaladsl.DurableStateBehavior
+import pekko.serialization.jackson.CborSerializable
 
 /**
  * This bank account example illustrates:
@@ -42,7 +43,7 @@ object AccountExampleWithCommandHandlersInDurableState {
     val Zero = BigDecimal(0)
 
     // type alias to reduce boilerplate
-    type ReplyEffect = akka.persistence.typed.state.scaladsl.ReplyEffect[Account]
+    type ReplyEffect = pekko.persistence.typed.state.scaladsl.ReplyEffect[Account]
 
     // State
     sealed trait Account extends CborSerializable {
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala
similarity index 90%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala
index f4cd1dff46..cc2518f577 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.pattern.StatusReply
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.pattern.StatusReply
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.serialization.jackson.CborSerializable
 
 /**
  * Bank account example illustrating:
@@ -46,7 +47,7 @@ object AccountExampleWithCommandHandlersInState {
     val Zero = BigDecimal(0)
 
     // type alias to reduce boilerplate
-    type ReplyEffect = akka.persistence.typed.scaladsl.ReplyEffect[Event, Account]
+    type ReplyEffect = pekko.persistence.typed.scaladsl.ReplyEffect[Event, Account]
 
     // State
     sealed trait Account extends CborSerializable {
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
similarity index 92%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
index d202ff1c38..fd2c8ea4ff 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.pattern.StatusReply
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.ReplyEffect
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.pattern.StatusReply
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.ReplyEffect
+import pekko.serialization.jackson.CborSerializable
 
 /**
  * Bank account example illustrating:
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala
similarity index 87%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala
index 7929b0c8c3..33a29a2dee 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.pattern.StatusReply
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.state.scaladsl.Effect
-import akka.persistence.typed.state.scaladsl.DurableStateBehavior
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.pattern.StatusReply
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.state.scaladsl.Effect
+import pekko.persistence.typed.state.scaladsl.DurableStateBehavior
+import pekko.serialization.jackson.CborSerializable
 
 /**
  * This bank account example illustrates:
@@ -38,7 +39,7 @@ object AccountExampleWithOptionDurableState {
     val Zero = BigDecimal(0)
 
     // type alias to reduce boilerplate
-    type ReplyEffect = akka.persistence.typed.state.scaladsl.ReplyEffect[Option[Account]]
+    type ReplyEffect = pekko.persistence.typed.state.scaladsl.ReplyEffect[Option[Account]]
 
     // State
     sealed trait Account extends CborSerializable {
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithOptionState.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionState.scala
similarity index 90%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithOptionState.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionState.scala
index fd7facc5b3..28d359c470 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithOptionState.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionState.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.pattern.StatusReply
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.pattern.StatusReply
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.serialization.jackson.CborSerializable
 
 /**
  * Bank account example illustrating:
@@ -46,7 +47,7 @@ object AccountExampleWithOptionState {
     val Zero = BigDecimal(0)
 
     // type alias to reduce boilerplate
-    type ReplyEffect = akka.persistence.typed.scaladsl.ReplyEffect[Event, Option[Account]]
+    type ReplyEffect = pekko.persistence.typed.scaladsl.ReplyEffect[Event, Option[Account]]
 
     // State
     sealed trait Account extends CborSerializable {
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala
similarity index 62%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala
index 4afaacf7fd..acd1118e54 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala
@@ -2,22 +2,24 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
 import scala.annotation.nowarn
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.persistence.query.{ DeletedDurableState, Offset }
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.persistence.query.{ DeletedDurableState, Offset }
+import pekko.stream.scaladsl.Source
 
 @nowarn
 object DurableStateStoreQueryUsageCompileOnlySpec {
   def getQuery[Record](system: ActorSystem, pluginId: String, offset: Offset) = {
     // #get-durable-state-store-query-example
-    import akka.persistence.state.DurableStateStoreRegistry
-    import akka.persistence.query.scaladsl.DurableStateStoreQuery
-    import akka.persistence.query.DurableStateChange
-    import akka.persistence.query.UpdatedDurableState
+    import org.apache.pekko
+    import pekko.persistence.state.DurableStateStoreRegistry
+    import pekko.persistence.query.scaladsl.DurableStateStoreQuery
+    import pekko.persistence.query.DurableStateChange
+    import pekko.persistence.query.UpdatedDurableState
 
     val durableStateStoreQuery =
       DurableStateStoreRegistry(system).durableStateStoreFor[DurableStateStoreQuery[Record]](pluginId)
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala
similarity index 53%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala
index bcf0b1a9c2..29bfe9d64d 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
-import akka.Done
-import akka.actor.Address
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.cluster.sharding.external.ExternalShardAllocation
-import akka.cluster.sharding.external.ExternalShardAllocationStrategy
-import akka.cluster.sharding.external.scaladsl.ExternalShardAllocationClient
-import akka.cluster.sharding.typed.ShardingEnvelope
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import docs.akka.cluster.sharding.typed.ShardingCompileOnlySpec.Basics.Counter
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.Address
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.cluster.sharding.external.ExternalShardAllocation
+import pekko.cluster.sharding.external.ExternalShardAllocationStrategy
+import pekko.cluster.sharding.external.scaladsl.ExternalShardAllocationClient
+import pekko.cluster.sharding.typed.ShardingEnvelope
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import docs.org.apache.pekko.cluster.sharding.typed.ShardingCompileOnlySpec.Basics.Counter
 
 import scala.concurrent.Future
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala
similarity index 81%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala
index 6760a21ae0..bb6fabb895 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Join
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Join
+import pekko.persistence.typed.PersistenceId
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala
similarity index 77%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala
index 615334a5ba..7294e84564 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala
@@ -2,24 +2,26 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.serialization.jackson.CborSerializable
 
 object HelloWorldPersistentEntityExample {
 
   // #persistent-entity-usage
-  import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-  import akka.cluster.sharding.typed.scaladsl.Entity
-  import akka.util.Timeout
+  import org.apache.pekko
+  import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+  import pekko.cluster.sharding.typed.scaladsl.Entity
+  import pekko.util.Timeout
 
   class HelloWorldService(system: ActorSystem[_]) {
     import system.executionContext
@@ -43,9 +45,10 @@ object HelloWorldPersistentEntityExample {
   // #persistent-entity-usage
 
   // #persistent-entity
-  import akka.actor.typed.Behavior
-  import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-  import akka.persistence.typed.scaladsl.Effect
+  import org.apache.pekko
+  import pekko.actor.typed.Behavior
+  import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+  import pekko.persistence.typed.scaladsl.Effect
 
   object HelloWorld {
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala
similarity index 73%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala
index 5f9fba6f38..93be0d5e48 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.cluster.sharding.typed.ReplicatedEntity
-import akka.cluster.sharding.typed.ReplicatedEntityProvider
-import akka.cluster.sharding.typed.ReplicatedSharding
-import akka.cluster.sharding.typed.ReplicatedShardingExtension
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityRef
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.cluster.sharding.typed.ReplicatedEntity
+import pekko.cluster.sharding.typed.ReplicatedEntityProvider
+import pekko.cluster.sharding.typed.ReplicatedSharding
+import pekko.cluster.sharding.typed.ReplicatedShardingExtension
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityRef
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
 import scala.annotation.nowarn
 
 @nowarn("msg=never used")
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala
similarity index 77%
rename from akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala
index f25f477ad3..0e240b7db3 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.sharding.typed
+package docs.org.apache.pekko.cluster.sharding.typed
 
 import scala.concurrent.duration._
 
-import akka.actor.typed.{ ActorRef, ActorSystem, Behavior }
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.typed.{ ActorRef, ActorSystem, Behavior }
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.persistence.typed.PersistenceId
 import scala.annotation.nowarn
-import docs.akka.persistence.typed.BlogPostEntity
-import docs.akka.persistence.typed.BlogPostEntity.Command
+import docs.org.apache.pekko.persistence.typed.BlogPostEntity
+import docs.org.apache.pekko.persistence.typed.BlogPostEntity.Command
 
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
 
 @nowarn
 object ShardingCompileOnlySpec {
@@ -25,10 +26,11 @@ object ShardingCompileOnlySpec {
   object Basics {
 
     // #sharding-extension
-    import akka.cluster.sharding.typed.ShardingEnvelope
-    import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-    import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-    import akka.cluster.sharding.typed.scaladsl.EntityRef
+    import org.apache.pekko
+    import pekko.cluster.sharding.typed.ShardingEnvelope
+    import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+    import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+    import pekko.cluster.sharding.typed.scaladsl.EntityRef
 
     val sharding = ClusterSharding(system)
     // #sharding-extension
@@ -88,8 +90,9 @@ object ShardingCompileOnlySpec {
   }
 
   object CounterWithPassivate {
-    import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-    import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
+    import org.apache.pekko
+    import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+    import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
 
     // #counter-passivate
     object Counter {
@@ -135,8 +138,9 @@ object ShardingCompileOnlySpec {
 
   object CounterWithResponseToShardedActor {
 
-    import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-    import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
+    import org.apache.pekko
+    import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+    import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
 
     // #sharded-response
     // a sharded actor that needs counter updates
@@ -178,11 +182,12 @@ object ShardingCompileOnlySpec {
       val TypeKey = EntityTypeKey[Basics.Counter.Command]("Counter")
     }
 
-    val replyMessageAdapter: ActorRef[akka.cluster.sharding.ShardRegion.CurrentShardRegionState] = ???
+    val replyMessageAdapter: ActorRef[pekko.cluster.sharding.ShardRegion.CurrentShardRegionState] = ???
 
     // #get-shard-region-state
-    import akka.cluster.sharding.typed.GetShardRegionState
-    import akka.cluster.sharding.ShardRegion.CurrentShardRegionState
+    import org.apache.pekko
+    import pekko.cluster.sharding.typed.GetShardRegionState
+    import pekko.cluster.sharding.ShardRegion.CurrentShardRegionState
 
     val replyTo: ActorRef[CurrentShardRegionState] = replyMessageAdapter
 
@@ -196,11 +201,12 @@ object ShardingCompileOnlySpec {
       val TypeKey = EntityTypeKey[Basics.Counter.Command]("Counter")
     }
 
-    val replyMessageAdapter: ActorRef[akka.cluster.sharding.ShardRegion.ClusterShardingStats] = ???
+    val replyMessageAdapter: ActorRef[pekko.cluster.sharding.ShardRegion.ClusterShardingStats] = ???
 
     // #get-cluster-sharding-stats
-    import akka.cluster.sharding.typed.GetClusterShardingStats
-    import akka.cluster.sharding.ShardRegion.ClusterShardingStats
+    import org.apache.pekko
+    import pekko.cluster.sharding.typed.GetClusterShardingStats
+    import pekko.cluster.sharding.ShardRegion.ClusterShardingStats
     import scala.concurrent.duration._
 
     val replyTo: ActorRef[ClusterShardingStats] = replyMessageAdapter
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/FlightRecording.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/FlightRecording.scala
similarity index 91%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/FlightRecording.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/FlightRecording.scala
index c0a84e7725..fc9bc23db4 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/FlightRecording.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/FlightRecording.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 import java.nio.file.Files
 import java.nio.file.Path
 
-import akka.actor.{ ActorSystem, ExtendedActorSystem }
+import org.apache.pekko.actor.{ ActorSystem, ExtendedActorSystem }
 
 /**
  * This will work on JDK11 and JDK8 built with the enable-jfr flag (8u262+).
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
similarity index 88%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
index 9385fdfe93..884cb432a5 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import scala.collection.{ immutable => im }
 import scala.concurrent.duration._
@@ -11,11 +11,12 @@ import com.typesafe.config.{ Config, ConfigFactory }
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.CoordinatedShutdown
-import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, LogCapturing, ScalaTestWithActorTestKit }
-import akka.actor.typed.ActorSystem
-import akka.cluster.{ Cluster => ClassicCluster }
-import akka.testkit.LongRunningTest
+import org.apache.pekko
+import pekko.actor.CoordinatedShutdown
+import pekko.actor.testkit.typed.scaladsl.{ ActorTestKit, LogCapturing, ScalaTestWithActorTestKit }
+import pekko.actor.typed.ActorSystem
+import pekko.cluster.{ Cluster => ClassicCluster }
+import pekko.testkit.LongRunningTest
 
 object JoinConfigCompatCheckerClusterShardingSpec {
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala
similarity index 86%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala
index 798ca03acd..c27ca9b678 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import org.scalatest.wordspec.AnyWordSpecLike
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.eventstream.EventStream
-import akka.persistence.typed
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.PublishedEvent
-import akka.persistence.typed.internal.{ PublishedEventImpl, ReplicatedPublishedEventMetaData, VersionVector }
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.eventstream.EventStream
+import pekko.persistence.typed
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.PublishedEvent
+import pekko.persistence.typed.internal.{ PublishedEventImpl, ReplicatedPublishedEventMetaData, VersionVector }
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
 
 class ReplicatedShardingDirectReplicationSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
similarity index 87%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
index 4d64ad3d0b..08283b4108 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
@@ -2,44 +2,45 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import java.util.concurrent.ThreadLocalRandom
-import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, LogCapturing, ScalaTestWithActorTestKit }
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.typed.ReplicatedShardingSpec.DataCenter
-import akka.cluster.sharding.typed.ReplicatedShardingSpec.Normal
-import akka.cluster.sharding.typed.ReplicatedShardingSpec.ReplicationType
-import akka.cluster.sharding.typed.ReplicatedShardingSpec.Role
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Join
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.{ ActorTestKit, LogCapturing, ScalaTestWithActorTestKit }
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.typed.ReplicatedShardingSpec.DataCenter
+import pekko.cluster.sharding.typed.ReplicatedShardingSpec.Normal
+import pekko.cluster.sharding.typed.ReplicatedShardingSpec.ReplicationType
+import pekko.cluster.sharding.typed.ReplicatedShardingSpec.Role
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Join
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.serialization.jackson.CborSerializable
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.cluster.sharding.typed.ReplicatedShardingSpec.MyReplicatedIntSet
-import akka.cluster.sharding.typed.ReplicatedShardingSpec.MyReplicatedStringSet
-import akka.persistence.typed.ReplicationId
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.cluster.sharding.typed.ReplicatedShardingSpec.MyReplicatedIntSet
+import pekko.cluster.sharding.typed.ReplicatedShardingSpec.MyReplicatedStringSet
+import pekko.persistence.typed.ReplicationId
 import com.typesafe.config.Config
-import akka.util.ccompat._
+import pekko.util.ccompat._
 import org.scalatest.time.Span
 
 @ccompatUsedUntil213
 object ReplicatedShardingSpec {
   def commonConfig = ConfigFactory.parseString("""
       akka.loglevel = DEBUG
-      akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+      akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
       akka.actor.provider = "cluster"
       akka.remote.classic.netty.tcp.port = 0
       akka.remote.artery.canonical.port = 0""").withFallback(PersistenceTestKitPlugin.config)
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ShardingSerializerSpec.scala
similarity index 80%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ShardingSerializerSpec.scala
index b64603c08e..4b0a7d0e5c 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ShardingSerializerSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed
+package org.apache.pekko.cluster.sharding.typed
 
 import org.scalatest.wordspec.AnyWordSpecLike
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.internal.adapter.ActorSystemAdapter
-import akka.cluster.sharding.typed.internal.ShardingSerializer
-import akka.serialization.SerializationExtension
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.internal.adapter.ActorSystemAdapter
+import pekko.cluster.sharding.typed.internal.ShardingSerializer
+import pekko.serialization.SerializationExtension
 
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/DurableShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/DurableShardingSpec.scala
similarity index 89%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/DurableShardingSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/DurableShardingSpec.scala
index 5dc713f5c8..80eb2c3b97 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/DurableShardingSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/DurableShardingSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.delivery
+package org.apache.pekko.cluster.sharding.typed.delivery
 
 import java.util.UUID
 
@@ -11,26 +11,27 @@ import scala.concurrent.duration._
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.ConsumerController.SequencedMessage
-import akka.actor.typed.delivery.DurableProducerQueue
-import akka.actor.typed.delivery.TestConsumer
-import akka.actor.typed.eventstream.EventStream
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.sharding.typed.ShardingEnvelope
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Join
-import akka.persistence.journal.inmem.InmemJournal
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.delivery.EventSourcedProducerQueue
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.ConsumerController.SequencedMessage
+import pekko.actor.typed.delivery.DurableProducerQueue
+import pekko.actor.typed.delivery.TestConsumer
+import pekko.actor.typed.eventstream.EventStream
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.sharding.typed.ShardingEnvelope
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Join
+import pekko.persistence.journal.inmem.InmemJournal
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.delivery.EventSourcedProducerQueue
 
 object DurableShardingSpec {
   def conf: Config =
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala
similarity index 95%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala
index 4a2166f771..6f5c1a164d 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.delivery
+package org.apache.pekko.cluster.sharding.typed.delivery
 
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -11,24 +11,25 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.LoggingTestKit
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.ConsumerController.SequencedMessage
-import akka.actor.typed.delivery.TestConsumer
-import akka.actor.typed.delivery.internal.ProducerControllerImpl
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.cluster.sharding.typed.ShardingEnvelope
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Join
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.ConsumerController.SequencedMessage
+import pekko.actor.typed.delivery.TestConsumer
+import pekko.actor.typed.delivery.internal.ProducerControllerImpl
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.cluster.sharding.typed.ShardingEnvelope
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Join
 
 object ReliableDeliveryShardingSpec {
   val config = ConfigFactory.parseString("""
@@ -510,7 +511,7 @@ class ReliableDeliveryShardingSpec
 
       LoggingTestKit.empty
         .withMessageRegex("ProducerController.*terminated")
-        .withLoggerName("akka.cluster.sharding.typed.delivery.ShardingConsumerController")
+        .withLoggerName("org.apache.pekko.cluster.sharding.typed.delivery.ShardingConsumerController")
         .expect {
           testKit.stop(shardingProducerController1)
         }
@@ -521,7 +522,7 @@ class ReliableDeliveryShardingSpec
 
       LoggingTestKit
         .debug("Starting ConsumerController")
-        .withLoggerName("akka.cluster.sharding.typed.delivery.ShardingConsumerController")
+        .withLoggerName("org.apache.pekko.cluster.sharding.typed.delivery.ShardingConsumerController")
         .expect {
           producerProbe.receiveMessage().sendNextTo ! ShardingEnvelope("entity-1", TestConsumer.Job("msg-3"))
         }
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/internal/Murmur2Spec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2Spec.scala
similarity index 93%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/internal/Murmur2Spec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2Spec.scala
index 7c568aefdf..2ab56edca5 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/internal/Murmur2Spec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2Spec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.internal
+package org.apache.pekko.cluster.sharding.typed.internal
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
similarity index 94%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
index 4e1eaf6e41..cce46375ff 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.scaladsl
+package org.apache.pekko.cluster.sharding.typed.scaladsl
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CountDownLatch
@@ -16,26 +16,27 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.sharding.{ ClusterSharding => ClassicClusterSharding }
-import akka.cluster.sharding.ShardRegion.CurrentShardRegionState
-import akka.cluster.sharding.ShardRegion.GetShardRegionState
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding.Passivate
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding.ShardCommand
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Join
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.sharding.{ ClusterSharding => ClassicClusterSharding }
+import pekko.cluster.sharding.ShardRegion.CurrentShardRegionState
+import pekko.cluster.sharding.ShardRegion.GetShardRegionState
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding.Passivate
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding.ShardCommand
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Join
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
 
 object ClusterShardingPersistenceSpec {
   val config = ConfigFactory.parseString("""
@@ -162,7 +163,7 @@ class ClusterShardingPersistenceSpec
 
     // also make sure that the entity is removed from the Shard before continuing
     // FIXME #24466: rewrite this with Typed API when region queries are supported
-    import akka.actor.typed.scaladsl.adapter._
+    import pekko.actor.typed.scaladsl.adapter._
     val regionStateProbe = TestProbe[CurrentShardRegionState]()
     val classicRegion = ClassicClusterSharding(system.toClassic)
     regionStateProbe.awaitAssert {
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala
similarity index 90%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala
index 6192b18f15..d19c1c7d57 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.scaladsl
+package org.apache.pekko.cluster.sharding.typed.scaladsl
 
 import scala.concurrent.duration._
 import scala.util.Failure
@@ -11,25 +11,26 @@ import scala.util.Success
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.PostStop
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.typed.ShardingEnvelope
-import akka.cluster.sharding.typed.ShardingMessageExtractor
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Join
-import akka.cluster.typed.Leave
-import akka.pattern.AskTimeoutException
-import akka.serialization.jackson.CborSerializable
-import akka.util.Timeout
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.ActorTestKit
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.typed.ShardingEnvelope
+import pekko.cluster.sharding.typed.ShardingMessageExtractor
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Join
+import pekko.cluster.typed.Leave
+import pekko.pattern.AskTimeoutException
+import pekko.serialization.jackson.CborSerializable
+import pekko.util.Timeout
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object ClusterShardingSpec {
@@ -150,11 +151,11 @@ class ClusterShardingSpec
       .withStopMessage(IdStopPlz()))
 
   def totalEntityCount1(): Int = {
-    import akka.pattern.ask
+    import org.apache.pekko.pattern.ask
     implicit val timeout: Timeout = Timeout(6.seconds)
     val statsBefore =
-      (shardingRefSystem1WithEnvelope.toClassic ? akka.cluster.sharding.ShardRegion.GetClusterShardingStats(5.seconds))
-        .mapTo[akka.cluster.sharding.ShardRegion.ClusterShardingStats]
+      (shardingRefSystem1WithEnvelope.toClassic ? pekko.cluster.sharding.ShardRegion.GetClusterShardingStats(5.seconds))
+        .mapTo[pekko.cluster.sharding.ShardRegion.ClusterShardingStats]
     val totalCount = statsBefore.futureValue.regions.values.flatMap(_.stats.values).sum
     totalCount
   }
@@ -345,8 +346,8 @@ class ClusterShardingSpec
 
       val p = TestProbe[Any]()
       shardingRefSystem1WithEnvelope.toClassic
-        .tell(akka.cluster.sharding.ShardRegion.StartEntity("startEntity-1"), p.ref.toClassic)
-      p.expectMessageType[akka.cluster.sharding.ShardRegion.StartEntityAck]
+        .tell(pekko.cluster.sharding.ShardRegion.StartEntity("startEntity-1"), p.ref.toClassic)
+      p.expectMessageType[pekko.cluster.sharding.ShardRegion.StartEntityAck]
 
       eventually {
         val totalCountAfter = totalEntityCount1()
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala
similarity index 78%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala
index 9c052dfd4c..02e202b663 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.scaladsl
+package org.apache.pekko.cluster.sharding.typed.scaladsl
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe }
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.typed.ActorRef
-import akka.cluster.sharding.ShardRegion.{ CurrentShardRegionState, ShardState }
-import akka.cluster.sharding.typed.{ GetShardRegionState, ShardingMessageExtractor }
-import akka.cluster.sharding.typed.scaladsl.ClusterShardingSpec._
-import akka.cluster.typed.{ Cluster, Join }
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe }
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.typed.ActorRef
+import pekko.cluster.sharding.ShardRegion.{ CurrentShardRegionState, ShardState }
+import pekko.cluster.sharding.typed.{ GetShardRegionState, ShardingMessageExtractor }
+import pekko.cluster.sharding.typed.scaladsl.ClusterShardingSpec._
+import pekko.cluster.typed.{ Cluster, Join }
 
 class ClusterShardingStateSpec
     extends ScalaTestWithActorTestKit(ClusterShardingSpec.config)
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala
similarity index 74%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala
index ef136cbf6c..20ca04cd18 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.scaladsl
+package org.apache.pekko.cluster.sharding.typed.scaladsl
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.cluster.sharding.ShardRegion.ClusterShardingStats
-import akka.cluster.sharding.ShardRegion.ShardRegionStats
-import akka.cluster.sharding.typed.ClusterShardingSettings
-import akka.cluster.sharding.typed.GetClusterShardingStats
-import akka.cluster.sharding.typed.scaladsl.ClusterShardingSpec._
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Join
-import akka.cluster.typed.SelfUp
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.cluster.sharding.ShardRegion.ClusterShardingStats
+import pekko.cluster.sharding.ShardRegion.ShardRegionStats
+import pekko.cluster.sharding.typed.ClusterShardingSettings
+import pekko.cluster.sharding.typed.GetClusterShardingStats
+import pekko.cluster.sharding.typed.scaladsl.ClusterShardingSpec._
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Join
+import pekko.cluster.typed.SelfUp
 
 class ClusterShardingStatsSpec
     extends ScalaTestWithActorTestKit(ClusterShardingSpec.config)
@@ -37,7 +38,7 @@ class ClusterShardingStatsSpec
       val cluster = Cluster(system)
       val upProbe = createTestProbe[SelfUp]()
 
-      cluster.subscriptions ! akka.cluster.typed.Subscribe(upProbe.ref, classOf[SelfUp])
+      cluster.subscriptions ! pekko.cluster.typed.Subscribe(upProbe.ref, classOf[SelfUp])
       cluster.manager ! Join(cluster.selfMember.address)
       upProbe.expectMessageType[SelfUp]
 
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala
similarity index 86%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala
index 0e95b19d89..816d585fa8 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.scaladsl
+package org.apache.pekko.cluster.sharding.typed.scaladsl
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.typed.ShardedDaemonProcessSettings
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Join
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.typed.ShardedDaemonProcessSettings
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Join
 
 object ShardedDaemonProcessSpec {
   // single node cluster config
diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala
similarity index 77%
rename from akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala
rename to akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala
index 5ba66353da..313e12f472 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala
@@ -2,26 +2,27 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.typed.testkit.scaladsl
+package org.apache.pekko.cluster.sharding.typed.testkit.scaladsl
 
 import scala.concurrent.Future
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.sharding.ShardCoordinator
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.typed.ClusterShardingQuery
-import akka.cluster.sharding.typed.ClusterShardingSettings
-import akka.cluster.sharding.typed.javadsl
-import akka.cluster.sharding.typed.scaladsl.ClusterSharding
-import akka.cluster.sharding.typed.scaladsl.Entity
-import akka.cluster.sharding.typed.scaladsl.EntityRef
-import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.sharding.ShardCoordinator
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.typed.ClusterShardingQuery
+import pekko.cluster.sharding.typed.ClusterShardingSettings
+import pekko.cluster.sharding.typed.javadsl
+import pekko.cluster.sharding.typed.scaladsl.ClusterSharding
+import pekko.cluster.sharding.typed.scaladsl.Entity
+import pekko.cluster.sharding.typed.scaladsl.EntityRef
+import pekko.cluster.sharding.typed.scaladsl.EntityTypeKey
 
 object TestEntityRefSpec {
 
diff --git a/akka-cluster-sharding/src/main/java/akka/cluster/sharding/protobuf/msg/ClusterShardingMessages.java b/akka-cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
similarity index 57%
rename from akka-cluster-sharding/src/main/java/akka/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
rename to akka-cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
index 06ccc874de..babf290ba3 100644
--- a/akka-cluster-sharding/src/main/java/akka/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
+++ b/akka-cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
@@ -5,32 +5,32 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ClusterShardingMessages.proto
 
-package akka.cluster.sharding.protobuf.msg;
+package org.apache.pekko.cluster.sharding.protobuf.msg;
 
 public final class ClusterShardingMessages {
   private ClusterShardingMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface CoordinatorStateOrBuilder extends
       // @@protoc_insertion_point(interface_extends:CoordinatorState)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
-    java.util.List 
+    java.util.List 
         getShardsList();
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getShards(int index);
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getShards(int index);
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
@@ -38,12 +38,12 @@ public final class ClusterShardingMessages {
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
-    java.util.List 
+    java.util.List 
         getShardsOrBuilderList();
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder getShardsOrBuilder(
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder getShardsOrBuilder(
         int index);
 
     /**
@@ -68,7 +68,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the regions at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRegionsBytes(int index);
 
     /**
@@ -93,7 +93,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the regionProxies at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRegionProxiesBytes(int index);
 
     /**
@@ -118,51 +118,51 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the unallocatedShards at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getUnallocatedShardsBytes(int index);
   }
   /**
    * Protobuf type {@code CoordinatorState}
    */
   public  static final class CoordinatorState extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CoordinatorState)
       CoordinatorStateOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use CoordinatorState.newBuilder() to construct.
-    private CoordinatorState(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private CoordinatorState(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private CoordinatorState() {
       shards_ = java.util.Collections.emptyList();
-      regions_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
-      regionProxies_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
-      unallocatedShards_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new CoordinatorState();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private CoordinatorState(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -173,35 +173,35 @@ public final class ClusterShardingMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                shards_ = new java.util.ArrayList();
+                shards_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               shards_.add(
-                  input.readMessage(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.PARSER, extensionRegistry));
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                regions_ = new akka.protobufv3.internal.LazyStringArrayList();
+                regions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               regions_.add(bs);
               break;
             }
             case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                regionProxies_ = new akka.protobufv3.internal.LazyStringArrayList();
+                regionProxies_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               regionProxies_.add(bs);
               break;
             }
             case 34: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                unallocatedShards_ = new akka.protobufv3.internal.LazyStringArrayList();
+                unallocatedShards_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
               unallocatedShards_.add(bs);
@@ -216,10 +216,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -238,22 +238,22 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.Builder.class);
     }
 
     public interface ShardEntryOrBuilder extends
         // @@protoc_insertion_point(interface_extends:CoordinatorState.ShardEntry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required string shardId = 1;
@@ -269,7 +269,7 @@ public final class ClusterShardingMessages {
        * required string shardId = 1;
        * @return The bytes for shardId.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getShardIdBytes();
 
       /**
@@ -286,19 +286,19 @@ public final class ClusterShardingMessages {
        * required string regionRef = 2;
        * @return The bytes for regionRef.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getRegionRefBytes();
     }
     /**
      * Protobuf type {@code CoordinatorState.ShardEntry}
      */
     public  static final class ShardEntry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:CoordinatorState.ShardEntry)
         ShardEntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use ShardEntry.newBuilder() to construct.
-      private ShardEntry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private ShardEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private ShardEntry() {
@@ -309,26 +309,26 @@ public final class ClusterShardingMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new ShardEntry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private ShardEntry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -338,13 +338,13 @@ public final class ClusterShardingMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 shardId_ = bs;
                 break;
               }
               case 18: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000002;
                 regionRef_ = bs;
                 break;
@@ -358,27 +358,27 @@ public final class ClusterShardingMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder.class);
       }
 
       private int bitField0_;
@@ -400,8 +400,8 @@ public final class ClusterShardingMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             shardId_ = s;
@@ -413,17 +413,17 @@ public final class ClusterShardingMessages {
        * required string shardId = 1;
        * @return The bytes for shardId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardIdBytes() {
         java.lang.Object ref = shardId_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           shardId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
@@ -445,8 +445,8 @@ public final class ClusterShardingMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             regionRef_ = s;
@@ -458,17 +458,17 @@ public final class ClusterShardingMessages {
        * required string regionRef = 2;
        * @return The bytes for regionRef.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRegionRefBytes() {
         java.lang.Object ref = regionRef_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           regionRef_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
@@ -492,13 +492,13 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shardId_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shardId_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, regionRef_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, regionRef_);
         }
         unknownFields.writeTo(output);
       }
@@ -510,10 +510,10 @@ public final class ClusterShardingMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shardId_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shardId_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, regionRef_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, regionRef_);
         }
         size += unknownFields.getSerializedSize();
         memoizedSize = size;
@@ -525,10 +525,10 @@ public final class ClusterShardingMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry)) {
           return super.equals(obj);
         }
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry) obj;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry) obj;
 
         if (hasShardId() != other.hasShardId()) return false;
         if (hasShardId()) {
@@ -564,73 +564,73 @@ public final class ClusterShardingMessages {
         return hash;
       }
 
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -639,7 +639,7 @@ public final class ClusterShardingMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -650,7 +650,7 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -658,34 +658,34 @@ public final class ClusterShardingMessages {
        * Protobuf type {@code CoordinatorState.ShardEntry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
           // @@protoc_insertion_point(builder_implements:CoordinatorState.ShardEntry)
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_descriptor;
+          return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_fieldAccessorTable
+          return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder.class);
+                  org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder.class);
         }
 
-        // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.newBuilder()
+        // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
           }
         }
@@ -700,19 +700,19 @@ public final class ClusterShardingMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_descriptor;
+          return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_ShardEntry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getDefaultInstanceForType() {
-          return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.getDefaultInstance();
+        public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry build() {
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry result = buildPartial();
+        public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry build() {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -720,8 +720,8 @@ public final class ClusterShardingMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry buildPartial() {
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry(this);
+        public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry buildPartial() {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -743,44 +743,44 @@ public final class ClusterShardingMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry) {
-            return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry) {
+            return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry other) {
-          if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry other) {
+          if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.getDefaultInstance()) return this;
           if (other.hasShardId()) {
             bitField0_ |= 0x00000001;
             shardId_ = other.shardId_;
@@ -809,14 +809,14 @@ public final class ClusterShardingMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parsedMessage = null;
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -842,8 +842,8 @@ public final class ClusterShardingMessages {
         public java.lang.String getShardId() {
           java.lang.Object ref = shardId_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               shardId_ = s;
@@ -857,17 +857,17 @@ public final class ClusterShardingMessages {
          * required string shardId = 1;
          * @return The bytes for shardId.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getShardIdBytes() {
           java.lang.Object ref = shardId_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             shardId_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -901,7 +901,7 @@ public final class ClusterShardingMessages {
          * @return This builder for chaining.
          */
         public Builder setShardIdBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -926,8 +926,8 @@ public final class ClusterShardingMessages {
         public java.lang.String getRegionRef() {
           java.lang.Object ref = regionRef_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               regionRef_ = s;
@@ -941,17 +941,17 @@ public final class ClusterShardingMessages {
          * required string regionRef = 2;
          * @return The bytes for regionRef.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getRegionRefBytes() {
           java.lang.Object ref = regionRef_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             regionRef_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -985,7 +985,7 @@ public final class ClusterShardingMessages {
          * @return This builder for chaining.
          */
         public Builder setRegionRefBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -996,13 +996,13 @@ public final class ClusterShardingMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -1011,54 +1011,54 @@ public final class ClusterShardingMessages {
       }
 
       // @@protoc_insertion_point(class_scope:CoordinatorState.ShardEntry)
-      private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry DEFAULT_INSTANCE;
+      private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry();
       }
 
-      public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getDefaultInstance() {
+      public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public ShardEntry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new ShardEntry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
     }
 
     public static final int SHARDS_FIELD_NUMBER = 1;
-    private java.util.List shards_;
+    private java.util.List shards_;
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
-    public java.util.List getShardsList() {
+    public java.util.List getShardsList() {
       return shards_;
     }
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getShardsOrBuilderList() {
       return shards_;
     }
@@ -1071,24 +1071,24 @@ public final class ClusterShardingMessages {
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getShards(int index) {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getShards(int index) {
       return shards_.get(index);
     }
     /**
      * repeated .CoordinatorState.ShardEntry shards = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder getShardsOrBuilder(
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder getShardsOrBuilder(
         int index) {
       return shards_.get(index);
     }
 
     public static final int REGIONS_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList regions_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList regions_;
     /**
      * repeated string regions = 2;
      * @return A list containing the regions.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getRegionsList() {
       return regions_;
     }
@@ -1112,18 +1112,18 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the regions at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRegionsBytes(int index) {
       return regions_.getByteString(index);
     }
 
     public static final int REGIONPROXIES_FIELD_NUMBER = 3;
-    private akka.protobufv3.internal.LazyStringList regionProxies_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList regionProxies_;
     /**
      * repeated string regionProxies = 3;
      * @return A list containing the regionProxies.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getRegionProxiesList() {
       return regionProxies_;
     }
@@ -1147,18 +1147,18 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the regionProxies at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRegionProxiesBytes(int index) {
       return regionProxies_.getByteString(index);
     }
 
     public static final int UNALLOCATEDSHARDS_FIELD_NUMBER = 4;
-    private akka.protobufv3.internal.LazyStringList unallocatedShards_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList unallocatedShards_;
     /**
      * repeated string unallocatedShards = 4;
      * @return A list containing the unallocatedShards.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getUnallocatedShardsList() {
       return unallocatedShards_;
     }
@@ -1182,7 +1182,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the unallocatedShards at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getUnallocatedShardsBytes(int index) {
       return unallocatedShards_.getByteString(index);
     }
@@ -1205,19 +1205,19 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < shards_.size(); i++) {
         output.writeMessage(1, shards_.get(i));
       }
       for (int i = 0; i < regions_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, regions_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, regions_.getRaw(i));
       }
       for (int i = 0; i < regionProxies_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, regionProxies_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, regionProxies_.getRaw(i));
       }
       for (int i = 0; i < unallocatedShards_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, unallocatedShards_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, unallocatedShards_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -1229,7 +1229,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       for (int i = 0; i < shards_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, shards_.get(i));
       }
       {
@@ -1266,10 +1266,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState) obj;
 
       if (!getShardsList()
           .equals(other.getShardsList())) return false;
@@ -1311,73 +1311,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1386,7 +1386,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1397,7 +1397,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1405,34 +1405,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code CoordinatorState}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:CoordinatorState)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorStateOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorStateOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getShardsFieldBuilder();
         }
@@ -1446,29 +1446,29 @@ public final class ClusterShardingMessages {
         } else {
           shardsBuilder_.clear();
         }
-        regions_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
-        regionProxies_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
-        unallocatedShards_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CoordinatorState_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1476,8 +1476,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState(this);
         int from_bitField0_ = bitField0_;
         if (shardsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -1513,44 +1513,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.getDefaultInstance()) return this;
         if (shardsBuilder_ == null) {
           if (!other.shards_.isEmpty()) {
             if (shards_.isEmpty()) {
@@ -1570,7 +1570,7 @@ public final class ClusterShardingMessages {
               shards_ = other.shards_;
               bitField0_ = (bitField0_ & ~0x00000001);
               shardsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getShardsFieldBuilder() : null;
             } else {
               shardsBuilder_.addAllMessages(other.shards_);
@@ -1624,14 +1624,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1642,22 +1642,22 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private java.util.List shards_ =
+      private java.util.List shards_ =
         java.util.Collections.emptyList();
       private void ensureShardsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          shards_ = new java.util.ArrayList(shards_);
+          shards_ = new java.util.ArrayList(shards_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder> shardsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder> shardsBuilder_;
 
       /**
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
-      public java.util.List getShardsList() {
+      public java.util.List getShardsList() {
         if (shardsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(shards_);
         } else {
@@ -1677,7 +1677,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getShards(int index) {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry getShards(int index) {
         if (shardsBuilder_ == null) {
           return shards_.get(index);
         } else {
@@ -1688,7 +1688,7 @@ public final class ClusterShardingMessages {
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
       public Builder setShards(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry value) {
         if (shardsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1705,7 +1705,7 @@ public final class ClusterShardingMessages {
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
       public Builder setShards(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder builderForValue) {
         if (shardsBuilder_ == null) {
           ensureShardsIsMutable();
           shards_.set(index, builderForValue.build());
@@ -1718,7 +1718,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
-      public Builder addShards(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry value) {
+      public Builder addShards(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry value) {
         if (shardsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1735,7 +1735,7 @@ public final class ClusterShardingMessages {
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
       public Builder addShards(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry value) {
         if (shardsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1752,7 +1752,7 @@ public final class ClusterShardingMessages {
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
       public Builder addShards(
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder builderForValue) {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder builderForValue) {
         if (shardsBuilder_ == null) {
           ensureShardsIsMutable();
           shards_.add(builderForValue.build());
@@ -1766,7 +1766,7 @@ public final class ClusterShardingMessages {
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
       public Builder addShards(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder builderForValue) {
         if (shardsBuilder_ == null) {
           ensureShardsIsMutable();
           shards_.add(index, builderForValue.build());
@@ -1780,10 +1780,10 @@ public final class ClusterShardingMessages {
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
       public Builder addAllShards(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (shardsBuilder_ == null) {
           ensureShardsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, shards_);
           onChanged();
         } else {
@@ -1820,14 +1820,14 @@ public final class ClusterShardingMessages {
       /**
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder getShardsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder getShardsBuilder(
           int index) {
         return getShardsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder getShardsOrBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder getShardsOrBuilder(
           int index) {
         if (shardsBuilder_ == null) {
           return shards_.get(index);  } else {
@@ -1837,7 +1837,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getShardsOrBuilderList() {
         if (shardsBuilder_ != null) {
           return shardsBuilder_.getMessageOrBuilderList();
@@ -1848,31 +1848,31 @@ public final class ClusterShardingMessages {
       /**
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder addShardsBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder addShardsBuilder() {
         return getShardsFieldBuilder().addBuilder(
-            akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.getDefaultInstance());
+            org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.getDefaultInstance());
       }
       /**
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder addShardsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder addShardsBuilder(
           int index) {
         return getShardsFieldBuilder().addBuilder(
-            index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.getDefaultInstance());
+            index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.getDefaultInstance());
       }
       /**
        * repeated .CoordinatorState.ShardEntry shards = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getShardsBuilderList() {
         return getShardsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder> 
           getShardsFieldBuilder() {
         if (shardsBuilder_ == null) {
-          shardsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder>(
+          shardsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState.ShardEntryOrBuilder>(
                   shards_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -1882,10 +1882,10 @@ public final class ClusterShardingMessages {
         return shardsBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList regions_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureRegionsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          regions_ = new akka.protobufv3.internal.LazyStringArrayList(regions_);
+          regions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(regions_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -1893,7 +1893,7 @@ public final class ClusterShardingMessages {
        * repeated string regions = 2;
        * @return A list containing the regions.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getRegionsList() {
         return regions_.getUnmodifiableView();
       }
@@ -1917,7 +1917,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the regions at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRegionsBytes(int index) {
         return regions_.getByteString(index);
       }
@@ -1960,7 +1960,7 @@ public final class ClusterShardingMessages {
       public Builder addAllRegions(
           java.lang.Iterable values) {
         ensureRegionsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, regions_);
         onChanged();
         return this;
@@ -1970,7 +1970,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearRegions() {
-        regions_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        regions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1981,7 +1981,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addRegionsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1991,10 +1991,10 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.LazyStringList regionProxies_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureRegionProxiesIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          regionProxies_ = new akka.protobufv3.internal.LazyStringArrayList(regionProxies_);
+          regionProxies_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(regionProxies_);
           bitField0_ |= 0x00000004;
          }
       }
@@ -2002,7 +2002,7 @@ public final class ClusterShardingMessages {
        * repeated string regionProxies = 3;
        * @return A list containing the regionProxies.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getRegionProxiesList() {
         return regionProxies_.getUnmodifiableView();
       }
@@ -2026,7 +2026,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the regionProxies at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRegionProxiesBytes(int index) {
         return regionProxies_.getByteString(index);
       }
@@ -2069,7 +2069,7 @@ public final class ClusterShardingMessages {
       public Builder addAllRegionProxies(
           java.lang.Iterable values) {
         ensureRegionProxiesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, regionProxies_);
         onChanged();
         return this;
@@ -2079,7 +2079,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearRegionProxies() {
-        regionProxies_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        regionProxies_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -2090,7 +2090,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addRegionProxiesBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2100,10 +2100,10 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.LazyStringList unallocatedShards_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureUnallocatedShardsIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          unallocatedShards_ = new akka.protobufv3.internal.LazyStringArrayList(unallocatedShards_);
+          unallocatedShards_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(unallocatedShards_);
           bitField0_ |= 0x00000008;
          }
       }
@@ -2111,7 +2111,7 @@ public final class ClusterShardingMessages {
        * repeated string unallocatedShards = 4;
        * @return A list containing the unallocatedShards.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getUnallocatedShardsList() {
         return unallocatedShards_.getUnmodifiableView();
       }
@@ -2135,7 +2135,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the unallocatedShards at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getUnallocatedShardsBytes(int index) {
         return unallocatedShards_.getByteString(index);
       }
@@ -2178,7 +2178,7 @@ public final class ClusterShardingMessages {
       public Builder addAllUnallocatedShards(
           java.lang.Iterable values) {
         ensureUnallocatedShardsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, unallocatedShards_);
         onChanged();
         return this;
@@ -2188,7 +2188,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearUnallocatedShards() {
-        unallocatedShards_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        unallocatedShards_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
@@ -2199,7 +2199,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addUnallocatedShardsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2210,13 +2210,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2225,37 +2225,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:CoordinatorState)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public CoordinatorState parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new CoordinatorState(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CoordinatorState getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2263,7 +2263,7 @@ public final class ClusterShardingMessages {
 
   public interface ActorRefMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ActorRefMessage)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string ref = 1;
@@ -2279,19 +2279,19 @@ public final class ClusterShardingMessages {
      * required string ref = 1;
      * @return The bytes for ref.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRefBytes();
   }
   /**
    * Protobuf type {@code ActorRefMessage}
    */
   public  static final class ActorRefMessage extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ActorRefMessage)
       ActorRefMessageOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ActorRefMessage.newBuilder() to construct.
-    private ActorRefMessage(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ActorRefMessage(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ActorRefMessage() {
@@ -2301,26 +2301,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ActorRefMessage();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ActorRefMessage(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2330,7 +2330,7 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               ref_ = bs;
               break;
@@ -2344,27 +2344,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.Builder.class);
     }
 
     private int bitField0_;
@@ -2386,8 +2386,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           ref_ = s;
@@ -2399,17 +2399,17 @@ public final class ClusterShardingMessages {
      * required string ref = 1;
      * @return The bytes for ref.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRefBytes() {
       java.lang.Object ref = ref_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         ref_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -2429,10 +2429,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, ref_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, ref_);
       }
       unknownFields.writeTo(output);
     }
@@ -2444,7 +2444,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, ref_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, ref_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -2456,10 +2456,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage) obj;
 
       if (hasRef() != other.hasRef()) return false;
       if (hasRef()) {
@@ -2486,73 +2486,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -2561,7 +2561,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2572,7 +2572,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2580,34 +2580,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ActorRefMessage}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ActorRefMessage)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessageOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessageOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -2620,19 +2620,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ActorRefMessage_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2640,8 +2640,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2659,44 +2659,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage.getDefaultInstance()) return this;
         if (other.hasRef()) {
           bitField0_ |= 0x00000001;
           ref_ = other.ref_;
@@ -2717,14 +2717,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2750,8 +2750,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getRef() {
         java.lang.Object ref = ref_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             ref_ = s;
@@ -2765,17 +2765,17 @@ public final class ClusterShardingMessages {
        * required string ref = 1;
        * @return The bytes for ref.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRefBytes() {
         java.lang.Object ref = ref_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           ref_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -2809,7 +2809,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setRefBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2820,13 +2820,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2835,37 +2835,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ActorRefMessage)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ActorRefMessage parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ActorRefMessage(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ActorRefMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2873,7 +2873,7 @@ public final class ClusterShardingMessages {
 
   public interface ShardIdMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ShardIdMessage)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string shard = 1;
@@ -2889,19 +2889,19 @@ public final class ClusterShardingMessages {
      * required string shard = 1;
      * @return The bytes for shard.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes();
   }
   /**
    * Protobuf type {@code ShardIdMessage}
    */
   public  static final class ShardIdMessage extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardIdMessage)
       ShardIdMessageOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ShardIdMessage.newBuilder() to construct.
-    private ShardIdMessage(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ShardIdMessage(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ShardIdMessage() {
@@ -2911,26 +2911,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardIdMessage();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ShardIdMessage(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2940,7 +2940,7 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               shard_ = bs;
               break;
@@ -2954,27 +2954,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.Builder.class);
     }
 
     private int bitField0_;
@@ -2996,8 +2996,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           shard_ = s;
@@ -3009,17 +3009,17 @@ public final class ClusterShardingMessages {
      * required string shard = 1;
      * @return The bytes for shard.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes() {
       java.lang.Object ref = shard_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         shard_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -3039,10 +3039,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shard_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shard_);
       }
       unknownFields.writeTo(output);
     }
@@ -3054,7 +3054,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shard_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shard_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -3066,10 +3066,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage) obj;
 
       if (hasShard() != other.hasShard()) return false;
       if (hasShard()) {
@@ -3096,73 +3096,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3171,7 +3171,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3182,7 +3182,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3190,34 +3190,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ShardIdMessage}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ShardIdMessage)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessageOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessageOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -3230,19 +3230,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardIdMessage_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3250,8 +3250,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3269,44 +3269,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage.getDefaultInstance()) return this;
         if (other.hasShard()) {
           bitField0_ |= 0x00000001;
           shard_ = other.shard_;
@@ -3327,14 +3327,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3360,8 +3360,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getShard() {
         java.lang.Object ref = shard_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             shard_ = s;
@@ -3375,17 +3375,17 @@ public final class ClusterShardingMessages {
        * required string shard = 1;
        * @return The bytes for shard.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardBytes() {
         java.lang.Object ref = shard_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           shard_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -3419,7 +3419,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setShardBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -3430,13 +3430,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -3445,37 +3445,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ShardIdMessage)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ShardIdMessage parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ShardIdMessage(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardIdMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3483,7 +3483,7 @@ public final class ClusterShardingMessages {
 
   public interface ShardHomeAllocatedOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ShardHomeAllocated)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string shard = 1;
@@ -3499,7 +3499,7 @@ public final class ClusterShardingMessages {
      * required string shard = 1;
      * @return The bytes for shard.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes();
 
     /**
@@ -3516,19 +3516,19 @@ public final class ClusterShardingMessages {
      * required string region = 2;
      * @return The bytes for region.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRegionBytes();
   }
   /**
    * Protobuf type {@code ShardHomeAllocated}
    */
   public  static final class ShardHomeAllocated extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardHomeAllocated)
       ShardHomeAllocatedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ShardHomeAllocated.newBuilder() to construct.
-    private ShardHomeAllocated(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ShardHomeAllocated(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ShardHomeAllocated() {
@@ -3539,26 +3539,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardHomeAllocated();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ShardHomeAllocated(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3568,13 +3568,13 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               shard_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               region_ = bs;
               break;
@@ -3588,27 +3588,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.Builder.class);
     }
 
     private int bitField0_;
@@ -3630,8 +3630,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           shard_ = s;
@@ -3643,17 +3643,17 @@ public final class ClusterShardingMessages {
      * required string shard = 1;
      * @return The bytes for shard.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes() {
       java.lang.Object ref = shard_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         shard_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -3675,8 +3675,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           region_ = s;
@@ -3688,17 +3688,17 @@ public final class ClusterShardingMessages {
      * required string region = 2;
      * @return The bytes for region.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRegionBytes() {
       java.lang.Object ref = region_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         region_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -3722,13 +3722,13 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shard_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shard_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, region_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, region_);
       }
       unknownFields.writeTo(output);
     }
@@ -3740,10 +3740,10 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shard_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shard_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, region_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, region_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -3755,10 +3755,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated) obj;
 
       if (hasShard() != other.hasShard()) return false;
       if (hasShard()) {
@@ -3794,73 +3794,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3869,7 +3869,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3880,7 +3880,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3888,34 +3888,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ShardHomeAllocated}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ShardHomeAllocated)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocatedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocatedOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -3930,19 +3930,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomeAllocated_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3950,8 +3950,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3973,44 +3973,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated.getDefaultInstance()) return this;
         if (other.hasShard()) {
           bitField0_ |= 0x00000001;
           shard_ = other.shard_;
@@ -4039,14 +4039,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4072,8 +4072,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getShard() {
         java.lang.Object ref = shard_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             shard_ = s;
@@ -4087,17 +4087,17 @@ public final class ClusterShardingMessages {
        * required string shard = 1;
        * @return The bytes for shard.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardBytes() {
         java.lang.Object ref = shard_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           shard_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -4131,7 +4131,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setShardBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -4156,8 +4156,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getRegion() {
         java.lang.Object ref = region_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             region_ = s;
@@ -4171,17 +4171,17 @@ public final class ClusterShardingMessages {
        * required string region = 2;
        * @return The bytes for region.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRegionBytes() {
         java.lang.Object ref = region_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           region_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -4215,7 +4215,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setRegionBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -4226,13 +4226,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -4241,37 +4241,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ShardHomeAllocated)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ShardHomeAllocated parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ShardHomeAllocated(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeAllocated getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4279,7 +4279,7 @@ public final class ClusterShardingMessages {
 
   public interface ShardHomeOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ShardHome)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string shard = 1;
@@ -4295,7 +4295,7 @@ public final class ClusterShardingMessages {
      * required string shard = 1;
      * @return The bytes for shard.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes();
 
     /**
@@ -4312,19 +4312,19 @@ public final class ClusterShardingMessages {
      * required string region = 2;
      * @return The bytes for region.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRegionBytes();
   }
   /**
    * Protobuf type {@code ShardHome}
    */
   public  static final class ShardHome extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardHome)
       ShardHomeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ShardHome.newBuilder() to construct.
-    private ShardHome(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ShardHome(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ShardHome() {
@@ -4335,26 +4335,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardHome();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ShardHome(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4364,13 +4364,13 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               shard_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               region_ = bs;
               break;
@@ -4384,27 +4384,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.Builder.class);
     }
 
     private int bitField0_;
@@ -4426,8 +4426,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           shard_ = s;
@@ -4439,17 +4439,17 @@ public final class ClusterShardingMessages {
      * required string shard = 1;
      * @return The bytes for shard.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes() {
       java.lang.Object ref = shard_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         shard_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4471,8 +4471,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           region_ = s;
@@ -4484,17 +4484,17 @@ public final class ClusterShardingMessages {
      * required string region = 2;
      * @return The bytes for region.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRegionBytes() {
       java.lang.Object ref = region_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         region_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4518,13 +4518,13 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shard_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shard_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, region_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, region_);
       }
       unknownFields.writeTo(output);
     }
@@ -4536,10 +4536,10 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shard_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shard_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, region_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, region_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -4551,10 +4551,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome) obj;
 
       if (hasShard() != other.hasShard()) return false;
       if (hasShard()) {
@@ -4590,73 +4590,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -4665,7 +4665,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4676,7 +4676,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4684,34 +4684,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ShardHome}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ShardHome)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -4726,19 +4726,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHome_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4746,8 +4746,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4769,44 +4769,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome.getDefaultInstance()) return this;
         if (other.hasShard()) {
           bitField0_ |= 0x00000001;
           shard_ = other.shard_;
@@ -4835,14 +4835,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4868,8 +4868,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getShard() {
         java.lang.Object ref = shard_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             shard_ = s;
@@ -4883,17 +4883,17 @@ public final class ClusterShardingMessages {
        * required string shard = 1;
        * @return The bytes for shard.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardBytes() {
         java.lang.Object ref = shard_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           shard_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -4927,7 +4927,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setShardBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -4952,8 +4952,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getRegion() {
         java.lang.Object ref = region_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             region_ = s;
@@ -4967,17 +4967,17 @@ public final class ClusterShardingMessages {
        * required string region = 2;
        * @return The bytes for region.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRegionBytes() {
         java.lang.Object ref = region_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           region_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -5011,7 +5011,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setRegionBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5022,13 +5022,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -5037,37 +5037,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ShardHome)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ShardHome parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ShardHome(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHome getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5075,7 +5075,7 @@ public final class ClusterShardingMessages {
 
   public interface ShardHomesEntryOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ShardHomesEntry)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string region = 1;
@@ -5091,7 +5091,7 @@ public final class ClusterShardingMessages {
      * required string region = 1;
      * @return The bytes for region.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRegionBytes();
 
     /**
@@ -5116,7 +5116,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the shard at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes(int index);
   }
   /**
@@ -5127,42 +5127,42 @@ public final class ClusterShardingMessages {
    * Protobuf type {@code ShardHomesEntry}
    */
   public  static final class ShardHomesEntry extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardHomesEntry)
       ShardHomesEntryOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ShardHomesEntry.newBuilder() to construct.
-    private ShardHomesEntry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ShardHomesEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ShardHomesEntry() {
       region_ = "";
-      shard_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardHomesEntry();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ShardHomesEntry(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5172,15 +5172,15 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               region_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                shard_ = new akka.protobufv3.internal.LazyStringArrayList();
+                shard_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               shard_.add(bs);
@@ -5195,10 +5195,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -5208,17 +5208,17 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder.class);
     }
 
     private int bitField0_;
@@ -5240,8 +5240,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           region_ = s;
@@ -5253,27 +5253,27 @@ public final class ClusterShardingMessages {
      * required string region = 1;
      * @return The bytes for region.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRegionBytes() {
       java.lang.Object ref = region_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         region_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int SHARD_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList shard_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList shard_;
     /**
      * repeated string shard = 2;
      * @return A list containing the shard.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getShardList() {
       return shard_;
     }
@@ -5297,7 +5297,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the shard at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes(int index) {
       return shard_.getByteString(index);
     }
@@ -5318,13 +5318,13 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, region_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, region_);
       }
       for (int i = 0; i < shard_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, shard_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, shard_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -5336,7 +5336,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, region_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, region_);
       }
       {
         int dataSize = 0;
@@ -5356,10 +5356,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry) obj;
 
       if (hasRegion() != other.hasRegion()) return false;
       if (hasRegion()) {
@@ -5392,73 +5392,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5467,7 +5467,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5478,7 +5478,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5490,34 +5490,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ShardHomesEntry}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ShardHomesEntry)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -5526,25 +5526,25 @@ public final class ClusterShardingMessages {
         super.clear();
         region_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        shard_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomesEntry_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5552,8 +5552,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5576,44 +5576,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.getDefaultInstance()) return this;
         if (other.hasRegion()) {
           bitField0_ |= 0x00000001;
           region_ = other.region_;
@@ -5644,14 +5644,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5677,8 +5677,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getRegion() {
         java.lang.Object ref = region_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             region_ = s;
@@ -5692,17 +5692,17 @@ public final class ClusterShardingMessages {
        * required string region = 1;
        * @return The bytes for region.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRegionBytes() {
         java.lang.Object ref = region_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           region_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -5736,7 +5736,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setRegionBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5746,10 +5746,10 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.LazyStringList shard_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureShardIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          shard_ = new akka.protobufv3.internal.LazyStringArrayList(shard_);
+          shard_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(shard_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -5757,7 +5757,7 @@ public final class ClusterShardingMessages {
        * repeated string shard = 2;
        * @return A list containing the shard.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getShardList() {
         return shard_.getUnmodifiableView();
       }
@@ -5781,7 +5781,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the shard at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardBytes(int index) {
         return shard_.getByteString(index);
       }
@@ -5824,7 +5824,7 @@ public final class ClusterShardingMessages {
       public Builder addAllShard(
           java.lang.Iterable values) {
         ensureShardIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, shard_);
         onChanged();
         return this;
@@ -5834,7 +5834,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearShard() {
-        shard_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        shard_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -5845,7 +5845,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addShardBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5856,13 +5856,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -5871,37 +5871,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ShardHomesEntry)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ShardHomesEntry parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ShardHomesEntry(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5909,17 +5909,17 @@ public final class ClusterShardingMessages {
 
   public interface ShardHomesOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ShardHomes)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
-    java.util.List 
+    java.util.List 
         getHomesList();
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getHomes(int index);
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getHomes(int index);
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
@@ -5927,24 +5927,24 @@ public final class ClusterShardingMessages {
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
-    java.util.List 
+    java.util.List 
         getHomesOrBuilderList();
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder getHomesOrBuilder(
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder getHomesOrBuilder(
         int index);
   }
   /**
    * Protobuf type {@code ShardHomes}
    */
   public  static final class ShardHomes extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardHomes)
       ShardHomesOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ShardHomes.newBuilder() to construct.
-    private ShardHomes(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ShardHomes(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ShardHomes() {
@@ -5954,26 +5954,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardHomes();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ShardHomes(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5984,11 +5984,11 @@ public final class ClusterShardingMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                homes_ = new java.util.ArrayList();
+                homes_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               homes_.add(
-                  input.readMessage(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -6000,10 +6000,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -6013,31 +6013,31 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.Builder.class);
     }
 
     public static final int HOMES_FIELD_NUMBER = 1;
-    private java.util.List homes_;
+    private java.util.List homes_;
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
-    public java.util.List getHomesList() {
+    public java.util.List getHomesList() {
       return homes_;
     }
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getHomesOrBuilderList() {
       return homes_;
     }
@@ -6050,13 +6050,13 @@ public final class ClusterShardingMessages {
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getHomes(int index) {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getHomes(int index) {
       return homes_.get(index);
     }
     /**
      * repeated .ShardHomesEntry homes = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder getHomesOrBuilder(
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder getHomesOrBuilder(
         int index) {
       return homes_.get(index);
     }
@@ -6079,7 +6079,7 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < homes_.size(); i++) {
         output.writeMessage(1, homes_.get(i));
@@ -6094,7 +6094,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       for (int i = 0; i < homes_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, homes_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -6107,10 +6107,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes) obj;
 
       if (!getHomesList()
           .equals(other.getHomesList())) return false;
@@ -6134,73 +6134,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -6209,7 +6209,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6220,7 +6220,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -6228,34 +6228,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ShardHomes}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ShardHomes)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getHomesFieldBuilder();
         }
@@ -6273,19 +6273,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardHomes_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6293,8 +6293,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes(this);
         int from_bitField0_ = bitField0_;
         if (homesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -6315,44 +6315,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes.getDefaultInstance()) return this;
         if (homesBuilder_ == null) {
           if (!other.homes_.isEmpty()) {
             if (homes_.isEmpty()) {
@@ -6372,7 +6372,7 @@ public final class ClusterShardingMessages {
               homes_ = other.homes_;
               bitField0_ = (bitField0_ & ~0x00000001);
               homesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getHomesFieldBuilder() : null;
             } else {
               homesBuilder_.addAllMessages(other.homes_);
@@ -6396,14 +6396,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6414,22 +6414,22 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private java.util.List homes_ =
+      private java.util.List homes_ =
         java.util.Collections.emptyList();
       private void ensureHomesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          homes_ = new java.util.ArrayList(homes_);
+          homes_ = new java.util.ArrayList(homes_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder> homesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder> homesBuilder_;
 
       /**
        * repeated .ShardHomesEntry homes = 1;
        */
-      public java.util.List getHomesList() {
+      public java.util.List getHomesList() {
         if (homesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(homes_);
         } else {
@@ -6449,7 +6449,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardHomesEntry homes = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getHomes(int index) {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry getHomes(int index) {
         if (homesBuilder_ == null) {
           return homes_.get(index);
         } else {
@@ -6460,7 +6460,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardHomesEntry homes = 1;
        */
       public Builder setHomes(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry value) {
         if (homesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6477,7 +6477,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardHomesEntry homes = 1;
        */
       public Builder setHomes(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder builderForValue) {
         if (homesBuilder_ == null) {
           ensureHomesIsMutable();
           homes_.set(index, builderForValue.build());
@@ -6490,7 +6490,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardHomesEntry homes = 1;
        */
-      public Builder addHomes(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry value) {
+      public Builder addHomes(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry value) {
         if (homesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6507,7 +6507,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardHomesEntry homes = 1;
        */
       public Builder addHomes(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry value) {
         if (homesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6524,7 +6524,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardHomesEntry homes = 1;
        */
       public Builder addHomes(
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder builderForValue) {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder builderForValue) {
         if (homesBuilder_ == null) {
           ensureHomesIsMutable();
           homes_.add(builderForValue.build());
@@ -6538,7 +6538,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardHomesEntry homes = 1;
        */
       public Builder addHomes(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder builderForValue) {
         if (homesBuilder_ == null) {
           ensureHomesIsMutable();
           homes_.add(index, builderForValue.build());
@@ -6552,10 +6552,10 @@ public final class ClusterShardingMessages {
        * repeated .ShardHomesEntry homes = 1;
        */
       public Builder addAllHomes(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (homesBuilder_ == null) {
           ensureHomesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, homes_);
           onChanged();
         } else {
@@ -6592,14 +6592,14 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardHomesEntry homes = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder getHomesBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder getHomesBuilder(
           int index) {
         return getHomesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .ShardHomesEntry homes = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder getHomesOrBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder getHomesOrBuilder(
           int index) {
         if (homesBuilder_ == null) {
           return homes_.get(index);  } else {
@@ -6609,7 +6609,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardHomesEntry homes = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getHomesOrBuilderList() {
         if (homesBuilder_ != null) {
           return homesBuilder_.getMessageOrBuilderList();
@@ -6620,31 +6620,31 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardHomesEntry homes = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder addHomesBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder addHomesBuilder() {
         return getHomesFieldBuilder().addBuilder(
-            akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.getDefaultInstance());
+            org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.getDefaultInstance());
       }
       /**
        * repeated .ShardHomesEntry homes = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder addHomesBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder addHomesBuilder(
           int index) {
         return getHomesFieldBuilder().addBuilder(
-            index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.getDefaultInstance());
+            index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.getDefaultInstance());
       }
       /**
        * repeated .ShardHomesEntry homes = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getHomesBuilderList() {
         return getHomesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder> 
           getHomesFieldBuilder() {
         if (homesBuilder_ == null) {
-          homesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder>(
+          homesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomesEntryOrBuilder>(
                   homes_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -6655,13 +6655,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -6670,37 +6670,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ShardHomes)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ShardHomes parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ShardHomes(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardHomes getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6708,7 +6708,7 @@ public final class ClusterShardingMessages {
 
   public interface EntityStateOrBuilder extends
       // @@protoc_insertion_point(interface_extends:EntityState)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated string entities = 1;
@@ -6732,48 +6732,48 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entities at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntitiesBytes(int index);
   }
   /**
    * Protobuf type {@code EntityState}
    */
   public  static final class EntityState extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntityState)
       EntityStateOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use EntityState.newBuilder() to construct.
-    private EntityState(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private EntityState(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private EntityState() {
-      entities_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new EntityState();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private EntityState(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6783,9 +6783,9 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entities_ = new akka.protobufv3.internal.LazyStringArrayList();
+                entities_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               entities_.add(bs);
@@ -6800,10 +6800,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -6813,26 +6813,26 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.Builder.class);
     }
 
     public static final int ENTITIES_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.LazyStringList entities_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList entities_;
     /**
      * repeated string entities = 1;
      * @return A list containing the entities.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getEntitiesList() {
       return entities_;
     }
@@ -6856,7 +6856,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entities at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntitiesBytes(int index) {
       return entities_.getByteString(index);
     }
@@ -6873,10 +6873,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < entities_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entities_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entities_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -6905,10 +6905,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState) obj;
 
       if (!getEntitiesList()
           .equals(other.getEntitiesList())) return false;
@@ -6932,73 +6932,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -7007,7 +7007,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7018,7 +7018,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -7026,59 +7026,59 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code EntityState}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:EntityState)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStateOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStateOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entities_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityState_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7086,8 +7086,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
           entities_ = entities_.getUnmodifiableView();
@@ -7104,44 +7104,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState.getDefaultInstance()) return this;
         if (!other.entities_.isEmpty()) {
           if (entities_.isEmpty()) {
             entities_ = other.entities_;
@@ -7164,14 +7164,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7182,10 +7182,10 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.LazyStringList entities_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureEntitiesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          entities_ = new akka.protobufv3.internal.LazyStringArrayList(entities_);
+          entities_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entities_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -7193,7 +7193,7 @@ public final class ClusterShardingMessages {
        * repeated string entities = 1;
        * @return A list containing the entities.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntitiesList() {
         return entities_.getUnmodifiableView();
       }
@@ -7217,7 +7217,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the entities at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntitiesBytes(int index) {
         return entities_.getByteString(index);
       }
@@ -7260,7 +7260,7 @@ public final class ClusterShardingMessages {
       public Builder addAllEntities(
           java.lang.Iterable values) {
         ensureEntitiesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entities_);
         onChanged();
         return this;
@@ -7270,7 +7270,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntities() {
-        entities_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entities_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -7281,7 +7281,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addEntitiesBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7292,13 +7292,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -7307,37 +7307,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:EntityState)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public EntityState parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new EntityState(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityState getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7345,7 +7345,7 @@ public final class ClusterShardingMessages {
 
   public interface EntityStartedOrBuilder extends
       // @@protoc_insertion_point(interface_extends:EntityStarted)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string entityId = 1;
@@ -7361,7 +7361,7 @@ public final class ClusterShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes();
   }
   /**
@@ -7372,12 +7372,12 @@ public final class ClusterShardingMessages {
    * Protobuf type {@code EntityStarted}
    */
   public  static final class EntityStarted extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntityStarted)
       EntityStartedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use EntityStarted.newBuilder() to construct.
-    private EntityStarted(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private EntityStarted(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private EntityStarted() {
@@ -7387,26 +7387,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new EntityStarted();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private EntityStarted(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7416,7 +7416,7 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               entityId_ = bs;
               break;
@@ -7430,27 +7430,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.Builder.class);
     }
 
     private int bitField0_;
@@ -7472,8 +7472,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           entityId_ = s;
@@ -7485,17 +7485,17 @@ public final class ClusterShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         entityId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -7515,10 +7515,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -7530,7 +7530,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -7542,10 +7542,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted) obj;
 
       if (hasEntityId() != other.hasEntityId()) return false;
       if (hasEntityId()) {
@@ -7572,73 +7572,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -7647,7 +7647,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7658,7 +7658,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -7670,34 +7670,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code EntityStarted}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:EntityStarted)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStartedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStartedOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -7710,19 +7710,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStarted_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7730,8 +7730,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7749,44 +7749,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
           bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
@@ -7807,14 +7807,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7840,8 +7840,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getEntityId() {
         java.lang.Object ref = entityId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             entityId_ = s;
@@ -7855,17 +7855,17 @@ public final class ClusterShardingMessages {
        * required string entityId = 1;
        * @return The bytes for entityId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntityIdBytes() {
         java.lang.Object ref = entityId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           entityId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -7899,7 +7899,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setEntityIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7910,13 +7910,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -7925,37 +7925,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:EntityStarted)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public EntityStarted parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new EntityStarted(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStarted getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7963,7 +7963,7 @@ public final class ClusterShardingMessages {
 
   public interface EntitiesStartedOrBuilder extends
       // @@protoc_insertion_point(interface_extends:EntitiesStarted)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated string entityId = 1;
@@ -7987,48 +7987,48 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entityId at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes(int index);
   }
   /**
    * Protobuf type {@code EntitiesStarted}
    */
   public  static final class EntitiesStarted extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntitiesStarted)
       EntitiesStartedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use EntitiesStarted.newBuilder() to construct.
-    private EntitiesStarted(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private EntitiesStarted(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private EntitiesStarted() {
-      entityId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new EntitiesStarted();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private EntitiesStarted(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8038,9 +8038,9 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entityId_ = new akka.protobufv3.internal.LazyStringArrayList();
+                entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               entityId_.add(bs);
@@ -8055,10 +8055,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -8068,26 +8068,26 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.Builder.class);
     }
 
     public static final int ENTITYID_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.LazyStringList entityId_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList entityId_;
     /**
      * repeated string entityId = 1;
      * @return A list containing the entityId.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getEntityIdList() {
       return entityId_;
     }
@@ -8111,7 +8111,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entityId at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes(int index) {
       return entityId_.getByteString(index);
     }
@@ -8128,10 +8128,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < entityId_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -8160,10 +8160,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted) obj;
 
       if (!getEntityIdList()
           .equals(other.getEntityIdList())) return false;
@@ -8187,73 +8187,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -8262,7 +8262,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8273,7 +8273,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -8281,59 +8281,59 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code EntitiesStarted}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:EntitiesStarted)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStartedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStartedOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStarted_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8341,8 +8341,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
           entityId_ = entityId_.getUnmodifiableView();
@@ -8359,44 +8359,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted.getDefaultInstance()) return this;
         if (!other.entityId_.isEmpty()) {
           if (entityId_.isEmpty()) {
             entityId_ = other.entityId_;
@@ -8419,14 +8419,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -8437,10 +8437,10 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.LazyStringList entityId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureEntityIdIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          entityId_ = new akka.protobufv3.internal.LazyStringArrayList(entityId_);
+          entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityId_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -8448,7 +8448,7 @@ public final class ClusterShardingMessages {
        * repeated string entityId = 1;
        * @return A list containing the entityId.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntityIdList() {
         return entityId_.getUnmodifiableView();
       }
@@ -8472,7 +8472,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the entityId at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntityIdBytes(int index) {
         return entityId_.getByteString(index);
       }
@@ -8515,7 +8515,7 @@ public final class ClusterShardingMessages {
       public Builder addAllEntityId(
           java.lang.Iterable values) {
         ensureEntityIdIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entityId_);
         onChanged();
         return this;
@@ -8525,7 +8525,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        entityId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -8536,7 +8536,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addEntityIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8547,13 +8547,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -8562,37 +8562,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:EntitiesStarted)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public EntitiesStarted parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new EntitiesStarted(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStarted getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8600,7 +8600,7 @@ public final class ClusterShardingMessages {
 
   public interface EntityStoppedOrBuilder extends
       // @@protoc_insertion_point(interface_extends:EntityStopped)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string entityId = 1;
@@ -8616,7 +8616,7 @@ public final class ClusterShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes();
   }
   /**
@@ -8627,12 +8627,12 @@ public final class ClusterShardingMessages {
    * Protobuf type {@code EntityStopped}
    */
   public  static final class EntityStopped extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntityStopped)
       EntityStoppedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use EntityStopped.newBuilder() to construct.
-    private EntityStopped(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private EntityStopped(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private EntityStopped() {
@@ -8642,26 +8642,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new EntityStopped();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private EntityStopped(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8671,7 +8671,7 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               entityId_ = bs;
               break;
@@ -8685,27 +8685,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.Builder.class);
     }
 
     private int bitField0_;
@@ -8727,8 +8727,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           entityId_ = s;
@@ -8740,17 +8740,17 @@ public final class ClusterShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         entityId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -8770,10 +8770,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -8785,7 +8785,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -8797,10 +8797,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped) obj;
 
       if (hasEntityId() != other.hasEntityId()) return false;
       if (hasEntityId()) {
@@ -8827,73 +8827,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -8902,7 +8902,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8913,7 +8913,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -8925,34 +8925,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code EntityStopped}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:EntityStopped)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStoppedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStoppedOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -8965,19 +8965,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntityStopped_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8985,8 +8985,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -9004,44 +9004,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
           bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
@@ -9062,14 +9062,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -9095,8 +9095,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getEntityId() {
         java.lang.Object ref = entityId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             entityId_ = s;
@@ -9110,17 +9110,17 @@ public final class ClusterShardingMessages {
        * required string entityId = 1;
        * @return The bytes for entityId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntityIdBytes() {
         java.lang.Object ref = entityId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           entityId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -9154,7 +9154,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setEntityIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -9165,13 +9165,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -9180,37 +9180,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:EntityStopped)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public EntityStopped parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new EntityStopped(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntityStopped getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -9218,7 +9218,7 @@ public final class ClusterShardingMessages {
 
   public interface EntitiesStoppedOrBuilder extends
       // @@protoc_insertion_point(interface_extends:EntitiesStopped)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated string entityId = 1;
@@ -9242,48 +9242,48 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entityId at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes(int index);
   }
   /**
    * Protobuf type {@code EntitiesStopped}
    */
   public  static final class EntitiesStopped extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EntitiesStopped)
       EntitiesStoppedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use EntitiesStopped.newBuilder() to construct.
-    private EntitiesStopped(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private EntitiesStopped(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private EntitiesStopped() {
-      entityId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new EntitiesStopped();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private EntitiesStopped(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9293,9 +9293,9 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entityId_ = new akka.protobufv3.internal.LazyStringArrayList();
+                entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               entityId_.add(bs);
@@ -9310,10 +9310,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -9323,26 +9323,26 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.Builder.class);
     }
 
     public static final int ENTITYID_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.LazyStringList entityId_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList entityId_;
     /**
      * repeated string entityId = 1;
      * @return A list containing the entityId.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getEntityIdList() {
       return entityId_;
     }
@@ -9366,7 +9366,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entityId at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes(int index) {
       return entityId_.getByteString(index);
     }
@@ -9383,10 +9383,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < entityId_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -9415,10 +9415,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped) obj;
 
       if (!getEntityIdList()
           .equals(other.getEntityIdList())) return false;
@@ -9442,73 +9442,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -9517,7 +9517,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -9528,7 +9528,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -9536,59 +9536,59 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code EntitiesStopped}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:EntitiesStopped)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStoppedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStoppedOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_EntitiesStopped_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9596,8 +9596,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
           entityId_ = entityId_.getUnmodifiableView();
@@ -9614,44 +9614,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped.getDefaultInstance()) return this;
         if (!other.entityId_.isEmpty()) {
           if (entityId_.isEmpty()) {
             entityId_ = other.entityId_;
@@ -9674,14 +9674,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -9692,10 +9692,10 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.LazyStringList entityId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureEntityIdIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          entityId_ = new akka.protobufv3.internal.LazyStringArrayList(entityId_);
+          entityId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityId_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -9703,7 +9703,7 @@ public final class ClusterShardingMessages {
        * repeated string entityId = 1;
        * @return A list containing the entityId.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntityIdList() {
         return entityId_.getUnmodifiableView();
       }
@@ -9727,7 +9727,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the entityId at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntityIdBytes(int index) {
         return entityId_.getByteString(index);
       }
@@ -9770,7 +9770,7 @@ public final class ClusterShardingMessages {
       public Builder addAllEntityId(
           java.lang.Iterable values) {
         ensureEntityIdIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entityId_);
         onChanged();
         return this;
@@ -9780,7 +9780,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
-        entityId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -9791,7 +9791,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addEntityIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -9802,13 +9802,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -9817,37 +9817,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:EntitiesStopped)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public EntitiesStopped parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new EntitiesStopped(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.EntitiesStopped getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -9855,7 +9855,7 @@ public final class ClusterShardingMessages {
 
   public interface ShardStatsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ShardStats)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string shard = 1;
@@ -9871,7 +9871,7 @@ public final class ClusterShardingMessages {
      * required string shard = 1;
      * @return The bytes for shard.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes();
 
     /**
@@ -9889,12 +9889,12 @@ public final class ClusterShardingMessages {
    * Protobuf type {@code ShardStats}
    */
   public  static final class ShardStats extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardStats)
       ShardStatsOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ShardStats.newBuilder() to construct.
-    private ShardStats(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ShardStats(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ShardStats() {
@@ -9904,26 +9904,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardStats();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ShardStats(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9933,7 +9933,7 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               shard_ = bs;
               break;
@@ -9952,27 +9952,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.Builder.class);
     }
 
     private int bitField0_;
@@ -9994,8 +9994,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           shard_ = s;
@@ -10007,17 +10007,17 @@ public final class ClusterShardingMessages {
      * required string shard = 1;
      * @return The bytes for shard.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getShardBytes() {
       java.lang.Object ref = shard_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         shard_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -10058,10 +10058,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shard_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shard_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt32(2, entityCount_);
@@ -10076,10 +10076,10 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shard_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shard_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(2, entityCount_);
       }
       size += unknownFields.getSerializedSize();
@@ -10092,10 +10092,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats) obj;
 
       if (hasShard() != other.hasShard()) return false;
       if (hasShard()) {
@@ -10131,73 +10131,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -10206,7 +10206,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -10217,7 +10217,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -10225,34 +10225,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ShardStats}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ShardStats)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStatsOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStatsOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -10267,19 +10267,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardStats_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -10287,8 +10287,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -10310,44 +10310,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats.getDefaultInstance()) return this;
         if (other.hasShard()) {
           bitField0_ |= 0x00000001;
           shard_ = other.shard_;
@@ -10374,14 +10374,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -10407,8 +10407,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getShard() {
         java.lang.Object ref = shard_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             shard_ = s;
@@ -10422,17 +10422,17 @@ public final class ClusterShardingMessages {
        * required string shard = 1;
        * @return The bytes for shard.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardBytes() {
         java.lang.Object ref = shard_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           shard_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -10466,7 +10466,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setShardBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -10514,13 +10514,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -10529,37 +10529,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ShardStats)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ShardStats parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ShardStats(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStats getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -10567,17 +10567,17 @@ public final class ClusterShardingMessages {
 
   public interface ShardRegionStatsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ShardRegionStats)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .MapFieldEntry stats = 1;
      */
-    java.util.List 
+    java.util.List 
         getStatsList();
     /**
      * repeated .MapFieldEntry stats = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getStats(int index);
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getStats(int index);
     /**
      * repeated .MapFieldEntry stats = 1;
      */
@@ -10585,12 +10585,12 @@ public final class ClusterShardingMessages {
     /**
      * repeated .MapFieldEntry stats = 1;
      */
-    java.util.List 
+    java.util.List 
         getStatsOrBuilderList();
     /**
      * repeated .MapFieldEntry stats = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder getStatsOrBuilder(
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder getStatsOrBuilder(
         int index);
 
     /**
@@ -10615,49 +10615,49 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the failed at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getFailedBytes(int index);
   }
   /**
    * Protobuf type {@code ShardRegionStats}
    */
   public  static final class ShardRegionStats extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardRegionStats)
       ShardRegionStatsOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ShardRegionStats.newBuilder() to construct.
-    private ShardRegionStats(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ShardRegionStats(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ShardRegionStats() {
       stats_ = java.util.Collections.emptyList();
-      failed_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardRegionStats();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ShardRegionStats(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -10668,17 +10668,17 @@ public final class ClusterShardingMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                stats_ = new java.util.ArrayList();
+                stats_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               stats_.add(
-                  input.readMessage(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.PARSER, extensionRegistry));
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                failed_ = new akka.protobufv3.internal.LazyStringArrayList();
+                failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               failed_.add(bs);
@@ -10693,10 +10693,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -10709,31 +10709,31 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder.class);
     }
 
     public static final int STATS_FIELD_NUMBER = 1;
-    private java.util.List stats_;
+    private java.util.List stats_;
     /**
      * repeated .MapFieldEntry stats = 1;
      */
-    public java.util.List getStatsList() {
+    public java.util.List getStatsList() {
       return stats_;
     }
     /**
      * repeated .MapFieldEntry stats = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getStatsOrBuilderList() {
       return stats_;
     }
@@ -10746,24 +10746,24 @@ public final class ClusterShardingMessages {
     /**
      * repeated .MapFieldEntry stats = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getStats(int index) {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getStats(int index) {
       return stats_.get(index);
     }
     /**
      * repeated .MapFieldEntry stats = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder getStatsOrBuilder(
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder getStatsOrBuilder(
         int index) {
       return stats_.get(index);
     }
 
     public static final int FAILED_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList failed_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList failed_;
     /**
      * repeated string failed = 2;
      * @return A list containing the failed.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getFailedList() {
       return failed_;
     }
@@ -10787,7 +10787,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the failed at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getFailedBytes(int index) {
       return failed_.getByteString(index);
     }
@@ -10804,13 +10804,13 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < stats_.size(); i++) {
         output.writeMessage(1, stats_.get(i));
       }
       for (int i = 0; i < failed_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, failed_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, failed_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -10822,7 +10822,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       for (int i = 0; i < stats_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, stats_.get(i));
       }
       {
@@ -10843,10 +10843,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats) obj;
 
       if (!getStatsList()
           .equals(other.getStatsList())) return false;
@@ -10876,73 +10876,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -10951,7 +10951,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -10962,7 +10962,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -10970,34 +10970,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ShardRegionStats}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ShardRegionStats)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getStatsFieldBuilder();
         }
@@ -11011,25 +11011,25 @@ public final class ClusterShardingMessages {
         } else {
           statsBuilder_.clear();
         }
-        failed_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardRegionStats_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11037,8 +11037,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats(this);
         int from_bitField0_ = bitField0_;
         if (statsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -11064,44 +11064,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance()) return this;
         if (statsBuilder_ == null) {
           if (!other.stats_.isEmpty()) {
             if (stats_.isEmpty()) {
@@ -11121,7 +11121,7 @@ public final class ClusterShardingMessages {
               stats_ = other.stats_;
               bitField0_ = (bitField0_ & ~0x00000001);
               statsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getStatsFieldBuilder() : null;
             } else {
               statsBuilder_.addAllMessages(other.stats_);
@@ -11150,14 +11150,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -11168,22 +11168,22 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private java.util.List stats_ =
+      private java.util.List stats_ =
         java.util.Collections.emptyList();
       private void ensureStatsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          stats_ = new java.util.ArrayList(stats_);
+          stats_ = new java.util.ArrayList(stats_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder> statsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder> statsBuilder_;
 
       /**
        * repeated .MapFieldEntry stats = 1;
        */
-      public java.util.List getStatsList() {
+      public java.util.List getStatsList() {
         if (statsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(stats_);
         } else {
@@ -11203,7 +11203,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .MapFieldEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getStats(int index) {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getStats(int index) {
         if (statsBuilder_ == null) {
           return stats_.get(index);
         } else {
@@ -11214,7 +11214,7 @@ public final class ClusterShardingMessages {
        * repeated .MapFieldEntry stats = 1;
        */
       public Builder setStats(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry value) {
         if (statsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11231,7 +11231,7 @@ public final class ClusterShardingMessages {
        * repeated .MapFieldEntry stats = 1;
        */
       public Builder setStats(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder builderForValue) {
         if (statsBuilder_ == null) {
           ensureStatsIsMutable();
           stats_.set(index, builderForValue.build());
@@ -11244,7 +11244,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .MapFieldEntry stats = 1;
        */
-      public Builder addStats(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry value) {
+      public Builder addStats(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry value) {
         if (statsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11261,7 +11261,7 @@ public final class ClusterShardingMessages {
        * repeated .MapFieldEntry stats = 1;
        */
       public Builder addStats(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry value) {
         if (statsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11278,7 +11278,7 @@ public final class ClusterShardingMessages {
        * repeated .MapFieldEntry stats = 1;
        */
       public Builder addStats(
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder builderForValue) {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder builderForValue) {
         if (statsBuilder_ == null) {
           ensureStatsIsMutable();
           stats_.add(builderForValue.build());
@@ -11292,7 +11292,7 @@ public final class ClusterShardingMessages {
        * repeated .MapFieldEntry stats = 1;
        */
       public Builder addStats(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder builderForValue) {
         if (statsBuilder_ == null) {
           ensureStatsIsMutable();
           stats_.add(index, builderForValue.build());
@@ -11306,10 +11306,10 @@ public final class ClusterShardingMessages {
        * repeated .MapFieldEntry stats = 1;
        */
       public Builder addAllStats(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (statsBuilder_ == null) {
           ensureStatsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, stats_);
           onChanged();
         } else {
@@ -11346,14 +11346,14 @@ public final class ClusterShardingMessages {
       /**
        * repeated .MapFieldEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder getStatsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder getStatsBuilder(
           int index) {
         return getStatsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .MapFieldEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder getStatsOrBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder getStatsOrBuilder(
           int index) {
         if (statsBuilder_ == null) {
           return stats_.get(index);  } else {
@@ -11363,7 +11363,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .MapFieldEntry stats = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getStatsOrBuilderList() {
         if (statsBuilder_ != null) {
           return statsBuilder_.getMessageOrBuilderList();
@@ -11374,31 +11374,31 @@ public final class ClusterShardingMessages {
       /**
        * repeated .MapFieldEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder addStatsBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder addStatsBuilder() {
         return getStatsFieldBuilder().addBuilder(
-            akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.getDefaultInstance());
+            org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.getDefaultInstance());
       }
       /**
        * repeated .MapFieldEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder addStatsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder addStatsBuilder(
           int index) {
         return getStatsFieldBuilder().addBuilder(
-            index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.getDefaultInstance());
+            index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.getDefaultInstance());
       }
       /**
        * repeated .MapFieldEntry stats = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getStatsBuilderList() {
         return getStatsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder> 
           getStatsFieldBuilder() {
         if (statsBuilder_ == null) {
-          statsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder>(
+          statsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder>(
                   stats_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -11408,10 +11408,10 @@ public final class ClusterShardingMessages {
         return statsBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList failed_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureFailedIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          failed_ = new akka.protobufv3.internal.LazyStringArrayList(failed_);
+          failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(failed_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -11419,7 +11419,7 @@ public final class ClusterShardingMessages {
        * repeated string failed = 2;
        * @return A list containing the failed.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getFailedList() {
         return failed_.getUnmodifiableView();
       }
@@ -11443,7 +11443,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the failed at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getFailedBytes(int index) {
         return failed_.getByteString(index);
       }
@@ -11486,7 +11486,7 @@ public final class ClusterShardingMessages {
       public Builder addAllFailed(
           java.lang.Iterable values) {
         ensureFailedIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, failed_);
         onChanged();
         return this;
@@ -11496,7 +11496,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearFailed() {
-        failed_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -11507,7 +11507,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addFailedBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -11518,13 +11518,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -11533,37 +11533,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ShardRegionStats)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ShardRegionStats parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ShardRegionStats(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -11571,7 +11571,7 @@ public final class ClusterShardingMessages {
 
   public interface MapFieldEntryOrBuilder extends
       // @@protoc_insertion_point(interface_extends:MapFieldEntry)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * optional string key = 1;
@@ -11587,7 +11587,7 @@ public final class ClusterShardingMessages {
      * optional string key = 1;
      * @return The bytes for key.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getKeyBytes();
 
     /**
@@ -11605,12 +11605,12 @@ public final class ClusterShardingMessages {
    * Protobuf type {@code MapFieldEntry}
    */
   public  static final class MapFieldEntry extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MapFieldEntry)
       MapFieldEntryOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use MapFieldEntry.newBuilder() to construct.
-    private MapFieldEntry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private MapFieldEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private MapFieldEntry() {
@@ -11620,26 +11620,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new MapFieldEntry();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private MapFieldEntry(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -11649,7 +11649,7 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               key_ = bs;
               break;
@@ -11668,27 +11668,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder.class);
     }
 
     private int bitField0_;
@@ -11710,8 +11710,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           key_ = s;
@@ -11723,17 +11723,17 @@ public final class ClusterShardingMessages {
      * optional string key = 1;
      * @return The bytes for key.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getKeyBytes() {
       java.lang.Object ref = key_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         key_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -11766,10 +11766,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt32(2, value_);
@@ -11784,10 +11784,10 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(2, value_);
       }
       size += unknownFields.getSerializedSize();
@@ -11800,10 +11800,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -11839,73 +11839,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -11914,7 +11914,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -11925,7 +11925,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -11933,34 +11933,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code MapFieldEntry}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:MapFieldEntry)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntryOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -11975,19 +11975,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_MapFieldEntry_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11995,8 +11995,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -12018,44 +12018,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry.getDefaultInstance()) return this;
         if (other.hasKey()) {
           bitField0_ |= 0x00000001;
           key_ = other.key_;
@@ -12076,14 +12076,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -12109,8 +12109,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getKey() {
         java.lang.Object ref = key_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             key_ = s;
@@ -12124,17 +12124,17 @@ public final class ClusterShardingMessages {
        * optional string key = 1;
        * @return The bytes for key.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           key_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -12168,7 +12168,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setKeyBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -12216,13 +12216,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -12231,37 +12231,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:MapFieldEntry)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public MapFieldEntry parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new MapFieldEntry(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.MapFieldEntry getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -12269,7 +12269,7 @@ public final class ClusterShardingMessages {
 
   public interface GetClusterShardingStatsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:GetClusterShardingStats)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int64 timeoutNanos = 1;
@@ -12286,12 +12286,12 @@ public final class ClusterShardingMessages {
    * Protobuf type {@code GetClusterShardingStats}
    */
   public  static final class GetClusterShardingStats extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:GetClusterShardingStats)
       GetClusterShardingStatsOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use GetClusterShardingStats.newBuilder() to construct.
-    private GetClusterShardingStats(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private GetClusterShardingStats(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private GetClusterShardingStats() {
@@ -12300,26 +12300,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new GetClusterShardingStats();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private GetClusterShardingStats(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -12342,27 +12342,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.Builder.class);
     }
 
     private int bitField0_;
@@ -12399,7 +12399,7 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, timeoutNanos_);
@@ -12414,7 +12414,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, timeoutNanos_);
       }
       size += unknownFields.getSerializedSize();
@@ -12427,10 +12427,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats) obj;
 
       if (hasTimeoutNanos() != other.hasTimeoutNanos()) return false;
       if (hasTimeoutNanos()) {
@@ -12450,7 +12450,7 @@ public final class ClusterShardingMessages {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasTimeoutNanos()) {
         hash = (37 * hash) + TIMEOUTNANOS_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimeoutNanos());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -12458,73 +12458,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -12533,7 +12533,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -12544,7 +12544,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -12552,34 +12552,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code GetClusterShardingStats}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:GetClusterShardingStats)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStatsOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStatsOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -12592,19 +12592,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_GetClusterShardingStats_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -12612,8 +12612,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -12631,44 +12631,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats.getDefaultInstance()) return this;
         if (other.hasTimeoutNanos()) {
           setTimeoutNanos(other.getTimeoutNanos());
         }
@@ -12687,14 +12687,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -12743,13 +12743,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -12758,37 +12758,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:GetClusterShardingStats)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public GetClusterShardingStats parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new GetClusterShardingStats(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.GetClusterShardingStats getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -12796,17 +12796,17 @@ public final class ClusterShardingMessages {
 
   public interface ClusterShardingStatsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ClusterShardingStats)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
-    java.util.List 
+    java.util.List 
         getStatsList();
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getStats(int index);
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getStats(int index);
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
@@ -12814,24 +12814,24 @@ public final class ClusterShardingMessages {
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
-    java.util.List 
+    java.util.List 
         getStatsOrBuilderList();
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder getStatsOrBuilder(
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder getStatsOrBuilder(
         int index);
   }
   /**
    * Protobuf type {@code ClusterShardingStats}
    */
   public  static final class ClusterShardingStats extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ClusterShardingStats)
       ClusterShardingStatsOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ClusterShardingStats.newBuilder() to construct.
-    private ClusterShardingStats(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ClusterShardingStats(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ClusterShardingStats() {
@@ -12841,26 +12841,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ClusterShardingStats();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ClusterShardingStats(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -12871,11 +12871,11 @@ public final class ClusterShardingMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                stats_ = new java.util.ArrayList();
+                stats_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               stats_.add(
-                  input.readMessage(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -12887,10 +12887,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -12900,31 +12900,31 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.Builder.class);
     }
 
     public static final int STATS_FIELD_NUMBER = 1;
-    private java.util.List stats_;
+    private java.util.List stats_;
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
-    public java.util.List getStatsList() {
+    public java.util.List getStatsList() {
       return stats_;
     }
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getStatsOrBuilderList() {
       return stats_;
     }
@@ -12937,13 +12937,13 @@ public final class ClusterShardingMessages {
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getStats(int index) {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getStats(int index) {
       return stats_.get(index);
     }
     /**
      * repeated .ClusterShardingStatsEntry stats = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder getStatsOrBuilder(
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder getStatsOrBuilder(
         int index) {
       return stats_.get(index);
     }
@@ -12966,7 +12966,7 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < stats_.size(); i++) {
         output.writeMessage(1, stats_.get(i));
@@ -12981,7 +12981,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       for (int i = 0; i < stats_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, stats_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -12994,10 +12994,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats) obj;
 
       if (!getStatsList()
           .equals(other.getStatsList())) return false;
@@ -13021,73 +13021,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -13096,7 +13096,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -13107,7 +13107,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -13115,34 +13115,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ClusterShardingStats}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ClusterShardingStats)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getStatsFieldBuilder();
         }
@@ -13160,19 +13160,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStats_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -13180,8 +13180,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats(this);
         int from_bitField0_ = bitField0_;
         if (statsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -13202,44 +13202,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats.getDefaultInstance()) return this;
         if (statsBuilder_ == null) {
           if (!other.stats_.isEmpty()) {
             if (stats_.isEmpty()) {
@@ -13259,7 +13259,7 @@ public final class ClusterShardingMessages {
               stats_ = other.stats_;
               bitField0_ = (bitField0_ & ~0x00000001);
               statsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getStatsFieldBuilder() : null;
             } else {
               statsBuilder_.addAllMessages(other.stats_);
@@ -13283,14 +13283,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -13301,22 +13301,22 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private java.util.List stats_ =
+      private java.util.List stats_ =
         java.util.Collections.emptyList();
       private void ensureStatsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          stats_ = new java.util.ArrayList(stats_);
+          stats_ = new java.util.ArrayList(stats_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder> statsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder> statsBuilder_;
 
       /**
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
-      public java.util.List getStatsList() {
+      public java.util.List getStatsList() {
         if (statsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(stats_);
         } else {
@@ -13336,7 +13336,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getStats(int index) {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getStats(int index) {
         if (statsBuilder_ == null) {
           return stats_.get(index);
         } else {
@@ -13347,7 +13347,7 @@ public final class ClusterShardingMessages {
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
       public Builder setStats(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry value) {
         if (statsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13364,7 +13364,7 @@ public final class ClusterShardingMessages {
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
       public Builder setStats(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder builderForValue) {
         if (statsBuilder_ == null) {
           ensureStatsIsMutable();
           stats_.set(index, builderForValue.build());
@@ -13377,7 +13377,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
-      public Builder addStats(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry value) {
+      public Builder addStats(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry value) {
         if (statsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13394,7 +13394,7 @@ public final class ClusterShardingMessages {
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
       public Builder addStats(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry value) {
         if (statsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13411,7 +13411,7 @@ public final class ClusterShardingMessages {
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
       public Builder addStats(
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder builderForValue) {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder builderForValue) {
         if (statsBuilder_ == null) {
           ensureStatsIsMutable();
           stats_.add(builderForValue.build());
@@ -13425,7 +13425,7 @@ public final class ClusterShardingMessages {
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
       public Builder addStats(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder builderForValue) {
         if (statsBuilder_ == null) {
           ensureStatsIsMutable();
           stats_.add(index, builderForValue.build());
@@ -13439,10 +13439,10 @@ public final class ClusterShardingMessages {
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
       public Builder addAllStats(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (statsBuilder_ == null) {
           ensureStatsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, stats_);
           onChanged();
         } else {
@@ -13479,14 +13479,14 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder getStatsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder getStatsBuilder(
           int index) {
         return getStatsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder getStatsOrBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder getStatsOrBuilder(
           int index) {
         if (statsBuilder_ == null) {
           return stats_.get(index);  } else {
@@ -13496,7 +13496,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getStatsOrBuilderList() {
         if (statsBuilder_ != null) {
           return statsBuilder_.getMessageOrBuilderList();
@@ -13507,31 +13507,31 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder addStatsBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder addStatsBuilder() {
         return getStatsFieldBuilder().addBuilder(
-            akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.getDefaultInstance());
+            org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.getDefaultInstance());
       }
       /**
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder addStatsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder addStatsBuilder(
           int index) {
         return getStatsFieldBuilder().addBuilder(
-            index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.getDefaultInstance());
+            index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.getDefaultInstance());
       }
       /**
        * repeated .ClusterShardingStatsEntry stats = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getStatsBuilderList() {
         return getStatsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder> 
           getStatsFieldBuilder() {
         if (statsBuilder_ == null) {
-          statsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder>(
+          statsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder>(
                   stats_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -13542,13 +13542,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -13557,37 +13557,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ClusterShardingStats)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ClusterShardingStats parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ClusterShardingStats(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStats getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -13595,7 +13595,7 @@ public final class ClusterShardingMessages {
 
   public interface ClusterShardingStatsEntryOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ClusterShardingStatsEntry)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Address address = 1;
@@ -13606,11 +13606,11 @@ public final class ClusterShardingMessages {
      * required .Address address = 1;
      * @return The address.
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getAddress();
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getAddress();
     /**
      * required .Address address = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getAddressOrBuilder();
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getAddressOrBuilder();
 
     /**
      * required .ShardRegionStats stats = 2;
@@ -13621,22 +13621,22 @@ public final class ClusterShardingMessages {
      * required .ShardRegionStats stats = 2;
      * @return The stats.
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getStats();
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getStats();
     /**
      * required .ShardRegionStats stats = 2;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder getStatsOrBuilder();
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder getStatsOrBuilder();
   }
   /**
    * Protobuf type {@code ClusterShardingStatsEntry}
    */
   public  static final class ClusterShardingStatsEntry extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ClusterShardingStatsEntry)
       ClusterShardingStatsEntryOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ClusterShardingStatsEntry.newBuilder() to construct.
-    private ClusterShardingStatsEntry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ClusterShardingStatsEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ClusterShardingStatsEntry() {
@@ -13645,26 +13645,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ClusterShardingStatsEntry();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ClusterShardingStatsEntry(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -13674,11 +13674,11 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder subBuilder = null;
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = address_.toBuilder();
               }
-              address_ = input.readMessage(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.PARSER, extensionRegistry);
+              address_ = input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(address_);
                 address_ = subBuilder.buildPartial();
@@ -13687,11 +13687,11 @@ public final class ClusterShardingMessages {
               break;
             }
             case 18: {
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder subBuilder = null;
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = stats_.toBuilder();
               }
-              stats_ = input.readMessage(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.PARSER, extensionRegistry);
+              stats_ = input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(stats_);
                 stats_ = subBuilder.buildPartial();
@@ -13708,32 +13708,32 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder.class);
     }
 
     private int bitField0_;
     public static final int ADDRESS_FIELD_NUMBER = 1;
-    private akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address address_;
+    private org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address address_;
     /**
      * required .Address address = 1;
      * @return Whether the address field is set.
@@ -13745,18 +13745,18 @@ public final class ClusterShardingMessages {
      * required .Address address = 1;
      * @return The address.
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getAddress() {
-      return address_ == null ? akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getAddress() {
+      return address_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getAddressOrBuilder() {
-      return address_ == null ? akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getAddressOrBuilder() {
+      return address_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
     }
 
     public static final int STATS_FIELD_NUMBER = 2;
-    private akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats stats_;
+    private org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats stats_;
     /**
      * required .ShardRegionStats stats = 2;
      * @return Whether the stats field is set.
@@ -13768,14 +13768,14 @@ public final class ClusterShardingMessages {
      * required .ShardRegionStats stats = 2;
      * @return The stats.
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getStats() {
-      return stats_ == null ? akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getStats() {
+      return stats_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
     }
     /**
      * required .ShardRegionStats stats = 2;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder getStatsOrBuilder() {
-      return stats_ == null ? akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder getStatsOrBuilder() {
+      return stats_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -13802,7 +13802,7 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getAddress());
@@ -13820,11 +13820,11 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getAddress());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getStats());
       }
       size += unknownFields.getSerializedSize();
@@ -13837,10 +13837,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry) obj;
 
       if (hasAddress() != other.hasAddress()) return false;
       if (hasAddress()) {
@@ -13876,73 +13876,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -13951,7 +13951,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -13962,7 +13962,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -13970,34 +13970,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ClusterShardingStatsEntry}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ClusterShardingStatsEntry)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntryOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAddressFieldBuilder();
           getStatsFieldBuilder();
@@ -14022,19 +14022,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ClusterShardingStatsEntry_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -14042,8 +14042,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -14073,44 +14073,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry.getDefaultInstance()) return this;
         if (other.hasAddress()) {
           mergeAddress(other.getAddress());
         }
@@ -14138,14 +14138,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -14156,9 +14156,9 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address address_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder> addressBuilder_;
+      private org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address address_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder> addressBuilder_;
       /**
        * required .Address address = 1;
        * @return Whether the address field is set.
@@ -14170,9 +14170,9 @@ public final class ClusterShardingMessages {
        * required .Address address = 1;
        * @return The address.
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getAddress() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getAddress() {
         if (addressBuilder_ == null) {
-          return address_ == null ? akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
+          return address_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
         } else {
           return addressBuilder_.getMessage();
         }
@@ -14180,7 +14180,7 @@ public final class ClusterShardingMessages {
       /**
        * required .Address address = 1;
        */
-      public Builder setAddress(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
+      public Builder setAddress(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
         if (addressBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14197,7 +14197,7 @@ public final class ClusterShardingMessages {
        * required .Address address = 1;
        */
       public Builder setAddress(
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder builderForValue) {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
           onChanged();
@@ -14210,13 +14210,13 @@ public final class ClusterShardingMessages {
       /**
        * required .Address address = 1;
        */
-      public Builder mergeAddress(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
+      public Builder mergeAddress(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               address_ != null &&
-              address_ != akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance()) {
+              address_ != org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance()) {
             address_ =
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
           } else {
             address_ = value;
           }
@@ -14243,7 +14243,7 @@ public final class ClusterShardingMessages {
       /**
        * required .Address address = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder getAddressBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder getAddressBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getAddressFieldBuilder().getBuilder();
@@ -14251,23 +14251,23 @@ public final class ClusterShardingMessages {
       /**
        * required .Address address = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getAddressOrBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getAddressOrBuilder() {
         if (addressBuilder_ != null) {
           return addressBuilder_.getMessageOrBuilder();
         } else {
           return address_ == null ?
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance() : address_;
         }
       }
       /**
        * required .Address address = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder> 
           getAddressFieldBuilder() {
         if (addressBuilder_ == null) {
-          addressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder>(
+          addressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder>(
                   getAddress(),
                   getParentForChildren(),
                   isClean());
@@ -14276,9 +14276,9 @@ public final class ClusterShardingMessages {
         return addressBuilder_;
       }
 
-      private akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats stats_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder> statsBuilder_;
+      private org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats stats_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder> statsBuilder_;
       /**
        * required .ShardRegionStats stats = 2;
        * @return Whether the stats field is set.
@@ -14290,9 +14290,9 @@ public final class ClusterShardingMessages {
        * required .ShardRegionStats stats = 2;
        * @return The stats.
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getStats() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats getStats() {
         if (statsBuilder_ == null) {
-          return stats_ == null ? akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
+          return stats_ == null ? org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
         } else {
           return statsBuilder_.getMessage();
         }
@@ -14300,7 +14300,7 @@ public final class ClusterShardingMessages {
       /**
        * required .ShardRegionStats stats = 2;
        */
-      public Builder setStats(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats value) {
+      public Builder setStats(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats value) {
         if (statsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14317,7 +14317,7 @@ public final class ClusterShardingMessages {
        * required .ShardRegionStats stats = 2;
        */
       public Builder setStats(
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder builderForValue) {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder builderForValue) {
         if (statsBuilder_ == null) {
           stats_ = builderForValue.build();
           onChanged();
@@ -14330,13 +14330,13 @@ public final class ClusterShardingMessages {
       /**
        * required .ShardRegionStats stats = 2;
        */
-      public Builder mergeStats(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats value) {
+      public Builder mergeStats(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats value) {
         if (statsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               stats_ != null &&
-              stats_ != akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance()) {
+              stats_ != org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance()) {
             stats_ =
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.newBuilder(stats_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.newBuilder(stats_).mergeFrom(value).buildPartial();
           } else {
             stats_ = value;
           }
@@ -14363,7 +14363,7 @@ public final class ClusterShardingMessages {
       /**
        * required .ShardRegionStats stats = 2;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder getStatsBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder getStatsBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getStatsFieldBuilder().getBuilder();
@@ -14371,23 +14371,23 @@ public final class ClusterShardingMessages {
       /**
        * required .ShardRegionStats stats = 2;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder getStatsOrBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder getStatsOrBuilder() {
         if (statsBuilder_ != null) {
           return statsBuilder_.getMessageOrBuilder();
         } else {
           return stats_ == null ?
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.getDefaultInstance() : stats_;
         }
       }
       /**
        * required .ShardRegionStats stats = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder> 
           getStatsFieldBuilder() {
         if (statsBuilder_ == null) {
-          statsBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder>(
+          statsBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStats.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardRegionStatsOrBuilder>(
                   getStats(),
                   getParentForChildren(),
                   isClean());
@@ -14397,13 +14397,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -14412,37 +14412,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ClusterShardingStatsEntry)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ClusterShardingStatsEntry parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ClusterShardingStatsEntry(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ClusterShardingStatsEntry getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -14450,17 +14450,17 @@ public final class ClusterShardingMessages {
 
   public interface CurrentRegionsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:CurrentRegions)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .Address regions = 1;
      */
-    java.util.List 
+    java.util.List 
         getRegionsList();
     /**
      * repeated .Address regions = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getRegions(int index);
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getRegions(int index);
     /**
      * repeated .Address regions = 1;
      */
@@ -14468,24 +14468,24 @@ public final class ClusterShardingMessages {
     /**
      * repeated .Address regions = 1;
      */
-    java.util.List 
+    java.util.List 
         getRegionsOrBuilderList();
     /**
      * repeated .Address regions = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getRegionsOrBuilder(
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getRegionsOrBuilder(
         int index);
   }
   /**
    * Protobuf type {@code CurrentRegions}
    */
   public  static final class CurrentRegions extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CurrentRegions)
       CurrentRegionsOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use CurrentRegions.newBuilder() to construct.
-    private CurrentRegions(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private CurrentRegions(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private CurrentRegions() {
@@ -14495,26 +14495,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new CurrentRegions();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private CurrentRegions(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -14525,11 +14525,11 @@ public final class ClusterShardingMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                regions_ = new java.util.ArrayList();
+                regions_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               regions_.add(
-                  input.readMessage(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -14541,10 +14541,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -14554,31 +14554,31 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.Builder.class);
     }
 
     public static final int REGIONS_FIELD_NUMBER = 1;
-    private java.util.List regions_;
+    private java.util.List regions_;
     /**
      * repeated .Address regions = 1;
      */
-    public java.util.List getRegionsList() {
+    public java.util.List getRegionsList() {
       return regions_;
     }
     /**
      * repeated .Address regions = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getRegionsOrBuilderList() {
       return regions_;
     }
@@ -14591,13 +14591,13 @@ public final class ClusterShardingMessages {
     /**
      * repeated .Address regions = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getRegions(int index) {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getRegions(int index) {
       return regions_.get(index);
     }
     /**
      * repeated .Address regions = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getRegionsOrBuilder(
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getRegionsOrBuilder(
         int index) {
       return regions_.get(index);
     }
@@ -14620,7 +14620,7 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < regions_.size(); i++) {
         output.writeMessage(1, regions_.get(i));
@@ -14635,7 +14635,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       for (int i = 0; i < regions_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, regions_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -14648,10 +14648,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions) obj;
 
       if (!getRegionsList()
           .equals(other.getRegionsList())) return false;
@@ -14675,73 +14675,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -14750,7 +14750,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -14761,7 +14761,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -14769,34 +14769,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code CurrentRegions}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:CurrentRegions)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegionsOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegionsOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getRegionsFieldBuilder();
         }
@@ -14814,19 +14814,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentRegions_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -14834,8 +14834,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions(this);
         int from_bitField0_ = bitField0_;
         if (regionsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -14856,44 +14856,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions.getDefaultInstance()) return this;
         if (regionsBuilder_ == null) {
           if (!other.regions_.isEmpty()) {
             if (regions_.isEmpty()) {
@@ -14913,7 +14913,7 @@ public final class ClusterShardingMessages {
               regions_ = other.regions_;
               bitField0_ = (bitField0_ & ~0x00000001);
               regionsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getRegionsFieldBuilder() : null;
             } else {
               regionsBuilder_.addAllMessages(other.regions_);
@@ -14937,14 +14937,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -14955,22 +14955,22 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private java.util.List regions_ =
+      private java.util.List regions_ =
         java.util.Collections.emptyList();
       private void ensureRegionsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          regions_ = new java.util.ArrayList(regions_);
+          regions_ = new java.util.ArrayList(regions_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder> regionsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder> regionsBuilder_;
 
       /**
        * repeated .Address regions = 1;
        */
-      public java.util.List getRegionsList() {
+      public java.util.List getRegionsList() {
         if (regionsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(regions_);
         } else {
@@ -14990,7 +14990,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .Address regions = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getRegions(int index) {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getRegions(int index) {
         if (regionsBuilder_ == null) {
           return regions_.get(index);
         } else {
@@ -15001,7 +15001,7 @@ public final class ClusterShardingMessages {
        * repeated .Address regions = 1;
        */
       public Builder setRegions(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
         if (regionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15018,7 +15018,7 @@ public final class ClusterShardingMessages {
        * repeated .Address regions = 1;
        */
       public Builder setRegions(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder builderForValue) {
         if (regionsBuilder_ == null) {
           ensureRegionsIsMutable();
           regions_.set(index, builderForValue.build());
@@ -15031,7 +15031,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .Address regions = 1;
        */
-      public Builder addRegions(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
+      public Builder addRegions(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
         if (regionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15048,7 +15048,7 @@ public final class ClusterShardingMessages {
        * repeated .Address regions = 1;
        */
       public Builder addRegions(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address value) {
         if (regionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15065,7 +15065,7 @@ public final class ClusterShardingMessages {
        * repeated .Address regions = 1;
        */
       public Builder addRegions(
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder builderForValue) {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder builderForValue) {
         if (regionsBuilder_ == null) {
           ensureRegionsIsMutable();
           regions_.add(builderForValue.build());
@@ -15079,7 +15079,7 @@ public final class ClusterShardingMessages {
        * repeated .Address regions = 1;
        */
       public Builder addRegions(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder builderForValue) {
         if (regionsBuilder_ == null) {
           ensureRegionsIsMutable();
           regions_.add(index, builderForValue.build());
@@ -15093,10 +15093,10 @@ public final class ClusterShardingMessages {
        * repeated .Address regions = 1;
        */
       public Builder addAllRegions(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (regionsBuilder_ == null) {
           ensureRegionsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, regions_);
           onChanged();
         } else {
@@ -15133,14 +15133,14 @@ public final class ClusterShardingMessages {
       /**
        * repeated .Address regions = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder getRegionsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder getRegionsBuilder(
           int index) {
         return getRegionsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Address regions = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getRegionsOrBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder getRegionsOrBuilder(
           int index) {
         if (regionsBuilder_ == null) {
           return regions_.get(index);  } else {
@@ -15150,7 +15150,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .Address regions = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getRegionsOrBuilderList() {
         if (regionsBuilder_ != null) {
           return regionsBuilder_.getMessageOrBuilderList();
@@ -15161,31 +15161,31 @@ public final class ClusterShardingMessages {
       /**
        * repeated .Address regions = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder addRegionsBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder addRegionsBuilder() {
         return getRegionsFieldBuilder().addBuilder(
-            akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance());
+            org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance());
       }
       /**
        * repeated .Address regions = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder addRegionsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder addRegionsBuilder(
           int index) {
         return getRegionsFieldBuilder().addBuilder(
-            index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance());
+            index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance());
       }
       /**
        * repeated .Address regions = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getRegionsBuilderList() {
         return getRegionsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder> 
           getRegionsFieldBuilder() {
         if (regionsBuilder_ == null) {
-          regionsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder>(
+          regionsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder>(
                   regions_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -15196,13 +15196,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -15211,37 +15211,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:CurrentRegions)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public CurrentRegions parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new CurrentRegions(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentRegions getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -15249,7 +15249,7 @@ public final class ClusterShardingMessages {
 
   public interface AddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Address)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string protocol = 1;
@@ -15265,7 +15265,7 @@ public final class ClusterShardingMessages {
      * required string protocol = 1;
      * @return The bytes for protocol.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes();
 
     /**
@@ -15282,7 +15282,7 @@ public final class ClusterShardingMessages {
      * required string system = 2;
      * @return The bytes for system.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes();
 
     /**
@@ -15299,7 +15299,7 @@ public final class ClusterShardingMessages {
      * required string hostname = 3;
      * @return The bytes for hostname.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes();
 
     /**
@@ -15322,12 +15322,12 @@ public final class ClusterShardingMessages {
    * Protobuf type {@code Address}
    */
   public  static final class Address extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Address.newBuilder() to construct.
-    private Address(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Address(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Address() {
@@ -15339,26 +15339,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Address();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Address(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -15368,19 +15368,19 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               protocol_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               system_ = bs;
               break;
             }
             case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000004;
               hostname_ = bs;
               break;
@@ -15399,27 +15399,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder.class);
     }
 
     private int bitField0_;
@@ -15441,8 +15441,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           protocol_ = s;
@@ -15454,17 +15454,17 @@ public final class ClusterShardingMessages {
      * required string protocol = 1;
      * @return The bytes for protocol.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         protocol_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -15486,8 +15486,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           system_ = s;
@@ -15499,17 +15499,17 @@ public final class ClusterShardingMessages {
      * required string system = 2;
      * @return The bytes for system.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         system_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -15531,8 +15531,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           hostname_ = s;
@@ -15544,17 +15544,17 @@ public final class ClusterShardingMessages {
      * required string hostname = 3;
      * @return The bytes for hostname.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         hostname_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -15603,16 +15603,16 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, protocol_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, protocol_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, system_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, system_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, hostname_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, hostname_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeUInt32(4, port_);
@@ -15627,16 +15627,16 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, protocol_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, protocol_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, system_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, system_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, hostname_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, hostname_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(4, port_);
       }
       size += unknownFields.getSerializedSize();
@@ -15649,10 +15649,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address) obj;
 
       if (hasProtocol() != other.hasProtocol()) return false;
       if (hasProtocol()) {
@@ -15706,73 +15706,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -15781,7 +15781,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -15792,7 +15792,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -15805,34 +15805,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code Address}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Address)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.AddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -15851,19 +15851,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -15871,8 +15871,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -15902,44 +15902,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address.getDefaultInstance()) return this;
         if (other.hasProtocol()) {
           bitField0_ |= 0x00000001;
           protocol_ = other.protocol_;
@@ -15982,14 +15982,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -16015,8 +16015,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getProtocol() {
         java.lang.Object ref = protocol_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             protocol_ = s;
@@ -16030,17 +16030,17 @@ public final class ClusterShardingMessages {
        * required string protocol = 1;
        * @return The bytes for protocol.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getProtocolBytes() {
         java.lang.Object ref = protocol_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           protocol_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -16074,7 +16074,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setProtocolBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -16099,8 +16099,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getSystem() {
         java.lang.Object ref = system_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             system_ = s;
@@ -16114,17 +16114,17 @@ public final class ClusterShardingMessages {
        * required string system = 2;
        * @return The bytes for system.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getSystemBytes() {
         java.lang.Object ref = system_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           system_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -16158,7 +16158,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setSystemBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -16183,8 +16183,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getHostname() {
         java.lang.Object ref = hostname_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             hostname_ = s;
@@ -16198,17 +16198,17 @@ public final class ClusterShardingMessages {
        * required string hostname = 3;
        * @return The bytes for hostname.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getHostnameBytes() {
         java.lang.Object ref = hostname_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           hostname_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -16242,7 +16242,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setHostnameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -16290,13 +16290,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -16305,37 +16305,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Address)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
    
-        PARSER = new akka.protobufv3.internal.AbstractParser
    () {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
    
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser
    () {
       @java.lang.Override
       public Address parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Address(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser
     parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser
     parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser
     getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser
     getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.Address getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -16343,7 +16343,7 @@ public final class ClusterShardingMessages {
 
   public interface StartEntityOrBuilder extends
       // @@protoc_insertion_point(interface_extends:StartEntity)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string entityId = 1;
@@ -16359,19 +16359,19 @@ public final class ClusterShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes();
   }
   /**
    * Protobuf type {@code StartEntity}
    */
   public  static final class StartEntity extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:StartEntity)
       StartEntityOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use StartEntity.newBuilder() to construct.
-    private StartEntity(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private StartEntity(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private StartEntity() {
@@ -16381,26 +16381,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new StartEntity();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private StartEntity(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -16410,7 +16410,7 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               entityId_ = bs;
               break;
@@ -16424,27 +16424,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.Builder.class);
     }
 
     private int bitField0_;
@@ -16466,8 +16466,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           entityId_ = s;
@@ -16479,17 +16479,17 @@ public final class ClusterShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         entityId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -16509,10 +16509,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -16524,7 +16524,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -16536,10 +16536,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity) obj;
 
       if (hasEntityId() != other.hasEntityId()) return false;
       if (hasEntityId()) {
@@ -16566,73 +16566,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -16641,7 +16641,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -16652,7 +16652,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -16660,34 +16660,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code StartEntity}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:StartEntity)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -16700,19 +16700,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntity_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -16720,8 +16720,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -16739,44 +16739,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
           bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
@@ -16797,14 +16797,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -16830,8 +16830,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getEntityId() {
         java.lang.Object ref = entityId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             entityId_ = s;
@@ -16845,17 +16845,17 @@ public final class ClusterShardingMessages {
        * required string entityId = 1;
        * @return The bytes for entityId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntityIdBytes() {
         java.lang.Object ref = entityId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           entityId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -16889,7 +16889,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setEntityIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -16900,13 +16900,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -16915,37 +16915,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:StartEntity)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public StartEntity parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new StartEntity(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntity getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -16953,7 +16953,7 @@ public final class ClusterShardingMessages {
 
   public interface StartEntityAckOrBuilder extends
       // @@protoc_insertion_point(interface_extends:StartEntityAck)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string entityId = 1;
@@ -16969,7 +16969,7 @@ public final class ClusterShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes();
 
     /**
@@ -16986,19 +16986,19 @@ public final class ClusterShardingMessages {
      * required string shardId = 2;
      * @return The bytes for shardId.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes();
   }
   /**
    * Protobuf type {@code StartEntityAck}
    */
   public  static final class StartEntityAck extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:StartEntityAck)
       StartEntityAckOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use StartEntityAck.newBuilder() to construct.
-    private StartEntityAck(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private StartEntityAck(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private StartEntityAck() {
@@ -17009,26 +17009,26 @@ public final class ClusterShardingMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new StartEntityAck();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private StartEntityAck(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -17038,13 +17038,13 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               entityId_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               shardId_ = bs;
               break;
@@ -17058,27 +17058,27 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.Builder.class);
     }
 
     private int bitField0_;
@@ -17100,8 +17100,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           entityId_ = s;
@@ -17113,17 +17113,17 @@ public final class ClusterShardingMessages {
      * required string entityId = 1;
      * @return The bytes for entityId.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdBytes() {
       java.lang.Object ref = entityId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         entityId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -17145,8 +17145,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           shardId_ = s;
@@ -17158,17 +17158,17 @@ public final class ClusterShardingMessages {
      * required string shardId = 2;
      * @return The bytes for shardId.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes() {
       java.lang.Object ref = shardId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         shardId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -17192,13 +17192,13 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, shardId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, shardId_);
       }
       unknownFields.writeTo(output);
     }
@@ -17210,10 +17210,10 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, shardId_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, shardId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -17225,10 +17225,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck) obj;
 
       if (hasEntityId() != other.hasEntityId()) return false;
       if (hasEntityId()) {
@@ -17264,73 +17264,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -17339,7 +17339,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -17350,7 +17350,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -17358,34 +17358,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code StartEntityAck}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:StartEntityAck)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAckOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAckOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -17400,19 +17400,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_StartEntityAck_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -17420,8 +17420,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -17443,44 +17443,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck.getDefaultInstance()) return this;
         if (other.hasEntityId()) {
           bitField0_ |= 0x00000001;
           entityId_ = other.entityId_;
@@ -17509,14 +17509,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -17542,8 +17542,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getEntityId() {
         java.lang.Object ref = entityId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             entityId_ = s;
@@ -17557,17 +17557,17 @@ public final class ClusterShardingMessages {
        * required string entityId = 1;
        * @return The bytes for entityId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntityIdBytes() {
         java.lang.Object ref = entityId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           entityId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -17601,7 +17601,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setEntityIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -17626,8 +17626,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getShardId() {
         java.lang.Object ref = shardId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             shardId_ = s;
@@ -17641,17 +17641,17 @@ public final class ClusterShardingMessages {
        * required string shardId = 2;
        * @return The bytes for shardId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardIdBytes() {
         java.lang.Object ref = shardId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           shardId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -17685,7 +17685,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setShardIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -17696,13 +17696,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -17711,37 +17711,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:StartEntityAck)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public StartEntityAck parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new StartEntityAck(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.StartEntityAck getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -17749,7 +17749,7 @@ public final class ClusterShardingMessages {
 
   public interface CurrentShardStateOrBuilder extends
       // @@protoc_insertion_point(interface_extends:CurrentShardState)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string shardId = 1;
@@ -17765,7 +17765,7 @@ public final class ClusterShardingMessages {
      * required string shardId = 1;
      * @return The bytes for shardId.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes();
 
     /**
@@ -17790,49 +17790,49 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entityIds at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdsBytes(int index);
   }
   /**
    * Protobuf type {@code CurrentShardState}
    */
   public  static final class CurrentShardState extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CurrentShardState)
       CurrentShardStateOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use CurrentShardState.newBuilder() to construct.
-    private CurrentShardState(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private CurrentShardState(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private CurrentShardState() {
       shardId_ = "";
-      entityIds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new CurrentShardState();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private CurrentShardState(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -17842,15 +17842,15 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               shardId_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entityIds_ = new akka.protobufv3.internal.LazyStringArrayList();
+                entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               entityIds_.add(bs);
@@ -17865,10 +17865,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -17878,17 +17878,17 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.Builder.class);
     }
 
     private int bitField0_;
@@ -17910,8 +17910,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           shardId_ = s;
@@ -17923,27 +17923,27 @@ public final class ClusterShardingMessages {
      * required string shardId = 1;
      * @return The bytes for shardId.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes() {
       java.lang.Object ref = shardId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         shardId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int ENTITYIDS_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList entityIds_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_;
     /**
      * repeated string entityIds = 2;
      * @return A list containing the entityIds.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getEntityIdsList() {
       return entityIds_;
     }
@@ -17967,7 +17967,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entityIds at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdsBytes(int index) {
       return entityIds_.getByteString(index);
     }
@@ -17988,13 +17988,13 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shardId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shardId_);
       }
       for (int i = 0; i < entityIds_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, entityIds_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, entityIds_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -18006,7 +18006,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shardId_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shardId_);
       }
       {
         int dataSize = 0;
@@ -18026,10 +18026,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState) obj;
 
       if (hasShardId() != other.hasShardId()) return false;
       if (hasShardId()) {
@@ -18062,73 +18062,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -18137,7 +18137,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -18148,7 +18148,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -18156,34 +18156,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code CurrentShardState}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:CurrentShardState)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardStateOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardStateOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -18192,25 +18192,25 @@ public final class ClusterShardingMessages {
         super.clear();
         shardId_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        entityIds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardState_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -18218,8 +18218,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -18242,44 +18242,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState.getDefaultInstance()) return this;
         if (other.hasShardId()) {
           bitField0_ |= 0x00000001;
           shardId_ = other.shardId_;
@@ -18310,14 +18310,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -18343,8 +18343,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getShardId() {
         java.lang.Object ref = shardId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             shardId_ = s;
@@ -18358,17 +18358,17 @@ public final class ClusterShardingMessages {
        * required string shardId = 1;
        * @return The bytes for shardId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardIdBytes() {
         java.lang.Object ref = shardId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           shardId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -18402,7 +18402,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setShardIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -18412,10 +18412,10 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.LazyStringList entityIds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureEntityIdsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          entityIds_ = new akka.protobufv3.internal.LazyStringArrayList(entityIds_);
+          entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityIds_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -18423,7 +18423,7 @@ public final class ClusterShardingMessages {
        * repeated string entityIds = 2;
        * @return A list containing the entityIds.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntityIdsList() {
         return entityIds_.getUnmodifiableView();
       }
@@ -18447,7 +18447,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the entityIds at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntityIdsBytes(int index) {
         return entityIds_.getByteString(index);
       }
@@ -18490,7 +18490,7 @@ public final class ClusterShardingMessages {
       public Builder addAllEntityIds(
           java.lang.Iterable values) {
         ensureEntityIdsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entityIds_);
         onChanged();
         return this;
@@ -18500,7 +18500,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntityIds() {
-        entityIds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -18511,7 +18511,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addEntityIdsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -18522,13 +18522,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -18537,37 +18537,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:CurrentShardState)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public CurrentShardState parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new CurrentShardState(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardState getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -18575,7 +18575,7 @@ public final class ClusterShardingMessages {
 
   public interface ShardStateOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ShardState)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string shardId = 1;
@@ -18591,7 +18591,7 @@ public final class ClusterShardingMessages {
      * required string shardId = 1;
      * @return The bytes for shardId.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes();
 
     /**
@@ -18616,49 +18616,49 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entityIds at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdsBytes(int index);
   }
   /**
    * Protobuf type {@code ShardState}
    */
   public  static final class ShardState extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ShardState)
       ShardStateOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ShardState.newBuilder() to construct.
-    private ShardState(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ShardState(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ShardState() {
       shardId_ = "";
-      entityIds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ShardState();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ShardState(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -18668,15 +18668,15 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               shardId_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entityIds_ = new akka.protobufv3.internal.LazyStringArrayList();
+                entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               entityIds_.add(bs);
@@ -18691,10 +18691,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -18704,17 +18704,17 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder.class);
     }
 
     private int bitField0_;
@@ -18736,8 +18736,8 @@ public final class ClusterShardingMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           shardId_ = s;
@@ -18749,27 +18749,27 @@ public final class ClusterShardingMessages {
      * required string shardId = 1;
      * @return The bytes for shardId.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes() {
       java.lang.Object ref = shardId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         shardId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int ENTITYIDS_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList entityIds_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_;
     /**
      * repeated string entityIds = 2;
      * @return A list containing the entityIds.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getEntityIdsList() {
       return entityIds_;
     }
@@ -18793,7 +18793,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the entityIds at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getEntityIdsBytes(int index) {
       return entityIds_.getByteString(index);
     }
@@ -18814,13 +18814,13 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shardId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shardId_);
       }
       for (int i = 0; i < entityIds_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, entityIds_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, entityIds_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -18832,7 +18832,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shardId_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, shardId_);
       }
       {
         int dataSize = 0;
@@ -18852,10 +18852,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState) obj;
 
       if (hasShardId() != other.hasShardId()) return false;
       if (hasShardId()) {
@@ -18888,73 +18888,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -18963,7 +18963,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -18974,7 +18974,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -18982,34 +18982,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code ShardState}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ShardState)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -19018,25 +19018,25 @@ public final class ClusterShardingMessages {
         super.clear();
         shardId_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        entityIds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_ShardState_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -19044,8 +19044,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -19068,44 +19068,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.getDefaultInstance()) return this;
         if (other.hasShardId()) {
           bitField0_ |= 0x00000001;
           shardId_ = other.shardId_;
@@ -19136,14 +19136,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -19169,8 +19169,8 @@ public final class ClusterShardingMessages {
       public java.lang.String getShardId() {
         java.lang.Object ref = shardId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             shardId_ = s;
@@ -19184,17 +19184,17 @@ public final class ClusterShardingMessages {
        * required string shardId = 1;
        * @return The bytes for shardId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardIdBytes() {
         java.lang.Object ref = shardId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           shardId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -19228,7 +19228,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder setShardIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -19238,10 +19238,10 @@ public final class ClusterShardingMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.LazyStringList entityIds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureEntityIdsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          entityIds_ = new akka.protobufv3.internal.LazyStringArrayList(entityIds_);
+          entityIds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(entityIds_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -19249,7 +19249,7 @@ public final class ClusterShardingMessages {
        * repeated string entityIds = 2;
        * @return A list containing the entityIds.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getEntityIdsList() {
         return entityIds_.getUnmodifiableView();
       }
@@ -19273,7 +19273,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the entityIds at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getEntityIdsBytes(int index) {
         return entityIds_.getByteString(index);
       }
@@ -19316,7 +19316,7 @@ public final class ClusterShardingMessages {
       public Builder addAllEntityIds(
           java.lang.Iterable values) {
         ensureEntityIdsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, entityIds_);
         onChanged();
         return this;
@@ -19326,7 +19326,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearEntityIds() {
-        entityIds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        entityIds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -19337,7 +19337,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addEntityIdsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -19348,13 +19348,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -19363,37 +19363,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ShardState)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ShardState parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ShardState(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -19401,17 +19401,17 @@ public final class ClusterShardingMessages {
 
   public interface CurrentShardRegionStateOrBuilder extends
       // @@protoc_insertion_point(interface_extends:CurrentShardRegionState)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .ShardState shards = 1;
      */
-    java.util.List 
+    java.util.List 
         getShardsList();
     /**
      * repeated .ShardState shards = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getShards(int index);
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getShards(int index);
     /**
      * repeated .ShardState shards = 1;
      */
@@ -19419,12 +19419,12 @@ public final class ClusterShardingMessages {
     /**
      * repeated .ShardState shards = 1;
      */
-    java.util.List 
+    java.util.List 
         getShardsOrBuilderList();
     /**
      * repeated .ShardState shards = 1;
      */
-    akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder getShardsOrBuilder(
+    org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder getShardsOrBuilder(
         int index);
 
     /**
@@ -19449,49 +19449,49 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the failed at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getFailedBytes(int index);
   }
   /**
    * Protobuf type {@code CurrentShardRegionState}
    */
   public  static final class CurrentShardRegionState extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CurrentShardRegionState)
       CurrentShardRegionStateOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use CurrentShardRegionState.newBuilder() to construct.
-    private CurrentShardRegionState(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private CurrentShardRegionState(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private CurrentShardRegionState() {
       shards_ = java.util.Collections.emptyList();
-      failed_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new CurrentShardRegionState();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private CurrentShardRegionState(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -19502,17 +19502,17 @@ public final class ClusterShardingMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                shards_ = new java.util.ArrayList();
+                shards_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               shards_.add(
-                  input.readMessage(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.PARSER, extensionRegistry));
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                failed_ = new akka.protobufv3.internal.LazyStringArrayList();
+                failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               failed_.add(bs);
@@ -19527,10 +19527,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -19543,31 +19543,31 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.Builder.class);
     }
 
     public static final int SHARDS_FIELD_NUMBER = 1;
-    private java.util.List shards_;
+    private java.util.List shards_;
     /**
      * repeated .ShardState shards = 1;
      */
-    public java.util.List getShardsList() {
+    public java.util.List getShardsList() {
       return shards_;
     }
     /**
      * repeated .ShardState shards = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getShardsOrBuilderList() {
       return shards_;
     }
@@ -19580,24 +19580,24 @@ public final class ClusterShardingMessages {
     /**
      * repeated .ShardState shards = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getShards(int index) {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getShards(int index) {
       return shards_.get(index);
     }
     /**
      * repeated .ShardState shards = 1;
      */
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder getShardsOrBuilder(
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder getShardsOrBuilder(
         int index) {
       return shards_.get(index);
     }
 
     public static final int FAILED_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList failed_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList failed_;
     /**
      * repeated string failed = 2;
      * @return A list containing the failed.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getFailedList() {
       return failed_;
     }
@@ -19621,7 +19621,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the failed at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getFailedBytes(int index) {
       return failed_.getByteString(index);
     }
@@ -19644,13 +19644,13 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < shards_.size(); i++) {
         output.writeMessage(1, shards_.get(i));
       }
       for (int i = 0; i < failed_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, failed_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, failed_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -19662,7 +19662,7 @@ public final class ClusterShardingMessages {
 
       size = 0;
       for (int i = 0; i < shards_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, shards_.get(i));
       }
       {
@@ -19683,10 +19683,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState) obj;
 
       if (!getShardsList()
           .equals(other.getShardsList())) return false;
@@ -19716,73 +19716,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -19791,7 +19791,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -19802,7 +19802,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -19810,34 +19810,34 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code CurrentShardRegionState}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:CurrentShardRegionState)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionStateOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionStateOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getShardsFieldBuilder();
         }
@@ -19851,25 +19851,25 @@ public final class ClusterShardingMessages {
         } else {
           shardsBuilder_.clear();
         }
-        failed_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_CurrentShardRegionState_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -19877,8 +19877,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState(this);
         int from_bitField0_ = bitField0_;
         if (shardsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -19904,44 +19904,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState.getDefaultInstance()) return this;
         if (shardsBuilder_ == null) {
           if (!other.shards_.isEmpty()) {
             if (shards_.isEmpty()) {
@@ -19961,7 +19961,7 @@ public final class ClusterShardingMessages {
               shards_ = other.shards_;
               bitField0_ = (bitField0_ & ~0x00000001);
               shardsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getShardsFieldBuilder() : null;
             } else {
               shardsBuilder_.addAllMessages(other.shards_);
@@ -19995,14 +19995,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -20013,22 +20013,22 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private java.util.List shards_ =
+      private java.util.List shards_ =
         java.util.Collections.emptyList();
       private void ensureShardsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          shards_ = new java.util.ArrayList(shards_);
+          shards_ = new java.util.ArrayList(shards_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder> shardsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder> shardsBuilder_;
 
       /**
        * repeated .ShardState shards = 1;
        */
-      public java.util.List getShardsList() {
+      public java.util.List getShardsList() {
         if (shardsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(shards_);
         } else {
@@ -20048,7 +20048,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardState shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getShards(int index) {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState getShards(int index) {
         if (shardsBuilder_ == null) {
           return shards_.get(index);
         } else {
@@ -20059,7 +20059,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardState shards = 1;
        */
       public Builder setShards(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState value) {
         if (shardsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -20076,7 +20076,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardState shards = 1;
        */
       public Builder setShards(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder builderForValue) {
         if (shardsBuilder_ == null) {
           ensureShardsIsMutable();
           shards_.set(index, builderForValue.build());
@@ -20089,7 +20089,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardState shards = 1;
        */
-      public Builder addShards(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState value) {
+      public Builder addShards(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState value) {
         if (shardsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -20106,7 +20106,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardState shards = 1;
        */
       public Builder addShards(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState value) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState value) {
         if (shardsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -20123,7 +20123,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardState shards = 1;
        */
       public Builder addShards(
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder builderForValue) {
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder builderForValue) {
         if (shardsBuilder_ == null) {
           ensureShardsIsMutable();
           shards_.add(builderForValue.build());
@@ -20137,7 +20137,7 @@ public final class ClusterShardingMessages {
        * repeated .ShardState shards = 1;
        */
       public Builder addShards(
-          int index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder builderForValue) {
         if (shardsBuilder_ == null) {
           ensureShardsIsMutable();
           shards_.add(index, builderForValue.build());
@@ -20151,10 +20151,10 @@ public final class ClusterShardingMessages {
        * repeated .ShardState shards = 1;
        */
       public Builder addAllShards(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (shardsBuilder_ == null) {
           ensureShardsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, shards_);
           onChanged();
         } else {
@@ -20191,14 +20191,14 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardState shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder getShardsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder getShardsBuilder(
           int index) {
         return getShardsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .ShardState shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder getShardsOrBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder getShardsOrBuilder(
           int index) {
         if (shardsBuilder_ == null) {
           return shards_.get(index);  } else {
@@ -20208,7 +20208,7 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardState shards = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getShardsOrBuilderList() {
         if (shardsBuilder_ != null) {
           return shardsBuilder_.getMessageOrBuilderList();
@@ -20219,31 +20219,31 @@ public final class ClusterShardingMessages {
       /**
        * repeated .ShardState shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder addShardsBuilder() {
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder addShardsBuilder() {
         return getShardsFieldBuilder().addBuilder(
-            akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.getDefaultInstance());
+            org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.getDefaultInstance());
       }
       /**
        * repeated .ShardState shards = 1;
        */
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder addShardsBuilder(
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder addShardsBuilder(
           int index) {
         return getShardsFieldBuilder().addBuilder(
-            index, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.getDefaultInstance());
+            index, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.getDefaultInstance());
       }
       /**
        * repeated .ShardState shards = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getShardsBuilderList() {
         return getShardsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder> 
           getShardsFieldBuilder() {
         if (shardsBuilder_ == null) {
-          shardsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder>(
+          shardsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardState.Builder, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.ShardStateOrBuilder>(
                   shards_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -20253,10 +20253,10 @@ public final class ClusterShardingMessages {
         return shardsBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList failed_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureFailedIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          failed_ = new akka.protobufv3.internal.LazyStringArrayList(failed_);
+          failed_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(failed_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -20264,7 +20264,7 @@ public final class ClusterShardingMessages {
        * repeated string failed = 2;
        * @return A list containing the failed.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getFailedList() {
         return failed_.getUnmodifiableView();
       }
@@ -20288,7 +20288,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the failed at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getFailedBytes(int index) {
         return failed_.getByteString(index);
       }
@@ -20331,7 +20331,7 @@ public final class ClusterShardingMessages {
       public Builder addAllFailed(
           java.lang.Iterable values) {
         ensureFailedIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, failed_);
         onChanged();
         return this;
@@ -20341,7 +20341,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearFailed() {
-        failed_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        failed_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -20352,7 +20352,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addFailedBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -20363,13 +20363,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -20378,37 +20378,37 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:CurrentShardRegionState)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public CurrentShardRegionState parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new CurrentShardRegionState(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.CurrentShardRegionState getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -20416,7 +20416,7 @@ public final class ClusterShardingMessages {
 
   public interface RememberedShardStateOrBuilder extends
       // @@protoc_insertion_point(interface_extends:RememberedShardState)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated string shardId = 1;
@@ -20440,7 +20440,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the shardId at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes(int index);
 
     /**
@@ -20458,41 +20458,41 @@ public final class ClusterShardingMessages {
    * Protobuf type {@code RememberedShardState}
    */
   public  static final class RememberedShardState extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:RememberedShardState)
       RememberedShardStateOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use RememberedShardState.newBuilder() to construct.
-    private RememberedShardState(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private RememberedShardState(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private RememberedShardState() {
-      shardId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new RememberedShardState();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private RememberedShardState(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -20502,9 +20502,9 @@ public final class ClusterShardingMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                shardId_ = new akka.protobufv3.internal.LazyStringArrayList();
+                shardId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               shardId_.add(bs);
@@ -20524,10 +20524,10 @@ public final class ClusterShardingMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -20537,27 +20537,27 @@ public final class ClusterShardingMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_descriptor;
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.Builder.class);
+              org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.Builder.class);
     }
 
     private int bitField0_;
     public static final int SHARDID_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.LazyStringList shardId_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList shardId_;
     /**
      * repeated string shardId = 1;
      * @return A list containing the shardId.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getShardIdList() {
       return shardId_;
     }
@@ -20581,7 +20581,7 @@ public final class ClusterShardingMessages {
      * @param index The index of the value to return.
      * @return The bytes of the shardId at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getShardIdBytes(int index) {
       return shardId_.getByteString(index);
     }
@@ -20615,10 +20615,10 @@ public final class ClusterShardingMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < shardId_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shardId_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, shardId_.getRaw(i));
       }
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBool(2, marker_);
@@ -20641,7 +20641,7 @@ public final class ClusterShardingMessages {
         size += 1 * getShardIdList().size();
       }
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(2, marker_);
       }
       size += unknownFields.getSerializedSize();
@@ -20654,10 +20654,10 @@ public final class ClusterShardingMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState)) {
+      if (!(obj instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState)) {
         return super.equals(obj);
       }
-      akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState other = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState) obj;
+      org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState other = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState) obj;
 
       if (!getShardIdList()
           .equals(other.getShardIdList())) return false;
@@ -20683,7 +20683,7 @@ public final class ClusterShardingMessages {
       }
       if (hasMarker()) {
         hash = (37 * hash) + MARKER_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getMarker());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -20691,73 +20691,73 @@ public final class ClusterShardingMessages {
       return hash;
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseDelimitedFrom(
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -20766,7 +20766,7 @@ public final class ClusterShardingMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -20777,7 +20777,7 @@ public final class ClusterShardingMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -20785,41 +20785,41 @@ public final class ClusterShardingMessages {
      * Protobuf type {@code RememberedShardState}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:RememberedShardState)
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardStateOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardStateOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.class, akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.Builder.class);
+                org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.class, org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.Builder.class);
       }
 
-      // Construct using akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.newBuilder()
+      // Construct using org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        shardId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         marker_ = false;
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -20827,19 +20827,19 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_descriptor;
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.internal_static_RememberedShardState_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState getDefaultInstanceForType() {
-        return akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.getDefaultInstance();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState build() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState result = buildPartial();
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState build() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -20847,8 +20847,8 @@ public final class ClusterShardingMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState buildPartial() {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState result = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState(this);
+      public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState buildPartial() {
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState result = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -20871,44 +20871,44 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState) {
-          return mergeFrom((akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState) {
+          return mergeFrom((org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState other) {
-        if (other == akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState other) {
+        if (other == org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState.getDefaultInstance()) return this;
         if (!other.shardId_.isEmpty()) {
           if (shardId_.isEmpty()) {
             shardId_ = other.shardId_;
@@ -20934,14 +20934,14 @@ public final class ClusterShardingMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parsedMessage = null;
+        org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -20952,10 +20952,10 @@ public final class ClusterShardingMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.LazyStringList shardId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureShardIdIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          shardId_ = new akka.protobufv3.internal.LazyStringArrayList(shardId_);
+          shardId_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(shardId_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -20963,7 +20963,7 @@ public final class ClusterShardingMessages {
        * repeated string shardId = 1;
        * @return A list containing the shardId.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getShardIdList() {
         return shardId_.getUnmodifiableView();
       }
@@ -20987,7 +20987,7 @@ public final class ClusterShardingMessages {
        * @param index The index of the value to return.
        * @return The bytes of the shardId at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getShardIdBytes(int index) {
         return shardId_.getByteString(index);
       }
@@ -21030,7 +21030,7 @@ public final class ClusterShardingMessages {
       public Builder addAllShardId(
           java.lang.Iterable values) {
         ensureShardIdIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, shardId_);
         onChanged();
         return this;
@@ -21040,7 +21040,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder clearShardId() {
-        shardId_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        shardId_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -21051,7 +21051,7 @@ public final class ClusterShardingMessages {
        * @return This builder for chaining.
        */
       public Builder addShardIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -21099,13 +21099,13 @@ public final class ClusterShardingMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -21114,183 +21114,183 @@ public final class ClusterShardingMessages {
     }
 
     // @@protoc_insertion_point(class_scope:RememberedShardState)
-    private static final akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState();
     }
 
-    public static akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState getDefaultInstance() {
+    public static org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public RememberedShardState parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new RememberedShardState(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages.RememberedShardState getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_CoordinatorState_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_CoordinatorState_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_CoordinatorState_ShardEntry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_CoordinatorState_ShardEntry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ActorRefMessage_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ActorRefMessage_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ShardIdMessage_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ShardIdMessage_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ShardHomeAllocated_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ShardHomeAllocated_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ShardHome_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ShardHome_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ShardHomesEntry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ShardHomesEntry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ShardHomes_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ShardHomes_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_EntityState_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_EntityState_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_EntityStarted_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_EntityStarted_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_EntitiesStarted_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_EntitiesStarted_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_EntityStopped_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_EntityStopped_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_EntitiesStopped_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_EntitiesStopped_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ShardStats_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ShardStats_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ShardRegionStats_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ShardRegionStats_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_MapFieldEntry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_MapFieldEntry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_GetClusterShardingStats_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_GetClusterShardingStats_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ClusterShardingStats_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ClusterShardingStats_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ClusterShardingStatsEntry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ClusterShardingStatsEntry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_CurrentRegions_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_CurrentRegions_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Address_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Address_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_StartEntity_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_StartEntity_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_StartEntityAck_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_StartEntityAck_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_CurrentShardState_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_CurrentShardState_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ShardState_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ShardState_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_CurrentShardRegionState_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_CurrentShardRegionState_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_RememberedShardState_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_RememberedShardState_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -21330,173 +21330,173 @@ public final class ClusterShardingMessages {
       "ntityIds\030\002 \003(\t\"F\n\027CurrentShardRegionStat" +
       "e\022\033\n\006shards\030\001 \003(\0132\013.ShardState\022\016\n\006failed" +
       "\030\002 \003(\t\"7\n\024RememberedShardState\022\017\n\007shardI" +
-      "d\030\001 \003(\t\022\016\n\006marker\030\002 \001(\010B&\n\"akka.cluster." +
+      "d\030\001 \003(\t\022\016\n\006marker\030\002 \001(\010B&\n\"org.apache.pekko.cluster." +
       "sharding.protobuf.msgH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_CoordinatorState_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_CoordinatorState_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CoordinatorState_descriptor,
         new java.lang.String[] { "Shards", "Regions", "RegionProxies", "UnallocatedShards", });
     internal_static_CoordinatorState_ShardEntry_descriptor =
       internal_static_CoordinatorState_descriptor.getNestedTypes().get(0);
     internal_static_CoordinatorState_ShardEntry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CoordinatorState_ShardEntry_descriptor,
         new java.lang.String[] { "ShardId", "RegionRef", });
     internal_static_ActorRefMessage_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_ActorRefMessage_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActorRefMessage_descriptor,
         new java.lang.String[] { "Ref", });
     internal_static_ShardIdMessage_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_ShardIdMessage_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShardIdMessage_descriptor,
         new java.lang.String[] { "Shard", });
     internal_static_ShardHomeAllocated_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_ShardHomeAllocated_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShardHomeAllocated_descriptor,
         new java.lang.String[] { "Shard", "Region", });
     internal_static_ShardHome_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_ShardHome_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShardHome_descriptor,
         new java.lang.String[] { "Shard", "Region", });
     internal_static_ShardHomesEntry_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_ShardHomesEntry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShardHomesEntry_descriptor,
         new java.lang.String[] { "Region", "Shard", });
     internal_static_ShardHomes_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_ShardHomes_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShardHomes_descriptor,
         new java.lang.String[] { "Homes", });
     internal_static_EntityState_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_EntityState_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntityState_descriptor,
         new java.lang.String[] { "Entities", });
     internal_static_EntityStarted_descriptor =
       getDescriptor().getMessageTypes().get(8);
     internal_static_EntityStarted_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntityStarted_descriptor,
         new java.lang.String[] { "EntityId", });
     internal_static_EntitiesStarted_descriptor =
       getDescriptor().getMessageTypes().get(9);
     internal_static_EntitiesStarted_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntitiesStarted_descriptor,
         new java.lang.String[] { "EntityId", });
     internal_static_EntityStopped_descriptor =
       getDescriptor().getMessageTypes().get(10);
     internal_static_EntityStopped_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntityStopped_descriptor,
         new java.lang.String[] { "EntityId", });
     internal_static_EntitiesStopped_descriptor =
       getDescriptor().getMessageTypes().get(11);
     internal_static_EntitiesStopped_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntitiesStopped_descriptor,
         new java.lang.String[] { "EntityId", });
     internal_static_ShardStats_descriptor =
       getDescriptor().getMessageTypes().get(12);
     internal_static_ShardStats_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShardStats_descriptor,
         new java.lang.String[] { "Shard", "EntityCount", });
     internal_static_ShardRegionStats_descriptor =
       getDescriptor().getMessageTypes().get(13);
     internal_static_ShardRegionStats_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShardRegionStats_descriptor,
         new java.lang.String[] { "Stats", "Failed", });
     internal_static_MapFieldEntry_descriptor =
       getDescriptor().getMessageTypes().get(14);
     internal_static_MapFieldEntry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MapFieldEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
     internal_static_GetClusterShardingStats_descriptor =
       getDescriptor().getMessageTypes().get(15);
     internal_static_GetClusterShardingStats_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetClusterShardingStats_descriptor,
         new java.lang.String[] { "TimeoutNanos", });
     internal_static_ClusterShardingStats_descriptor =
       getDescriptor().getMessageTypes().get(16);
     internal_static_ClusterShardingStats_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ClusterShardingStats_descriptor,
         new java.lang.String[] { "Stats", });
     internal_static_ClusterShardingStatsEntry_descriptor =
       getDescriptor().getMessageTypes().get(17);
     internal_static_ClusterShardingStatsEntry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ClusterShardingStatsEntry_descriptor,
         new java.lang.String[] { "Address", "Stats", });
     internal_static_CurrentRegions_descriptor =
       getDescriptor().getMessageTypes().get(18);
     internal_static_CurrentRegions_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CurrentRegions_descriptor,
         new java.lang.String[] { "Regions", });
     internal_static_Address_descriptor =
       getDescriptor().getMessageTypes().get(19);
     internal_static_Address_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Address_descriptor,
         new java.lang.String[] { "Protocol", "System", "Hostname", "Port", });
     internal_static_StartEntity_descriptor =
       getDescriptor().getMessageTypes().get(20);
     internal_static_StartEntity_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_StartEntity_descriptor,
         new java.lang.String[] { "EntityId", });
     internal_static_StartEntityAck_descriptor =
       getDescriptor().getMessageTypes().get(21);
     internal_static_StartEntityAck_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_StartEntityAck_descriptor,
         new java.lang.String[] { "EntityId", "ShardId", });
     internal_static_CurrentShardState_descriptor =
       getDescriptor().getMessageTypes().get(22);
     internal_static_CurrentShardState_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CurrentShardState_descriptor,
         new java.lang.String[] { "ShardId", "EntityIds", });
     internal_static_ShardState_descriptor =
       getDescriptor().getMessageTypes().get(23);
     internal_static_ShardState_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShardState_descriptor,
         new java.lang.String[] { "ShardId", "EntityIds", });
     internal_static_CurrentShardRegionState_descriptor =
       getDescriptor().getMessageTypes().get(24);
     internal_static_CurrentShardRegionState_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CurrentShardRegionState_descriptor,
         new java.lang.String[] { "Shards", "Failed", });
     internal_static_RememberedShardState_descriptor =
       getDescriptor().getMessageTypes().get(25);
     internal_static_RememberedShardState_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_RememberedShardState_descriptor,
         new java.lang.String[] { "ShardId", "Marker", });
   }
diff --git a/akka-cluster-sharding/src/main/protobuf/ClusterShardingMessages.proto b/akka-cluster-sharding/src/main/protobuf/ClusterShardingMessages.proto
index f7dcf2211b..0434adf4e9 100644
--- a/akka-cluster-sharding/src/main/protobuf/ClusterShardingMessages.proto
+++ b/akka-cluster-sharding/src/main/protobuf/ClusterShardingMessages.proto
@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-option java_package = "akka.cluster.sharding.protobuf.msg";
+option java_package = "org.apache.pekko.cluster.sharding.protobuf.msg";
 option optimize_for = SPEED;
 
 message CoordinatorState {
diff --git a/akka-cluster-sharding/src/main/resources/reference.conf b/akka-cluster-sharding/src/main/resources/reference.conf
index ce627cd7af..dc68fd0369 100644
--- a/akka-cluster-sharding/src/main/resources/reference.conf
+++ b/akka-cluster-sharding/src/main/resources/reference.conf
@@ -448,13 +448,13 @@ akka.cluster.sharding {
 
 # Enable health check by default for when Akka management is on the classpath
 akka.management.health-checks.readiness-checks {
-  sharding = "akka.cluster.sharding.ClusterShardingHealthCheck"
+  sharding = "org.apache.pekko.cluster.sharding.ClusterShardingHealthCheck"
 }
 
 akka.cluster {
   configuration-compatibility-check {
     checkers {
-      akka-cluster-sharding = "akka.cluster.sharding.JoinConfigCompatCheckSharding"
+      akka-cluster-sharding = "org.apache.pekko.cluster.sharding.JoinConfigCompatCheckSharding"
     }
   }
 }
@@ -462,12 +462,12 @@ akka.cluster {
 # Protobuf serializer for Cluster Sharding messages
 akka.actor {
   serializers {
-    akka-sharding = "akka.cluster.sharding.protobuf.ClusterShardingMessageSerializer"
+    akka-sharding = "org.apache.pekko.cluster.sharding.protobuf.ClusterShardingMessageSerializer"
   }
   serialization-bindings {
-    "akka.cluster.sharding.ClusterShardingSerializable" = akka-sharding
+    "org.apache.pekko.cluster.sharding.ClusterShardingSerializable" = akka-sharding
   }
   serialization-identifiers {
-    "akka.cluster.sharding.protobuf.ClusterShardingMessageSerializer" = 13
+    "org.apache.pekko.cluster.sharding.protobuf.ClusterShardingMessageSerializer" = 13
   }
 }
diff --git a/akka-cluster-sharding/src/main/scala-jdk-9/akka/cluster/sharding/internal/jfr/Events.scala b/akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/Events.scala
similarity index 92%
rename from akka-cluster-sharding/src/main/scala-jdk-9/akka/cluster/sharding/internal/jfr/Events.scala
rename to akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/Events.scala
index 0273c003a8..01a8992346 100644
--- a/akka-cluster-sharding/src/main/scala-jdk-9/akka/cluster/sharding/internal/jfr/Events.scala
+++ b/akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/Events.scala
@@ -2,8 +2,8 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal.jfr
-import akka.annotation.InternalApi
+package org.apache.pekko.cluster.sharding.internal.jfr
+import org.apache.pekko.annotation.InternalApi
 import jdk.jfr.{ Category, Enabled, Event, Label, StackTrace, Timespan }
 
 // requires jdk9+ to compile
diff --git a/akka-cluster-sharding/src/main/scala-jdk-9/akka/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala b/akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala
similarity index 84%
rename from akka-cluster-sharding/src/main/scala-jdk-9/akka/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala
rename to akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala
index 629a30ad7d..bde05c65e8 100644
--- a/akka-cluster-sharding/src/main/scala-jdk-9/akka/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala
+++ b/akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal.jfr
+package org.apache.pekko.cluster.sharding.internal.jfr
 
-import akka.cluster.sharding.ShardingFlightRecorder
+import org.apache.pekko.cluster.sharding.ShardingFlightRecorder
 
 class JFRShardingFlightRecorder extends ShardingFlightRecorder {
   override def rememberEntityOperation(duration: Long): Unit =
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterSharding.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
similarity index 94%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterSharding.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
index eb4855483f..1c746dee52 100755
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterSharding.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import java.net.URLEncoder
 import java.util.Optional
@@ -12,35 +12,36 @@ import scala.collection.immutable
 import scala.concurrent.Await
 import scala.util.control.NonFatal
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.Deploy
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.actor.Status
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.ClusterSettings
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.ddata.Replicator
-import akka.cluster.ddata.ReplicatorSettings
-import akka.cluster.sharding.internal.CustomStateStoreModeProvider
-import akka.cluster.sharding.internal.DDataRememberEntitiesProvider
-import akka.cluster.sharding.internal.EventSourcedRememberEntitiesProvider
-import akka.cluster.sharding.internal.RememberEntitiesProvider
-import akka.cluster.singleton.ClusterSingletonManager
-import akka.event.Logging
-import akka.pattern.BackoffOpts
-import akka.pattern.ask
-import akka.util.ByteString
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.Deploy
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.actor.Status
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterSettings
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.ddata.Replicator
+import pekko.cluster.ddata.ReplicatorSettings
+import pekko.cluster.sharding.internal.CustomStateStoreModeProvider
+import pekko.cluster.sharding.internal.DDataRememberEntitiesProvider
+import pekko.cluster.sharding.internal.EventSourcedRememberEntitiesProvider
+import pekko.cluster.sharding.internal.RememberEntitiesProvider
+import pekko.cluster.singleton.ClusterSingletonManager
+import pekko.event.Logging
+import pekko.pattern.BackoffOpts
+import pekko.pattern.ask
+import pekko.util.ByteString
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * This extension provides sharding functionality of actors in a cluster.
@@ -92,7 +93,7 @@ import akka.util.ccompat.JavaConverters._
  * are located. Therefore the shard allocation decisions are taken by the central
  * `ShardCoordinator`, a cluster singleton, i.e. one instance on
  * the oldest member among all cluster nodes or a group of nodes tagged with a specific
- * role. The oldest member can be determined by [[akka.cluster.Member#isOlderThan]].
+ * role. The oldest member can be determined by [[pekko.cluster.Member#isOlderThan]].
  *
  * '''Shard Rebalancing''':
  * To be able to use newly added members in the cluster the coordinator facilitates rebalancing
@@ -187,7 +188,7 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
   }
 
   /**
-   * Scala API: Register a named entity type by defining the [[akka.actor.Props]] of the entity actor
+   * Scala API: Register a named entity type by defining the [[pekko.actor.Props]] of the entity actor
    * and functions to extract entity and shard identifier from messages. The [[ShardRegion]] actor
    * for this type can later be retrieved with the [[shardRegion]] method.
    *
@@ -231,7 +232,7 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
   }
 
   /**
-   * Scala API: Register a named entity type by defining the [[akka.actor.Props]] of the entity actor
+   * Scala API: Register a named entity type by defining the [[pekko.actor.Props]] of the entity actor
    * and functions to extract entity and shard identifier from messages. The [[ShardRegion]] actor
    * for this type can later be retrieved with the [[shardRegion]] method.
    *
@@ -275,7 +276,7 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def internalStart(
+  @InternalApi private[pekko] def internalStart(
       typeName: String,
       entityProps: String => Props,
       settings: ClusterShardingSettings,
@@ -318,12 +319,12 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
   }
 
   /**
-   * Register a named entity type by defining the [[akka.actor.Props]] of the entity actor and
+   * Register a named entity type by defining the [[pekko.actor.Props]] of the entity actor and
    * functions to extract entity and shard identifier from messages. The [[ShardRegion]] actor
    * for this type can later be retrieved with the [[shardRegion]] method.
    *
    * The default shard allocation strategy [[ShardCoordinator.LeastShardAllocationStrategy]]
-   * is used. [[akka.actor.PoisonPill]] is used as `handOffStopMessage`.
+   * is used. [[pekko.actor.PoisonPill]] is used as `handOffStopMessage`.
    *
    * This method will start a [[ShardRegion]] in proxy mode when there is no match between the
    * node roles and the role specified in the [[ClusterShardingSettings]] passed to this method.
@@ -354,12 +355,12 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
   }
 
   /**
-   * Register a named entity type by defining the [[akka.actor.Props]] of the entity actor and
+   * Register a named entity type by defining the [[pekko.actor.Props]] of the entity actor and
    * functions to extract entity and shard identifier from messages. The [[ShardRegion]] actor
    * for this type can later be retrieved with the [[shardRegion]] method.
    *
    * The default shard allocation strategy [[ShardCoordinator.LeastShardAllocationStrategy]]
-   * is used. [[akka.actor.PoisonPill]] is used as `handOffStopMessage`.
+   * is used. [[pekko.actor.PoisonPill]] is used as `handOffStopMessage`.
    *
    * This method will start a [[ShardRegion]] in proxy mode when there is no match between the
    * node roles and the role specified in the [[ClusterShardingSettings]] passed to this method.
@@ -386,7 +387,7 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
   }
 
   /**
-   * Java/Scala API: Register a named entity type by defining the [[akka.actor.Props]] of the entity actor
+   * Java/Scala API: Register a named entity type by defining the [[pekko.actor.Props]] of the entity actor
    * and functions to extract entity and shard identifier from messages. The [[ShardRegion]] actor
    * for this type can later be retrieved with the [[#shardRegion]] method.
    *
@@ -429,12 +430,12 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
   }
 
   /**
-   * Java/Scala API: Register a named entity type by defining the [[akka.actor.Props]] of the entity actor
+   * Java/Scala API: Register a named entity type by defining the [[pekko.actor.Props]] of the entity actor
    * and functions to extract entity and shard identifier from messages. The [[ShardRegion]] actor
    * for this type can later be retrieved with the [[#shardRegion]] method.
    *
    * The default shard allocation strategy [[ShardCoordinator.LeastShardAllocationStrategy]]
-   * is used. [[akka.actor.PoisonPill]] is used as `handOffStopMessage`.
+   * is used. [[pekko.actor.PoisonPill]] is used as `handOffStopMessage`.
    *
    * This method will start a [[ShardRegion]] in proxy mode when there is no match between the
    * node roles and the role specified in the [[ClusterShardingSettings]] passed to this method.
@@ -461,12 +462,12 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
   }
 
   /**
-   * Java/Scala API: Register a named entity type by defining the [[akka.actor.Props]] of the entity actor
+   * Java/Scala API: Register a named entity type by defining the [[pekko.actor.Props]] of the entity actor
    * and functions to extract entity and shard identifier from messages. The [[ShardRegion]] actor
    * for this type can later be retrieved with the [[#shardRegion]] method.
    *
    * The default shard allocation strategy [[ShardCoordinator.LeastShardAllocationStrategy]]
-   * is used. [[akka.actor.PoisonPill]] is used as `handOffStopMessage`.
+   * is used. [[pekko.actor.PoisonPill]] is used as `handOffStopMessage`.
    *
    * This method will start a [[ShardRegion]] in proxy mode when there is no match between the
    * node roles and the role specified in the [[ClusterShardingSettings]] passed to this method.
@@ -674,7 +675,7 @@ class ClusterSharding(system: ExtendedActorSystem) extends Extension {
 /**
  * INTERNAL API.
  */
-private[akka] object ClusterShardingGuardian {
+private[pekko] object ClusterShardingGuardian {
   import ShardCoordinator.ShardAllocationStrategy
   final case class Start(
       typeName: String,
@@ -699,7 +700,7 @@ private[akka] object ClusterShardingGuardian {
  * INTERNAL API. [[ShardRegion]] and [[ShardCoordinator]] actors are created as children
  * of this actor.
  */
-private[akka] class ClusterShardingGuardian extends Actor {
+private[pekko] class ClusterShardingGuardian extends Actor {
   import ClusterShardingGuardian._
 
   val cluster = Cluster(context.system)
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingHealthCheck.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala
similarity index 84%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingHealthCheck.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala
index ec4cb95bfb..23fccb7aef 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingHealthCheck.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.annotation.ApiMayChange
-import akka.event.Logging
-import akka.pattern.ask
-import akka.util.Timeout
-import akka.annotation.InternalApi
-import akka.pattern.AskTimeoutException
-import akka.util.ccompat.JavaConverters._
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.annotation.ApiMayChange
+import pekko.event.Logging
+import pekko.pattern.ask
+import pekko.util.Timeout
+import pekko.annotation.InternalApi
+import pekko.pattern.AskTimeoutException
+import pekko.util.ccompat.JavaConverters._
+import pekko.util.JavaDurationConverters._
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
@@ -24,7 +25,7 @@ import com.typesafe.config.Config
  * Internal API
  */
 @InternalApi
-private[akka] object ClusterShardingHealthCheckSettings {
+private[pekko] object ClusterShardingHealthCheckSettings {
   def apply(config: Config): ClusterShardingHealthCheckSettings =
     new ClusterShardingHealthCheckSettings(
       config.getStringList("names").asScala.toSet,
@@ -42,7 +43,7 @@ private object ClusterShardingHealthCheck {
  * INTERNAL API (ctr)
  */
 @ApiMayChange
-final class ClusterShardingHealthCheck private[akka] (
+final class ClusterShardingHealthCheck private[pekko] (
     system: ActorSystem,
     settings: ClusterShardingHealthCheckSettings,
     shardRegion: String => ActorRef)
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSerializable.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSerializable.scala
similarity index 84%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSerializable.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSerializable.scala
index 54f367ad1d..d4cd747884 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSerializable.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSerializable.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 /**
  * Marker trait for remote messages and persistent events/snapshots with special serializer.
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala
similarity index 96%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala
index a200bf11da..1882204bc1 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.ActorSystem
-import akka.actor.NoSerializationVerificationNeeded
-import akka.annotation.{ ApiMayChange, InternalApi }
-import akka.cluster.Cluster
-import akka.cluster.singleton.ClusterSingletonManagerSettings
-import akka.coordination.lease.LeaseUsageSettings
-import akka.japi.Util.immutableSeq
-import akka.util.Helpers.toRootLowerCase
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.annotation.{ ApiMayChange, InternalApi }
+import pekko.cluster.Cluster
+import pekko.cluster.singleton.ClusterSingletonManagerSettings
+import pekko.coordination.lease.LeaseUsageSettings
+import pekko.japi.Util.immutableSeq
+import pekko.util.Helpers.toRootLowerCase
+import pekko.util.JavaDurationConverters._
 import com.typesafe.config.Config
 
 import scala.collection.immutable
@@ -28,19 +29,19 @@ object ClusterShardingSettings {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] val RememberEntitiesStoreCustom = "custom"
+  private[pekko] val RememberEntitiesStoreCustom = "custom"
 
   /**
    * INTERNAL API
    */
   @InternalApi
-  private[akka] val RememberEntitiesStoreDData = "ddata"
+  private[pekko] val RememberEntitiesStoreDData = "ddata"
 
   /**
    * INTERNAL API
    */
   @InternalApi
-  private[akka] val RememberEntitiesStoreEventsourced = "eventsourced"
+  private[pekko] val RememberEntitiesStoreEventsourced = "eventsourced"
 
   /**
    * Create settings from the default configuration
@@ -127,21 +128,21 @@ object ClusterShardingSettings {
   /**
    * INTERNAL API
    */
-  private[akka] def roleOption(role: String): Option[String] =
+  private[pekko] def roleOption(role: String): Option[String] =
     if (role == "") None else Option(role)
 
   /**
    * API MAY CHANGE: Settings for passivation strategies may change after additional testing and feedback.
    */
   @ApiMayChange
-  final class PassivationStrategySettings private[akka] (
+  final class PassivationStrategySettings private[pekko] (
       val idleEntitySettings: Option[PassivationStrategySettings.IdleSettings],
       val activeEntityLimit: Option[Int],
       val replacementPolicySettings: Option[PassivationStrategySettings.PolicySettings],
       val admissionSettings: Option[PassivationStrategySettings.AdmissionSettings],
-      private[akka] val oldSettingUsed: Boolean) {
+      private[pekko] val oldSettingUsed: Boolean) {
 
-    private[akka] def this(
+    private[pekko] def this(
         idleEntitySettings: Option[PassivationStrategySettings.IdleSettings],
         activeEntityLimit: Option[Int],
         replacementPolicySettings: Option[PassivationStrategySettings.PolicySettings],
@@ -203,7 +204,7 @@ object ClusterShardingSettings {
     def withAdmission(settings: AdmissionSettings): PassivationStrategySettings =
       copy(admissionSettings = Some(settings))
 
-    private[akka] def withOldIdleStrategy(timeout: FiniteDuration): PassivationStrategySettings =
+    private[pekko] def withOldIdleStrategy(timeout: FiniteDuration): PassivationStrategySettings =
       copy(
         idleEntitySettings = Some(new IdleSettings(timeout, None)),
         activeEntityLimit = None,
@@ -599,7 +600,7 @@ object ClusterShardingSettings {
       }
     }
 
-    private[akka] def oldDefault(idleTimeout: FiniteDuration): PassivationStrategySettings =
+    private[pekko] def oldDefault(idleTimeout: FiniteDuration): PassivationStrategySettings =
       defaults.withOldIdleStrategy(idleTimeout)
   }
 
@@ -607,19 +608,19 @@ object ClusterShardingSettings {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] sealed trait PassivationStrategy
+  private[pekko] sealed trait PassivationStrategy
 
   /**
    * INTERNAL API
    */
   @InternalApi
-  private[akka] case object NoPassivationStrategy extends PassivationStrategy
+  private[pekko] case object NoPassivationStrategy extends PassivationStrategy
 
   /**
    * INTERNAL API
    */
   @InternalApi
-  private[akka] object IdlePassivationStrategy {
+  private[pekko] object IdlePassivationStrategy {
     def apply(settings: PassivationStrategySettings.IdleSettings): IdlePassivationStrategy =
       IdlePassivationStrategy(settings.timeout, settings.interval.getOrElse(settings.timeout / 2))
   }
@@ -628,14 +629,14 @@ object ClusterShardingSettings {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] case class IdlePassivationStrategy(timeout: FiniteDuration, interval: FiniteDuration)
+  private[pekko] case class IdlePassivationStrategy(timeout: FiniteDuration, interval: FiniteDuration)
       extends PassivationStrategy
 
   /**
    * INTERNAL API
    */
   @InternalApi
-  private[akka] object LeastRecentlyUsedPassivationStrategy {
+  private[pekko] object LeastRecentlyUsedPassivationStrategy {
     def apply(
         settings: PassivationStrategySettings.LeastRecentlyUsedSettings,
         limit: Int,
@@ -656,7 +657,7 @@ object ClusterShardingSettings {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] case class LeastRecentlyUsedPassivationStrategy(
+  private[pekko] case class LeastRecentlyUsedPassivationStrategy(
       limit: Int,
       segmented: immutable.Seq[Double],
       idle: Option[IdlePassivationStrategy])
@@ -666,14 +667,14 @@ object ClusterShardingSettings {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] case class MostRecentlyUsedPassivationStrategy(limit: Int, idle: Option[IdlePassivationStrategy])
+  private[pekko] case class MostRecentlyUsedPassivationStrategy(limit: Int, idle: Option[IdlePassivationStrategy])
       extends PassivationStrategy
 
   /**
    * INTERNAL API
    */
   @InternalApi
-  private[akka] object LeastFrequentlyUsedPassivationStrategy {
+  private[pekko] object LeastFrequentlyUsedPassivationStrategy {
     def apply(
         settings: PassivationStrategySettings.LeastFrequentlyUsedSettings,
         limit: Int,
@@ -685,7 +686,7 @@ object ClusterShardingSettings {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] case class LeastFrequentlyUsedPassivationStrategy(
+  private[pekko] case class LeastFrequentlyUsedPassivationStrategy(
       limit: Int,
       dynamicAging: Boolean,
       idle: Option[IdlePassivationStrategy])
@@ -695,7 +696,7 @@ object ClusterShardingSettings {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] object CompositePassivationStrategy {
+  private[pekko] object CompositePassivationStrategy {
     object AdmissionFilter {
       def apply(filterSettings: Option[PassivationStrategySettings.AdmissionSettings.FilterSettings]): AdmissionFilter =
         filterSettings match {
@@ -774,7 +775,7 @@ object ClusterShardingSettings {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] case class CompositePassivationStrategy(
+  private[pekko] case class CompositePassivationStrategy(
       limit: Int,
       mainStrategy: PassivationStrategy,
       windowStrategy: PassivationStrategy,
@@ -791,7 +792,7 @@ object ClusterShardingSettings {
    * Determine the passivation strategy to use from settings.
    */
   @InternalApi
-  private[akka] object PassivationStrategy {
+  private[pekko] object PassivationStrategy {
     def apply(settings: ClusterShardingSettings): PassivationStrategy =
       if (settings.rememberEntities) {
         NoPassivationStrategy
@@ -827,7 +828,7 @@ object ClusterShardingSettings {
     }
 
     def describe(strategy: PassivationStrategy): String = {
-      import akka.util.PrettyDuration._
+      import pekko.util.PrettyDuration._
       strategy match {
         case NoPassivationStrategy =>
           "disabled"
@@ -1292,11 +1293,11 @@ final class ClusterShardingSettings(
 
   /** If true, this node should run the shard region, otherwise just a shard proxy should started on this node. */
   @InternalApi
-  private[akka] def shouldHostShard(cluster: Cluster): Boolean =
+  private[pekko] def shouldHostShard(cluster: Cluster): Boolean =
     role.forall(cluster.selfMember.roles.contains)
 
   @InternalApi
-  private[akka] val passivationStrategy: ClusterShardingSettings.PassivationStrategy =
+  private[pekko] val passivationStrategy: ClusterShardingSettings.PassivationStrategy =
     ClusterShardingSettings.PassivationStrategy(this)
 
   def withRole(role: String): ClusterShardingSettings = copy(role = ClusterShardingSettings.roleOption(role))
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/JoinConfigCompatCheckSharding.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckSharding.scala
similarity index 75%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/JoinConfigCompatCheckSharding.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckSharding.scala
index 99fcb12009..bb56e12e6c 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/JoinConfigCompatCheckSharding.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckSharding.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.collection.{ immutable => im }
 
 import com.typesafe.config.Config
 
-import akka.annotation.InternalApi
-import akka.cluster.{ ConfigValidation, JoinConfigCompatChecker }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.{ ConfigValidation, JoinConfigCompatChecker }
 
 /**
  * INTERNAL API
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
similarity index 63%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
index c01b1857c5..baa2ac9914 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ShardCoordinator.Internal.ShardHomeAllocated
-import akka.persistence.journal.EventAdapter
-import akka.persistence.journal.EventSeq
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ShardCoordinator.Internal.ShardHomeAllocated
+import pekko.persistence.journal.EventAdapter
+import pekko.persistence.journal.EventSeq
 
 /**
  * Used for migrating from persistent state store mode to the new event sourced remember entities. No user API,
@@ -16,7 +17,7 @@ import akka.persistence.journal.EventSeq
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class OldCoordinatorStateMigrationEventAdapter extends EventAdapter {
+private[pekko] final class OldCoordinatorStateMigrationEventAdapter extends EventAdapter {
   override def manifest(event: Any): String =
     ""
 
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/RemoveInternalClusterShardingData.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
similarity index 92%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/RemoveInternalClusterShardingData.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
index 63599a6448..a0e094cea7 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/RemoveInternalClusterShardingData.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.Future
 import scala.concurrent.Promise
 import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Deploy
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.persistence._
-import akka.persistence.journal.leveldb.SharedLeveldbJournal
-import akka.persistence.journal.leveldb.SharedLeveldbStore
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Deploy
+import pekko.actor.Props
+import pekko.actor.Terminated
+import pekko.persistence._
+import pekko.persistence.journal.leveldb.SharedLeveldbJournal
+import pekko.persistence.journal.leveldb.SharedLeveldbStore
 
 import scala.annotation.nowarn
 
@@ -39,7 +40,7 @@ import scala.annotation.nowarn
  * Use this program as a standalone Java main program:
  * {{{
  * java -classpath 
- *   akka.cluster.sharding.RemoveInternalClusterShardingData
+ *   org.apache.pekko.cluster.sharding.RemoveInternalClusterShardingData
  *     -2.3 entityType1 entityType2 entityType3
  * }}}
  *
@@ -107,7 +108,7 @@ object RemoveInternalClusterShardingData {
   /**
    * INTERNAL API: `Props` for [[RemoveInternalClusterShardingData]] actor.
    */
-  private[akka] def props(
+  private[pekko] def props(
       journalPluginId: String,
       typeNames: Set[String],
       completion: Promise[Unit],
@@ -118,7 +119,7 @@ object RemoveInternalClusterShardingData {
   /**
    * INTERNAL API
    */
-  private[akka] object RemoveOnePersistenceId {
+  private[pekko] object RemoveOnePersistenceId {
     def props(journalPluginId: String, persistenceId: String, replyTo: ActorRef): Props =
       Props(new RemoveOnePersistenceId(journalPluginId, persistenceId: String, replyTo))
 
@@ -131,7 +132,7 @@ object RemoveInternalClusterShardingData {
    * `persistenceId`. It will reply with `RemoveOnePersistenceId.Result`
    * when done.
    */
-  private[akka] class RemoveOnePersistenceId(
+  private[pekko] class RemoveOnePersistenceId(
       override val journalPluginId: String,
       override val persistenceId: String,
       replyTo: ActorRef)
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala
similarity index 96%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala
index 8e38848e90..e823b44b84 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala
@@ -2,41 +2,42 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import java.net.URLEncoder
 import java.util
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.DeadLetterSuppression
-import akka.actor.Deploy
-import akka.actor.Dropped
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.Props
-import akka.actor.Stash
-import akka.actor.Terminated
-import akka.actor.Timers
-import akka.annotation.InternalStableApi
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.InitialStateAsEvents
-import akka.cluster.ClusterEvent.MemberEvent
-import akka.cluster.ClusterEvent.MemberPreparingForShutdown
-import akka.cluster.ClusterEvent.MemberReadyForShutdown
-import akka.cluster.sharding.ShardRegion.ShardsUpdated
-import akka.cluster.sharding.internal.EntityPassivationStrategy
-import akka.cluster.sharding.internal.RememberEntitiesShardStore
-import akka.cluster.sharding.internal.RememberEntitiesShardStore.GetEntities
-import akka.cluster.sharding.internal.RememberEntitiesProvider
-import akka.cluster.sharding.internal.RememberEntityStarter
-import akka.coordination.lease.scaladsl.Lease
-import akka.coordination.lease.scaladsl.LeaseProvider
-import akka.event.LoggingAdapter
-import akka.pattern.pipe
-import akka.util.MessageBufferMap
-import akka.util.OptionVal
-import akka.util.PrettyDuration._
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.DeadLetterSuppression
+import pekko.actor.Deploy
+import pekko.actor.Dropped
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.Props
+import pekko.actor.Stash
+import pekko.actor.Terminated
+import pekko.actor.Timers
+import pekko.annotation.InternalStableApi
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent.InitialStateAsEvents
+import pekko.cluster.ClusterEvent.MemberEvent
+import pekko.cluster.ClusterEvent.MemberPreparingForShutdown
+import pekko.cluster.ClusterEvent.MemberReadyForShutdown
+import pekko.cluster.sharding.ShardRegion.ShardsUpdated
+import pekko.cluster.sharding.internal.EntityPassivationStrategy
+import pekko.cluster.sharding.internal.RememberEntitiesShardStore
+import pekko.cluster.sharding.internal.RememberEntitiesShardStore.GetEntities
+import pekko.cluster.sharding.internal.RememberEntitiesProvider
+import pekko.cluster.sharding.internal.RememberEntityStarter
+import pekko.coordination.lease.scaladsl.Lease
+import pekko.coordination.lease.scaladsl.LeaseProvider
+import pekko.event.LoggingAdapter
+import pekko.pattern.pipe
+import pekko.util.MessageBufferMap
+import pekko.util.OptionVal
+import pekko.util.PrettyDuration._
+import pekko.util.unused
 
 import scala.collection.immutable.Set
 import scala.concurrent.duration._
@@ -46,7 +47,7 @@ import scala.concurrent.duration._
  *
  * @see [[ClusterSharding$ ClusterSharding extension]]
  */
-private[akka] object Shard {
+private[pekko] object Shard {
   import ShardRegion.EntityId
 
   /**
@@ -359,7 +360,7 @@ private[akka] object Shard {
       }
     }
 
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     // only called once during handoff
     def activeEntities(): Set[ActorRef] = byRef.keySet.asScala.toSet
 
@@ -407,7 +408,7 @@ private[akka] object Shard {
  * @see [[ClusterSharding$ ClusterSharding extension]]
  */
 @InternalStableApi
-private[akka] class Shard(
+private[pekko] class Shard(
     typeName: String,
     shardId: ShardRegion.ShardId,
     entityProps: String => Props,
@@ -429,7 +430,7 @@ private[akka] class Shard(
   import ShardRegion.Passivate
   import ShardRegion.ShardInitialized
 
-  import akka.cluster.sharding.ShardCoordinator.Internal.CoordinatorMessage
+  import pekko.cluster.sharding.ShardCoordinator.Internal.CoordinatorMessage
 
   private val verboseDebug = context.system.settings.config.getBoolean("akka.cluster.sharding.verbose-debug-logging")
 
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala
similarity index 97%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala
index 91390a764e..d8a4a01e69 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala
@@ -2,39 +2,40 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.util.Success
 import scala.annotation.nowarn
-import akka.actor._
-import akka.actor.DeadLetterSuppression
-import akka.annotation.DoNotInherit
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent
-import akka.cluster.ClusterEvent._
-import akka.cluster.ddata.LWWRegister
-import akka.cluster.ddata.LWWRegisterKey
-import akka.cluster.ddata.Replicator._
-import akka.cluster.ddata.SelfUniqueAddress
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.internal.AbstractLeastShardAllocationStrategy
-import akka.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.RegionEntry
-import akka.cluster.sharding.internal.EventSourcedRememberEntitiesCoordinatorStore.MigrationMarker
-import akka.cluster.sharding.internal.{
+import org.apache.pekko
+import pekko.actor._
+import pekko.actor.DeadLetterSuppression
+import pekko.annotation.DoNotInherit
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.ddata.LWWRegister
+import pekko.cluster.ddata.LWWRegisterKey
+import pekko.cluster.ddata.Replicator._
+import pekko.cluster.ddata.SelfUniqueAddress
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.internal.AbstractLeastShardAllocationStrategy
+import pekko.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.RegionEntry
+import pekko.cluster.sharding.internal.EventSourcedRememberEntitiesCoordinatorStore.MigrationMarker
+import pekko.cluster.sharding.internal.{
   EventSourcedRememberEntitiesCoordinatorStore,
   RememberEntitiesCoordinatorStore,
   RememberEntitiesProvider
 }
-import akka.dispatch.ExecutionContexts
-import akka.event.{ BusLogging, Logging }
-import akka.pattern.{ pipe, AskTimeoutException }
-import akka.persistence._
-import akka.util.PrettyDuration._
-import akka.util.Timeout
+import pekko.dispatch.ExecutionContexts
+import pekko.event.{ BusLogging, Logging }
+import pekko.pattern.{ pipe, AskTimeoutException }
+import pekko.persistence._
+import pekko.util.PrettyDuration._
+import pekko.util.Timeout
 
 /**
  * @see [[ClusterSharding$ ClusterSharding extension]]
@@ -45,10 +46,10 @@ object ShardCoordinator {
 
   /**
    * INTERNAL API
-   * Factory method for the [[akka.actor.Props]] of the [[ShardCoordinator]] actor.
+   * Factory method for the [[pekko.actor.Props]] of the [[ShardCoordinator]] actor.
    */
   @nowarn("msg=deprecated")
-  private[akka] def props(
+  private[pekko] def props(
       typeName: String,
       settings: ClusterShardingSettings,
       allocationStrategy: ShardAllocationStrategy): Props =
@@ -56,10 +57,10 @@ object ShardCoordinator {
 
   /**
    * INTERNAL API
-   * Factory method for the [[akka.actor.Props]] of the [[ShardCoordinator]] actor with state based on ddata.
+   * Factory method for the [[pekko.actor.Props]] of the [[ShardCoordinator]] actor with state based on ddata.
    */
   @InternalStableApi
-  private[akka] def props(
+  private[pekko] def props(
       typeName: String,
       settings: ClusterShardingSettings,
       allocationStrategy: ShardAllocationStrategy,
@@ -181,7 +182,7 @@ object ShardCoordinator {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] trait ActorSystemDependentAllocationStrategy extends ShardAllocationStrategy {
+  private[pekko] trait ActorSystemDependentAllocationStrategy extends ShardAllocationStrategy {
 
     /**
      * Called before any calls to allocate/rebalance.
@@ -201,14 +202,14 @@ object ShardCoordinator {
         shardId: ShardId,
         currentShardAllocations: Map[ActorRef, immutable.IndexedSeq[ShardId]]): Future[ActorRef] = {
 
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       allocateShard(requester, shardId, currentShardAllocations.asJava)
     }
 
     override final def rebalance(
         currentShardAllocations: Map[ActorRef, immutable.IndexedSeq[ShardId]],
         rebalanceInProgress: Set[ShardId]): Future[Set[ShardId]] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       implicit val ec = ExecutionContexts.parasitic
       rebalance(currentShardAllocations.asJava, rebalanceInProgress.asJava).map(_.asScala.toSet)
     }
@@ -246,7 +247,7 @@ object ShardCoordinator {
   private val emptyRebalanceResult = Future.successful(Set.empty[ShardId])
 
   /**
-   * Use [[akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy.leastShardAllocationStrategy]] instead.
+   * Use [[pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy.leastShardAllocationStrategy]] instead.
    * The new rebalance algorithm was included in Akka 2.6.10. It can reach optimal balance in
    * less rebalance rounds (typically 1 or 2 rounds). The amount of shards to rebalance in each
    * round can still be limited to make it progress slower.
@@ -316,7 +317,7 @@ object ShardCoordinator {
   /**
    * INTERNAL API
    */
-  private[akka] object Internal {
+  private[pekko] object Internal {
 
     /**
      * Used as a special termination message from [[ClusterSharding]]
@@ -442,7 +443,7 @@ object ShardCoordinator {
      * State of the shard coordinator.
      * Was also used as the persistent state in the old persistent coordinator.
      */
-    @SerialVersionUID(1L) final case class State private[akka] (
+    @SerialVersionUID(1L) final case class State private[pekko] (
         // region for each shard
         shards: Map[ShardId, ActorRef] = Map.empty,
         // shards for each region
@@ -538,7 +539,7 @@ object ShardCoordinator {
    */
   private final case class RebalanceResult(shards: Set[ShardId])
 
-  private[akka] object RebalanceWorker {
+  private[pekko] object RebalanceWorker {
     final case class ShardRegionTerminated(region: ActorRef)
   }
 
@@ -546,11 +547,11 @@ object ShardCoordinator {
    * INTERNAL API. Rebalancing process is performed by this actor.
    * It sends `BeginHandOff` to all `ShardRegion` actors followed by
    * `HandOff` to the `ShardRegion` responsible for the shard.
-   * When the handoff is completed it sends [[akka.cluster.sharding.ShardCoordinator.RebalanceDone]]
+   * When the handoff is completed it sends [[pekko.cluster.sharding.ShardCoordinator.RebalanceDone]]
    * to its parent `ShardCoordinator`. If the process takes longer than the
-   * `handOffTimeout` it also sends [[akka.cluster.sharding.ShardCoordinator.RebalanceDone]].
+   * `handOffTimeout` it also sends [[pekko.cluster.sharding.ShardCoordinator.RebalanceDone]].
    */
-  private[akka] class RebalanceWorker(
+  private[pekko] class RebalanceWorker(
       typeName: String,
       shard: String,
       shardRegionFrom: ActorRef,
@@ -631,7 +632,7 @@ object ShardCoordinator {
     }
   }
 
-  private[akka] def rebalanceWorkerProps(
+  private[pekko] def rebalanceWorkerProps(
       typeName: String,
       shard: String,
       shardRegionFrom: ActorRef,
@@ -888,7 +889,7 @@ abstract class ShardCoordinator(
         }
 
       case ShardRegion.GetClusterShardingStats(waitMax) =>
-        import akka.pattern.ask
+        import pekko.pattern.ask
         implicit val timeout: Timeout = waitMax
         Future
           .sequence(aliveRegions.map { regionActor =>
@@ -1422,7 +1423,7 @@ class PersistentShardCoordinator(
  * INTERNAL API
  */
 @InternalApi
-private[akka] object DDataShardCoordinator {
+private[pekko] object DDataShardCoordinator {
 
   private case object RememberEntitiesStoreStopped
 
@@ -1443,7 +1444,7 @@ private[akka] object DDataShardCoordinator {
  * @see [[ClusterSharding$ ClusterSharding extension]]
  */
 @InternalApi
-private[akka] class DDataShardCoordinator(
+private[pekko] class DDataShardCoordinator(
     override val typeName: String,
     settings: ClusterShardingSettings,
     allocationStrategy: ShardCoordinator.ShardAllocationStrategy,
@@ -1457,7 +1458,7 @@ private[akka] class DDataShardCoordinator(
   import DDataShardCoordinator._
   import ShardCoordinator.Internal._
 
-  import akka.cluster.ddata.Replicator.Update
+  import pekko.cluster.ddata.Replicator.Update
 
   private val verboseDebug = context.system.settings.config.getBoolean("akka.cluster.sharding.verbose-debug-logging")
 
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardRegion.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
similarity index 96%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardRegion.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
index 77c8e2459e..f7a3857633 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardRegion.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import java.net.URLEncoder
 import scala.annotation.tailrec
@@ -12,24 +12,25 @@ import scala.concurrent.duration._
 import scala.reflect.ClassTag
 import scala.runtime.AbstractFunction1
 import scala.util.{ Failure, Success }
-import akka.Done
-import akka.actor._
-import akka.annotation.ApiMayChange
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
-import akka.cluster.ClusterSettings
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.ClusterShardingSettings.PassivationStrategy
-import akka.cluster.sharding.Shard.ShardStats
-import akka.cluster.sharding.internal.RememberEntitiesProvider
-import akka.event.Logging
-import akka.pattern.ask
-import akka.pattern.pipe
-import akka.util.MessageBufferMap
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.Done
+import pekko.actor._
+import pekko.annotation.ApiMayChange
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.ClusterSettings
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.ClusterShardingSettings.PassivationStrategy
+import pekko.cluster.sharding.Shard.ShardStats
+import pekko.cluster.sharding.internal.RememberEntitiesProvider
+import pekko.event.Logging
+import pekko.pattern.ask
+import pekko.pattern.pipe
+import pekko.util.MessageBufferMap
+import pekko.util.Timeout
 
 /**
  * @see [[ClusterSharding$ ClusterSharding extension]]
@@ -38,9 +39,9 @@ object ShardRegion {
 
   /**
    * INTERNAL API
-   * Factory method for the [[akka.actor.Props]] of the [[ShardRegion]] actor.
+   * Factory method for the [[pekko.actor.Props]] of the [[ShardRegion]] actor.
    */
-  private[akka] def props(
+  private[pekko] def props(
       typeName: String,
       entityProps: String => Props,
       settings: ClusterShardingSettings,
@@ -63,10 +64,10 @@ object ShardRegion {
 
   /**
    * INTERNAL API
-   * Factory method for the [[akka.actor.Props]] of the [[ShardRegion]] actor
+   * Factory method for the [[pekko.actor.Props]] of the [[ShardRegion]] actor
    * when using it in proxy only mode.
    */
-  private[akka] def proxyProps(
+  private[pekko] def proxyProps(
       typeName: String,
       dataCenter: Option[DataCenter],
       settings: ClusterShardingSettings,
@@ -195,7 +196,7 @@ object ShardRegion {
    * between reception of `Passivate` and termination of the entity. Such buffered messages
    * are thereafter delivered to a new incarnation of the entity.
    *
-   * [[akka.actor.PoisonPill]] is a perfectly fine `stopMessage`.
+   * [[pekko.actor.PoisonPill]] is a perfectly fine `stopMessage`.
    */
   @SerialVersionUID(1L) final case class Passivate(stopMessage: Any) extends ShardRegionCommand
 
@@ -251,7 +252,7 @@ object ShardRegion {
      * Java API
      */
     def getRegions: java.util.Set[Address] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       regions.asJava
     }
 
@@ -281,7 +282,7 @@ object ShardRegion {
      * Java API
      */
     def getRegions(): java.util.Map[Address, ShardRegionStats] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       regions.asJava
     }
   }
@@ -315,13 +316,13 @@ object ShardRegion {
      * Java API
      */
     def getStats(): java.util.Map[ShardId, Int] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       stats.asJava
     }
 
     /** Java API */
     def getFailed(): java.util.Set[ShardId] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       failed.asJava
     }
 
@@ -381,13 +382,13 @@ object ShardRegion {
      * If gathering the shard information times out the set of shards will be empty.
      */
     def getShards(): java.util.Set[ShardState] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       shards.asJava
     }
 
     /** Java API */
     def getFailed(): java.util.Set[ShardId] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       failed.asJava
     }
 
@@ -424,7 +425,7 @@ object ShardRegion {
      * Java API:
      */
     def getEntityIds(): java.util.Set[EntityId] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       entityIds.asJava
     }
   }
@@ -437,7 +438,7 @@ object ShardRegion {
    * Response is [[ShardRegionState]]
    */
   @InternalApi
-  private[akka] object GetShardRegionStatus extends ShardRegionQuery
+  private[pekko] object GetShardRegionStatus extends ShardRegionQuery
 
   /**
    * INTERNAL API
@@ -445,7 +446,7 @@ object ShardRegion {
    * Status of a ShardRegion. Only for local requests so not serializable.
    */
   @InternalApi
-  private[akka] final class ShardRegionStatus(val typeName: String, val registeredWithCoordinator: Boolean)
+  private[pekko] final class ShardRegionStatus(val typeName: String, val registeredWithCoordinator: Boolean)
 
   /**
    * Periodic tick to run some house-keeping.
@@ -502,14 +503,14 @@ object ShardRegion {
    * Used for passivation strategies that change limits based on the number of active shards.
    */
   @InternalApi
-  private[akka] final case class ShardsUpdated(activeShards: Int) extends DeadLetterSuppression
+  private[pekko] final case class ShardsUpdated(activeShards: Int) extends DeadLetterSuppression
 
   /**
    * INTERNAL API. Sends stopMessage (e.g. `PoisonPill`) to the entities and when all of
    * them have terminated it replies with `ShardStopped`.
    * If the entities don't terminate after `handoffTimeout` it will try stopping them forcefully.
    */
-  @InternalApi private[akka] class HandOffStopper(
+  @InternalApi private[pekko] class HandOffStopper(
       typeName: String,
       shard: String,
       replyTo: ActorRef,
@@ -571,7 +572,7 @@ object ShardRegion {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] object HandOffStopper {
+  @InternalApi private[pekko] object HandOffStopper {
     private case object StopTimeout
     private case object StopTimeoutWarning
 
@@ -601,7 +602,7 @@ object ShardRegion {
  * @see [[ClusterSharding$ ClusterSharding extension]]
  */
 @InternalStableApi
-private[akka] class ShardRegion(
+private[pekko] class ShardRegion(
     typeName: String,
     entityProps: Option[String => Props],
     dataCenter: Option[DataCenter],
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardingFlightRecorder.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingFlightRecorder.scala
similarity index 69%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardingFlightRecorder.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingFlightRecorder.scala
index 0e2c30adc4..b49a8f6aa2 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardingFlightRecorder.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingFlightRecorder.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
-import akka.actor.{ ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
-import akka.annotation.InternalApi
-import akka.util.FlightRecorderLoader
+package org.apache.pekko.cluster.sharding
+import org.apache.pekko
+import pekko.actor.{ ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
+import pekko.annotation.InternalApi
+import pekko.util.FlightRecorderLoader
 
 /**
  * INTERNAL API
@@ -18,14 +19,14 @@ object ShardingFlightRecorder extends ExtensionId[ShardingFlightRecorder] with E
   override def createExtension(system: ExtendedActorSystem): ShardingFlightRecorder =
     FlightRecorderLoader.load[ShardingFlightRecorder](
       system,
-      "akka.cluster.sharding.internal.jfr.JFRShardingFlightRecorder",
+      "org.apache.pekko.cluster.sharding.internal.jfr.JFRShardingFlightRecorder",
       NoOpShardingFlightRecorder)
 }
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] trait ShardingFlightRecorder extends Extension {
+@InternalApi private[pekko] trait ShardingFlightRecorder extends Extension {
   def rememberEntityOperation(duration: Long): Unit
   def rememberEntityAdd(entityId: String): Unit
   def rememberEntityRemove(entityId: String): Unit
@@ -37,7 +38,7 @@ object ShardingFlightRecorder extends ExtensionId[ShardingFlightRecorder] with E
  * INTERNAL
  */
 @InternalApi
-private[akka] case object NoOpShardingFlightRecorder extends ShardingFlightRecorder {
+private[pekko] case object NoOpShardingFlightRecorder extends ShardingFlightRecorder {
   override def rememberEntityOperation(duration: Long): Unit = ()
   override def rememberEntityAdd(entityId: String): Unit = ()
   override def rememberEntityRemove(entityId: String): Unit = ()
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardingLogMarker.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingLogMarker.scala
similarity index 86%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardingLogMarker.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingLogMarker.scala
index 377c9f858d..c0ac6c2d7b 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardingLogMarker.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingLogMarker.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.Address
-import akka.annotation.ApiMayChange
-import akka.annotation.InternalApi
-import akka.event.LogMarker
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.annotation.ApiMayChange
+import pekko.annotation.InternalApi
+import pekko.event.LogMarker
 
 /**
  * This is public with the purpose to document the used markers and properties of log events.
@@ -20,7 +21,7 @@ object ShardingLogMarker {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] object Properties {
+  @InternalApi private[pekko] object Properties {
     val ShardTypeName = "akkaShardTypeName"
     val ShardId = "akkaShardId"
   }
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardingQueries.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingQueries.scala
similarity index 96%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardingQueries.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingQueries.scala
index 4c154c1b85..623c2f1dff 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardingQueries.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingQueries.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration.FiniteDuration
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /** INTERNAL API */
 @InternalApi
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ClientTimeoutException.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ClientTimeoutException.scala
similarity index 76%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ClientTimeoutException.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ClientTimeoutException.scala
index 7a5194a4a9..3b3e5b36d7 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ClientTimeoutException.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ClientTimeoutException.scala
@@ -2,6 +2,6 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.external
+package org.apache.pekko.cluster.sharding.external
 
 final class ClientTimeoutException(reason: String) extends RuntimeException(reason)
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocation.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocation.scala
similarity index 78%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocation.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocation.scala
index 66af08c604..065850dd2a 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocation.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocation.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.external
+package org.apache.pekko.cluster.sharding.external
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.function.{ Function => JFunction }
 
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.annotation.ApiMayChange
-import akka.cluster.sharding.external.internal.ExternalShardAllocationClientImpl
+import org.apache.pekko
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.annotation.ApiMayChange
+import pekko.cluster.sharding.external.internal.ExternalShardAllocationClientImpl
 
 /**
  * API May Change
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategy.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategy.scala
similarity index 84%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategy.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategy.scala
index 9039343457..7d2f2db7e6 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategy.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategy.scala
@@ -2,43 +2,44 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.external
+package org.apache.pekko.cluster.sharding.external
 
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ActorRefScope
-import akka.actor.Address
-import akka.actor.AddressFromURIString
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.Props
-import akka.actor.Stash
-import akka.cluster.Cluster
-import akka.cluster.ddata.DistributedData
-import akka.cluster.ddata.LWWMapKey
-import akka.cluster.ddata.Replicator.Changed
-import akka.cluster.ddata.Replicator.Subscribe
-import akka.cluster.sharding.ShardCoordinator
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.event.Logging
-import akka.pattern.AskTimeoutException
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ActorRefScope
+import pekko.actor.Address
+import pekko.actor.AddressFromURIString
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.Props
+import pekko.actor.Stash
+import pekko.cluster.Cluster
+import pekko.cluster.ddata.DistributedData
+import pekko.cluster.ddata.LWWMapKey
+import pekko.cluster.ddata.Replicator.Changed
+import pekko.cluster.ddata.Replicator.Subscribe
+import pekko.cluster.sharding.ShardCoordinator
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.event.Logging
+import pekko.pattern.AskTimeoutException
+import pekko.util.Timeout
 
 object ExternalShardAllocationStrategy {
 
   type ShardRegion = ActorRef
 
   // local only messages
-  private[akka] final case class GetShardLocation(shard: ShardId)
-  private[akka] case object GetShardLocations
-  private[akka] final case class GetShardLocationsResponse(desiredAllocations: Map[ShardId, Address])
-  private[akka] final case class GetShardLocationResponse(address: Option[Address])
+  private[pekko] final case class GetShardLocation(shard: ShardId)
+  private[pekko] case object GetShardLocations
+  private[pekko] final case class GetShardLocationsResponse(desiredAllocations: Map[ShardId, Address])
+  private[pekko] final case class GetShardLocationResponse(address: Option[Address])
 
   // only returned locally, serialized as a string
   final case class ShardLocation(address: Address) extends NoSerializationVerificationNeeded
@@ -49,7 +50,7 @@ object ExternalShardAllocationStrategy {
 
   // uses a string primitive types are optimized in ddata to not serialize every entity
   // separately
-  private[akka] def ddataKey(typeName: String): LWWMapKey[ShardId, String] = {
+  private[pekko] def ddataKey(typeName: String): LWWMapKey[ShardId, String] = {
     LWWMapKey[ShardId, String](s"external-sharding-$typeName")
   }
 
@@ -93,13 +94,13 @@ class ExternalShardAllocationStrategy(systemProvider: ClassicActorSystemProvider
   import ExternalShardAllocationStrategy._
   import system.dispatcher
 
-  import akka.pattern.ask
+  import pekko.pattern.ask
 
   private val log = Logging(system, classOf[ExternalShardAllocationStrategy])
 
   private var shardState: ActorRef = _
 
-  private[akka] def createShardStateActor(): ActorRef = {
+  private[pekko] def createShardStateActor(): ActorRef = {
     system
       .asInstanceOf[ExtendedActorSystem]
       .systemActorOf(DDataStateActor.props(typeName), s"external-allocation-state-$typeName")
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ShardLocations.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala
similarity index 51%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ShardLocations.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala
index da131999b7..0459e02bb7 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ShardLocations.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.external
+package org.apache.pekko.cluster.sharding.external
 
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.external.ExternalShardAllocationStrategy.ShardLocation
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.external.ExternalShardAllocationStrategy.ShardLocation
+import pekko.util.ccompat.JavaConverters._
 
 final class ShardLocations(val locations: Map[ShardId, ShardLocation]) {
 
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
similarity index 68%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
index 98ce81cc7b..e9b0d02f8c 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
@@ -2,51 +2,52 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.external.internal
+package org.apache.pekko.cluster.sharding.external.internal
 
 import java.util.concurrent.CompletionStage
 
 import scala.compat.java8.FutureConverters._
 import scala.concurrent.Future
 
-import akka.Done
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.AddressFromURIString
-import akka.annotation.InternalApi
-import akka.cluster.ddata.DistributedData
-import akka.cluster.ddata.LWWMap
-import akka.cluster.ddata.Replicator.Get
-import akka.cluster.ddata.Replicator.GetFailure
-import akka.cluster.ddata.Replicator.GetSuccess
-import akka.cluster.ddata.Replicator.NotFound
-import akka.cluster.ddata.Replicator.ReadMajority
-import akka.cluster.ddata.Replicator.Update
-import akka.cluster.ddata.Replicator.UpdateSuccess
-import akka.cluster.ddata.Replicator.UpdateTimeout
-import akka.cluster.ddata.Replicator.WriteLocal
-import akka.cluster.ddata.SelfUniqueAddress
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.external.ClientTimeoutException
-import akka.cluster.sharding.external.ExternalShardAllocationStrategy
-import akka.cluster.sharding.external.ExternalShardAllocationStrategy.ShardLocation
-import akka.cluster.sharding.external.ShardLocations
-import akka.dispatch.MessageDispatcher
-import akka.event.Logging
-import akka.pattern.ask
-import akka.util.JavaDurationConverters._
-import akka.util.PrettyDuration._
-import akka.util.Timeout
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.AddressFromURIString
+import pekko.annotation.InternalApi
+import pekko.cluster.ddata.DistributedData
+import pekko.cluster.ddata.LWWMap
+import pekko.cluster.ddata.Replicator.Get
+import pekko.cluster.ddata.Replicator.GetFailure
+import pekko.cluster.ddata.Replicator.GetSuccess
+import pekko.cluster.ddata.Replicator.NotFound
+import pekko.cluster.ddata.Replicator.ReadMajority
+import pekko.cluster.ddata.Replicator.Update
+import pekko.cluster.ddata.Replicator.UpdateSuccess
+import pekko.cluster.ddata.Replicator.UpdateTimeout
+import pekko.cluster.ddata.Replicator.WriteLocal
+import pekko.cluster.ddata.SelfUniqueAddress
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.external.ClientTimeoutException
+import pekko.cluster.sharding.external.ExternalShardAllocationStrategy
+import pekko.cluster.sharding.external.ExternalShardAllocationStrategy.ShardLocation
+import pekko.cluster.sharding.external.ShardLocations
+import pekko.dispatch.MessageDispatcher
+import pekko.event.Logging
+import pekko.pattern.ask
+import pekko.util.JavaDurationConverters._
+import pekko.util.PrettyDuration._
+import pekko.util.Timeout
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API
  */
 @InternalApi
 final private[external] class ExternalShardAllocationClientImpl(system: ActorSystem, typeName: String)
-    extends akka.cluster.sharding.external.scaladsl.ExternalShardAllocationClient
-    with akka.cluster.sharding.external.javadsl.ExternalShardAllocationClient {
+    extends pekko.cluster.sharding.external.scaladsl.ExternalShardAllocationClient
+    with pekko.cluster.sharding.external.javadsl.ExternalShardAllocationClient {
 
   private val log = Logging(system, classOf[ExternalShardAllocationClientImpl])
 
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
similarity index 83%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
index 9646a000c5..9c76558ee3 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.external.javadsl
+package org.apache.pekko.cluster.sharding.external.javadsl
 
 import java.util.concurrent.CompletionStage
 
-import akka.Done
-import akka.actor.Address
-import akka.annotation.ApiMayChange
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.external.ShardLocations
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.Address
+import pekko.annotation.ApiMayChange
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.external.ShardLocations
 
 /**
  * API May Change
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
similarity index 83%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
index fd308cead9..f08ae7f1b9 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.external.scaladsl
+package org.apache.pekko.cluster.sharding.external.scaladsl
 
 import scala.concurrent.Future
 
-import akka.Done
-import akka.actor.Address
-import akka.annotation.ApiMayChange
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.external.ShardLocations
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.Address
+import pekko.annotation.ApiMayChange
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.external.ShardLocations
 
 /**
  * API May Change
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
similarity index 88%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
index 2bdcc122e2..1c4a8dc69c 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
 import java.lang.{ Boolean => JBoolean, Integer => JInteger }
 
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.ShardCoordinator.ActorSystemDependentAllocationStrategy
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.pattern.after
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.ShardCoordinator.ActorSystemDependentAllocationStrategy
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.pattern.after
 
 import scala.collection.immutable
 import scala.concurrent.Future
@@ -28,7 +29,7 @@ import scala.concurrent.duration.DurationInt
  * INTERNAL API
  */
 @InternalApi
-private[akka] object AbstractLeastShardAllocationStrategy {
+private[pekko] object AbstractLeastShardAllocationStrategy {
   import MemberStatus._
   private val JoiningCluster: Set[MemberStatus] = Set(Joining, WeaklyUp)
   private val LeavingClusterStatuses: Set[MemberStatus] = Set(Leaving, Exiting, Down)
@@ -61,7 +62,7 @@ private[akka] object AbstractLeastShardAllocationStrategy {
  * INTERNAL API
  */
 @InternalApi
-private[akka] abstract class AbstractLeastShardAllocationStrategy extends ActorSystemDependentAllocationStrategy {
+private[pekko] abstract class AbstractLeastShardAllocationStrategy extends ActorSystemDependentAllocationStrategy {
   import AbstractLeastShardAllocationStrategy._
 
   @volatile private var system: ActorSystem = _
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/CustomStateStoreModeProvider.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/CustomStateStoreModeProvider.scala
similarity index 78%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/CustomStateStoreModeProvider.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/CustomStateStoreModeProvider.scala
index f7fe55a56e..2faf1bb419 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/CustomStateStoreModeProvider.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/CustomStateStoreModeProvider.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
-import akka.actor.ActorSystem
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.event.Logging
+package org.apache.pekko.cluster.sharding.internal
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.event.Logging
 
 /**
  * INTERNAL API
@@ -17,7 +18,7 @@ import akka.event.Logging
  * Only intended for testing, not an extension point.
  */
 @InternalApi
-private[akka] final class CustomStateStoreModeProvider(
+private[pekko] final class CustomStateStoreModeProvider(
     typeName: String,
     system: ActorSystem,
     settings: ClusterShardingSettings)
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
similarity index 84%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
index 9df0c15a47..a3561ab393 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.ddata.GSet
-import akka.cluster.ddata.GSetKey
-import akka.cluster.ddata.Replicator
-import akka.cluster.ddata.Replicator.ReadMajority
-import akka.cluster.ddata.Replicator.WriteMajority
-import akka.cluster.ddata.SelfUniqueAddress
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion.ShardId
+package org.apache.pekko.cluster.sharding.internal
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.ddata.GSet
+import pekko.cluster.ddata.GSetKey
+import pekko.cluster.ddata.Replicator
+import pekko.cluster.ddata.Replicator.ReadMajority
+import pekko.cluster.ddata.Replicator.WriteMajority
+import pekko.cluster.ddata.SelfUniqueAddress
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.ShardRegion.ShardId
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object DDataRememberEntitiesCoordinatorStore {
+private[pekko] object DDataRememberEntitiesCoordinatorStore {
   def props(typeName: String, settings: ClusterShardingSettings, replicator: ActorRef, majorityMinCap: Int): Props =
     Props(new DDataRememberEntitiesCoordinatorStore(typeName, settings, replicator, majorityMinCap))
 }
@@ -31,7 +32,7 @@ private[akka] object DDataRememberEntitiesCoordinatorStore {
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class DDataRememberEntitiesCoordinatorStore(
+private[pekko] final class DDataRememberEntitiesCoordinatorStore(
     typeName: String,
     settings: ClusterShardingSettings,
     replicator: ActorRef,
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesProvider.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesProvider.scala
similarity index 63%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesProvider.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesProvider.scala
index e71f914031..5aefc51112 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesProvider.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesProvider.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion.ShardId
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.ShardRegion.ShardId
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class DDataRememberEntitiesProvider(
+private[pekko] final class DDataRememberEntitiesProvider(
     typeName: String,
     settings: ClusterShardingSettings,
     majorityMinCap: Int,
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala
similarity index 86%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala
index 3e290641fa..3e90554ea4 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala
@@ -2,35 +2,36 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.actor.Stash
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.ddata.ORSet
-import akka.cluster.ddata.ORSetKey
-import akka.cluster.ddata.Replicator.Get
-import akka.cluster.ddata.Replicator.GetDataDeleted
-import akka.cluster.ddata.Replicator.GetFailure
-import akka.cluster.ddata.Replicator.GetSuccess
-import akka.cluster.ddata.Replicator.ModifyFailure
-import akka.cluster.ddata.Replicator.NotFound
-import akka.cluster.ddata.Replicator.ReadMajority
-import akka.cluster.ddata.Replicator.StoreFailure
-import akka.cluster.ddata.Replicator.Update
-import akka.cluster.ddata.Replicator.UpdateDataDeleted
-import akka.cluster.ddata.Replicator.UpdateSuccess
-import akka.cluster.ddata.Replicator.UpdateTimeout
-import akka.cluster.ddata.Replicator.WriteMajority
-import akka.cluster.ddata.SelfUniqueAddress
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion.EntityId
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.util.PrettyDuration._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.actor.Stash
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.ddata.ORSet
+import pekko.cluster.ddata.ORSetKey
+import pekko.cluster.ddata.Replicator.Get
+import pekko.cluster.ddata.Replicator.GetDataDeleted
+import pekko.cluster.ddata.Replicator.GetFailure
+import pekko.cluster.ddata.Replicator.GetSuccess
+import pekko.cluster.ddata.Replicator.ModifyFailure
+import pekko.cluster.ddata.Replicator.NotFound
+import pekko.cluster.ddata.Replicator.ReadMajority
+import pekko.cluster.ddata.Replicator.StoreFailure
+import pekko.cluster.ddata.Replicator.Update
+import pekko.cluster.ddata.Replicator.UpdateDataDeleted
+import pekko.cluster.ddata.Replicator.UpdateSuccess
+import pekko.cluster.ddata.Replicator.UpdateTimeout
+import pekko.cluster.ddata.Replicator.WriteMajority
+import pekko.cluster.ddata.SelfUniqueAddress
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.ShardRegion.EntityId
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.util.PrettyDuration._
 
 import scala.concurrent.ExecutionContext
 
@@ -38,7 +39,7 @@ import scala.concurrent.ExecutionContext
  * INTERNAL API
  */
 @InternalApi
-private[akka] object DDataRememberEntitiesShardStore {
+private[pekko] object DDataRememberEntitiesShardStore {
 
   def props(
       shardId: ShardId,
@@ -71,7 +72,7 @@ private[akka] object DDataRememberEntitiesShardStore {
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class DDataRememberEntitiesShardStore(
+private[pekko] final class DDataRememberEntitiesShardStore(
     shardId: ShardId,
     typeName: String,
     settings: ClusterShardingSettings,
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EntityPassivationStrategy.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EntityPassivationStrategy.scala
similarity index 93%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EntityPassivationStrategy.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EntityPassivationStrategy.scala
index bd81024bea..b0078e89be 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EntityPassivationStrategy.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EntityPassivationStrategy.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion.EntityId
-import akka.util.FastFrequencySketch
-import akka.util.FrequencySketch
-import akka.util.OptionVal
-import akka.util.{ FrequencyList, RecencyList, SegmentedRecencyList }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.ShardRegion.EntityId
+import pekko.util.FastFrequencySketch
+import pekko.util.FrequencySketch
+import pekko.util.OptionVal
+import pekko.util.{ FrequencyList, RecencyList, SegmentedRecencyList }
 
 import scala.collection.immutable
 import scala.concurrent.duration.FiniteDuration
@@ -19,7 +20,7 @@ import scala.concurrent.duration.FiniteDuration
  * INTERNAL API
  */
 @InternalApi
-private[akka] object EntityPassivationStrategy {
+private[pekko] object EntityPassivationStrategy {
   type PassivateEntities = immutable.Seq[EntityId]
 
   object PassivateEntities {
@@ -74,7 +75,7 @@ private[akka] object EntityPassivationStrategy {
  * INTERNAL API: An entity passivation strategy, which is instantiated per active shard.
  */
 @InternalApi
-private[akka] sealed abstract class EntityPassivationStrategy {
+private[pekko] sealed abstract class EntityPassivationStrategy {
   import EntityPassivationStrategy.PassivateEntities
 
   /**
@@ -121,7 +122,7 @@ private[akka] sealed abstract class EntityPassivationStrategy {
  * INTERNAL API: No-op passivation strategy for when automatic passivation is disabled.
  */
 @InternalApi
-private[akka] object DisabledEntityPassivationStrategy extends EntityPassivationStrategy {
+private[pekko] object DisabledEntityPassivationStrategy extends EntityPassivationStrategy {
   import EntityPassivationStrategy.PassivateEntities
 
   override def limitUpdated(newLimit: Int): PassivateEntities = PassivateEntities.none
@@ -136,14 +137,14 @@ private[akka] object DisabledEntityPassivationStrategy extends EntityPassivation
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class IdleCheck(val timeout: FiniteDuration, val interval: FiniteDuration)
+private[pekko] final class IdleCheck(val timeout: FiniteDuration, val interval: FiniteDuration)
 
 /**
  * INTERNAL API: Passivates entities when they have not received a message for a specified length of time.
  * @param idleCheck passivate idle entities after the given timeout, checking every interval
  */
 @InternalApi
-private[akka] final class IdleEntityPassivationStrategy(idleCheck: IdleCheck) extends EntityPassivationStrategy {
+private[pekko] final class IdleEntityPassivationStrategy(idleCheck: IdleCheck) extends EntityPassivationStrategy {
 
   import EntityPassivationStrategy.PassivateEntities
 
@@ -170,7 +171,7 @@ private[akka] final class IdleEntityPassivationStrategy(idleCheck: IdleCheck) ex
  * @param initialLimit initial active entity capacity for a shard region
  */
 @InternalApi
-private[akka] abstract class LimitBasedEntityPassivationStrategy(initialLimit: Int) extends EntityPassivationStrategy {
+private[pekko] abstract class LimitBasedEntityPassivationStrategy(initialLimit: Int) extends EntityPassivationStrategy {
   import EntityPassivationStrategy.PassivateEntities
 
   protected var activeShards: Int = 1
@@ -201,7 +202,7 @@ private[akka] abstract class LimitBasedEntityPassivationStrategy(initialLimit: I
  * @param initialLimit initial active entity capacity for a shard region
  * @param idleCheck optionally passivate idle entities after the given timeout, checking every interval
  */
-private[akka] final class LeastRecentlyUsedEntityPassivationStrategy(initialLimit: Int, idleCheck: Option[IdleCheck])
+private[pekko] final class LeastRecentlyUsedEntityPassivationStrategy(initialLimit: Int, idleCheck: Option[IdleCheck])
     extends LimitBasedEntityPassivationStrategy(initialLimit) {
 
   import EntityPassivationStrategy.PassivateEntities
@@ -235,7 +236,7 @@ private[akka] final class LeastRecentlyUsedEntityPassivationStrategy(initialLimi
  * @param idleCheck optionally passivate idle entities after the given timeout, checking every interval
  */
 @InternalApi
-private[akka] final class SegmentedLeastRecentlyUsedEntityPassivationStrategy(
+private[pekko] final class SegmentedLeastRecentlyUsedEntityPassivationStrategy(
     initialLimit: Int,
     proportions: immutable.Seq[Double],
     idleCheck: Option[IdleCheck])
@@ -268,7 +269,7 @@ private[akka] final class SegmentedLeastRecentlyUsedEntityPassivationStrategy(
  * @param idleCheck optionally passivate idle entities after the given timeout, checking every interval
  */
 @InternalApi
-private[akka] final class MostRecentlyUsedEntityPassivationStrategy(initialLimit: Int, idleCheck: Option[IdleCheck])
+private[pekko] final class MostRecentlyUsedEntityPassivationStrategy(initialLimit: Int, idleCheck: Option[IdleCheck])
     extends LimitBasedEntityPassivationStrategy(initialLimit) {
 
   import EntityPassivationStrategy.PassivateEntities
@@ -299,7 +300,7 @@ private[akka] final class MostRecentlyUsedEntityPassivationStrategy(initialLimit
  * @param idleCheck optionally passivate idle entities after the given timeout, checking every interval
  */
 @InternalApi
-private[akka] final class LeastFrequentlyUsedEntityPassivationStrategy(
+private[pekko] final class LeastFrequentlyUsedEntityPassivationStrategy(
     initialLimit: Int,
     dynamicAging: Boolean,
     idleCheck: Option[IdleCheck])
@@ -326,7 +327,7 @@ private[akka] final class LeastFrequentlyUsedEntityPassivationStrategy(
  * INTERNAL API
  */
 @InternalApi
-private[akka] object ActiveEntities {
+private[pekko] object ActiveEntities {
   def apply(strategy: ClusterShardingSettings.PassivationStrategy, idleEnabled: Boolean): ActiveEntities =
     strategy match {
       case ClusterShardingSettings.LeastRecentlyUsedPassivationStrategy(_, segmented, _) =>
@@ -346,7 +347,7 @@ private[akka] object ActiveEntities {
  * Active entity tracking for entity passivation strategies, implemented with a replacement policy.
  */
 @InternalApi
-private[akka] sealed abstract class ActiveEntities {
+private[pekko] sealed abstract class ActiveEntities {
   import EntityPassivationStrategy.PassivateEntities
 
   /**
@@ -402,7 +403,7 @@ private[akka] sealed abstract class ActiveEntities {
  * Disabled ActiveEntities (for no window in composite passivation strategies).
  */
 @InternalApi
-private[akka] object NoActiveEntities extends ActiveEntities {
+private[pekko] object NoActiveEntities extends ActiveEntities {
   import EntityPassivationStrategy.PassivateEntities
 
   override def size: Int = 0
@@ -423,7 +424,7 @@ private[akka] object NoActiveEntities extends ActiveEntities {
  * @param initialLimit initial active entity capacity for a shard
  */
 @InternalApi
-private[akka] final class LeastRecentlyUsedReplacementPolicy(initialLimit: Int) extends ActiveEntities {
+private[pekko] final class LeastRecentlyUsedReplacementPolicy(initialLimit: Int) extends ActiveEntities {
   import EntityPassivationStrategy.PassivateEntities
 
   private var limit = initialLimit
@@ -469,7 +470,7 @@ private[akka] final class LeastRecentlyUsedReplacementPolicy(initialLimit: Int)
  * @param idleEnabled whether idle entity passivation is enabled
  */
 @InternalApi
-private[akka] final class SegmentedLeastRecentlyUsedReplacementPolicy(
+private[pekko] final class SegmentedLeastRecentlyUsedReplacementPolicy(
     initialLimit: Int,
     proportions: immutable.Seq[Double],
     idleEnabled: Boolean)
@@ -522,7 +523,7 @@ private[akka] final class SegmentedLeastRecentlyUsedReplacementPolicy(
  * @param initialLimit initial active entity capacity for a shard
  */
 @InternalApi
-private[akka] final class MostRecentlyUsedReplacementPolicy(initialLimit: Int) extends ActiveEntities {
+private[pekko] final class MostRecentlyUsedReplacementPolicy(initialLimit: Int) extends ActiveEntities {
   import EntityPassivationStrategy.PassivateEntities
 
   private var limit = initialLimit
@@ -565,7 +566,7 @@ private[akka] final class MostRecentlyUsedReplacementPolicy(initialLimit: Int) e
  * @param idleEnabled whether idle entity passivation is enabled
  */
 @InternalApi
-private[akka] final class LeastFrequentlyUsedReplacementPolicy(
+private[pekko] final class LeastFrequentlyUsedReplacementPolicy(
     initialLimit: Int,
     dynamicAging: Boolean,
     idleEnabled: Boolean)
@@ -636,7 +637,7 @@ private[akka] final class LeastFrequentlyUsedReplacementPolicy(
  * @param idleCheck optionally passivate idle entities after the given timeout, checking every interval
  */
 @InternalApi
-private[akka] final class CompositeEntityPassivationStrategy(
+private[pekko] final class CompositeEntityPassivationStrategy(
     initialLimit: Int,
     window: ActiveEntities,
     initialWindowProportion: Double,
@@ -738,7 +739,7 @@ private[akka] final class CompositeEntityPassivationStrategy(
  * INTERNAL API
  */
 @InternalApi
-private[akka] object AdmissionOptimizer {
+private[pekko] object AdmissionOptimizer {
   def apply(
       initialLimit: Int,
       optimizer: ClusterShardingSettings.CompositePassivationStrategy.AdmissionOptimizer): AdmissionOptimizer =
@@ -759,7 +760,7 @@ private[akka] object AdmissionOptimizer {
  * An optimizer for the size of the admission window for a composite passivation strategy.
  */
 @InternalApi
-private[akka] abstract class AdmissionOptimizer {
+private[pekko] abstract class AdmissionOptimizer {
 
   /**
    * An entity was accessed that is already active.
@@ -792,7 +793,7 @@ private[akka] abstract class AdmissionOptimizer {
  * Disabled admission window proportion optimizer.
  */
 @InternalApi
-private[akka] object NoAdmissionOptimizer extends AdmissionOptimizer {
+private[pekko] object NoAdmissionOptimizer extends AdmissionOptimizer {
   override def recordActive(): Unit = ()
   override def recordPassive(): Unit = ()
   override def updateLimit(newLimit: Int): Unit = ()
@@ -805,7 +806,7 @@ private[akka] object NoAdmissionOptimizer extends AdmissionOptimizer {
  * Optimizer for the admission window using a simple hill-climbing algorithm.
  */
 @InternalApi
-private[akka] final class HillClimbingAdmissionOptimizer(
+private[pekko] final class HillClimbingAdmissionOptimizer(
     initialLimit: Int,
     adjustMultiplier: Double,
     initialStep: Double,
@@ -848,7 +849,7 @@ private[akka] final class HillClimbingAdmissionOptimizer(
  * INTERNAL API
  */
 @InternalApi
-private[akka] object AdmissionFilter {
+private[pekko] object AdmissionFilter {
   def apply(
       initialCapacity: Int,
       filter: ClusterShardingSettings.CompositePassivationStrategy.AdmissionFilter): AdmissionFilter = filter match {
@@ -865,7 +866,7 @@ private[akka] object AdmissionFilter {
  * An admission filter for the main area for a composite passivation strategy.
  */
 @InternalApi
-private[akka] abstract class AdmissionFilter {
+private[pekko] abstract class AdmissionFilter {
 
   /**
    * Update the capacity, the per-shard entity limit.
@@ -897,7 +898,7 @@ private[akka] abstract class AdmissionFilter {
  * Disabled admission filter, always admit candidates to the main area.
  */
 @InternalApi
-private[akka] object AlwaysAdmissionFilter extends AdmissionFilter {
+private[pekko] object AlwaysAdmissionFilter extends AdmissionFilter {
   override def updateCapacity(newCapacity: Int): Unit = ()
   override def update(id: EntityId): Unit = ()
   override def admit(candidate: EntityId, selected: EntityId): Boolean = true
@@ -909,7 +910,7 @@ private[akka] object AlwaysAdmissionFilter extends AdmissionFilter {
  * Admission filter based on a frequency sketch.
  */
 @InternalApi
-private[akka] object FrequencySketchAdmissionFilter {
+private[pekko] object FrequencySketchAdmissionFilter {
   def apply(
       initialCapacity: Int,
       widthMultiplier: Int,
@@ -929,7 +930,7 @@ private[akka] object FrequencySketchAdmissionFilter {
  * Admission filter based on a frequency sketch.
  */
 @InternalApi
-private[akka] final class FrequencySketchAdmissionFilter(
+private[pekko] final class FrequencySketchAdmissionFilter(
     initialCapacity: Int,
     widthMultiplier: Int,
     resetMultiplier: Double,
@@ -956,7 +957,7 @@ private[akka] final class FrequencySketchAdmissionFilter(
  * Admission filter based on a frequency sketch (fast version with depth of 4 and 4-bit counters).
  */
 @InternalApi
-private[akka] final class FastFrequencySketchAdmissionFilter(
+private[pekko] final class FastFrequencySketchAdmissionFilter(
     initialCapacity: Int,
     widthMultiplier: Int,
     resetMultiplier: Double)
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala
similarity index 87%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala
index 7ab50926f6..8161b6d530 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
-import akka.actor.ActorLogging
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ShardCoordinator.Internal
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.ClusterShardingSerializable
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.persistence._
+import org.apache.pekko
+import pekko.actor.ActorLogging
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ShardCoordinator.Internal
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.ClusterShardingSerializable
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.persistence._
 
 import scala.collection.mutable
 
@@ -19,7 +20,7 @@ import scala.collection.mutable
  * INTERNAL API
  */
 @InternalApi
-private[akka] object EventSourcedRememberEntitiesCoordinatorStore {
+private[pekko] object EventSourcedRememberEntitiesCoordinatorStore {
   def props(typeName: String, settings: ClusterShardingSettings): Props =
     Props(new EventSourcedRememberEntitiesCoordinatorStore(typeName, settings))
 
@@ -32,7 +33,7 @@ private[akka] object EventSourcedRememberEntitiesCoordinatorStore {
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class EventSourcedRememberEntitiesCoordinatorStore(
+private[pekko] final class EventSourcedRememberEntitiesCoordinatorStore(
     typeName: String,
     settings: ClusterShardingSettings)
     extends PersistentActor
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala
similarity index 69%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala
index 01cef59177..5f2501f049 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion.ShardId
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.ShardRegion.ShardId
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class EventSourcedRememberEntitiesProvider(typeName: String, settings: ClusterShardingSettings)
+private[pekko] final class EventSourcedRememberEntitiesProvider(typeName: String, settings: ClusterShardingSettings)
     extends RememberEntitiesProvider {
 
   // this is backed by an actor using the same events, at the serialization level, as the now removed PersistentShard when state-store-mode=persistence
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
similarity index 82%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
index e7fbd4a2a4..b934887f98 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
@@ -2,31 +2,32 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
-import akka.actor.ActorLogging
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ClusterShardingSerializable
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion
-import akka.cluster.sharding.ShardRegion.EntityId
-import akka.persistence.DeleteMessagesFailure
-import akka.persistence.DeleteMessagesSuccess
-import akka.persistence.DeleteSnapshotsFailure
-import akka.persistence.DeleteSnapshotsSuccess
-import akka.persistence.PersistentActor
-import akka.persistence.RecoveryCompleted
-import akka.persistence.SaveSnapshotFailure
-import akka.persistence.SaveSnapshotSuccess
-import akka.persistence.SnapshotOffer
-import akka.persistence.SnapshotSelectionCriteria
+import org.apache.pekko
+import pekko.actor.ActorLogging
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ClusterShardingSerializable
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.ShardRegion
+import pekko.cluster.sharding.ShardRegion.EntityId
+import pekko.persistence.DeleteMessagesFailure
+import pekko.persistence.DeleteMessagesSuccess
+import pekko.persistence.DeleteSnapshotsFailure
+import pekko.persistence.DeleteSnapshotsSuccess
+import pekko.persistence.PersistentActor
+import pekko.persistence.RecoveryCompleted
+import pekko.persistence.SaveSnapshotFailure
+import pekko.persistence.SaveSnapshotSuccess
+import pekko.persistence.SnapshotOffer
+import pekko.persistence.SnapshotSelectionCriteria
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object EventSourcedRememberEntitiesShardStore {
+private[pekko] object EventSourcedRememberEntitiesShardStore {
 
   /**
    * A case class which represents a state change for the Shard
@@ -36,7 +37,7 @@ private[akka] object EventSourcedRememberEntitiesShardStore {
   /**
    * Persistent state of the Shard.
    */
-  final case class State private[akka] (entities: Set[EntityId] = Set.empty) extends ClusterShardingSerializable
+  final case class State private[pekko] (entities: Set[EntityId] = Set.empty) extends ClusterShardingSerializable
 
   /**
    * `State` change for starting a set of entities in this `Shard`
@@ -62,7 +63,7 @@ private[akka] object EventSourcedRememberEntitiesShardStore {
  * @see [[ClusterSharding$ ClusterSharding extension]]
  */
 @InternalApi
-private[akka] final class EventSourcedRememberEntitiesShardStore(
+private[pekko] final class EventSourcedRememberEntitiesShardStore(
     typeName: String,
     shardId: ShardRegion.ShardId,
     settings: ClusterShardingSettings)
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/LeastShardAllocationStrategy.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/LeastShardAllocationStrategy.scala
similarity index 89%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/LeastShardAllocationStrategy.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/LeastShardAllocationStrategy.scala
index af0cc8e5b7..635e19781f 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/LeastShardAllocationStrategy.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/LeastShardAllocationStrategy.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
 import scala.collection.immutable
 import scala.concurrent.Future
-import akka.actor.ActorRef
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.RegionEntry
-import akka.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.ShardSuitabilityOrdering
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.RegionEntry
+import pekko.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.ShardSuitabilityOrdering
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object LeastShardAllocationStrategy {
+@InternalApi private[pekko] object LeastShardAllocationStrategy {
   private val emptyRebalanceResult = Future.successful(Set.empty[ShardId])
 }
 
@@ -39,7 +40,7 @@ import akka.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.Shard
  * @param relativeLimit fraction (< 1.0) of total number of (known) shards that will be rebalanced
  *                      in one rebalance round
  */
-@InternalApi private[akka] class LeastShardAllocationStrategy(absoluteLimit: Int, relativeLimit: Double)
+@InternalApi private[pekko] class LeastShardAllocationStrategy(absoluteLimit: Int, relativeLimit: Double)
     extends AbstractLeastShardAllocationStrategy {
   import LeastShardAllocationStrategy.emptyRebalanceResult
 
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/RememberEntitiesStore.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStore.scala
similarity index 85%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/RememberEntitiesStore.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStore.scala
index afeff21b3c..98361f0442 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/RememberEntitiesStore.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStore.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ShardRegion.EntityId
-import akka.cluster.sharding.ShardRegion.ShardId
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ShardRegion.EntityId
+import pekko.cluster.sharding.ShardRegion.ShardId
 
 /**
  * INTERNAL API
@@ -15,7 +16,7 @@ import akka.cluster.sharding.ShardRegion.ShardId
  * Created once for the shard guardian
  */
 @InternalApi
-private[akka] trait RememberEntitiesProvider {
+private[pekko] trait RememberEntitiesProvider {
 
   /**
    * Called once per started shard coordinator to create the remember entities coordinator store.
@@ -42,7 +43,7 @@ private[akka] trait RememberEntitiesProvider {
  * Implementations are responsible for each of the methods failing the returned future after a timeout.
  */
 @InternalApi
-private[akka] object RememberEntitiesShardStore {
+private[pekko] object RememberEntitiesShardStore {
   // SPI protocol for a remember entities shard store
   sealed trait Command
 
@@ -62,7 +63,7 @@ private[akka] object RememberEntitiesShardStore {
  * Could potentially become an open SPI in the future.
  */
 @InternalApi
-private[akka] object RememberEntitiesCoordinatorStore {
+private[pekko] object RememberEntitiesCoordinatorStore {
   // SPI protocol for a remember entities coordinator store
   sealed trait Command
 
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/RememberEntityStarter.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntityStarter.scala
similarity index 86%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/RememberEntityStarter.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntityStarter.scala
index 4215c32e88..c6605bd9bd 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/RememberEntityStarter.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntityStarter.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.Props
-import akka.actor.Timers
-import akka.annotation.InternalApi
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.Shard
-import akka.cluster.sharding.ShardRegion
-import akka.cluster.sharding.ShardRegion.EntityId
-import akka.cluster.sharding.ShardRegion.ShardId
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.Props
+import pekko.actor.Timers
+import pekko.annotation.InternalApi
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.Shard
+import pekko.cluster.sharding.ShardRegion
+import pekko.cluster.sharding.ShardRegion.EntityId
+import pekko.cluster.sharding.ShardRegion.ShardId
 
 import scala.collection.immutable.Set
 import scala.concurrent.ExecutionContext
@@ -24,7 +25,7 @@ import scala.concurrent.ExecutionContext
  * INTERNAL API
  */
 @InternalApi
-private[akka] object RememberEntityStarter {
+private[pekko] object RememberEntityStarter {
   def props(
       region: ActorRef,
       shard: ActorRef,
@@ -41,7 +42,7 @@ private[akka] object RememberEntityStarter {
  * INTERNAL API: Actor responsible for starting entities when rememberEntities is enabled
  */
 @InternalApi
-private[akka] final class RememberEntityStarter(
+private[pekko] final class RememberEntityStarter(
     region: ActorRef,
     shard: ActorRef,
     shardId: ShardRegion.ShardId,
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
similarity index 95%
rename from akka-cluster-sharding/src/main/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
rename to akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
index c21415be92..231aa8db5c 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
+++ b/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.protobuf
+package org.apache.pekko.cluster.sharding.protobuf
 
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream }
 import java.io.NotSerializableException
@@ -13,32 +13,33 @@ import scala.annotation.tailrec
 import scala.collection.immutable
 import scala.concurrent.duration._
 
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.cluster.sharding.Shard
-import akka.cluster.sharding.ShardCoordinator
-import akka.cluster.sharding.ShardRegion._
-import akka.cluster.sharding.protobuf.msg.{ ClusterShardingMessages => sm }
-import akka.cluster.sharding.protobuf.msg.ClusterShardingMessages
-import akka.cluster.sharding.internal.EventSourcedRememberEntitiesCoordinatorStore.{
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.sharding.Shard
+import pekko.cluster.sharding.ShardCoordinator
+import pekko.cluster.sharding.ShardRegion._
+import pekko.cluster.sharding.protobuf.msg.{ ClusterShardingMessages => sm }
+import pekko.cluster.sharding.protobuf.msg.ClusterShardingMessages
+import pekko.cluster.sharding.internal.EventSourcedRememberEntitiesCoordinatorStore.{
   MigrationMarker,
   State => RememberShardsState
 }
-import akka.cluster.sharding.internal.EventSourcedRememberEntitiesShardStore.{ State => EntityState }
-import akka.cluster.sharding.internal.EventSourcedRememberEntitiesShardStore.{ EntitiesStarted, EntitiesStopped }
-import akka.protobufv3.internal.MessageLite
-import akka.serialization.BaseSerializer
-import akka.serialization.Serialization
-import akka.serialization.SerializerWithStringManifest
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import pekko.cluster.sharding.internal.EventSourcedRememberEntitiesShardStore.{ State => EntityState }
+import pekko.cluster.sharding.internal.EventSourcedRememberEntitiesShardStore.{ EntitiesStarted, EntitiesStopped }
+import pekko.protobufv3.internal.MessageLite
+import pekko.serialization.BaseSerializer
+import pekko.serialization.Serialization
+import pekko.serialization.SerializerWithStringManifest
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API: Protobuf serializer of ClusterSharding messages.
  */
 @ccompatUsedUntil213
-private[akka] class ClusterShardingMessageSerializer(val system: ExtendedActorSystem)
+private[pekko] class ClusterShardingMessageSerializer(val system: ExtendedActorSystem)
     extends SerializerWithStringManifest
     with BaseSerializer {
   import Shard.{ CurrentShardState, GetCurrentShardState }
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/GlobalRegistry.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GlobalRegistry.scala
similarity index 89%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/GlobalRegistry.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GlobalRegistry.scala
index 69dd03d308..e97e702f16 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/GlobalRegistry.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GlobalRegistry.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.sharding.ShardRegion
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.sharding.ShardRegion
+import pekko.serialization.jackson.CborSerializable
 
 object GlobalRegistry {
   final case class Register(key: String, address: Address) extends CborSerializable
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/GremlinController.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GremlinController.scala
similarity index 68%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/GremlinController.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GremlinController.scala
index 286aa118d4..48db6205cf 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/GremlinController.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GremlinController.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.pattern.pipe
-import akka.remote.RemoteActorRefProvider
-import akka.remote.transport.ThrottlerTransportAdapter.Blackhole
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.remote.transport.ThrottlerTransportAdapter.SetThrottle
-import akka.remote.transport.ThrottlerTransportAdapter.Unthrottled
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.pattern.pipe
+import pekko.remote.RemoteActorRefProvider
+import pekko.remote.transport.ThrottlerTransportAdapter.Blackhole
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.remote.transport.ThrottlerTransportAdapter.SetThrottle
+import pekko.remote.transport.ThrottlerTransportAdapter.Unthrottled
+import pekko.serialization.jackson.CborSerializable
 
 object GremlinController {
   final case class BlackholeNode(target: Address) extends CborSerializable
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
similarity index 93%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
index 33dd97588b..c06bfeda70 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -12,23 +12,24 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.BeforeAndAfterEach
 
-import akka.actor._
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.sharding.ClusterSharding
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.singleton.ClusterSingletonManager
-import akka.cluster.singleton.ClusterSingletonManagerSettings
-import akka.pattern.ask
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.LongRunningTest
-import akka.testkit.TestKit
-import akka.testkit.TestProbe
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.sharding.ClusterSharding
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.singleton.ClusterSingletonManager
+import pekko.cluster.singleton.ClusterSingletonManagerSettings
+import pekko.pattern.ask
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.LongRunningTest
+import pekko.testkit.TestKit
+import pekko.testkit.TestProbe
+import pekko.util.Timeout
 
 /*
  * Depends on akka private classes so needs to be in this package
@@ -48,7 +49,7 @@ object RandomizedSplitBrainResolverIntegrationSpec extends MultiNodeConfig {
     akka {
       loglevel = INFO
       cluster {
-        downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         split-brain-resolver {
           stable-after = 10s
 
@@ -71,7 +72,7 @@ object RandomizedSplitBrainResolverIntegrationSpec extends MultiNodeConfig {
     }
 
     test-lease {
-      lease-class = akka.cluster.sbr.SbrTestLeaseActorClient
+      lease-class = org.apache.pekko.cluster.sbr.SbrTestLeaseActorClient
       heartbeat-interval = 1s
       heartbeat-timeout = 120s
       lease-operation-timeout = 3s
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SbrTestLeaseActor.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SbrTestLeaseActor.scala
similarity index 85%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SbrTestLeaseActor.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SbrTestLeaseActor.scala
index 78b392243a..fe0fbf918e 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SbrTestLeaseActor.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SbrTestLeaseActor.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import java.util.concurrent.atomic.AtomicReference
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.actor.Props
-import akka.coordination.lease.LeaseSettings
-import akka.coordination.lease.scaladsl.Lease
-import akka.pattern.ask
-import akka.serialization.jackson.CborSerializable
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.actor.Props
+import pekko.coordination.lease.LeaseSettings
+import pekko.coordination.lease.scaladsl.Lease
+import pekko.pattern.ask
+import pekko.serialization.jackson.CborSerializable
+import pekko.util.Timeout
 
 object SbrTestLeaseActor {
   def props: Props =
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SplitBrainResolverIntegrationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
similarity index 94%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
index a700fc3f2f..88bdec8042 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -12,26 +12,27 @@ import com.typesafe.config.ConfigFactory
 import com.typesafe.config.ConfigValueFactory
 import org.scalatest.BeforeAndAfterEach
 
-import akka.actor._
-import akka.cluster.Cluster
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.ClusterSettings.DefaultDataCenter
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.sharding.ClusterSharding
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.singleton.ClusterSingletonManager
-import akka.cluster.singleton.ClusterSingletonManagerSettings
-import akka.pattern.ask
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.LongRunningTest
-import akka.testkit.TestKit
-import akka.testkit.TestProbe
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.ClusterSettings.DefaultDataCenter
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.sharding.ClusterSharding
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.singleton.ClusterSingletonManager
+import pekko.cluster.singleton.ClusterSingletonManagerSettings
+import pekko.pattern.ask
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.LongRunningTest
+import pekko.testkit.TestKit
+import pekko.testkit.TestProbe
+import pekko.util.Timeout
 
 /*
  * Depends on akka private classes so needs to be in this package
@@ -51,7 +52,7 @@ object SplitBrainResolverIntegrationSpec extends MultiNodeConfig {
     akka {
       loglevel = INFO
       cluster {
-        downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         split-brain-resolver.active-strategy = keep-majority
         split-brain-resolver.stable-after = 10s
 
@@ -400,7 +401,7 @@ class SplitBrainResolverIntegrationSpec
         }
       }
       test-lease {
-        lease-class = akka.cluster.sbr.SbrTestLeaseActorClient
+        lease-class = org.apache.pekko.cluster.sbr.SbrTestLeaseActorClient
         heartbeat-interval = 1s
         heartbeat-timeout = 120s
         lease-operation-timeout = 3s
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala
similarity index 94%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala
index 969fdd6a40..9ce01773f1 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.MemberStatus
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.cluster.MemberStatus
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object ClusterShardCoordinatorDowning2Spec {
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala
similarity index 94%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala
index 31996e3b29..c1522b7585 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.MemberStatus
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.cluster.MemberStatus
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object ClusterShardCoordinatorDowningSpec {
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala
similarity index 95%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala
index a994c831f8..4796ecb75d 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.actor._
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.pattern.ask
-import akka.remote.testconductor.RoleName
-import akka.testkit._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.pattern.ask
+import pekko.remote.testconductor.RoleName
+import pekko.testkit._
+import pekko.util.Timeout
 
 object ClusterShardingCustomShardAllocationSpec {
 
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingFailureSpec.scala
similarity index 94%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingFailureSpec.scala
index 9db8562e3b..cd95368ed6 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingFailureSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
-import akka.actor._
-import akka.cluster.sharding.ShardRegion.Passivate
-import akka.cluster.sharding.ShardRegion.StartEntity
-import akka.remote.testconductor.RoleName
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.sharding.ShardRegion.Passivate
+import pekko.cluster.sharding.ShardRegion.StartEntity
+import pekko.remote.testconductor.RoleName
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object ClusterShardingFailureSpec {
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStateSpec.scala
similarity index 95%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStateSpec.scala
index 5b833b757b..2640660a03 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStateSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.testkit.TestProbe
 
 object ClusterShardingGetStateSpec {
   import MultiNodeClusterShardingSpec.PingPongActor
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStatsSpec.scala
similarity index 96%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStatsSpec.scala
index 321bafb303..eaa2bf0dd6 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStatsSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
-import akka.actor._
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.testkit.TestDuration
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.testkit.TestDuration
+import pekko.testkit.TestProbe
 import com.typesafe.config.ConfigFactory
 
 object ClusterShardingGetStatsSpec {
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
similarity index 95%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
index 64cbc7c82b..561b66086b 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
-import akka.actor._
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.remote.testconductor.RoleName
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.remote.testconductor.RoleName
+import pekko.testkit._
 
 import scala.concurrent.Await
 
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala
similarity index 92%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala
index 4c40005619..9c0e7456ed 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.Done
+import org.apache.pekko.Done
 
 import scala.concurrent.duration._
-import akka.actor._
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.ShardRegion.{ CurrentRegions, GracefulShutdown }
-import akka.remote.testconductor.RoleName
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.ShardRegion.{ CurrentRegions, GracefulShutdown }
+import pekko.remote.testconductor.RoleName
+import pekko.testkit._
 
 import scala.concurrent.Future
 
@@ -103,7 +104,7 @@ abstract class ClusterShardingGracefulShutdownSpec(multiNodeConfig: ClusterShard
         // to validate region shutdown completion is propagated immediately and not postponed
         // until when the cluster member leaves
         CoordinatedShutdown(system).addTask("cluster-sharding-shutdown-region", "postpone-actual-stop")(() => {
-          akka.pattern.after(40.seconds)(Future.successful(Done))
+          pekko.pattern.after(40.seconds)(Future.successful(Done))
         })
         CoordinatedShutdown(system).run(CoordinatedShutdown.unknownReason)
       }
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala
similarity index 93%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala
index 58ccc732ac..8880f469a0 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.testkit._
+import org.apache.pekko.testkit._
 
 object ClusterShardingIncorrectSetupSpecConfig
     extends MultiNodeClusterShardingConfig(
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeavingSpec.scala
similarity index 96%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeavingSpec.scala
index 2f22ed7e3c..6e7d6898f7 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeavingSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
-import akka.actor.{ Actor, ActorRef, Props }
-import akka.cluster.MemberStatus
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, Props }
+import pekko.cluster.MemberStatus
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object ClusterShardingLeavingSpec {
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingMinMembersSpec.scala
similarity index 92%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingMinMembersSpec.scala
index 63fb608b7c..0d782d6bf1 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingMinMembersSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.ShardRegion.{ ClusterShardingStats, GetClusterShardingStats }
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.ShardRegion.{ ClusterShardingStats, GetClusterShardingStats }
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 abstract class ClusterShardingMinMembersSpecConfig(mode: String)
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingQueriesSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingQueriesSpec.scala
similarity index 97%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingQueriesSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingQueriesSpec.scala
index e9c3fe89a2..944168de07 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingQueriesSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingQueriesSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.ScalaFutures
-import akka.actor.Props
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.testkit.TestProbe
 
 object ClusterShardingQueriesSpec {
   import MultiNodeClusterShardingSpec.PingPongActor
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala
similarity index 93%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala
index 20089f9eef..381c42503b 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.Done
-import akka.actor._
-import akka.cluster.MemberStatus
-import akka.testkit.{ ImplicitSender, TestProbe }
+import org.apache.pekko
+import pekko.Done
+import pekko.actor._
+import pekko.cluster.MemberStatus
+import pekko.testkit.{ ImplicitSender, TestProbe }
 
 /**
  * Test for issue #28416
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala
similarity index 97%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala
index 40ca3194fe..6b10b40116 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.persistence.journal.leveldb.SharedLeveldbJournal
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.{ Cluster, MemberStatus }
+import pekko.persistence.journal.leveldb.SharedLeveldbJournal
+import pekko.testkit._
 
 object ClusterShardingRememberEntitiesNewExtractorSpec {
 
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala
similarity index 97%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala
index e5e0e11393..d0cac2efa9 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.testkit._
-import akka.remote.testkit.MultiNodeSpec
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.{ Cluster, MemberStatus }
+import pekko.testkit._
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object ClusterShardingRememberEntitiesSpec {
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRolePartitioningSpec.scala
similarity index 97%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRolePartitioningSpec.scala
index 5cddc258b1..8c64e3cb59 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRolePartitioningSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.cluster.sharding.ShardRegion.{ ClusterShardingStats, GetClusterShardingStats }
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.sharding.ShardRegion.{ ClusterShardingStats, GetClusterShardingStats }
+import pekko.testkit._
 
 // Tests the case where cluster roles are used with cluster.min-nr-of-members, no per role min set
 // with 5 node cluster, 2 roles: 3 nodes role R1, 2 nodes role R2
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala
similarity index 94%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala
index c5197bae18..2d26f6ba91 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
-import akka.actor._
-import akka.remote.testconductor.RoleName
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 /**
  * one-to-one mapping between shards and entities is not efficient but some use that anyway
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala
similarity index 97%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala
index dc77f7d8c2..d0a2775067 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 import scala.language.postfixOps
 import com.typesafe.config.ConfigFactory
-import akka.actor._
-import akka.cluster.Cluster
-import akka.cluster.ddata.{ Replicator, ReplicatorSettings }
-import akka.cluster.sharding.ShardCoordinator.Internal.{ BeginHandOff, BeginHandOffAck, HandOff, ShardStopped }
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.ShardRegion.{ CurrentRegions, GetCurrentRegions, Passivate }
-import akka.cluster.sharding.internal.{ DDataRememberEntitiesProvider, EventSourcedRememberEntitiesProvider }
-import akka.cluster.singleton.{ ClusterSingletonManager, ClusterSingletonManagerSettings }
-import akka.pattern.BackoffOpts
-import akka.persistence.journal.leveldb.{ SharedLeveldbJournal, SharedLeveldbStore }
-import akka.persistence.{ Persistence, PersistentActor }
-import akka.remote.testconductor.RoleName
-import akka.testkit._
-import akka.testkit.TestEvent.Mute
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.Cluster
+import pekko.cluster.ddata.{ Replicator, ReplicatorSettings }
+import pekko.cluster.sharding.ShardCoordinator.Internal.{ BeginHandOff, BeginHandOffAck, HandOff, ShardStopped }
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.ShardRegion.{ CurrentRegions, GetCurrentRegions, Passivate }
+import pekko.cluster.sharding.internal.{ DDataRememberEntitiesProvider, EventSourcedRememberEntitiesProvider }
+import pekko.cluster.singleton.{ ClusterSingletonManager, ClusterSingletonManagerSettings }
+import pekko.pattern.BackoffOpts
+import pekko.persistence.journal.leveldb.{ SharedLeveldbJournal, SharedLeveldbStore }
+import pekko.persistence.{ Persistence, PersistentActor }
+import pekko.remote.testconductor.RoleName
+import pekko.testkit._
+import pekko.testkit.TestEvent.Mute
 
 import scala.annotation.nowarn
 
@@ -136,7 +137,7 @@ abstract class ClusterShardingSpecConfig(
     akka.loglevel = "DEBUG"
     
     akka.cluster.sharding.verbose-debug-logging = on
-    akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     
     akka.cluster.roles = ["backend"]
     akka.cluster.distributed-data.gossip-interval = 1s
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ExternalShardAllocationSpec.scala
similarity index 90%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ExternalShardAllocationSpec.scala
index cd3165e865..120980e2c0 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ExternalShardAllocationSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.time.Span
 
-import akka.actor.{ Actor, ActorLogging, Address, Props }
-import akka.cluster.Cluster
-import akka.cluster.sharding.ExternalShardAllocationSpec.GiveMeYourHome.{ Get, Home }
-import akka.cluster.sharding.external.{ ExternalShardAllocation, ExternalShardAllocationStrategy }
-import akka.serialization.jackson.CborSerializable
-import akka.testkit.{ ImplicitSender, TestProbe }
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, Address, Props }
+import pekko.cluster.Cluster
+import pekko.cluster.sharding.ExternalShardAllocationSpec.GiveMeYourHome.{ Get, Home }
+import pekko.cluster.sharding.external.{ ExternalShardAllocation, ExternalShardAllocationStrategy }
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit.{ ImplicitSender, TestProbe }
 
 object ExternalShardAllocationSpecConfig
     extends MultiNodeClusterShardingConfig(additionalConfig = """
@@ -76,7 +77,7 @@ abstract class ExternalShardAllocationSpec
   import ExternalShardAllocationSpecConfig._
 
   override implicit val patienceConfig: PatienceConfig = {
-    import akka.testkit.TestDuration
+    import org.apache.pekko.testkit.TestDuration
     PatienceConfig(testKitSettings.DefaultTimeout.duration.dilated, Span(100, org.scalatest.time.Millis))
   }
 
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiDcClusterShardingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiDcClusterShardingSpec.scala
similarity index 94%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiDcClusterShardingSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiDcClusterShardingSpec.scala
index 7139856c87..a4424c50d8 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiDcClusterShardingSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiDcClusterShardingSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Actor, ActorRef, Address, Props }
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.cluster.sharding.ShardRegion.{ CurrentRegions, GetCurrentRegions }
-import akka.remote.testconductor.RoleName
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, Address, Props }
+import pekko.cluster.{ Cluster, MemberStatus }
+import pekko.cluster.sharding.ShardRegion.{ CurrentRegions, GetCurrentRegions }
+import pekko.remote.testconductor.RoleName
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object MultiDcClusterShardingSpec {
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingConfig.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingConfig.scala
similarity index 93%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingConfig.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingConfig.scala
index 7540013a3d..498c001e5d 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingConfig.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingConfig.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import java.lang.reflect.Modifier
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.cluster.MultiNodeClusterSpec
-import akka.persistence.journal.leveldb.SharedLeveldbJournal
-import akka.remote.testkit.MultiNodeConfig
+import org.apache.pekko
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.persistence.journal.leveldb.SharedLeveldbJournal
+import pekko.remote.testkit.MultiNodeConfig
 
 object MultiNodeClusterShardingConfig {
 
@@ -106,7 +107,7 @@ abstract class MultiNodeClusterShardingConfig(
     ConfigFactory
       .parseString(s"""
         akka.actor.provider = "cluster"
-        akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+        akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
         akka.cluster.testkit.auto-down-unreachable-after = 0s
         akka.cluster.sharding.state-store-mode = "$mode"
         akka.cluster.sharding.remember-entities = $rememberEntities
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala
similarity index 92%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala
index 373506dbe4..9f3e268f6d 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import java.io.File
 import scala.concurrent.duration._
 import org.apache.commons.io.FileUtils
-import akka.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, ActorSystem, Identify, PoisonPill, Props }
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.persistence.Persistence
-import akka.persistence.journal.leveldb.{ SharedLeveldbJournal, SharedLeveldbStore }
-import akka.remote.testconductor.RoleName
-import akka.serialization.jackson.CborSerializable
-import akka.testkit.{ TestActors, TestProbe }
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, ActorSystem, Identify, PoisonPill, Props }
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.persistence.Persistence
+import pekko.persistence.journal.leveldb.{ SharedLeveldbJournal, SharedLeveldbStore }
+import pekko.remote.testconductor.RoleName
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit.{ TestActors, TestProbe }
+import pekko.util.ccompat._
 
 import scala.annotation.nowarn
 
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/RollingUpdateShardAllocationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/RollingUpdateShardAllocationSpec.scala
similarity index 95%
rename from akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/RollingUpdateShardAllocationSpec.scala
rename to akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/RollingUpdateShardAllocationSpec.scala
index 062afb80e8..7b8b58f5d4 100644
--- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/RollingUpdateShardAllocationSpec.scala
+++ b/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/RollingUpdateShardAllocationSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.Address
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus.Up
-import akka.serialization.jackson.CborSerializable
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.Address
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus.Up
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit.ImplicitSender
 import com.typesafe.config.ConfigFactory
 import scala.concurrent.duration._
 
diff --git a/akka-cluster-sharding/src/test/resources/adaptivity-trace.conf b/akka-cluster-sharding/src/test/resources/adaptivity-trace.conf
index c933d82a5b..d2ad0a9275 100644
--- a/akka-cluster-sharding/src/test/resources/adaptivity-trace.conf
+++ b/akka-cluster-sharding/src/test/resources/adaptivity-trace.conf
@@ -8,7 +8,7 @@
 #
 # Download Corda traces from: https://github.com/ben-manes/caffeine
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator adaptivity-trace
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator adaptivity-trace
 #
 #   ╔════════════════════╤═════════╤═══════════╤═════════════╤══════════════╗
 #   ║                Run │  Active │  Accesses │ Activations │ Passivations ║
diff --git a/akka-cluster-sharding/src/test/resources/arc-trace-database.conf b/akka-cluster-sharding/src/test/resources/arc-trace-database.conf
index 83a2c3be35..4095a31171 100644
--- a/akka-cluster-sharding/src/test/resources/arc-trace-database.conf
+++ b/akka-cluster-sharding/src/test/resources/arc-trace-database.conf
@@ -6,7 +6,7 @@
 # Download traces from the author's home page:
 # https://researcher.watson.ibm.com/researcher/view_person_subpage.php?id=4700
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator arc-trace-database
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator arc-trace-database
 #
 #   ╔═══════════════════╤═════════╤════════════╤═════════════╤══════════════╗
 #   ║               Run │  Active │   Accesses │ Activations │ Passivations ║
diff --git a/akka-cluster-sharding/src/test/resources/arc-trace-search.conf b/akka-cluster-sharding/src/test/resources/arc-trace-search.conf
index 52ee1e0362..5e3e6b0032 100644
--- a/akka-cluster-sharding/src/test/resources/arc-trace-search.conf
+++ b/akka-cluster-sharding/src/test/resources/arc-trace-search.conf
@@ -6,7 +6,7 @@
 # Download traces from the author's home page:
 # https://researcher.watson.ibm.com/researcher/view_person_subpage.php?id=4700
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator arc-trace-search
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator arc-trace-search
 #
 #   ╔═════════════════════╤═════════╤════════════╤═════════════╤══════════════╗
 #   ║                 Run │  Active │   Accesses │ Activations │ Passivations ║
diff --git a/akka-cluster-sharding/src/test/resources/lirs-trace-glimpse.conf b/akka-cluster-sharding/src/test/resources/lirs-trace-glimpse.conf
index b85acea3f0..d0e4eea34c 100644
--- a/akka-cluster-sharding/src/test/resources/lirs-trace-glimpse.conf
+++ b/akka-cluster-sharding/src/test/resources/lirs-trace-glimpse.conf
@@ -6,7 +6,7 @@
 #
 # Download traces from: https://github.com/zhongch4g/LIRS2
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator lirs-trace-glimpse
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator lirs-trace-glimpse
 #
 #   ╔═════════════════════╤═════════╤══════════╤═════════════╤══════════════╗
 #   ║                 Run │  Active │ Accesses │ Activations │ Passivations ║
diff --git a/akka-cluster-sharding/src/test/resources/lirs-trace-multi.conf b/akka-cluster-sharding/src/test/resources/lirs-trace-multi.conf
index f9f96db7d5..1e9ee5afbc 100644
--- a/akka-cluster-sharding/src/test/resources/lirs-trace-multi.conf
+++ b/akka-cluster-sharding/src/test/resources/lirs-trace-multi.conf
@@ -6,7 +6,7 @@
 #
 # Download traces from: https://github.com/zhongch4g/LIRS2
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator lirs-trace-multi
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator lirs-trace-multi
 #
 #   ╔═════════════════════╤═════════╤══════════╤═════════════╤══════════════╗
 #   ║                 Run │  Active │ Accesses │ Activations │ Passivations ║
diff --git a/akka-cluster-sharding/src/test/resources/lirs-trace-postgres.conf b/akka-cluster-sharding/src/test/resources/lirs-trace-postgres.conf
index 3f8982b5d1..e3e75fea7d 100644
--- a/akka-cluster-sharding/src/test/resources/lirs-trace-postgres.conf
+++ b/akka-cluster-sharding/src/test/resources/lirs-trace-postgres.conf
@@ -6,7 +6,7 @@
 #
 # Download traces from: https://github.com/zhongch4g/LIRS2
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator lirs-trace-postgres
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator lirs-trace-postgres
 #
 #   ╔═════════════════════╤═════════╤══════════╤═════════════╤══════════════╗
 #   ║                 Run │  Active │ Accesses │ Activations │ Passivations ║
diff --git a/akka-cluster-sharding/src/test/resources/lirs2-trace-w106.conf b/akka-cluster-sharding/src/test/resources/lirs2-trace-w106.conf
index b1f531083a..2112145953 100644
--- a/akka-cluster-sharding/src/test/resources/lirs2-trace-w106.conf
+++ b/akka-cluster-sharding/src/test/resources/lirs2-trace-w106.conf
@@ -9,7 +9,7 @@
 # This trace is a week-long virtual disk trace collected by CloudPhysics's caching analytics service.
 # The trace has just over 275k unique ids. The most popular 100 ids account for around 34% of accesses.
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator lirs2-trace-w106
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator lirs2-trace-w106
 #
 #   ╔════════════════════╤═════════╤═══════════╤═════════════╤══════════════╗
 #   ║                Run │  Active │  Accesses │ Activations │ Passivations ║
diff --git a/akka-cluster-sharding/src/test/resources/synthetic-loop.conf b/akka-cluster-sharding/src/test/resources/synthetic-loop.conf
index 39f959c5ff..c21d6abebb 100644
--- a/akka-cluster-sharding/src/test/resources/synthetic-loop.conf
+++ b/akka-cluster-sharding/src/test/resources/synthetic-loop.conf
@@ -1,7 +1,7 @@
 #
 # Run with synthetically generated access events with a looping scan through ids.
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator synthetic-loop
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator synthetic-loop
 #
 #   ╔═════════════════════╤═════════╤════════════╤═════════════╤══════════════╗
 #   ║                 Run │  Active │   Accesses │ Activations │ Passivations ║
diff --git a/akka-cluster-sharding/src/test/resources/synthetic-zipfian.conf b/akka-cluster-sharding/src/test/resources/synthetic-zipfian.conf
index c8ba95be69..8db75db9ab 100644
--- a/akka-cluster-sharding/src/test/resources/synthetic-zipfian.conf
+++ b/akka-cluster-sharding/src/test/resources/synthetic-zipfian.conf
@@ -1,7 +1,7 @@
 #
 # Run with synthetically generated access events with a scrambled zipfian distribution.
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator synthetic-zipfian
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator synthetic-zipfian
 #
 #   Zipfian:
 #
diff --git a/akka-cluster-sharding/src/test/resources/text-moby-dick.conf b/akka-cluster-sharding/src/test/resources/text-moby-dick.conf
index 30f6744490..48365030fe 100644
--- a/akka-cluster-sharding/src/test/resources/text-moby-dick.conf
+++ b/akka-cluster-sharding/src/test/resources/text-moby-dick.conf
@@ -3,7 +3,7 @@
 #
 # Text can be downloaded from: https://www.gutenberg.org/files/2701/2701-0.txt
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator text-moby-dick
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator text-moby-dick
 #
 #   ╔════════════════════╤═════════╤══════════╤═════════════╤══════════════╗
 #   ║                Run │  Active │ Accesses │ Activations │ Passivations ║
diff --git a/akka-cluster-sharding/src/test/resources/wikipedia-trace-2018.conf b/akka-cluster-sharding/src/test/resources/wikipedia-trace-2018.conf
index a5b08482c2..6296c89d72 100644
--- a/akka-cluster-sharding/src/test/resources/wikipedia-trace-2018.conf
+++ b/akka-cluster-sharding/src/test/resources/wikipedia-trace-2018.conf
@@ -11,7 +11,7 @@
 # Active entity limit of 100k is just over 0.1% of the id space.
 # The most popular 100k ids account for almost half of the accesses.
 #
-# > akka-cluster-sharding/Test/runMain akka.cluster.sharding.passivation.simulator.Simulator wikipedia-trace-2018
+# > akka-cluster-sharding/Test/runMain org.apache.pekko.cluster.sharding.passivation.simulator.Simulator wikipedia-trace-2018
 #
 #   ╔═════════════════════╤═════════╤═══════════════╤═══════════════╤═══════════════╗
 #   ║                 Run │  Active │      Accesses │   Activations │  Passivations ║
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingHealthCheckSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheckSpec.scala
similarity index 93%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingHealthCheckSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheckSpec.scala
index d2c371f572..18956a2b08 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingHealthCheckSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheckSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.testkit.AkkaSpec
-import akka.testkit.TestProbe
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestProbe
+import pekko.testkit.WithLogCapturing
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.ScalaFutures
 
@@ -15,7 +16,7 @@ import scala.concurrent.duration._
 object ClusterShardingHealthCheckSpec {
   val config = ConfigFactory.parseString("""
           akka.loglevel = DEBUG
-          akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+          akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
             """.stripMargin)
 }
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingInternalsSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingInternalsSpec.scala
similarity index 82%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingInternalsSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingInternalsSpec.scala
index 432c915825..c5d5bbc21b 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingInternalsSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingInternalsSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 
-import akka.actor.{ Actor, ActorRef, ExtendedActorSystem, NoSerializationVerificationNeeded, PoisonPill, Props }
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.sharding.ShardCoordinator.Internal.ShardStopped
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.ShardRegion.{ ExtractEntityId, ExtractShardId, HandOffStopper, Msg }
-import akka.testkit.WithLogCapturing
-import akka.testkit.{ AkkaSpec, TestProbe }
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, ExtendedActorSystem, NoSerializationVerificationNeeded, PoisonPill, Props }
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.sharding.ShardCoordinator.Internal.ShardStopped
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.ShardRegion.{ ExtractEntityId, ExtractShardId, HandOffStopper, Msg }
+import pekko.testkit.WithLogCapturing
+import pekko.testkit.{ AkkaSpec, TestProbe }
 
 object ClusterShardingInternalsSpec {
   case class HandOffStopMessage() extends NoSerializationVerificationNeeded
@@ -34,7 +35,7 @@ class ClusterShardingInternalsSpec extends AkkaSpec("""
     |akka.loglevel = DEBUG
     |akka.cluster.sharding.verbose-debug-logging = on
     |akka.cluster.sharding.fail-on-invalid-entity-state-transition = on
-    |akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    |akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     |""".stripMargin) with WithLogCapturing {
   import ClusterShardingInternalsSpec._
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingLeaseSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala
similarity index 90%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingLeaseSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala
index b61d805f15..fc13e73062 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingLeaseSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.util.Success
 import scala.util.control.NoStackTrace
 import com.typesafe.config.{ Config, ConfigFactory }
-import akka.actor.Props
-import akka.cluster.sharding.ShardRegion.StartEntity
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.coordination.lease.TestLease
-import akka.coordination.lease.TestLeaseExt
-import akka.testkit.{ AkkaSpec, ImplicitSender, WithLogCapturing }
-import akka.testkit.TestActors.EchoActor
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.cluster.sharding.ShardRegion.StartEntity
+import pekko.cluster.{ Cluster, MemberStatus }
+import pekko.coordination.lease.TestLease
+import pekko.coordination.lease.TestLeaseExt
+import pekko.testkit.{ AkkaSpec, ImplicitSender, WithLogCapturing }
+import pekko.testkit.TestActors.EchoActor
 
 object ClusterShardingLeaseSpec {
   val config = ConfigFactory.parseString("""
     akka.loglevel = DEBUG
-    akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     akka.actor.provider = "cluster"
     akka.remote.classic.netty.tcp.port = 0
     akka.remote.artery.canonical.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala
similarity index 99%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala
index 25ce3d24eb..79f1af7128 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.ActorSystem
-import akka.testkit.{ AkkaSpec, TestKit }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.testkit.{ AkkaSpec, TestKit }
 import com.typesafe.config.ConfigFactory
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConcurrentStartupShardingSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ConcurrentStartupShardingSpec.scala
similarity index 82%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConcurrentStartupShardingSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ConcurrentStartupShardingSpec.scala
index 411b6d6ee6..c56711a2da 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConcurrentStartupShardingSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ConcurrentStartupShardingSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.testkit.AkkaSpec
-import akka.testkit.DeadLettersFilter
-import akka.testkit.TestEvent.Mute
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.testkit.AkkaSpec
+import pekko.testkit.DeadLettersFilter
+import pekko.testkit.TestEvent.Mute
+import pekko.testkit.WithLogCapturing
 
 object ConcurrentStartupShardingSpec {
 
@@ -21,7 +22,7 @@ object ConcurrentStartupShardingSpec {
     """
     akka.actor.provider = "cluster"
     akka.loglevel = DEBUG
-    akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     akka.remote.classic.netty.tcp.port = 0
     akka.remote.artery.canonical.port = 0
     akka.log-dead-letters = off
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/CoordinatedShutdownShardingSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/CoordinatedShutdownShardingSpec.scala
similarity index 91%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/CoordinatedShutdownShardingSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/CoordinatedShutdownShardingSpec.scala
index 925a7f9f47..a52752d202 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/CoordinatedShutdownShardingSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/CoordinatedShutdownShardingSpec.scala
@@ -2,28 +2,29 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.Done
-import akka.actor.ActorSystem
-import akka.actor.CoordinatedShutdown
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.testkit.AkkaSpec
-import akka.testkit.TestActors.EchoActor
-import akka.testkit.TestProbe
-import akka.testkit.WithLogCapturing
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ActorSystem
+import pekko.actor.CoordinatedShutdown
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestActors.EchoActor
+import pekko.testkit.TestProbe
+import pekko.testkit.WithLogCapturing
+import pekko.util.ccompat._
 
 object CoordinatedShutdownShardingSpec {
   val config =
     """
     akka.loglevel = DEBUG
-    akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     akka.actor.provider = "cluster"
     akka.remote.classic.netty.tcp.port = 0
     akka.remote.artery.canonical.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala
similarity index 96%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala
index 13eecccfa7..9b8ed7d775 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterSettings
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.cluster.UniqueAddress
-import akka.cluster.sharding.internal.AbstractLeastShardAllocationStrategy
-import akka.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.RegionEntry
-import akka.testkit.AkkaSpec
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.ClusterSettings
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.cluster.UniqueAddress
+import pekko.cluster.sharding.internal.AbstractLeastShardAllocationStrategy
+import pekko.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.RegionEntry
+import pekko.testkit.AkkaSpec
+import pekko.util.Version
 
 import scala.collection.immutable.SortedSet
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/EntitiesSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntitiesSpec.scala
similarity index 89%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/EntitiesSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntitiesSpec.scala
index 44444e9dc1..0ac593bd35 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/EntitiesSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntitiesSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
-import akka.actor.ActorRef
-import akka.cluster.sharding
-import akka.cluster.sharding.Shard.Active
-import akka.cluster.sharding.Shard.NoState
-import akka.cluster.sharding.Shard.Passivating
-import akka.cluster.sharding.Shard.RememberedButNotCreated
-import akka.cluster.sharding.Shard.RememberingStart
-import akka.cluster.sharding.Shard.RememberingStop
-import akka.event.NoLogging
-import akka.util.OptionVal
+package org.apache.pekko.cluster.sharding
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.cluster.sharding
+import pekko.cluster.sharding.Shard.Active
+import pekko.cluster.sharding.Shard.NoState
+import pekko.cluster.sharding.Shard.Passivating
+import pekko.cluster.sharding.Shard.RememberedButNotCreated
+import pekko.cluster.sharding.Shard.RememberingStart
+import pekko.cluster.sharding.Shard.RememberingStop
+import pekko.event.NoLogging
+import pekko.util.OptionVal
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/EntityTerminationSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntityTerminationSpec.scala
similarity index 93%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/EntityTerminationSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntityTerminationSpec.scala
index 3f2c9d79f1..260270ff31 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/EntityTerminationSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntityTerminationSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.Actor
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.WithLogCapturing
 import com.typesafe.config.ConfigFactory
 
 import scala.concurrent.duration._
@@ -25,7 +26,7 @@ object EntityTerminationSpec {
 
   def config = ConfigFactory.parseString("""
       akka.loglevel=DEBUG
-      akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+      akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
       akka.actor.provider = cluster
       akka.remote.artery.canonical.port = 0
       akka.remote.classic.netty.tcp.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/GetShardTypeNamesSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/GetShardTypeNamesSpec.scala
similarity index 82%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/GetShardTypeNamesSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/GetShardTypeNamesSpec.scala
index 952ca6bdbe..8fba090d8d 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/GetShardTypeNamesSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/GetShardTypeNamesSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.testkit.AkkaSpec
-import akka.testkit.TestActors.EchoActor
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestActors.EchoActor
+import pekko.testkit.WithLogCapturing
 
 object GetShardTypeNamesSpec {
   val config =
     """
     akka.loglevel = DEBUG
-    akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     akka.actor.provider = "cluster"
     akka.remote.classic.netty.tcp.port = 0
     akka.remote.artery.canonical.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala
similarity index 86%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala
index 90ec8f659e..560b339e38 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.collection.{ immutable => im }
 import scala.concurrent.duration._
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.actor.ActorSystem
-import akka.cluster.{ Cluster, ClusterReadView }
-import akka.testkit.WithLogCapturing
-import akka.testkit.{ AkkaSpec, LongRunningTest }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.cluster.{ Cluster, ClusterReadView }
+import pekko.testkit.WithLogCapturing
+import pekko.testkit.{ AkkaSpec, LongRunningTest }
 
 class JoinConfigCompatCheckShardingSpec extends AkkaSpec() with WithLogCapturing {
 
@@ -28,7 +29,7 @@ class JoinConfigCompatCheckShardingSpec extends AkkaSpec() with WithLogCapturing
     ConfigFactory.parseString("""
      akka.actor.provider = "cluster"
      akka.loglevel = DEBUG
-     akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+     akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
      akka.coordinated-shutdown.terminate-actor-system = on
      akka.remote.classic.netty.tcp.port = 0
      akka.remote.artery.canonical.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala
similarity index 92%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala
index b3824f16da..730a306e47 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.annotation.tailrec
 import scala.collection.immutable
 import scala.util.Random
-import akka.actor.ActorRef
-import akka.cluster.ClusterEvent
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.Member
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.internal.LeastShardAllocationStrategy
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.cluster.ClusterEvent
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.Member
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.internal.LeastShardAllocationStrategy
+import pekko.testkit.AkkaSpec
 
 import scala.collection.immutable.SortedSet
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/LeastShardAllocationStrategySpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategySpec.scala
similarity index 94%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/LeastShardAllocationStrategySpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategySpec.scala
index 029981baaf..6709c41c7d 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/LeastShardAllocationStrategySpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategySpec.scala
@@ -2,28 +2,29 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.collection.immutable
-import akka.actor.ActorPath
-import akka.actor.ActorRef
-import akka.actor.ActorRefProvider
-import akka.actor.Address
-import akka.actor.MinimalActorRef
-import akka.actor.RootActorPath
-import akka.cluster.ClusterEvent
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterSettings
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.cluster.UniqueAddress
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.internal.AbstractLeastShardAllocationStrategy
-import akka.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.RegionEntry
-import akka.cluster.sharding.internal.LeastShardAllocationStrategy
-import akka.testkit.AkkaSpec
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.ActorPath
+import pekko.actor.ActorRef
+import pekko.actor.ActorRefProvider
+import pekko.actor.Address
+import pekko.actor.MinimalActorRef
+import pekko.actor.RootActorPath
+import pekko.cluster.ClusterEvent
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.ClusterSettings
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.cluster.UniqueAddress
+import pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.internal.AbstractLeastShardAllocationStrategy
+import pekko.cluster.sharding.internal.AbstractLeastShardAllocationStrategy.RegionEntry
+import pekko.cluster.sharding.internal.LeastShardAllocationStrategy
+import pekko.testkit.AkkaSpec
+import pekko.util.Version
 
 import scala.collection.immutable.SortedSet
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardingMigrationSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/PersistentShardingMigrationSpec.scala
similarity index 91%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardingMigrationSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/PersistentShardingMigrationSpec.scala
index 257bced59e..cac16172d0 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardingMigrationSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/PersistentShardingMigrationSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 import java.util.UUID
 
-import akka.actor.{ ActorRef, ActorSystem, Props }
-import akka.cluster.sharding.ShardRegion.CurrentRegions
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.persistence.PersistentActor
-import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ActorSystem, Props }
+import pekko.cluster.sharding.ShardRegion.CurrentRegions
+import pekko.cluster.{ Cluster, MemberStatus }
+import pekko.persistence.PersistentActor
+import pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
 import com.typesafe.config.{ Config, ConfigFactory }
 
 import scala.concurrent.Await
@@ -65,11 +66,11 @@ object PersistentShardingMigrationSpec {
        
        akka.persistence.journal.leveldb {
         event-adapters {
-          coordinator-migration = "akka.cluster.sharding.OldCoordinatorStateMigrationEventAdapter"
+          coordinator-migration = "org.apache.pekko.cluster.sharding.OldCoordinatorStateMigrationEventAdapter"
         }
 
         event-adapter-bindings {
-          "akka.cluster.sharding.ShardCoordinator$Internal$DomainEvent"        = coordinator-migration
+          "org.apache.pekko.cluster.sharding.ShardCoordinator$Internal$DomainEvent"        = coordinator-migration
         }
       }
        
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ProxyShardingSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ProxyShardingSpec.scala
similarity index 89%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ProxyShardingSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ProxyShardingSpec.scala
index 6be40fcb6d..812153a501 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ProxyShardingSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ProxyShardingSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 import scala.concurrent.duration.FiniteDuration
 
-import akka.actor.ActorRef
-import akka.testkit.AkkaSpec
-import akka.testkit.TestActors
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestActors
+import pekko.testkit.WithLogCapturing
 
 object ProxyShardingSpec {
   val config = """
   akka.actor.provider = cluster
   akka.loglevel = DEBUG
-  akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+  akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
   akka.remote.classic.netty.tcp.port = 0
   akka.remote.artery.canonical.port = 0
   akka.cluster.sharding.verbose-debug-logging = on
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala
similarity index 82%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala
index 358a0319b9..2076d61a35 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.Shard.GetShardStats
-import akka.cluster.sharding.Shard.ShardStats
-import akka.cluster.sharding.ShardRegion.StartEntity
-import akka.cluster.sharding.ShardRegion.StartEntityAck
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.Shard.GetShardStats
+import pekko.cluster.sharding.Shard.ShardStats
+import pekko.cluster.sharding.ShardRegion.StartEntity
+import pekko.cluster.sharding.ShardRegion.StartEntityAck
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.WithLogCapturing
 
 object RememberEntitiesAndStartEntitySpec {
   class EntityActor extends Actor {
@@ -44,7 +45,7 @@ object RememberEntitiesAndStartEntitySpec {
 
   val config = ConfigFactory.parseString("""
       akka.loglevel=DEBUG
-      akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+      akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
       akka.actor.provider = cluster
       akka.remote.artery.canonical.port = 0
       akka.remote.classic.netty.tcp.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala
similarity index 91%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala
index e93ad01518..f85285734d 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.{ Actor, ActorLogging, ActorRef, Props }
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRef, Props }
+import pekko.cluster.{ Cluster, MemberStatus }
+import pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
@@ -41,7 +42,7 @@ object RememberEntitiesBatchedUpdatesSpec {
 
   def config = ConfigFactory.parseString("""
       akka.loglevel=DEBUG
-      # akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+      # akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
       akka.actor.provider = cluster
       akka.remote.artery.canonical.port = 0
       akka.remote.classic.netty.tcp.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesFailureSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala
similarity index 94%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesFailureSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala
index fc35112615..3aa185c82b 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesFailureSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala
@@ -2,32 +2,33 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.Done
-import akka.actor.{ Actor, ActorLogging, ActorRef, Props, Timers }
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.internal.RememberEntitiesCoordinatorStore
-import akka.cluster.sharding.internal.RememberEntitiesShardStore
-import akka.cluster.sharding.internal.RememberEntitiesProvider
-import akka.testkit.AkkaSpec
-import akka.testkit.TestException
-import akka.testkit.TestProbe
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.{ Actor, ActorLogging, ActorRef, Props, Timers }
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.internal.RememberEntitiesCoordinatorStore
+import pekko.cluster.sharding.internal.RememberEntitiesShardStore
+import pekko.cluster.sharding.internal.RememberEntitiesProvider
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestException
+import pekko.testkit.TestProbe
+import pekko.testkit.WithLogCapturing
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 import scala.concurrent.duration._
 import scala.concurrent.ExecutionContext
 
-import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
+import org.apache.pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy
 
 object RememberEntitiesFailureSpec {
   val config = ConfigFactory.parseString(s"""
       akka.loglevel = DEBUG
-      akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+      akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
       akka.actor.provider = cluster
       akka.remote.artery.canonical.port = 0
       akka.remote.classic.netty.tcp.port = 0
@@ -36,7 +37,7 @@ object RememberEntitiesFailureSpec {
       akka.cluster.sharding.state-store-mode = ddata
       akka.cluster.sharding.remember-entities = on
       akka.cluster.sharding.remember-entities-store = custom
-      akka.cluster.sharding.remember-entities-custom-store = "akka.cluster.sharding.RememberEntitiesFailureSpec$$FakeStore"
+      akka.cluster.sharding.remember-entities-custom-store = "org.apache.pekko.cluster.sharding.RememberEntitiesFailureSpec$$FakeStore"
       # quick backoffs
       akka.cluster.sharding.entity-restart-backoff = 1s
       akka.cluster.sharding.shard-failure-backoff = 1s
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala
similarity index 93%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala
index dedb3c39b0..8861f64202 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import java.util.UUID
 
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.sharding.ShardRegion.CurrentRegions
-import akka.persistence.PersistentActor
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.sharding.ShardRegion.CurrentRegions
+import pekko.persistence.PersistentActor
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.TestProbe
 import com.typesafe.config.ConfigFactory
 
 import scala.concurrent.Await
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala
similarity index 90%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala
index 310bd96025..a804a4b9f3 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import java.io.File
 
@@ -12,25 +12,26 @@ import scala.util.Success
 
 import org.apache.commons.io.FileUtils
 
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.sharding.RemoveInternalClusterShardingData.RemoveOnePersistenceId.Removals
-import akka.cluster.sharding.RemoveInternalClusterShardingData.RemoveOnePersistenceId.Result
-import akka.persistence.PersistentActor
-import akka.persistence.Recovery
-import akka.persistence.RecoveryCompleted
-import akka.persistence.SnapshotOffer
-import akka.persistence.SnapshotSelectionCriteria
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.TestActors.EchoActor
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.sharding.RemoveInternalClusterShardingData.RemoveOnePersistenceId.Removals
+import pekko.cluster.sharding.RemoveInternalClusterShardingData.RemoveOnePersistenceId.Result
+import pekko.persistence.PersistentActor
+import pekko.persistence.Recovery
+import pekko.persistence.RecoveryCompleted
+import pekko.persistence.SnapshotOffer
+import pekko.persistence.SnapshotSelectionCriteria
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.TestActors.EchoActor
+import pekko.testkit.WithLogCapturing
 
 object RemoveInternalClusterShardingDataSpec {
   val config = """
     akka.loglevel = DEBUG
-    akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     akka.actor.provider = "cluster"
     akka.remote.classic.netty.tcp.port = 0
     akka.remote.artery.canonical.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardRegionSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardRegionSpec.scala
similarity index 90%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardRegionSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardRegionSpec.scala
index 98714426ed..7a6b1792d8 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardRegionSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardRegionSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import java.io.File
 
 import com.typesafe.config.ConfigFactory
 import org.apache.commons.io.FileUtils
-import akka.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, PoisonPill, Props }
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.testkit.{ AkkaSpec, DeadLettersFilter, TestProbe, WithLogCapturing }
-import akka.testkit.TestEvent.Mute
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, PoisonPill, Props }
+import pekko.cluster.{ Cluster, MemberStatus }
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.testkit.{ AkkaSpec, DeadLettersFilter, TestProbe, WithLogCapturing }
+import pekko.testkit.TestEvent.Mute
 
 object ShardRegionSpec {
   val host = "127.0.0.1"
@@ -25,7 +26,7 @@ object ShardRegionSpec {
   val config =
     ConfigFactory.parseString(tempConfig).withFallback(ConfigFactory.parseString(s"""
         akka.loglevel = DEBUG
-        akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+        akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
         akka.actor.provider = "cluster"
         akka.remote.classic.netty.tcp.port = 0
         akka.remote.artery.canonical.port = 0
@@ -35,7 +36,7 @@ object ShardRegionSpec {
             dir = "target/ShardRegionSpec/sharding-ddata"
             map-size = 10 MiB
         }
-        akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+        akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
         akka.cluster.jmx.enabled = off
         akka.cluster.sharding.verbose-debug-logging = on
         akka.cluster.sharding.fail-on-invalid-entity-state-transition = on
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardWithLeaseSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala
similarity index 88%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardWithLeaseSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala
index 0715c040d5..e676674813 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardWithLeaseSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.coordination.lease.{ LeaseUsageSettings, TestLeaseExt }
-import akka.testkit.AkkaSpec
-import akka.testkit.EventFilter
-import akka.testkit.TestProbe
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.coordination.lease.{ LeaseUsageSettings, TestLeaseExt }
+import pekko.testkit.AkkaSpec
+import pekko.testkit.EventFilter
+import pekko.testkit.TestProbe
+import pekko.testkit.WithLogCapturing
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
@@ -26,12 +27,12 @@ object ShardWithLeaseSpec {
   val config =
     """
       akka.loglevel = DEBUG
-      akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+      akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
       akka.actor.provider = "cluster"
       akka.remote.classic.netty.tcp.port = 0
       akka.remote.artery.canonical.port = 0
       test-lease {
-          lease-class = akka.coordination.lease.TestLease
+          lease-class = org.apache.pekko.coordination.lease.TestLease
           heartbeat-interval = 1s
           heartbeat-timeout = 120s
           lease-operation-timeout = 3s
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardingQueriesSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardingQueriesSpec.scala
similarity index 90%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardingQueriesSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardingQueriesSpec.scala
index 4864da371f..3d8b4810c0 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardingQueriesSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardingQueriesSpec.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.cluster.sharding.Shard.{ CurrentShardState, ShardStats }
-import akka.cluster.sharding.ShardRegion.ShardState
-import akka.cluster.sharding.ShardingQueries.ShardsQueryResult
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.cluster.sharding.Shard.{ CurrentShardState, ShardStats }
+import pekko.cluster.sharding.ShardRegion.ShardState
+import pekko.cluster.sharding.ShardingQueries.ShardsQueryResult
+import pekko.testkit.AkkaSpec
 
 class ShardingQueriesSpec extends AkkaSpec {
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/StartEntitySpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/StartEntitySpec.scala
similarity index 94%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/StartEntitySpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/StartEntitySpec.scala
index 37b214d775..2961533373 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/StartEntitySpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/StartEntitySpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.WithLogCapturing
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.WithLogCapturing
 import com.typesafe.config.ConfigFactory
 import scala.concurrent.duration._
 
@@ -24,7 +25,7 @@ object StartEntitySpec {
 
   def config = ConfigFactory.parseString("""
       akka.loglevel=DEBUG
-      akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+      akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
       akka.actor.provider = cluster
       akka.remote.artery.canonical.port = 0
       akka.remote.classic.netty.tcp.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/SupervisionSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/SupervisionSpec.scala
similarity index 92%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/SupervisionSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/SupervisionSpec.scala
index 2ddce3718a..461cd2c934 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/SupervisionSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/SupervisionSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding
+package org.apache.pekko.cluster.sharding
 
 import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
-import akka.actor.{ Actor, ActorLogging, ActorRef, PoisonPill, Props }
-import akka.cluster.Cluster
-import akka.cluster.sharding.ShardRegion.Passivate
-import akka.pattern.{ BackoffOpts, BackoffSupervisor }
-import akka.testkit.EventFilter
-import akka.testkit.WithLogCapturing
-import akka.testkit.{ AkkaSpec, ImplicitSender }
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRef, PoisonPill, Props }
+import pekko.cluster.Cluster
+import pekko.cluster.sharding.ShardRegion.Passivate
+import pekko.pattern.{ BackoffOpts, BackoffSupervisor }
+import pekko.testkit.EventFilter
+import pekko.testkit.WithLogCapturing
+import pekko.testkit.{ AkkaSpec, ImplicitSender }
 
 object SupervisionSpec {
   val config =
@@ -20,7 +21,7 @@ object SupervisionSpec {
     akka.actor.provider = "cluster"
     akka.remote.artery.canonical.port = 0
     akka.remote.classic.netty.tcp.port = 0
-    akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     akka.loglevel = DEBUG
     akka.cluster.sharding.verbose-debug-logging = on
     akka.cluster.sharding.fail-on-invalid-entity-state-transition = on
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala
similarity index 77%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala
index e7ea0a1668..f266a6d204 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.external
+package org.apache.pekko.cluster.sharding.external
 
 import scala.concurrent.duration._
 
-import akka.cluster.sharding.external.ExternalShardAllocationStrategy.GetShardLocation
-import akka.cluster.sharding.external.ExternalShardAllocationStrategy.GetShardLocationResponse
-import akka.cluster.sharding.external.ExternalShardAllocationStrategy.GetShardLocations
-import akka.testkit.AkkaSpec
-import akka.testkit.TestProbe
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.cluster.sharding.external.ExternalShardAllocationStrategy.GetShardLocation
+import pekko.cluster.sharding.external.ExternalShardAllocationStrategy.GetShardLocationResponse
+import pekko.cluster.sharding.external.ExternalShardAllocationStrategy.GetShardLocations
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestProbe
+import pekko.util.Timeout
 
 class ExternalShardAllocationStrategySpec extends AkkaSpec("""
     akka.actor.provider = cluster 
@@ -57,7 +58,7 @@ class ExternalShardAllocationStrategySpec extends AkkaSpec("""
   def createStrategy(): (ExternalShardAllocationStrategy, TestProbe) = {
     val probe = TestProbe()
     val strategy = new ExternalShardAllocationStrategy(system, "type")(Timeout(250.millis)) {
-      override private[akka] def createShardStateActor() = probe.ref
+      override private[pekko] def createShardStateActor() = probe.ref
     }
     strategy.start()
     (strategy, probe)
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala
similarity index 92%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala
index a9ccf48f4b..3911055cf3 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
 import java.util.UUID
 
-import akka.actor.Props
-import akka.cluster.ddata.{ Replicator, ReplicatorSettings }
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.testkit.{ AkkaSpec, ImplicitSender, WithLogCapturing }
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.cluster.ddata.{ Replicator, ReplicatorSettings }
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.{ Cluster, MemberStatus }
+import pekko.testkit.{ AkkaSpec, ImplicitSender, WithLogCapturing }
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
@@ -22,7 +23,7 @@ object RememberEntitiesShardStoreSpec {
   def config =
     ConfigFactory.parseString(s"""
       akka.loglevel=DEBUG
-      akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+      akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
       akka.actor.provider = cluster
       akka.remote.artery.canonical.port = 0
       akka.remote.classic.netty.tcp.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/internal/RememberEntitiesStarterSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStarterSpec.scala
similarity index 94%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/internal/RememberEntitiesStarterSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStarterSpec.scala
index ca16c00d2c..f23be1d8b6 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/internal/RememberEntitiesStarterSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStarterSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.internal
+package org.apache.pekko.cluster.sharding.internal
 
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.Shard
-import akka.cluster.sharding.ShardRegion
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.testkit.AkkaSpec
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.Shard
+import pekko.cluster.sharding.ShardRegion
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestProbe
 import com.typesafe.config.ConfigFactory
 
 import scala.concurrent.duration._
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/CompositeSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/CompositeSpec.scala
similarity index 99%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/CompositeSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/CompositeSpec.scala
index 361cdc0050..74ff6ce6af 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/CompositeSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/CompositeSpec.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation
+package org.apache.pekko.cluster.sharding.passivation
 
-import akka.cluster.sharding.ShardRegion
+import org.apache.pekko.cluster.sharding.ShardRegion
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/EntityPassivationSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/EntityPassivationSpec.scala
similarity index 89%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/EntityPassivationSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/EntityPassivationSpec.scala
index 690738bffd..5048b6d669 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/EntityPassivationSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/EntityPassivationSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation
+package org.apache.pekko.cluster.sharding.passivation
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.sharding.ClusterSharding
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion
-import akka.testkit.WithLogCapturing
-import akka.testkit.AkkaSpec
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.sharding.ClusterSharding
+import pekko.cluster.sharding.ClusterShardingSettings
+import pekko.cluster.sharding.ShardRegion
+import pekko.testkit.WithLogCapturing
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestProbe
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.Eventually
@@ -24,7 +25,7 @@ object EntityPassivationSpec {
 
   val config: Config = ConfigFactory.parseString("""
     akka.loglevel = DEBUG
-    akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     akka.actor.provider = "cluster"
     akka.remote.classic.netty.tcp.port = 0
     akka.remote.artery.canonical.port = 0
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala
similarity index 95%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala
index 2ed196db7c..fbd23e262d 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation
+package org.apache.pekko.cluster.sharding.passivation
 
-import akka.cluster.sharding.internal.HillClimbingAdmissionOptimizer
+import org.apache.pekko.cluster.sharding.internal.HillClimbingAdmissionOptimizer
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/IdleSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/IdleSpec.scala
similarity index 97%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/IdleSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/IdleSpec.scala
index 0570aa1504..a92f547b30 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/IdleSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/IdleSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation
+package org.apache.pekko.cluster.sharding.passivation
 
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala
similarity index 99%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala
index 98d833065a..d64ca0e2db 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation
+package org.apache.pekko.cluster.sharding.passivation
 
-import akka.cluster.sharding.ShardRegion
+import org.apache.pekko.cluster.sharding.ShardRegion
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala
similarity index 99%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala
index c70cbaa0a3..252047bfae 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation
+package org.apache.pekko.cluster.sharding.passivation
 
-import akka.cluster.sharding.ShardRegion
+import org.apache.pekko.cluster.sharding.ShardRegion
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/MostRecentlyUsedSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/MostRecentlyUsedSpec.scala
similarity index 98%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/MostRecentlyUsedSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/MostRecentlyUsedSpec.scala
index a383a3949b..728486aa06 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/MostRecentlyUsedSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/MostRecentlyUsedSpec.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation
+package org.apache.pekko.cluster.sharding.passivation
 
-import akka.cluster.sharding.ShardRegion
+import org.apache.pekko.cluster.sharding.ShardRegion
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/AccessPattern.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/AccessPattern.scala
similarity index 97%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/AccessPattern.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/AccessPattern.scala
index 15013678dc..06c0094d76 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/AccessPattern.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/AccessPattern.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation.simulator
+package org.apache.pekko.cluster.sharding.passivation.simulator
 
-import akka.NotUsed
-import akka.cluster.sharding.ShardRegion.EntityId
-import akka.stream.scaladsl._
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.cluster.sharding.ShardRegion.EntityId
+import pekko.stream.scaladsl._
+import pekko.util.ByteString
 
 import java.nio.file.Paths
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/Simulator.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/Simulator.scala
similarity index 92%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/Simulator.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/Simulator.scala
index 70e2f06d29..0778621b85 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/Simulator.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/Simulator.scala
@@ -2,32 +2,33 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation.simulator
+package org.apache.pekko.cluster.sharding.passivation.simulator
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.cluster.sharding.internal.ActiveEntities
-import akka.cluster.sharding.internal.AdmissionFilter
-import akka.cluster.sharding.internal.AdmissionOptimizer
-import akka.cluster.sharding.internal.AlwaysAdmissionFilter
-import akka.cluster.sharding.internal.CompositeEntityPassivationStrategy
-import akka.cluster.sharding.internal.DisabledEntityPassivationStrategy
-import akka.cluster.sharding.internal.EntityPassivationStrategy
-import akka.cluster.sharding.internal.FrequencySketchAdmissionFilter
-import akka.cluster.sharding.internal.HillClimbingAdmissionOptimizer
-import akka.cluster.sharding.internal.LeastFrequentlyUsedEntityPassivationStrategy
-import akka.cluster.sharding.internal.LeastFrequentlyUsedReplacementPolicy
-import akka.cluster.sharding.internal.LeastRecentlyUsedEntityPassivationStrategy
-import akka.cluster.sharding.internal.LeastRecentlyUsedReplacementPolicy
-import akka.cluster.sharding.internal.MostRecentlyUsedEntityPassivationStrategy
-import akka.cluster.sharding.internal.MostRecentlyUsedReplacementPolicy
-import akka.cluster.sharding.internal.NoActiveEntities
-import akka.cluster.sharding.internal.NoAdmissionOptimizer
-import akka.cluster.sharding.internal.SegmentedLeastRecentlyUsedEntityPassivationStrategy
-import akka.cluster.sharding.internal.SegmentedLeastRecentlyUsedReplacementPolicy
-import akka.stream.scaladsl.Flow
-import akka.stream.scaladsl.Source
-import akka.util.OptionVal
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.cluster.sharding.internal.ActiveEntities
+import pekko.cluster.sharding.internal.AdmissionFilter
+import pekko.cluster.sharding.internal.AdmissionOptimizer
+import pekko.cluster.sharding.internal.AlwaysAdmissionFilter
+import pekko.cluster.sharding.internal.CompositeEntityPassivationStrategy
+import pekko.cluster.sharding.internal.DisabledEntityPassivationStrategy
+import pekko.cluster.sharding.internal.EntityPassivationStrategy
+import pekko.cluster.sharding.internal.FrequencySketchAdmissionFilter
+import pekko.cluster.sharding.internal.HillClimbingAdmissionOptimizer
+import pekko.cluster.sharding.internal.LeastFrequentlyUsedEntityPassivationStrategy
+import pekko.cluster.sharding.internal.LeastFrequentlyUsedReplacementPolicy
+import pekko.cluster.sharding.internal.LeastRecentlyUsedEntityPassivationStrategy
+import pekko.cluster.sharding.internal.LeastRecentlyUsedReplacementPolicy
+import pekko.cluster.sharding.internal.MostRecentlyUsedEntityPassivationStrategy
+import pekko.cluster.sharding.internal.MostRecentlyUsedReplacementPolicy
+import pekko.cluster.sharding.internal.NoActiveEntities
+import pekko.cluster.sharding.internal.NoAdmissionOptimizer
+import pekko.cluster.sharding.internal.SegmentedLeastRecentlyUsedEntityPassivationStrategy
+import pekko.cluster.sharding.internal.SegmentedLeastRecentlyUsedReplacementPolicy
+import pekko.stream.scaladsl.Flow
+import pekko.stream.scaladsl.Source
+import pekko.util.OptionVal
 import com.typesafe.config.ConfigFactory
 
 import scala.collection.immutable
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/SimulatorSettings.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala
similarity index 97%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/SimulatorSettings.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala
index 917aa46c7e..e2a011b8de 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/SimulatorSettings.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation.simulator
+package org.apache.pekko.cluster.sharding.passivation.simulator
 
-import akka.japi.Util.immutableSeq
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.japi.Util.immutableSeq
+import pekko.util.ccompat.JavaConverters._
 import com.typesafe.config.Config
 
 import java.util.Locale
@@ -15,7 +16,7 @@ final case class SimulatorSettings(runs: immutable.Seq[SimulatorSettings.RunSett
 
 object SimulatorSettings {
   def apply(testConfig: Config): SimulatorSettings = {
-    val simulatorConfig = testConfig.getConfig("akka.cluster.sharding.passivation.simulator")
+    val simulatorConfig = testConfig.getConfig("pekko.cluster.sharding.passivation.simulator")
     val runDefaults = simulatorConfig.getConfig("run-defaults")
     val runs = immutableSeq(simulatorConfig.getConfigList("runs")).map { runConfig =>
       RunSettings(simulatorConfig, runConfig.withFallback(runDefaults))
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/SimulatorStats.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorStats.scala
similarity index 98%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/SimulatorStats.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorStats.scala
index b0542b2cfa..282d3d58e7 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/passivation/simulator/SimulatorStats.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorStats.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.passivation.simulator
+package org.apache.pekko.cluster.sharding.passivation.simulator
 
-import akka.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Sink
 
 import scala.concurrent.Future
 
diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala
similarity index 86%
rename from akka-cluster-sharding/src/test/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala
rename to akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala
index 599a063e6e..9e62e039b4 100644
--- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala
+++ b/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sharding.protobuf
+package org.apache.pekko.cluster.sharding.protobuf
 
 import scala.concurrent.duration._
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.cluster.sharding.Shard
-import akka.cluster.sharding.ShardCoordinator
-import akka.cluster.sharding.ShardRegion
-import akka.cluster.sharding.ShardRegion.ShardId
-import akka.cluster.sharding.internal.EventSourcedRememberEntitiesShardStore
-import akka.cluster.sharding.internal.EventSourcedRememberEntitiesShardStore.EntitiesStarted
-import akka.serialization.SerializationExtension
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.cluster.sharding.Shard
+import pekko.cluster.sharding.ShardCoordinator
+import pekko.cluster.sharding.ShardRegion
+import pekko.cluster.sharding.ShardRegion.ShardId
+import pekko.cluster.sharding.internal.EventSourcedRememberEntitiesShardStore
+import pekko.cluster.sharding.internal.EventSourcedRememberEntitiesShardStore.EntitiesStarted
+import pekko.serialization.SerializationExtension
+import pekko.testkit.AkkaSpec
 
 class ClusterShardingMessageSerializerSpec extends AkkaSpec {
   import ShardCoordinator.Internal._
@@ -80,7 +81,7 @@ class ClusterShardingMessageSerializerSpec extends AkkaSpec {
     }
 
     "be able to deserialize old entity started event into entities started" in {
-      import akka.cluster.sharding.protobuf.msg.{ ClusterShardingMessages => sm }
+      import org.apache.pekko.cluster.sharding.protobuf.msg.{ ClusterShardingMessages => sm }
 
       val asBytes = sm.EntityStarted.newBuilder().setEntityId("e1").build().toByteArray
       SerializationExtension(system).deserialize(asBytes, 13, "CB").get shouldEqual EntitiesStarted(Set("e1"))
diff --git a/akka-cluster-tools/src/main/java/akka/cluster/client/protobuf/msg/ClusterClientMessages.java b/akka-cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java
similarity index 56%
rename from akka-cluster-tools/src/main/java/akka/cluster/client/protobuf/msg/ClusterClientMessages.java
rename to akka-cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java
index e30b9cc90c..2ed0c57167 100644
--- a/akka-cluster-tools/src/main/java/akka/cluster/client/protobuf/msg/ClusterClientMessages.java
+++ b/akka-cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java
@@ -5,22 +5,22 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ClusterClientMessages.proto
 
-package akka.cluster.client.protobuf.msg;
+package org.apache.pekko.cluster.client.protobuf.msg;
 
 public final class ClusterClientMessages {
   private ClusterClientMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface ContactsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Contacts)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated string contactPoints = 1;
@@ -44,48 +44,48 @@ public final class ClusterClientMessages {
      * @param index The index of the value to return.
      * @return The bytes of the contactPoints at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getContactPointsBytes(int index);
   }
   /**
    * Protobuf type {@code Contacts}
    */
   public  static final class Contacts extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Contacts)
       ContactsOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Contacts.newBuilder() to construct.
-    private Contacts(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Contacts(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Contacts() {
-      contactPoints_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Contacts();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Contacts(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -95,9 +95,9 @@ public final class ClusterClientMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                contactPoints_ = new akka.protobufv3.internal.LazyStringArrayList();
+                contactPoints_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               contactPoints_.add(bs);
@@ -112,10 +112,10 @@ public final class ClusterClientMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -125,26 +125,26 @@ public final class ClusterClientMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_descriptor;
+      return org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_fieldAccessorTable
+      return org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.class, akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.Builder.class);
+              org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.class, org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.Builder.class);
     }
 
     public static final int CONTACTPOINTS_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.LazyStringList contactPoints_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList contactPoints_;
     /**
      * repeated string contactPoints = 1;
      * @return A list containing the contactPoints.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getContactPointsList() {
       return contactPoints_;
     }
@@ -168,7 +168,7 @@ public final class ClusterClientMessages {
      * @param index The index of the value to return.
      * @return The bytes of the contactPoints at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getContactPointsBytes(int index) {
       return contactPoints_.getByteString(index);
     }
@@ -185,10 +185,10 @@ public final class ClusterClientMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < contactPoints_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, contactPoints_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, contactPoints_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -217,10 +217,10 @@ public final class ClusterClientMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts)) {
+      if (!(obj instanceof org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts)) {
         return super.equals(obj);
       }
-      akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts other = (akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts) obj;
+      org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts other = (org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts) obj;
 
       if (!getContactPointsList()
           .equals(other.getContactPointsList())) return false;
@@ -244,73 +244,73 @@ public final class ClusterClientMessages {
       return hash;
     }
 
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseDelimitedFrom(
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -319,7 +319,7 @@ public final class ClusterClientMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -330,7 +330,7 @@ public final class ClusterClientMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -338,59 +338,59 @@ public final class ClusterClientMessages {
      * Protobuf type {@code Contacts}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Contacts)
-        akka.cluster.client.protobuf.msg.ClusterClientMessages.ContactsOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.ContactsOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_descriptor;
+        return org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_fieldAccessorTable
+        return org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.class, akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.Builder.class);
+                org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.class, org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.Builder.class);
       }
 
-      // Construct using akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.newBuilder()
+      // Construct using org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        contactPoints_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_descriptor;
+        return org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.internal_static_Contacts_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts getDefaultInstanceForType() {
-        return akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.getDefaultInstance();
+      public org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts build() {
-        akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts result = buildPartial();
+      public org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts build() {
+        org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -398,8 +398,8 @@ public final class ClusterClientMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts buildPartial() {
-        akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts result = new akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts(this);
+      public org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts buildPartial() {
+        org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts result = new org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
           contactPoints_ = contactPoints_.getUnmodifiableView();
@@ -416,44 +416,44 @@ public final class ClusterClientMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts) {
-          return mergeFrom((akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts) {
+          return mergeFrom((org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts other) {
-        if (other == akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts other) {
+        if (other == org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts.getDefaultInstance()) return this;
         if (!other.contactPoints_.isEmpty()) {
           if (contactPoints_.isEmpty()) {
             contactPoints_ = other.contactPoints_;
@@ -476,14 +476,14 @@ public final class ClusterClientMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parsedMessage = null;
+        org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -494,10 +494,10 @@ public final class ClusterClientMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.LazyStringList contactPoints_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureContactPointsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          contactPoints_ = new akka.protobufv3.internal.LazyStringArrayList(contactPoints_);
+          contactPoints_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(contactPoints_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -505,7 +505,7 @@ public final class ClusterClientMessages {
        * repeated string contactPoints = 1;
        * @return A list containing the contactPoints.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getContactPointsList() {
         return contactPoints_.getUnmodifiableView();
       }
@@ -529,7 +529,7 @@ public final class ClusterClientMessages {
        * @param index The index of the value to return.
        * @return The bytes of the contactPoints at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getContactPointsBytes(int index) {
         return contactPoints_.getByteString(index);
       }
@@ -572,7 +572,7 @@ public final class ClusterClientMessages {
       public Builder addAllContactPoints(
           java.lang.Iterable values) {
         ensureContactPointsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, contactPoints_);
         onChanged();
         return this;
@@ -582,7 +582,7 @@ public final class ClusterClientMessages {
        * @return This builder for chaining.
        */
       public Builder clearContactPoints() {
-        contactPoints_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        contactPoints_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -593,7 +593,7 @@ public final class ClusterClientMessages {
        * @return This builder for chaining.
        */
       public Builder addContactPointsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -604,13 +604,13 @@ public final class ClusterClientMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -619,68 +619,68 @@ public final class ClusterClientMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Contacts)
-    private static final akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts();
     }
 
-    public static akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts getDefaultInstance() {
+    public static org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Contacts parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Contacts(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.client.protobuf.msg.ClusterClientMessages.Contacts getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.client.protobuf.msg.ClusterClientMessages.Contacts getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Contacts_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Contacts_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
       "\n\033ClusterClientMessages.proto\"!\n\010Contact" +
-      "s\022\025\n\rcontactPoints\030\001 \003(\tB$\n akka.cluster" +
-      ".client.protobuf.msgH\001"
+      "s\022\025\n\rcontactPoints\030\001 \003(\tB0\n,org.apache.p" +
+      "ekko.cluster.client.protobuf.msgH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_Contacts_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Contacts_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Contacts_descriptor,
         new java.lang.String[] { "ContactPoints", });
   }
diff --git a/akka-cluster-tools/src/main/java/akka/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java b/akka-cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
similarity index 58%
rename from akka-cluster-tools/src/main/java/akka/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
rename to akka-cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
index 69306bccc6..35d3ebda77 100644
--- a/akka-cluster-tools/src/main/java/akka/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
+++ b/akka-cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
@@ -5,32 +5,32 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: DistributedPubSubMessages.proto
 
-package akka.cluster.pubsub.protobuf.msg;
+package org.apache.pekko.cluster.pubsub.protobuf.msg;
 
 public final class DistributedPubSubMessages {
   private DistributedPubSubMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface StatusOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Status)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .Status.Version versions = 1;
      */
-    java.util.List 
+    java.util.List 
         getVersionsList();
     /**
      * repeated .Status.Version versions = 1;
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index);
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index);
     /**
      * repeated .Status.Version versions = 1;
      */
@@ -38,12 +38,12 @@ public final class DistributedPubSubMessages {
     /**
      * repeated .Status.Version versions = 1;
      */
-    java.util.List 
+    java.util.List 
         getVersionsOrBuilderList();
     /**
      * repeated .Status.Version versions = 1;
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder(
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder(
         int index);
 
     /**
@@ -61,12 +61,12 @@ public final class DistributedPubSubMessages {
    * Protobuf type {@code Status}
    */
   public  static final class Status extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Status)
       StatusOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Status.newBuilder() to construct.
-    private Status(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Status(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Status() {
@@ -76,26 +76,26 @@ public final class DistributedPubSubMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Status();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Status(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -106,11 +106,11 @@ public final class DistributedPubSubMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                versions_ = new java.util.ArrayList();
+                versions_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               versions_.add(
-                  input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.PARSER, extensionRegistry));
               break;
             }
             case 16: {
@@ -127,10 +127,10 @@ public final class DistributedPubSubMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -140,22 +140,22 @@ public final class DistributedPubSubMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor;
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_fieldAccessorTable
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Builder.class);
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Builder.class);
     }
 
     public interface VersionOrBuilder extends
         // @@protoc_insertion_point(interface_extends:Status.Version)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required .Address address = 1;
@@ -166,11 +166,11 @@ public final class DistributedPubSubMessages {
        * required .Address address = 1;
        * @return The address.
        */
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress();
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress();
       /**
        * required .Address address = 1;
        */
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder();
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder();
 
       /**
        * required int64 timestamp = 2;
@@ -187,12 +187,12 @@ public final class DistributedPubSubMessages {
      * Protobuf type {@code Status.Version}
      */
     public  static final class Version extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:Status.Version)
         VersionOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Version.newBuilder() to construct.
-      private Version(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Version(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Version() {
@@ -201,26 +201,26 @@ public final class DistributedPubSubMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Version();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Version(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -230,11 +230,11 @@ public final class DistributedPubSubMessages {
                 done = true;
                 break;
               case 10: {
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null;
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000001) != 0)) {
                   subBuilder = address_.toBuilder();
                 }
-                address_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry);
+                address_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(address_);
                   address_ = subBuilder.buildPartial();
@@ -256,32 +256,32 @@ public final class DistributedPubSubMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder.class);
       }
 
       private int bitField0_;
       public static final int ADDRESS_FIELD_NUMBER = 1;
-      private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address address_;
+      private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address address_;
       /**
        * required .Address address = 1;
        * @return Whether the address field is set.
@@ -293,14 +293,14 @@ public final class DistributedPubSubMessages {
        * required .Address address = 1;
        * @return The address.
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress() {
-        return address_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress() {
+        return address_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
       }
       /**
        * required .Address address = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder() {
-        return address_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder() {
+        return address_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
       }
 
       public static final int TIMESTAMP_FIELD_NUMBER = 2;
@@ -344,7 +344,7 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeMessage(1, getAddress());
@@ -362,11 +362,11 @@ public final class DistributedPubSubMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(1, getAddress());
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(2, timestamp_);
         }
         size += unknownFields.getSerializedSize();
@@ -379,10 +379,10 @@ public final class DistributedPubSubMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version)) {
+        if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version)) {
           return super.equals(obj);
         }
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version) obj;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version) obj;
 
         if (hasAddress() != other.hasAddress()) return false;
         if (hasAddress()) {
@@ -411,7 +411,7 @@ public final class DistributedPubSubMessages {
         }
         if (hasTimestamp()) {
           hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getTimestamp());
         }
         hash = (29 * hash) + unknownFields.hashCode();
@@ -419,73 +419,73 @@ public final class DistributedPubSubMessages {
         return hash;
       }
 
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -494,7 +494,7 @@ public final class DistributedPubSubMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -505,7 +505,7 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -513,34 +513,34 @@ public final class DistributedPubSubMessages {
        * Protobuf type {@code Status.Version}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
           // @@protoc_insertion_point(builder_implements:Status.Version)
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor;
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_fieldAccessorTable
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder.class);
+                  org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder.class);
         }
 
-        // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.newBuilder()
+        // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getAddressFieldBuilder();
           }
@@ -560,19 +560,19 @@ public final class DistributedPubSubMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor;
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getDefaultInstanceForType() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance();
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version build() {
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version result = buildPartial();
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version build() {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -580,8 +580,8 @@ public final class DistributedPubSubMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version buildPartial() {
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version(this);
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version buildPartial() {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -607,44 +607,44 @@ public final class DistributedPubSubMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version) {
-            return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version) {
+            return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version other) {
-          if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version other) {
+          if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance()) return this;
           if (other.hasAddress()) {
             mergeAddress(other.getAddress());
           }
@@ -672,14 +672,14 @@ public final class DistributedPubSubMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parsedMessage = null;
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -690,9 +690,9 @@ public final class DistributedPubSubMessages {
         }
         private int bitField0_;
 
-        private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address address_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> addressBuilder_;
+        private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address address_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> addressBuilder_;
         /**
          * required .Address address = 1;
          * @return Whether the address field is set.
@@ -704,9 +704,9 @@ public final class DistributedPubSubMessages {
          * required .Address address = 1;
          * @return The address.
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress() {
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress() {
           if (addressBuilder_ == null) {
-            return address_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
+            return address_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
           } else {
             return addressBuilder_.getMessage();
           }
@@ -714,7 +714,7 @@ public final class DistributedPubSubMessages {
         /**
          * required .Address address = 1;
          */
-        public Builder setAddress(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
+        public Builder setAddress(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
           if (addressBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -731,7 +731,7 @@ public final class DistributedPubSubMessages {
          * required .Address address = 1;
          */
         public Builder setAddress(
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) {
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) {
           if (addressBuilder_ == null) {
             address_ = builderForValue.build();
             onChanged();
@@ -744,13 +744,13 @@ public final class DistributedPubSubMessages {
         /**
          * required .Address address = 1;
          */
-        public Builder mergeAddress(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
+        public Builder mergeAddress(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
           if (addressBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
                 address_ != null &&
-                address_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) {
+                address_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) {
               address_ =
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
             } else {
               address_ = value;
             }
@@ -777,7 +777,7 @@ public final class DistributedPubSubMessages {
         /**
          * required .Address address = 1;
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder getAddressBuilder() {
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder getAddressBuilder() {
           bitField0_ |= 0x00000001;
           onChanged();
           return getAddressFieldBuilder().getBuilder();
@@ -785,23 +785,23 @@ public final class DistributedPubSubMessages {
         /**
          * required .Address address = 1;
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder() {
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder() {
           if (addressBuilder_ != null) {
             return addressBuilder_.getMessageOrBuilder();
           } else {
             return address_ == null ?
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : address_;
           }
         }
         /**
          * required .Address address = 1;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> 
             getAddressFieldBuilder() {
           if (addressBuilder_ == null) {
-            addressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder>(
+            addressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder>(
                     getAddress(),
                     getParentForChildren(),
                     isClean());
@@ -848,13 +848,13 @@ public final class DistributedPubSubMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -863,37 +863,37 @@ public final class DistributedPubSubMessages {
       }
 
       // @@protoc_insertion_point(class_scope:Status.Version)
-      private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version DEFAULT_INSTANCE;
+      private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version();
       }
 
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getDefaultInstance() {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Version parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Version(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -901,17 +901,17 @@ public final class DistributedPubSubMessages {
 
     private int bitField0_;
     public static final int VERSIONS_FIELD_NUMBER = 1;
-    private java.util.List versions_;
+    private java.util.List versions_;
     /**
      * repeated .Status.Version versions = 1;
      */
-    public java.util.List getVersionsList() {
+    public java.util.List getVersionsList() {
       return versions_;
     }
     /**
      * repeated .Status.Version versions = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getVersionsOrBuilderList() {
       return versions_;
     }
@@ -924,13 +924,13 @@ public final class DistributedPubSubMessages {
     /**
      * repeated .Status.Version versions = 1;
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index) {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index) {
       return versions_.get(index);
     }
     /**
      * repeated .Status.Version versions = 1;
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder(
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder(
         int index) {
       return versions_.get(index);
     }
@@ -970,7 +970,7 @@ public final class DistributedPubSubMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < versions_.size(); i++) {
         output.writeMessage(1, versions_.get(i));
@@ -988,11 +988,11 @@ public final class DistributedPubSubMessages {
 
       size = 0;
       for (int i = 0; i < versions_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, versions_.get(i));
       }
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(2, replyToStatus_);
       }
       size += unknownFields.getSerializedSize();
@@ -1005,10 +1005,10 @@ public final class DistributedPubSubMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status)) {
+      if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status)) {
         return super.equals(obj);
       }
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status) obj;
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status) obj;
 
       if (!getVersionsList()
           .equals(other.getVersionsList())) return false;
@@ -1034,7 +1034,7 @@ public final class DistributedPubSubMessages {
       }
       if (hasReplyToStatus()) {
         hash = (37 * hash) + REPLYTOSTATUS_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getReplyToStatus());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -1042,73 +1042,73 @@ public final class DistributedPubSubMessages {
       return hash;
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1117,7 +1117,7 @@ public final class DistributedPubSubMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1128,7 +1128,7 @@ public final class DistributedPubSubMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1136,34 +1136,34 @@ public final class DistributedPubSubMessages {
      * Protobuf type {@code Status}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Status)
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.StatusOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.StatusOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Builder.class);
       }
 
-      // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.newBuilder()
+      // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getVersionsFieldBuilder();
         }
@@ -1183,19 +1183,19 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status getDefaultInstanceForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.getDefaultInstance();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status build() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status result = buildPartial();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status build() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1203,8 +1203,8 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status buildPartial() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status(this);
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status buildPartial() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (versionsBuilder_ == null) {
@@ -1231,44 +1231,44 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status) {
-          return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status) {
+          return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status other) {
-        if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status other) {
+        if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.getDefaultInstance()) return this;
         if (versionsBuilder_ == null) {
           if (!other.versions_.isEmpty()) {
             if (versions_.isEmpty()) {
@@ -1288,7 +1288,7 @@ public final class DistributedPubSubMessages {
               versions_ = other.versions_;
               bitField0_ = (bitField0_ & ~0x00000001);
               versionsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getVersionsFieldBuilder() : null;
             } else {
               versionsBuilder_.addAllMessages(other.versions_);
@@ -1315,14 +1315,14 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parsedMessage = null;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1333,22 +1333,22 @@ public final class DistributedPubSubMessages {
       }
       private int bitField0_;
 
-      private java.util.List versions_ =
+      private java.util.List versions_ =
         java.util.Collections.emptyList();
       private void ensureVersionsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          versions_ = new java.util.ArrayList(versions_);
+          versions_ = new java.util.ArrayList(versions_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder> versionsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder> versionsBuilder_;
 
       /**
        * repeated .Status.Version versions = 1;
        */
-      public java.util.List getVersionsList() {
+      public java.util.List getVersionsList() {
         if (versionsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(versions_);
         } else {
@@ -1368,7 +1368,7 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Status.Version versions = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index) {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index) {
         if (versionsBuilder_ == null) {
           return versions_.get(index);
         } else {
@@ -1379,7 +1379,7 @@ public final class DistributedPubSubMessages {
        * repeated .Status.Version versions = 1;
        */
       public Builder setVersions(
-          int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version value) {
+          int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version value) {
         if (versionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1396,7 +1396,7 @@ public final class DistributedPubSubMessages {
        * repeated .Status.Version versions = 1;
        */
       public Builder setVersions(
-          int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) {
         if (versionsBuilder_ == null) {
           ensureVersionsIsMutable();
           versions_.set(index, builderForValue.build());
@@ -1409,7 +1409,7 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Status.Version versions = 1;
        */
-      public Builder addVersions(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version value) {
+      public Builder addVersions(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version value) {
         if (versionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1426,7 +1426,7 @@ public final class DistributedPubSubMessages {
        * repeated .Status.Version versions = 1;
        */
       public Builder addVersions(
-          int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version value) {
+          int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version value) {
         if (versionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1443,7 +1443,7 @@ public final class DistributedPubSubMessages {
        * repeated .Status.Version versions = 1;
        */
       public Builder addVersions(
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) {
         if (versionsBuilder_ == null) {
           ensureVersionsIsMutable();
           versions_.add(builderForValue.build());
@@ -1457,7 +1457,7 @@ public final class DistributedPubSubMessages {
        * repeated .Status.Version versions = 1;
        */
       public Builder addVersions(
-          int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) {
         if (versionsBuilder_ == null) {
           ensureVersionsIsMutable();
           versions_.add(index, builderForValue.build());
@@ -1471,10 +1471,10 @@ public final class DistributedPubSubMessages {
        * repeated .Status.Version versions = 1;
        */
       public Builder addAllVersions(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (versionsBuilder_ == null) {
           ensureVersionsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, versions_);
           onChanged();
         } else {
@@ -1511,14 +1511,14 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Status.Version versions = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder getVersionsBuilder(
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder getVersionsBuilder(
           int index) {
         return getVersionsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Status.Version versions = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder(
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder(
           int index) {
         if (versionsBuilder_ == null) {
           return versions_.get(index);  } else {
@@ -1528,7 +1528,7 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Status.Version versions = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getVersionsOrBuilderList() {
         if (versionsBuilder_ != null) {
           return versionsBuilder_.getMessageOrBuilderList();
@@ -1539,31 +1539,31 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Status.Version versions = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder addVersionsBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder addVersionsBuilder() {
         return getVersionsFieldBuilder().addBuilder(
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance());
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance());
       }
       /**
        * repeated .Status.Version versions = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder addVersionsBuilder(
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder addVersionsBuilder(
           int index) {
         return getVersionsFieldBuilder().addBuilder(
-            index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance());
+            index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance());
       }
       /**
        * repeated .Status.Version versions = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getVersionsBuilderList() {
         return getVersionsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder> 
           getVersionsFieldBuilder() {
         if (versionsBuilder_ == null) {
-          versionsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder>(
+          versionsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder>(
                   versions_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -1611,13 +1611,13 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -1626,37 +1626,37 @@ public final class DistributedPubSubMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Status)
-    private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status();
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status getDefaultInstance() {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Status parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Status(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1664,17 +1664,17 @@ public final class DistributedPubSubMessages {
 
   public interface DeltaOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Delta)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
-    java.util.List 
+    java.util.List 
         getBucketsList();
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index);
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index);
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
@@ -1682,24 +1682,24 @@ public final class DistributedPubSubMessages {
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
-    java.util.List 
+    java.util.List 
         getBucketsOrBuilderList();
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder(
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder(
         int index);
   }
   /**
    * Protobuf type {@code Delta}
    */
   public  static final class Delta extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Delta)
       DeltaOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Delta.newBuilder() to construct.
-    private Delta(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Delta(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Delta() {
@@ -1709,26 +1709,26 @@ public final class DistributedPubSubMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Delta();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Delta(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1739,11 +1739,11 @@ public final class DistributedPubSubMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                buckets_ = new java.util.ArrayList();
+                buckets_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               buckets_.add(
-                  input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -1755,10 +1755,10 @@ public final class DistributedPubSubMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -1768,22 +1768,22 @@ public final class DistributedPubSubMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor;
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_fieldAccessorTable
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Builder.class);
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Builder.class);
     }
 
     public interface EntryOrBuilder extends
         // @@protoc_insertion_point(interface_extends:Delta.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required string key = 1;
@@ -1799,7 +1799,7 @@ public final class DistributedPubSubMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes();
 
       /**
@@ -1827,19 +1827,19 @@ public final class DistributedPubSubMessages {
        * optional string ref = 3;
        * @return The bytes for ref.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getRefBytes();
     }
     /**
      * Protobuf type {@code Delta.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:Delta.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -1850,26 +1850,26 @@ public final class DistributedPubSubMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -1879,7 +1879,7 @@ public final class DistributedPubSubMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 key_ = bs;
                 break;
@@ -1890,7 +1890,7 @@ public final class DistributedPubSubMessages {
                 break;
               }
               case 26: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000004;
                 ref_ = bs;
                 break;
@@ -1904,27 +1904,27 @@ public final class DistributedPubSubMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -1946,8 +1946,8 @@ public final class DistributedPubSubMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             key_ = s;
@@ -1959,17 +1959,17 @@ public final class DistributedPubSubMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           key_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
@@ -2008,8 +2008,8 @@ public final class DistributedPubSubMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             ref_ = s;
@@ -2021,17 +2021,17 @@ public final class DistributedPubSubMessages {
        * optional string ref = 3;
        * @return The bytes for ref.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRefBytes() {
         java.lang.Object ref = ref_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           ref_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
@@ -2055,16 +2055,16 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeInt64(2, version_);
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, ref_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, ref_);
         }
         unknownFields.writeTo(output);
       }
@@ -2076,14 +2076,14 @@ public final class DistributedPubSubMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(2, version_);
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, ref_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, ref_);
         }
         size += unknownFields.getSerializedSize();
         memoizedSize = size;
@@ -2095,10 +2095,10 @@ public final class DistributedPubSubMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry) obj;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry) obj;
 
         if (hasKey() != other.hasKey()) return false;
         if (hasKey()) {
@@ -2132,7 +2132,7 @@ public final class DistributedPubSubMessages {
         }
         if (hasVersion()) {
           hash = (37 * hash) + VERSION_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getVersion());
         }
         if (hasRef()) {
@@ -2144,73 +2144,73 @@ public final class DistributedPubSubMessages {
         return hash;
       }
 
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -2219,7 +2219,7 @@ public final class DistributedPubSubMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -2230,7 +2230,7 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -2238,34 +2238,34 @@ public final class DistributedPubSubMessages {
        * Protobuf type {@code Delta.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
           // @@protoc_insertion_point(builder_implements:Delta.Entry)
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor;
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder.class);
+                  org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
           }
         }
@@ -2282,19 +2282,19 @@ public final class DistributedPubSubMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor;
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getDefaultInstanceForType() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry build() {
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry result = buildPartial();
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry build() {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -2302,8 +2302,8 @@ public final class DistributedPubSubMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry buildPartial() {
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry(this);
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry buildPartial() {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2329,44 +2329,44 @@ public final class DistributedPubSubMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry) {
-            return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry other) {
-          if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry other) {
+          if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
             bitField0_ |= 0x00000001;
             key_ = other.key_;
@@ -2398,14 +2398,14 @@ public final class DistributedPubSubMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parsedMessage = null;
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -2431,8 +2431,8 @@ public final class DistributedPubSubMessages {
         public java.lang.String getKey() {
           java.lang.Object ref = key_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               key_ = s;
@@ -2446,17 +2446,17 @@ public final class DistributedPubSubMessages {
          * required string key = 1;
          * @return The bytes for key.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getKeyBytes() {
           java.lang.Object ref = key_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             key_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -2490,7 +2490,7 @@ public final class DistributedPubSubMessages {
          * @return This builder for chaining.
          */
         public Builder setKeyBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -2552,8 +2552,8 @@ public final class DistributedPubSubMessages {
         public java.lang.String getRef() {
           java.lang.Object ref = ref_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               ref_ = s;
@@ -2567,17 +2567,17 @@ public final class DistributedPubSubMessages {
          * optional string ref = 3;
          * @return The bytes for ref.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getRefBytes() {
           java.lang.Object ref = ref_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             ref_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -2611,7 +2611,7 @@ public final class DistributedPubSubMessages {
          * @return This builder for chaining.
          */
         public Builder setRefBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -2622,13 +2622,13 @@ public final class DistributedPubSubMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -2637,37 +2637,37 @@ public final class DistributedPubSubMessages {
       }
 
       // @@protoc_insertion_point(class_scope:Delta.Entry)
-      private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry DEFAULT_INSTANCE;
+      private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry();
       }
 
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -2675,7 +2675,7 @@ public final class DistributedPubSubMessages {
 
     public interface BucketOrBuilder extends
         // @@protoc_insertion_point(interface_extends:Delta.Bucket)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required .Address owner = 1;
@@ -2686,11 +2686,11 @@ public final class DistributedPubSubMessages {
        * required .Address owner = 1;
        * @return The owner.
        */
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner();
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner();
       /**
        * required .Address owner = 1;
        */
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder();
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder();
 
       /**
        * required int64 version = 2;
@@ -2706,12 +2706,12 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Delta.Entry content = 3;
        */
-      java.util.List 
+      java.util.List 
           getContentList();
       /**
        * repeated .Delta.Entry content = 3;
        */
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index);
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index);
       /**
        * repeated .Delta.Entry content = 3;
        */
@@ -2719,24 +2719,24 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Delta.Entry content = 3;
        */
-      java.util.List 
+      java.util.List 
           getContentOrBuilderList();
       /**
        * repeated .Delta.Entry content = 3;
        */
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder(
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder(
           int index);
     }
     /**
      * Protobuf type {@code Delta.Bucket}
      */
     public  static final class Bucket extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:Delta.Bucket)
         BucketOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Bucket.newBuilder() to construct.
-      private Bucket(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Bucket(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Bucket() {
@@ -2746,26 +2746,26 @@ public final class DistributedPubSubMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Bucket();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Bucket(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -2775,11 +2775,11 @@ public final class DistributedPubSubMessages {
                 done = true;
                 break;
               case 10: {
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null;
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000001) != 0)) {
                   subBuilder = owner_.toBuilder();
                 }
-                owner_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry);
+                owner_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(owner_);
                   owner_ = subBuilder.buildPartial();
@@ -2794,11 +2794,11 @@ public final class DistributedPubSubMessages {
               }
               case 26: {
                 if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                  content_ = new java.util.ArrayList();
+                  content_ = new java.util.ArrayList();
                   mutable_bitField0_ |= 0x00000004;
                 }
                 content_.add(
-                    input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.PARSER, extensionRegistry));
+                    input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.PARSER, extensionRegistry));
                 break;
               }
               default: {
@@ -2810,10 +2810,10 @@ public final class DistributedPubSubMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           if (((mutable_bitField0_ & 0x00000004) != 0)) {
@@ -2823,22 +2823,22 @@ public final class DistributedPubSubMessages {
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder.class);
       }
 
       private int bitField0_;
       public static final int OWNER_FIELD_NUMBER = 1;
-      private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address owner_;
+      private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address owner_;
       /**
        * required .Address owner = 1;
        * @return Whether the owner field is set.
@@ -2850,14 +2850,14 @@ public final class DistributedPubSubMessages {
        * required .Address owner = 1;
        * @return The owner.
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner() {
-        return owner_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner() {
+        return owner_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
       }
       /**
        * required .Address owner = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder() {
-        return owner_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder() {
+        return owner_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
       }
 
       public static final int VERSION_FIELD_NUMBER = 2;
@@ -2878,17 +2878,17 @@ public final class DistributedPubSubMessages {
       }
 
       public static final int CONTENT_FIELD_NUMBER = 3;
-      private java.util.List content_;
+      private java.util.List content_;
       /**
        * repeated .Delta.Entry content = 3;
        */
-      public java.util.List getContentList() {
+      public java.util.List getContentList() {
         return content_;
       }
       /**
        * repeated .Delta.Entry content = 3;
        */
-      public java.util.List 
+      public java.util.List 
           getContentOrBuilderList() {
         return content_;
       }
@@ -2901,13 +2901,13 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Delta.Entry content = 3;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index) {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index) {
         return content_.get(index);
       }
       /**
        * repeated .Delta.Entry content = 3;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder(
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder(
           int index) {
         return content_.get(index);
       }
@@ -2942,7 +2942,7 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeMessage(1, getOwner());
@@ -2963,15 +2963,15 @@ public final class DistributedPubSubMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(1, getOwner());
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(2, version_);
         }
         for (int i = 0; i < content_.size(); i++) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(3, content_.get(i));
         }
         size += unknownFields.getSerializedSize();
@@ -2984,10 +2984,10 @@ public final class DistributedPubSubMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket)) {
+        if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket)) {
           return super.equals(obj);
         }
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) obj;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) obj;
 
         if (hasOwner() != other.hasOwner()) return false;
         if (hasOwner()) {
@@ -3018,7 +3018,7 @@ public final class DistributedPubSubMessages {
         }
         if (hasVersion()) {
           hash = (37 * hash) + VERSION_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getVersion());
         }
         if (getContentCount() > 0) {
@@ -3030,73 +3030,73 @@ public final class DistributedPubSubMessages {
         return hash;
       }
 
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom(
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -3105,7 +3105,7 @@ public final class DistributedPubSubMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -3116,7 +3116,7 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -3124,34 +3124,34 @@ public final class DistributedPubSubMessages {
        * Protobuf type {@code Delta.Bucket}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
           // @@protoc_insertion_point(builder_implements:Delta.Bucket)
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor;
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_fieldAccessorTable
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder.class);
+                  org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder.class);
         }
 
-        // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.newBuilder()
+        // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getOwnerFieldBuilder();
             getContentFieldBuilder();
@@ -3178,19 +3178,19 @@ public final class DistributedPubSubMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor;
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getDefaultInstanceForType() {
-          return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance();
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket build() {
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result = buildPartial();
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket build() {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -3198,8 +3198,8 @@ public final class DistributedPubSubMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket buildPartial() {
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket(this);
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket buildPartial() {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3234,44 +3234,44 @@ public final class DistributedPubSubMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) {
-            return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) {
+            return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket other) {
-          if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket other) {
+          if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance()) return this;
           if (other.hasOwner()) {
             mergeOwner(other.getOwner());
           }
@@ -3297,7 +3297,7 @@ public final class DistributedPubSubMessages {
                 content_ = other.content_;
                 bitField0_ = (bitField0_ & ~0x00000004);
                 contentBuilder_ = 
-                  akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                      getContentFieldBuilder() : null;
               } else {
                 contentBuilder_.addAllMessages(other.content_);
@@ -3330,14 +3330,14 @@ public final class DistributedPubSubMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parsedMessage = null;
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -3348,9 +3348,9 @@ public final class DistributedPubSubMessages {
         }
         private int bitField0_;
 
-        private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address owner_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> ownerBuilder_;
+        private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address owner_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> ownerBuilder_;
         /**
          * required .Address owner = 1;
          * @return Whether the owner field is set.
@@ -3362,9 +3362,9 @@ public final class DistributedPubSubMessages {
          * required .Address owner = 1;
          * @return The owner.
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner() {
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner() {
           if (ownerBuilder_ == null) {
-            return owner_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
+            return owner_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
           } else {
             return ownerBuilder_.getMessage();
           }
@@ -3372,7 +3372,7 @@ public final class DistributedPubSubMessages {
         /**
          * required .Address owner = 1;
          */
-        public Builder setOwner(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
+        public Builder setOwner(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
           if (ownerBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -3389,7 +3389,7 @@ public final class DistributedPubSubMessages {
          * required .Address owner = 1;
          */
         public Builder setOwner(
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) {
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) {
           if (ownerBuilder_ == null) {
             owner_ = builderForValue.build();
             onChanged();
@@ -3402,13 +3402,13 @@ public final class DistributedPubSubMessages {
         /**
          * required .Address owner = 1;
          */
-        public Builder mergeOwner(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
+        public Builder mergeOwner(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) {
           if (ownerBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
                 owner_ != null &&
-                owner_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) {
+                owner_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) {
               owner_ =
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(owner_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(owner_).mergeFrom(value).buildPartial();
             } else {
               owner_ = value;
             }
@@ -3435,7 +3435,7 @@ public final class DistributedPubSubMessages {
         /**
          * required .Address owner = 1;
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder getOwnerBuilder() {
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder getOwnerBuilder() {
           bitField0_ |= 0x00000001;
           onChanged();
           return getOwnerFieldBuilder().getBuilder();
@@ -3443,23 +3443,23 @@ public final class DistributedPubSubMessages {
         /**
          * required .Address owner = 1;
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder() {
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder() {
           if (ownerBuilder_ != null) {
             return ownerBuilder_.getMessageOrBuilder();
           } else {
             return owner_ == null ?
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance() : owner_;
           }
         }
         /**
          * required .Address owner = 1;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> 
             getOwnerFieldBuilder() {
           if (ownerBuilder_ == null) {
-            ownerBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder>(
+            ownerBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder>(
                     getOwner(),
                     getParentForChildren(),
                     isClean());
@@ -3505,22 +3505,22 @@ public final class DistributedPubSubMessages {
           return this;
         }
 
-        private java.util.List content_ =
+        private java.util.List content_ =
           java.util.Collections.emptyList();
         private void ensureContentIsMutable() {
           if (!((bitField0_ & 0x00000004) != 0)) {
-            content_ = new java.util.ArrayList(content_);
+            content_ = new java.util.ArrayList(content_);
             bitField0_ |= 0x00000004;
            }
         }
 
-        private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder> contentBuilder_;
+        private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder> contentBuilder_;
 
         /**
          * repeated .Delta.Entry content = 3;
          */
-        public java.util.List getContentList() {
+        public java.util.List getContentList() {
           if (contentBuilder_ == null) {
             return java.util.Collections.unmodifiableList(content_);
           } else {
@@ -3540,7 +3540,7 @@ public final class DistributedPubSubMessages {
         /**
          * repeated .Delta.Entry content = 3;
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index) {
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index) {
           if (contentBuilder_ == null) {
             return content_.get(index);
           } else {
@@ -3551,7 +3551,7 @@ public final class DistributedPubSubMessages {
          * repeated .Delta.Entry content = 3;
          */
         public Builder setContent(
-            int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) {
+            int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) {
           if (contentBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -3568,7 +3568,7 @@ public final class DistributedPubSubMessages {
          * repeated .Delta.Entry content = 3;
          */
         public Builder setContent(
-            int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) {
+            int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) {
           if (contentBuilder_ == null) {
             ensureContentIsMutable();
             content_.set(index, builderForValue.build());
@@ -3581,7 +3581,7 @@ public final class DistributedPubSubMessages {
         /**
          * repeated .Delta.Entry content = 3;
          */
-        public Builder addContent(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) {
+        public Builder addContent(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) {
           if (contentBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -3598,7 +3598,7 @@ public final class DistributedPubSubMessages {
          * repeated .Delta.Entry content = 3;
          */
         public Builder addContent(
-            int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) {
+            int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) {
           if (contentBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -3615,7 +3615,7 @@ public final class DistributedPubSubMessages {
          * repeated .Delta.Entry content = 3;
          */
         public Builder addContent(
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) {
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) {
           if (contentBuilder_ == null) {
             ensureContentIsMutable();
             content_.add(builderForValue.build());
@@ -3629,7 +3629,7 @@ public final class DistributedPubSubMessages {
          * repeated .Delta.Entry content = 3;
          */
         public Builder addContent(
-            int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) {
+            int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) {
           if (contentBuilder_ == null) {
             ensureContentIsMutable();
             content_.add(index, builderForValue.build());
@@ -3643,10 +3643,10 @@ public final class DistributedPubSubMessages {
          * repeated .Delta.Entry content = 3;
          */
         public Builder addAllContent(
-            java.lang.Iterable values) {
+            java.lang.Iterable values) {
           if (contentBuilder_ == null) {
             ensureContentIsMutable();
-            akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+            org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
                 values, content_);
             onChanged();
           } else {
@@ -3683,14 +3683,14 @@ public final class DistributedPubSubMessages {
         /**
          * repeated .Delta.Entry content = 3;
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder getContentBuilder(
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder getContentBuilder(
             int index) {
           return getContentFieldBuilder().getBuilder(index);
         }
         /**
          * repeated .Delta.Entry content = 3;
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder(
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder(
             int index) {
           if (contentBuilder_ == null) {
             return content_.get(index);  } else {
@@ -3700,7 +3700,7 @@ public final class DistributedPubSubMessages {
         /**
          * repeated .Delta.Entry content = 3;
          */
-        public java.util.List 
+        public java.util.List 
              getContentOrBuilderList() {
           if (contentBuilder_ != null) {
             return contentBuilder_.getMessageOrBuilderList();
@@ -3711,31 +3711,31 @@ public final class DistributedPubSubMessages {
         /**
          * repeated .Delta.Entry content = 3;
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder addContentBuilder() {
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder addContentBuilder() {
           return getContentFieldBuilder().addBuilder(
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance());
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance());
         }
         /**
          * repeated .Delta.Entry content = 3;
          */
-        public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder addContentBuilder(
+        public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder addContentBuilder(
             int index) {
           return getContentFieldBuilder().addBuilder(
-              index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance());
+              index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance());
         }
         /**
          * repeated .Delta.Entry content = 3;
          */
-        public java.util.List 
+        public java.util.List 
              getContentBuilderList() {
           return getContentFieldBuilder().getBuilderList();
         }
-        private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder> 
             getContentFieldBuilder() {
           if (contentBuilder_ == null) {
-            contentBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder>(
+            contentBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder>(
                     content_,
                     ((bitField0_ & 0x00000004) != 0),
                     getParentForChildren(),
@@ -3746,13 +3746,13 @@ public final class DistributedPubSubMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -3761,54 +3761,54 @@ public final class DistributedPubSubMessages {
       }
 
       // @@protoc_insertion_point(class_scope:Delta.Bucket)
-      private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket DEFAULT_INSTANCE;
+      private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket();
       }
 
-      public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getDefaultInstance() {
+      public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Bucket parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Bucket(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
     }
 
     public static final int BUCKETS_FIELD_NUMBER = 1;
-    private java.util.List buckets_;
+    private java.util.List buckets_;
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
-    public java.util.List getBucketsList() {
+    public java.util.List getBucketsList() {
       return buckets_;
     }
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getBucketsOrBuilderList() {
       return buckets_;
     }
@@ -3821,13 +3821,13 @@ public final class DistributedPubSubMessages {
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index) {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index) {
       return buckets_.get(index);
     }
     /**
      * repeated .Delta.Bucket buckets = 1;
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder(
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder(
         int index) {
       return buckets_.get(index);
     }
@@ -3850,7 +3850,7 @@ public final class DistributedPubSubMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < buckets_.size(); i++) {
         output.writeMessage(1, buckets_.get(i));
@@ -3865,7 +3865,7 @@ public final class DistributedPubSubMessages {
 
       size = 0;
       for (int i = 0; i < buckets_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, buckets_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -3878,10 +3878,10 @@ public final class DistributedPubSubMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta)) {
+      if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta)) {
         return super.equals(obj);
       }
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta) obj;
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta) obj;
 
       if (!getBucketsList()
           .equals(other.getBucketsList())) return false;
@@ -3905,73 +3905,73 @@ public final class DistributedPubSubMessages {
       return hash;
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3980,7 +3980,7 @@ public final class DistributedPubSubMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3991,7 +3991,7 @@ public final class DistributedPubSubMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3999,34 +3999,34 @@ public final class DistributedPubSubMessages {
      * Protobuf type {@code Delta}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Delta)
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.DeltaOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.DeltaOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Builder.class);
       }
 
-      // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.newBuilder()
+      // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getBucketsFieldBuilder();
         }
@@ -4044,19 +4044,19 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta getDefaultInstanceForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.getDefaultInstance();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta build() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta result = buildPartial();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta build() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4064,8 +4064,8 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta buildPartial() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta(this);
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta buildPartial() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta(this);
         int from_bitField0_ = bitField0_;
         if (bucketsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -4086,44 +4086,44 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta) {
-          return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta) {
+          return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta other) {
-        if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta other) {
+        if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.getDefaultInstance()) return this;
         if (bucketsBuilder_ == null) {
           if (!other.buckets_.isEmpty()) {
             if (buckets_.isEmpty()) {
@@ -4143,7 +4143,7 @@ public final class DistributedPubSubMessages {
               buckets_ = other.buckets_;
               bitField0_ = (bitField0_ & ~0x00000001);
               bucketsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getBucketsFieldBuilder() : null;
             } else {
               bucketsBuilder_.addAllMessages(other.buckets_);
@@ -4167,14 +4167,14 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parsedMessage = null;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4185,22 +4185,22 @@ public final class DistributedPubSubMessages {
       }
       private int bitField0_;
 
-      private java.util.List buckets_ =
+      private java.util.List buckets_ =
         java.util.Collections.emptyList();
       private void ensureBucketsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          buckets_ = new java.util.ArrayList(buckets_);
+          buckets_ = new java.util.ArrayList(buckets_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder> bucketsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder> bucketsBuilder_;
 
       /**
        * repeated .Delta.Bucket buckets = 1;
        */
-      public java.util.List getBucketsList() {
+      public java.util.List getBucketsList() {
         if (bucketsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(buckets_);
         } else {
@@ -4220,7 +4220,7 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Delta.Bucket buckets = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index) {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index) {
         if (bucketsBuilder_ == null) {
           return buckets_.get(index);
         } else {
@@ -4231,7 +4231,7 @@ public final class DistributedPubSubMessages {
        * repeated .Delta.Bucket buckets = 1;
        */
       public Builder setBuckets(
-          int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) {
+          int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) {
         if (bucketsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4248,7 +4248,7 @@ public final class DistributedPubSubMessages {
        * repeated .Delta.Bucket buckets = 1;
        */
       public Builder setBuckets(
-          int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) {
         if (bucketsBuilder_ == null) {
           ensureBucketsIsMutable();
           buckets_.set(index, builderForValue.build());
@@ -4261,7 +4261,7 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Delta.Bucket buckets = 1;
        */
-      public Builder addBuckets(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) {
+      public Builder addBuckets(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) {
         if (bucketsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4278,7 +4278,7 @@ public final class DistributedPubSubMessages {
        * repeated .Delta.Bucket buckets = 1;
        */
       public Builder addBuckets(
-          int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) {
+          int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) {
         if (bucketsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4295,7 +4295,7 @@ public final class DistributedPubSubMessages {
        * repeated .Delta.Bucket buckets = 1;
        */
       public Builder addBuckets(
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) {
         if (bucketsBuilder_ == null) {
           ensureBucketsIsMutable();
           buckets_.add(builderForValue.build());
@@ -4309,7 +4309,7 @@ public final class DistributedPubSubMessages {
        * repeated .Delta.Bucket buckets = 1;
        */
       public Builder addBuckets(
-          int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) {
         if (bucketsBuilder_ == null) {
           ensureBucketsIsMutable();
           buckets_.add(index, builderForValue.build());
@@ -4323,10 +4323,10 @@ public final class DistributedPubSubMessages {
        * repeated .Delta.Bucket buckets = 1;
        */
       public Builder addAllBuckets(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (bucketsBuilder_ == null) {
           ensureBucketsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, buckets_);
           onChanged();
         } else {
@@ -4363,14 +4363,14 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Delta.Bucket buckets = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder getBucketsBuilder(
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder getBucketsBuilder(
           int index) {
         return getBucketsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Delta.Bucket buckets = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder(
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder(
           int index) {
         if (bucketsBuilder_ == null) {
           return buckets_.get(index);  } else {
@@ -4380,7 +4380,7 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Delta.Bucket buckets = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getBucketsOrBuilderList() {
         if (bucketsBuilder_ != null) {
           return bucketsBuilder_.getMessageOrBuilderList();
@@ -4391,31 +4391,31 @@ public final class DistributedPubSubMessages {
       /**
        * repeated .Delta.Bucket buckets = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder addBucketsBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder addBucketsBuilder() {
         return getBucketsFieldBuilder().addBuilder(
-            akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance());
+            org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance());
       }
       /**
        * repeated .Delta.Bucket buckets = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder addBucketsBuilder(
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder addBucketsBuilder(
           int index) {
         return getBucketsFieldBuilder().addBuilder(
-            index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance());
+            index, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance());
       }
       /**
        * repeated .Delta.Bucket buckets = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getBucketsBuilderList() {
         return getBucketsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder> 
           getBucketsFieldBuilder() {
         if (bucketsBuilder_ == null) {
-          bucketsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder>(
+          bucketsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder>(
                   buckets_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -4426,13 +4426,13 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -4441,37 +4441,37 @@ public final class DistributedPubSubMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Delta)
-    private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta();
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta getDefaultInstance() {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Delta parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Delta(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4479,7 +4479,7 @@ public final class DistributedPubSubMessages {
 
   public interface AddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Address)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string system = 1;
@@ -4495,7 +4495,7 @@ public final class DistributedPubSubMessages {
      * required string system = 1;
      * @return The bytes for system.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes();
 
     /**
@@ -4512,7 +4512,7 @@ public final class DistributedPubSubMessages {
      * required string hostname = 2;
      * @return The bytes for hostname.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes();
 
     /**
@@ -4540,7 +4540,7 @@ public final class DistributedPubSubMessages {
      * optional string protocol = 4;
      * @return The bytes for protocol.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes();
   }
   /**
@@ -4552,12 +4552,12 @@ public final class DistributedPubSubMessages {
    * Protobuf type {@code Address}
    */
   public  static final class Address extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Address.newBuilder() to construct.
-    private Address(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Address(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Address() {
@@ -4569,26 +4569,26 @@ public final class DistributedPubSubMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Address();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Address(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4598,13 +4598,13 @@ public final class DistributedPubSubMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               system_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               hostname_ = bs;
               break;
@@ -4615,7 +4615,7 @@ public final class DistributedPubSubMessages {
               break;
             }
             case 34: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000008;
               protocol_ = bs;
               break;
@@ -4629,27 +4629,27 @@ public final class DistributedPubSubMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor;
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_fieldAccessorTable
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder.class);
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder.class);
     }
 
     private int bitField0_;
@@ -4671,8 +4671,8 @@ public final class DistributedPubSubMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           system_ = s;
@@ -4684,17 +4684,17 @@ public final class DistributedPubSubMessages {
      * required string system = 1;
      * @return The bytes for system.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         system_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4716,8 +4716,8 @@ public final class DistributedPubSubMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           hostname_ = s;
@@ -4729,17 +4729,17 @@ public final class DistributedPubSubMessages {
      * required string hostname = 2;
      * @return The bytes for hostname.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         hostname_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4778,8 +4778,8 @@ public final class DistributedPubSubMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           protocol_ = s;
@@ -4791,17 +4791,17 @@ public final class DistributedPubSubMessages {
      * optional string protocol = 4;
      * @return The bytes for protocol.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         protocol_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4829,19 +4829,19 @@ public final class DistributedPubSubMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, system_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, system_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, hostname_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, hostname_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeUInt32(3, port_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_);
       }
       unknownFields.writeTo(output);
     }
@@ -4853,17 +4853,17 @@ public final class DistributedPubSubMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, system_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, system_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, hostname_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, hostname_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(3, port_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -4875,10 +4875,10 @@ public final class DistributedPubSubMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address)) {
+      if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address)) {
         return super.equals(obj);
       }
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address) obj;
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address) obj;
 
       if (hasSystem() != other.hasSystem()) return false;
       if (hasSystem()) {
@@ -4932,73 +4932,73 @@ public final class DistributedPubSubMessages {
       return hash;
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5007,7 +5007,7 @@ public final class DistributedPubSubMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5018,7 +5018,7 @@ public final class DistributedPubSubMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5031,34 +5031,34 @@ public final class DistributedPubSubMessages {
      * Protobuf type {@code Address}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Address)
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder.class);
       }
 
-      // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder()
+      // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -5077,19 +5077,19 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getDefaultInstanceForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address build() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address result = buildPartial();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address build() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5097,8 +5097,8 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address buildPartial() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address(this);
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address buildPartial() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5128,44 +5128,44 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address) {
-          return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address) {
+          return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address other) {
-        if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address other) {
+        if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) return this;
         if (other.hasSystem()) {
           bitField0_ |= 0x00000001;
           system_ = other.system_;
@@ -5205,14 +5205,14 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parsedMessage = null;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5238,8 +5238,8 @@ public final class DistributedPubSubMessages {
       public java.lang.String getSystem() {
         java.lang.Object ref = system_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             system_ = s;
@@ -5253,17 +5253,17 @@ public final class DistributedPubSubMessages {
        * required string system = 1;
        * @return The bytes for system.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getSystemBytes() {
         java.lang.Object ref = system_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           system_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -5297,7 +5297,7 @@ public final class DistributedPubSubMessages {
        * @return This builder for chaining.
        */
       public Builder setSystemBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5322,8 +5322,8 @@ public final class DistributedPubSubMessages {
       public java.lang.String getHostname() {
         java.lang.Object ref = hostname_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             hostname_ = s;
@@ -5337,17 +5337,17 @@ public final class DistributedPubSubMessages {
        * required string hostname = 2;
        * @return The bytes for hostname.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getHostnameBytes() {
         java.lang.Object ref = hostname_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           hostname_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -5381,7 +5381,7 @@ public final class DistributedPubSubMessages {
        * @return This builder for chaining.
        */
       public Builder setHostnameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5443,8 +5443,8 @@ public final class DistributedPubSubMessages {
       public java.lang.String getProtocol() {
         java.lang.Object ref = protocol_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             protocol_ = s;
@@ -5458,17 +5458,17 @@ public final class DistributedPubSubMessages {
        * optional string protocol = 4;
        * @return The bytes for protocol.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getProtocolBytes() {
         java.lang.Object ref = protocol_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           protocol_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -5502,7 +5502,7 @@ public final class DistributedPubSubMessages {
        * @return This builder for chaining.
        */
       public Builder setProtocolBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5513,13 +5513,13 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -5528,37 +5528,37 @@ public final class DistributedPubSubMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Address)
-    private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address();
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getDefaultInstance() {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
    
-        PARSER = new akka.protobufv3.internal.AbstractParser
    () {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
    
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser
    () {
       @java.lang.Override
       public Address parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Address(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser
     parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser
     parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser
     getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser
     getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5566,7 +5566,7 @@ public final class DistributedPubSubMessages {
 
   public interface SendOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Send)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string path = 1;
@@ -5582,7 +5582,7 @@ public final class DistributedPubSubMessages {
      * required string path = 1;
      * @return The bytes for path.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes();
 
     /**
@@ -5605,11 +5605,11 @@ public final class DistributedPubSubMessages {
      * required .Payload payload = 3;
      * @return The payload.
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload();
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload();
     /**
      * required .Payload payload = 3;
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder();
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder();
   }
   /**
    * 
    @@ -5620,12 +5620,12 @@ public final class DistributedPubSubMessages {
    * Protobuf type {@code Send}
    */
   public  static final class Send extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Send)
       SendOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Send.newBuilder() to construct.
-    private Send(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Send(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Send() {
@@ -5635,26 +5635,26 @@ public final class DistributedPubSubMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Send();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Send(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5664,7 +5664,7 @@ public final class DistributedPubSubMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               path_ = bs;
               break;
@@ -5675,11 +5675,11 @@ public final class DistributedPubSubMessages {
               break;
             }
             case 26: {
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) != 0)) {
                 subBuilder = payload_.toBuilder();
               }
-              payload_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
+              payload_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(payload_);
                 payload_ = subBuilder.buildPartial();
@@ -5696,27 +5696,27 @@ public final class DistributedPubSubMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor;
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_fieldAccessorTable
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.Builder.class);
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.Builder.class);
     }
 
     private int bitField0_;
@@ -5738,8 +5738,8 @@ public final class DistributedPubSubMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           path_ = s;
@@ -5751,17 +5751,17 @@ public final class DistributedPubSubMessages {
      * required string path = 1;
      * @return The bytes for path.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         path_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -5783,7 +5783,7 @@ public final class DistributedPubSubMessages {
     }
 
     public static final int PAYLOAD_FIELD_NUMBER = 3;
-    private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
+    private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
     /**
      * required .Payload payload = 3;
      * @return Whether the payload field is set.
@@ -5795,14 +5795,14 @@ public final class DistributedPubSubMessages {
      * required .Payload payload = 3;
      * @return The payload.
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
-      return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
+      return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
     /**
      * required .Payload payload = 3;
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
-      return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
+      return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -5833,10 +5833,10 @@ public final class DistributedPubSubMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, path_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, path_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeBool(2, localAffinity_);
@@ -5854,14 +5854,14 @@ public final class DistributedPubSubMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, path_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, path_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(2, localAffinity_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getPayload());
       }
       size += unknownFields.getSerializedSize();
@@ -5874,10 +5874,10 @@ public final class DistributedPubSubMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send)) {
+      if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send)) {
         return super.equals(obj);
       }
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send) obj;
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send) obj;
 
       if (hasPath() != other.hasPath()) return false;
       if (hasPath()) {
@@ -5911,7 +5911,7 @@ public final class DistributedPubSubMessages {
       }
       if (hasLocalAffinity()) {
         hash = (37 * hash) + LOCALAFFINITY_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getLocalAffinity());
       }
       if (hasPayload()) {
@@ -5923,73 +5923,73 @@ public final class DistributedPubSubMessages {
       return hash;
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5998,7 +5998,7 @@ public final class DistributedPubSubMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6009,7 +6009,7 @@ public final class DistributedPubSubMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -6022,34 +6022,34 @@ public final class DistributedPubSubMessages {
      * Protobuf type {@code Send}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Send)
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.Builder.class);
       }
 
-      // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.newBuilder()
+      // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getPayloadFieldBuilder();
         }
@@ -6071,19 +6071,19 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send getDefaultInstanceForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.getDefaultInstance();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send build() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send result = buildPartial();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send build() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6091,8 +6091,8 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send buildPartial() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send(this);
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send buildPartial() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6122,44 +6122,44 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send) {
-          return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send) {
+          return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send other) {
-        if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send other) {
+        if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.getDefaultInstance()) return this;
         if (other.hasPath()) {
           bitField0_ |= 0x00000001;
           path_ = other.path_;
@@ -6195,14 +6195,14 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parsedMessage = null;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6228,8 +6228,8 @@ public final class DistributedPubSubMessages {
       public java.lang.String getPath() {
         java.lang.Object ref = path_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             path_ = s;
@@ -6243,17 +6243,17 @@ public final class DistributedPubSubMessages {
        * required string path = 1;
        * @return The bytes for path.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getPathBytes() {
         java.lang.Object ref = path_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           path_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -6287,7 +6287,7 @@ public final class DistributedPubSubMessages {
        * @return This builder for chaining.
        */
       public Builder setPathBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -6334,9 +6334,9 @@ public final class DistributedPubSubMessages {
         return this;
       }
 
-      private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_;
+      private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_;
       /**
        * required .Payload payload = 3;
        * @return Whether the payload field is set.
@@ -6348,9 +6348,9 @@ public final class DistributedPubSubMessages {
        * required .Payload payload = 3;
        * @return The payload.
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
         if (payloadBuilder_ == null) {
-          return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+          return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
         } else {
           return payloadBuilder_.getMessage();
         }
@@ -6358,7 +6358,7 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public Builder setPayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
+      public Builder setPayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6375,7 +6375,7 @@ public final class DistributedPubSubMessages {
        * required .Payload payload = 3;
        */
       public Builder setPayload(
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
           onChanged();
@@ -6388,13 +6388,13 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public Builder mergePayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
+      public Builder mergePayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
               payload_ != null &&
-              payload_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
+              payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
             payload_ =
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
           } else {
             payload_ = value;
           }
@@ -6421,7 +6421,7 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getPayloadFieldBuilder().getBuilder();
@@ -6429,23 +6429,23 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
         if (payloadBuilder_ != null) {
           return payloadBuilder_.getMessageOrBuilder();
         } else {
           return payload_ == null ?
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
         }
       }
       /**
        * required .Payload payload = 3;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> 
           getPayloadFieldBuilder() {
         if (payloadBuilder_ == null) {
-          payloadBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>(
+          payloadBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>(
                   getPayload(),
                   getParentForChildren(),
                   isClean());
@@ -6455,13 +6455,13 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -6470,37 +6470,37 @@ public final class DistributedPubSubMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Send)
-    private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send();
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send getDefaultInstance() {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Send parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Send(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6508,7 +6508,7 @@ public final class DistributedPubSubMessages {
 
   public interface SendToAllOrBuilder extends
       // @@protoc_insertion_point(interface_extends:SendToAll)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string path = 1;
@@ -6524,7 +6524,7 @@ public final class DistributedPubSubMessages {
      * required string path = 1;
      * @return The bytes for path.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes();
 
     /**
@@ -6547,11 +6547,11 @@ public final class DistributedPubSubMessages {
      * required .Payload payload = 3;
      * @return The payload.
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload();
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload();
     /**
      * required .Payload payload = 3;
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder();
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder();
   }
   /**
    * 
    @@ -6562,12 +6562,12 @@ public final class DistributedPubSubMessages {
    * Protobuf type {@code SendToAll}
    */
   public  static final class SendToAll extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SendToAll)
       SendToAllOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use SendToAll.newBuilder() to construct.
-    private SendToAll(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private SendToAll(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private SendToAll() {
@@ -6577,26 +6577,26 @@ public final class DistributedPubSubMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new SendToAll();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private SendToAll(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6606,7 +6606,7 @@ public final class DistributedPubSubMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               path_ = bs;
               break;
@@ -6617,11 +6617,11 @@ public final class DistributedPubSubMessages {
               break;
             }
             case 26: {
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) != 0)) {
                 subBuilder = payload_.toBuilder();
               }
-              payload_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
+              payload_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(payload_);
                 payload_ = subBuilder.buildPartial();
@@ -6638,27 +6638,27 @@ public final class DistributedPubSubMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor;
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_fieldAccessorTable
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.Builder.class);
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.Builder.class);
     }
 
     private int bitField0_;
@@ -6680,8 +6680,8 @@ public final class DistributedPubSubMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           path_ = s;
@@ -6693,17 +6693,17 @@ public final class DistributedPubSubMessages {
      * required string path = 1;
      * @return The bytes for path.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         path_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -6725,7 +6725,7 @@ public final class DistributedPubSubMessages {
     }
 
     public static final int PAYLOAD_FIELD_NUMBER = 3;
-    private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
+    private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
     /**
      * required .Payload payload = 3;
      * @return Whether the payload field is set.
@@ -6737,14 +6737,14 @@ public final class DistributedPubSubMessages {
      * required .Payload payload = 3;
      * @return The payload.
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
-      return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
+      return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
     /**
      * required .Payload payload = 3;
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
-      return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
+      return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -6775,10 +6775,10 @@ public final class DistributedPubSubMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, path_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, path_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeBool(2, allButSelf_);
@@ -6796,14 +6796,14 @@ public final class DistributedPubSubMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, path_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, path_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(2, allButSelf_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getPayload());
       }
       size += unknownFields.getSerializedSize();
@@ -6816,10 +6816,10 @@ public final class DistributedPubSubMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll)) {
+      if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll)) {
         return super.equals(obj);
       }
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll) obj;
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll) obj;
 
       if (hasPath() != other.hasPath()) return false;
       if (hasPath()) {
@@ -6853,7 +6853,7 @@ public final class DistributedPubSubMessages {
       }
       if (hasAllButSelf()) {
         hash = (37 * hash) + ALLBUTSELF_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getAllButSelf());
       }
       if (hasPayload()) {
@@ -6865,73 +6865,73 @@ public final class DistributedPubSubMessages {
       return hash;
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -6940,7 +6940,7 @@ public final class DistributedPubSubMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6951,7 +6951,7 @@ public final class DistributedPubSubMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -6964,34 +6964,34 @@ public final class DistributedPubSubMessages {
      * Protobuf type {@code SendToAll}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:SendToAll)
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAllOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAllOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.Builder.class);
       }
 
-      // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.newBuilder()
+      // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getPayloadFieldBuilder();
         }
@@ -7013,19 +7013,19 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll getDefaultInstanceForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.getDefaultInstance();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll build() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll result = buildPartial();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll build() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7033,8 +7033,8 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll buildPartial() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll(this);
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll buildPartial() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7064,44 +7064,44 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll) {
-          return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll) {
+          return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll other) {
-        if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll other) {
+        if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.getDefaultInstance()) return this;
         if (other.hasPath()) {
           bitField0_ |= 0x00000001;
           path_ = other.path_;
@@ -7137,14 +7137,14 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parsedMessage = null;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7170,8 +7170,8 @@ public final class DistributedPubSubMessages {
       public java.lang.String getPath() {
         java.lang.Object ref = path_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             path_ = s;
@@ -7185,17 +7185,17 @@ public final class DistributedPubSubMessages {
        * required string path = 1;
        * @return The bytes for path.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getPathBytes() {
         java.lang.Object ref = path_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           path_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -7229,7 +7229,7 @@ public final class DistributedPubSubMessages {
        * @return This builder for chaining.
        */
       public Builder setPathBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7276,9 +7276,9 @@ public final class DistributedPubSubMessages {
         return this;
       }
 
-      private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_;
+      private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_;
       /**
        * required .Payload payload = 3;
        * @return Whether the payload field is set.
@@ -7290,9 +7290,9 @@ public final class DistributedPubSubMessages {
        * required .Payload payload = 3;
        * @return The payload.
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
         if (payloadBuilder_ == null) {
-          return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+          return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
         } else {
           return payloadBuilder_.getMessage();
         }
@@ -7300,7 +7300,7 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public Builder setPayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
+      public Builder setPayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7317,7 +7317,7 @@ public final class DistributedPubSubMessages {
        * required .Payload payload = 3;
        */
       public Builder setPayload(
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
           onChanged();
@@ -7330,13 +7330,13 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public Builder mergePayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
+      public Builder mergePayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
               payload_ != null &&
-              payload_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
+              payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
             payload_ =
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
           } else {
             payload_ = value;
           }
@@ -7363,7 +7363,7 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getPayloadFieldBuilder().getBuilder();
@@ -7371,23 +7371,23 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
         if (payloadBuilder_ != null) {
           return payloadBuilder_.getMessageOrBuilder();
         } else {
           return payload_ == null ?
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
         }
       }
       /**
        * required .Payload payload = 3;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> 
           getPayloadFieldBuilder() {
         if (payloadBuilder_ == null) {
-          payloadBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>(
+          payloadBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>(
                   getPayload(),
                   getParentForChildren(),
                   isClean());
@@ -7397,13 +7397,13 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -7412,37 +7412,37 @@ public final class DistributedPubSubMessages {
     }
 
     // @@protoc_insertion_point(class_scope:SendToAll)
-    private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll();
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll getDefaultInstance() {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public SendToAll parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new SendToAll(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7450,7 +7450,7 @@ public final class DistributedPubSubMessages {
 
   public interface PublishOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Publish)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string topic = 1;
@@ -7466,7 +7466,7 @@ public final class DistributedPubSubMessages {
      * required string topic = 1;
      * @return The bytes for topic.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getTopicBytes();
 
     /**
@@ -7478,11 +7478,11 @@ public final class DistributedPubSubMessages {
      * required .Payload payload = 3;
      * @return The payload.
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload();
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload();
     /**
      * required .Payload payload = 3;
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder();
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder();
   }
   /**
    * 
    @@ -7493,12 +7493,12 @@ public final class DistributedPubSubMessages {
    * Protobuf type {@code Publish}
    */
   public  static final class Publish extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Publish)
       PublishOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Publish.newBuilder() to construct.
-    private Publish(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Publish(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Publish() {
@@ -7508,26 +7508,26 @@ public final class DistributedPubSubMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Publish();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Publish(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7537,17 +7537,17 @@ public final class DistributedPubSubMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               topic_ = bs;
               break;
             }
             case 26: {
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = payload_.toBuilder();
               }
-              payload_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
+              payload_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(payload_);
                 payload_ = subBuilder.buildPartial();
@@ -7564,27 +7564,27 @@ public final class DistributedPubSubMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor;
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_fieldAccessorTable
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.Builder.class);
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.Builder.class);
     }
 
     private int bitField0_;
@@ -7606,8 +7606,8 @@ public final class DistributedPubSubMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           topic_ = s;
@@ -7619,22 +7619,22 @@ public final class DistributedPubSubMessages {
      * required string topic = 1;
      * @return The bytes for topic.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getTopicBytes() {
       java.lang.Object ref = topic_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         topic_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int PAYLOAD_FIELD_NUMBER = 3;
-    private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
+    private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
     /**
      * required .Payload payload = 3;
      * @return Whether the payload field is set.
@@ -7646,14 +7646,14 @@ public final class DistributedPubSubMessages {
      * required .Payload payload = 3;
      * @return The payload.
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
-      return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
+      return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
     /**
      * required .Payload payload = 3;
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
-      return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
+      return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -7680,10 +7680,10 @@ public final class DistributedPubSubMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, topic_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, topic_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(3, getPayload());
@@ -7698,10 +7698,10 @@ public final class DistributedPubSubMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, topic_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, topic_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getPayload());
       }
       size += unknownFields.getSerializedSize();
@@ -7714,10 +7714,10 @@ public final class DistributedPubSubMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish)) {
+      if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish)) {
         return super.equals(obj);
       }
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish) obj;
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish) obj;
 
       if (hasTopic() != other.hasTopic()) return false;
       if (hasTopic()) {
@@ -7753,73 +7753,73 @@ public final class DistributedPubSubMessages {
       return hash;
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -7828,7 +7828,7 @@ public final class DistributedPubSubMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7839,7 +7839,7 @@ public final class DistributedPubSubMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -7852,34 +7852,34 @@ public final class DistributedPubSubMessages {
      * Protobuf type {@code Publish}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Publish)
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PublishOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PublishOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.Builder.class);
       }
 
-      // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.newBuilder()
+      // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getPayloadFieldBuilder();
         }
@@ -7899,19 +7899,19 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish getDefaultInstanceForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.getDefaultInstance();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish build() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish result = buildPartial();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish build() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7919,8 +7919,8 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish buildPartial() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish(this);
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish buildPartial() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7946,44 +7946,44 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish) {
-          return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish) {
+          return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish other) {
-        if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish other) {
+        if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.getDefaultInstance()) return this;
         if (other.hasTopic()) {
           bitField0_ |= 0x00000001;
           topic_ = other.topic_;
@@ -8013,14 +8013,14 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parsedMessage = null;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -8046,8 +8046,8 @@ public final class DistributedPubSubMessages {
       public java.lang.String getTopic() {
         java.lang.Object ref = topic_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             topic_ = s;
@@ -8061,17 +8061,17 @@ public final class DistributedPubSubMessages {
        * required string topic = 1;
        * @return The bytes for topic.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getTopicBytes() {
         java.lang.Object ref = topic_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           topic_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -8105,7 +8105,7 @@ public final class DistributedPubSubMessages {
        * @return This builder for chaining.
        */
       public Builder setTopicBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8115,9 +8115,9 @@ public final class DistributedPubSubMessages {
         return this;
       }
 
-      private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_;
+      private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_;
       /**
        * required .Payload payload = 3;
        * @return Whether the payload field is set.
@@ -8129,9 +8129,9 @@ public final class DistributedPubSubMessages {
        * required .Payload payload = 3;
        * @return The payload.
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
         if (payloadBuilder_ == null) {
-          return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+          return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
         } else {
           return payloadBuilder_.getMessage();
         }
@@ -8139,7 +8139,7 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public Builder setPayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
+      public Builder setPayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8156,7 +8156,7 @@ public final class DistributedPubSubMessages {
        * required .Payload payload = 3;
        */
       public Builder setPayload(
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
           onChanged();
@@ -8169,13 +8169,13 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public Builder mergePayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
+      public Builder mergePayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               payload_ != null &&
-              payload_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
+              payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
             payload_ =
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
           } else {
             payload_ = value;
           }
@@ -8202,7 +8202,7 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getPayloadFieldBuilder().getBuilder();
@@ -8210,23 +8210,23 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 3;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
         if (payloadBuilder_ != null) {
           return payloadBuilder_.getMessageOrBuilder();
         } else {
           return payload_ == null ?
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
         }
       }
       /**
        * required .Payload payload = 3;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> 
           getPayloadFieldBuilder() {
         if (payloadBuilder_ == null) {
-          payloadBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>(
+          payloadBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>(
                   getPayload(),
                   getParentForChildren(),
                   isClean());
@@ -8236,13 +8236,13 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -8251,37 +8251,37 @@ public final class DistributedPubSubMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Publish)
-    private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish();
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish getDefaultInstance() {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Publish parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Publish(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8289,7 +8289,7 @@ public final class DistributedPubSubMessages {
 
   public interface SendToOneSubscriberOrBuilder extends
       // @@protoc_insertion_point(interface_extends:SendToOneSubscriber)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Payload payload = 1;
@@ -8300,11 +8300,11 @@ public final class DistributedPubSubMessages {
      * required .Payload payload = 1;
      * @return The payload.
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload();
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload();
     /**
      * required .Payload payload = 1;
      */
-    akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder();
+    org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder();
   }
   /**
    * 
    @@ -8315,12 +8315,12 @@ public final class DistributedPubSubMessages {
    * Protobuf type {@code SendToOneSubscriber}
    */
   public  static final class SendToOneSubscriber extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SendToOneSubscriber)
       SendToOneSubscriberOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use SendToOneSubscriber.newBuilder() to construct.
-    private SendToOneSubscriber(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private SendToOneSubscriber(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private SendToOneSubscriber() {
@@ -8329,26 +8329,26 @@ public final class DistributedPubSubMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new SendToOneSubscriber();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private SendToOneSubscriber(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8358,11 +8358,11 @@ public final class DistributedPubSubMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = payload_.toBuilder();
               }
-              payload_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
+              payload_ = input.readMessage(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(payload_);
                 payload_ = subBuilder.buildPartial();
@@ -8379,32 +8379,32 @@ public final class DistributedPubSubMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_descriptor;
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_fieldAccessorTable
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.Builder.class);
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.Builder.class);
     }
 
     private int bitField0_;
     public static final int PAYLOAD_FIELD_NUMBER = 1;
-    private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
+    private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
     /**
      * required .Payload payload = 1;
      * @return Whether the payload field is set.
@@ -8416,14 +8416,14 @@ public final class DistributedPubSubMessages {
      * required .Payload payload = 1;
      * @return The payload.
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
-      return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
+      return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
     /**
      * required .Payload payload = 1;
      */
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
-      return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
+      return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -8446,7 +8446,7 @@ public final class DistributedPubSubMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getPayload());
@@ -8461,7 +8461,7 @@ public final class DistributedPubSubMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getPayload());
       }
       size += unknownFields.getSerializedSize();
@@ -8474,10 +8474,10 @@ public final class DistributedPubSubMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber)) {
+      if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber)) {
         return super.equals(obj);
       }
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber) obj;
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber) obj;
 
       if (hasPayload() != other.hasPayload()) return false;
       if (hasPayload()) {
@@ -8504,73 +8504,73 @@ public final class DistributedPubSubMessages {
       return hash;
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseDelimitedFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -8579,7 +8579,7 @@ public final class DistributedPubSubMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8590,7 +8590,7 @@ public final class DistributedPubSubMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -8603,34 +8603,34 @@ public final class DistributedPubSubMessages {
      * Protobuf type {@code SendToOneSubscriber}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:SendToOneSubscriber)
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriberOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriberOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.Builder.class);
       }
 
-      // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.newBuilder()
+      // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getPayloadFieldBuilder();
         }
@@ -8648,19 +8648,19 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToOneSubscriber_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber getDefaultInstanceForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.getDefaultInstance();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber build() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber result = buildPartial();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber build() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8668,8 +8668,8 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber buildPartial() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber(this);
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber buildPartial() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -8691,44 +8691,44 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber) {
-          return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber) {
+          return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber other) {
-        if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber other) {
+        if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber.getDefaultInstance()) return this;
         if (other.hasPayload()) {
           mergePayload(other.getPayload());
         }
@@ -8750,14 +8750,14 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parsedMessage = null;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -8768,9 +8768,9 @@ public final class DistributedPubSubMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_;
+      private org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_;
       /**
        * required .Payload payload = 1;
        * @return Whether the payload field is set.
@@ -8782,9 +8782,9 @@ public final class DistributedPubSubMessages {
        * required .Payload payload = 1;
        * @return The payload.
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() {
         if (payloadBuilder_ == null) {
-          return payload_ == null ? akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+          return payload_ == null ? org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
         } else {
           return payloadBuilder_.getMessage();
         }
@@ -8792,7 +8792,7 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 1;
        */
-      public Builder setPayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
+      public Builder setPayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8809,7 +8809,7 @@ public final class DistributedPubSubMessages {
        * required .Payload payload = 1;
        */
       public Builder setPayload(
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
           onChanged();
@@ -8822,13 +8822,13 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 1;
        */
-      public Builder mergePayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
+      public Builder mergePayload(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               payload_ != null &&
-              payload_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
+              payload_ != org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) {
             payload_ =
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial();
           } else {
             payload_ = value;
           }
@@ -8855,7 +8855,7 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getPayloadFieldBuilder().getBuilder();
@@ -8863,23 +8863,23 @@ public final class DistributedPubSubMessages {
       /**
        * required .Payload payload = 1;
        */
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() {
         if (payloadBuilder_ != null) {
           return payloadBuilder_.getMessageOrBuilder();
         } else {
           return payload_ == null ?
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance() : payload_;
         }
       }
       /**
        * required .Payload payload = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> 
           getPayloadFieldBuilder() {
         if (payloadBuilder_ == null) {
-          payloadBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>(
+          payloadBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>(
                   getPayload(),
                   getParentForChildren(),
                   isClean());
@@ -8889,13 +8889,13 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -8904,37 +8904,37 @@ public final class DistributedPubSubMessages {
     }
 
     // @@protoc_insertion_point(class_scope:SendToOneSubscriber)
-    private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber();
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber getDefaultInstance() {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public SendToOneSubscriber parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new SendToOneSubscriber(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToOneSubscriber getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8942,7 +8942,7 @@ public final class DistributedPubSubMessages {
 
   public interface PayloadOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Payload)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required bytes enclosedMessage = 1;
@@ -8953,7 +8953,7 @@ public final class DistributedPubSubMessages {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
-    akka.protobufv3.internal.ByteString getEnclosedMessage();
+    org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage();
 
     /**
      * required int32 serializerId = 2;
@@ -8975,48 +8975,48 @@ public final class DistributedPubSubMessages {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
-    akka.protobufv3.internal.ByteString getMessageManifest();
+    org.apache.pekko.protobufv3.internal.ByteString getMessageManifest();
   }
   /**
    * Protobuf type {@code Payload}
    */
   public  static final class Payload extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Payload)
       PayloadOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Payload.newBuilder() to construct.
-    private Payload(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Payload(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Payload() {
-      enclosedMessage_ = akka.protobufv3.internal.ByteString.EMPTY;
-      messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+      messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Payload();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Payload(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9049,32 +9049,32 @@ public final class DistributedPubSubMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor;
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_fieldAccessorTable
+      return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder.class);
+              org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder.class);
     }
 
     private int bitField0_;
     public static final int ENCLOSEDMESSAGE_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.ByteString enclosedMessage_;
+    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_;
     /**
      * required bytes enclosedMessage = 1;
      * @return Whether the enclosedMessage field is set.
@@ -9086,7 +9086,7 @@ public final class DistributedPubSubMessages {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
-    public akka.protobufv3.internal.ByteString getEnclosedMessage() {
+    public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
       return enclosedMessage_;
     }
 
@@ -9108,7 +9108,7 @@ public final class DistributedPubSubMessages {
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 4;
-    private akka.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
     /**
      * optional bytes messageManifest = 4;
      * @return Whether the messageManifest field is set.
@@ -9120,7 +9120,7 @@ public final class DistributedPubSubMessages {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
-    public akka.protobufv3.internal.ByteString getMessageManifest() {
+    public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
 
@@ -9144,7 +9144,7 @@ public final class DistributedPubSubMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, enclosedMessage_);
@@ -9165,15 +9165,15 @@ public final class DistributedPubSubMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(1, enclosedMessage_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(2, serializerId_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(4, messageManifest_);
       }
       size += unknownFields.getSerializedSize();
@@ -9186,10 +9186,10 @@ public final class DistributedPubSubMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload)) {
+      if (!(obj instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload)) {
         return super.equals(obj);
       }
-      akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload other = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload) obj;
+      org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload other = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload) obj;
 
       if (hasEnclosedMessage() != other.hasEnclosedMessage()) return false;
       if (hasEnclosedMessage()) {
@@ -9234,73 +9234,73 @@ public final class DistributedPubSubMessages {
       return hash;
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom(
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -9309,7 +9309,7 @@ public final class DistributedPubSubMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -9320,7 +9320,7 @@ public final class DistributedPubSubMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -9328,63 +9328,63 @@ public final class DistributedPubSubMessages {
      * Protobuf type {@code Payload}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Payload)
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_fieldAccessorTable
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder.class);
+                org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.class, org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder.class);
       }
 
-      // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder()
+      // Construct using org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        enclosedMessage_ = akka.protobufv3.internal.ByteString.EMPTY;
+        enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+        messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor;
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getDefaultInstanceForType() {
-        return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload build() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload result = buildPartial();
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload build() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9392,8 +9392,8 @@ public final class DistributedPubSubMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload buildPartial() {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload(this);
+      public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload buildPartial() {
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload result = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -9419,44 +9419,44 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload) {
-          return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload) {
+          return mergeFrom((org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload other) {
-        if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload other) {
+        if (other == org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) return this;
         if (other.hasEnclosedMessage()) {
           setEnclosedMessage(other.getEnclosedMessage());
         }
@@ -9484,14 +9484,14 @@ public final class DistributedPubSubMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parsedMessage = null;
+        org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -9502,7 +9502,7 @@ public final class DistributedPubSubMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.ByteString enclosedMessage_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes enclosedMessage = 1;
        * @return Whether the enclosedMessage field is set.
@@ -9514,7 +9514,7 @@ public final class DistributedPubSubMessages {
        * required bytes enclosedMessage = 1;
        * @return The enclosedMessage.
        */
-      public akka.protobufv3.internal.ByteString getEnclosedMessage() {
+      public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
         return enclosedMessage_;
       }
       /**
@@ -9522,7 +9522,7 @@ public final class DistributedPubSubMessages {
        * @param value The enclosedMessage to set.
        * @return This builder for chaining.
        */
-      public Builder setEnclosedMessage(akka.protobufv3.internal.ByteString value) {
+      public Builder setEnclosedMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -9579,7 +9579,7 @@ public final class DistributedPubSubMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.ByteString messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * optional bytes messageManifest = 4;
        * @return Whether the messageManifest field is set.
@@ -9591,7 +9591,7 @@ public final class DistributedPubSubMessages {
        * optional bytes messageManifest = 4;
        * @return The messageManifest.
        */
-      public akka.protobufv3.internal.ByteString getMessageManifest() {
+      public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
       /**
@@ -9599,7 +9599,7 @@ public final class DistributedPubSubMessages {
        * @param value The messageManifest to set.
        * @return This builder for chaining.
        */
-      public Builder setMessageManifest(akka.protobufv3.internal.ByteString value) {
+      public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -9620,13 +9620,13 @@ public final class DistributedPubSubMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -9635,103 +9635,103 @@ public final class DistributedPubSubMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Payload)
-    private static final akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload();
     }
 
-    public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getDefaultInstance() {
+    public static org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Payload parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Payload(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Status_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Status_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Status_Version_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Status_Version_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Delta_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Delta_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Delta_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Delta_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Delta_Bucket_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Delta_Bucket_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Address_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Address_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Send_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Send_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_SendToAll_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_SendToAll_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Publish_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Publish_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_SendToOneSubscriber_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_SendToOneSubscriber_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Payload_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Payload_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -9753,77 +9753,77 @@ public final class DistributedPubSubMessages {
       "\0132\010.Payload\"0\n\023SendToOneSubscriber\022\031\n\007pa" +
       "yload\030\001 \002(\0132\010.Payload\"Q\n\007Payload\022\027\n\017encl" +
       "osedMessage\030\001 \002(\014\022\024\n\014serializerId\030\002 \002(\005\022" +
-      "\027\n\017messageManifest\030\004 \001(\014B$\n akka.cluster" +
-      ".pubsub.protobuf.msgH\001"
+      "\027\n\017messageManifest\030\004 \001(\014B0\n,org.apache.p" +
+      "ekko.cluster.pubsub.protobuf.msgH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_Status_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Status_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Status_descriptor,
         new java.lang.String[] { "Versions", "ReplyToStatus", });
     internal_static_Status_Version_descriptor =
       internal_static_Status_descriptor.getNestedTypes().get(0);
     internal_static_Status_Version_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Status_Version_descriptor,
         new java.lang.String[] { "Address", "Timestamp", });
     internal_static_Delta_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_Delta_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Delta_descriptor,
         new java.lang.String[] { "Buckets", });
     internal_static_Delta_Entry_descriptor =
       internal_static_Delta_descriptor.getNestedTypes().get(0);
     internal_static_Delta_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Delta_Entry_descriptor,
         new java.lang.String[] { "Key", "Version", "Ref", });
     internal_static_Delta_Bucket_descriptor =
       internal_static_Delta_descriptor.getNestedTypes().get(1);
     internal_static_Delta_Bucket_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Delta_Bucket_descriptor,
         new java.lang.String[] { "Owner", "Version", "Content", });
     internal_static_Address_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_Address_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Address_descriptor,
         new java.lang.String[] { "System", "Hostname", "Port", "Protocol", });
     internal_static_Send_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_Send_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Send_descriptor,
         new java.lang.String[] { "Path", "LocalAffinity", "Payload", });
     internal_static_SendToAll_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_SendToAll_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SendToAll_descriptor,
         new java.lang.String[] { "Path", "AllButSelf", "Payload", });
     internal_static_Publish_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_Publish_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Publish_descriptor,
         new java.lang.String[] { "Topic", "Payload", });
     internal_static_SendToOneSubscriber_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_SendToOneSubscriber_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SendToOneSubscriber_descriptor,
         new java.lang.String[] { "Payload", });
     internal_static_Payload_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_Payload_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Payload_descriptor,
         new java.lang.String[] { "EnclosedMessage", "SerializerId", "MessageManifest", });
   }
diff --git a/akka-cluster-tools/src/main/protobuf/ClusterClientMessages.proto b/akka-cluster-tools/src/main/protobuf/ClusterClientMessages.proto
index 63401f18db..9d974dc8a4 100644
--- a/akka-cluster-tools/src/main/protobuf/ClusterClientMessages.proto
+++ b/akka-cluster-tools/src/main/protobuf/ClusterClientMessages.proto
@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-option java_package = "akka.cluster.client.protobuf.msg";
+option java_package = "org.apache.pekko.cluster.client.protobuf.msg";
 option optimize_for = SPEED;
 
 message Contacts {
diff --git a/akka-cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto b/akka-cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto
index ee673cfcbf..ddb27bd073 100644
--- a/akka-cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto
+++ b/akka-cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto
@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-option java_package = "akka.cluster.pubsub.protobuf.msg";
+option java_package = "org.apache.pekko.cluster.pubsub.protobuf.msg";
 option optimize_for = SPEED;
 
 message Status {
diff --git a/akka-cluster-tools/src/main/resources/reference.conf b/akka-cluster-tools/src/main/resources/reference.conf
index 51c032e3f5..aad17ed753 100644
--- a/akka-cluster-tools/src/main/resources/reference.conf
+++ b/akka-cluster-tools/src/main/resources/reference.conf
@@ -41,14 +41,14 @@ akka.cluster.pub-sub {
 # Protobuf serializer for cluster DistributedPubSubMeditor messages
 akka.actor {
   serializers {
-    akka-pubsub = "akka.cluster.pubsub.protobuf.DistributedPubSubMessageSerializer"
+    akka-pubsub = "org.apache.pekko.cluster.pubsub.protobuf.DistributedPubSubMessageSerializer"
   }
   serialization-bindings {
-    "akka.cluster.pubsub.DistributedPubSubMessage" = akka-pubsub
-    "akka.cluster.pubsub.DistributedPubSubMediator$Internal$SendToOneSubscriber" = akka-pubsub
+    "org.apache.pekko.cluster.pubsub.DistributedPubSubMessage" = akka-pubsub
+    "org.apache.pekko.cluster.pubsub.DistributedPubSubMediator$Internal$SendToOneSubscriber" = akka-pubsub
   }
   serialization-identifiers {
-    "akka.cluster.pubsub.protobuf.DistributedPubSubMessageSerializer" = 9
+    "org.apache.pekko.cluster.pubsub.protobuf.DistributedPubSubMessageSerializer" = 9
   }
 }
 
@@ -80,7 +80,7 @@ akka.cluster.client.receptionist {
 
   # Number of potentially lost/delayed heartbeats that will be
   # accepted before considering it to be an anomaly.
-  # The ClusterReceptionist is using the akka.remote.DeadlineFailureDetector, which
+  # The ClusterReceptionist is using the org.apache.pekko.remote.DeadlineFailureDetector, which
   # will trigger if there are no heartbeats within the duration
   # heartbeat-interval + acceptable-heartbeat-pause, i.e. 15 seconds with
   # the default settings.
@@ -114,7 +114,7 @@ akka.cluster.client {
   
   # Number of potentially lost/delayed heartbeats that will be
   # accepted before considering it to be an anomaly.
-  # The ClusterClient is using the akka.remote.DeadlineFailureDetector, which
+  # The ClusterClient is using the org.apache.pekko.remote.DeadlineFailureDetector, which
   # will trigger if there are no heartbeats within the duration 
   # heartbeat-interval + acceptable-heartbeat-pause, i.e. 15 seconds with
   # the default settings.
@@ -142,13 +142,13 @@ akka.cluster.client {
 # Protobuf serializer for ClusterClient messages
 akka.actor {
   serializers {
-    akka-cluster-client = "akka.cluster.client.protobuf.ClusterClientMessageSerializer"
+    akka-cluster-client = "org.apache.pekko.cluster.client.protobuf.ClusterClientMessageSerializer"
   }
   serialization-bindings {
-    "akka.cluster.client.ClusterClientMessage" = akka-cluster-client
+    "org.apache.pekko.cluster.client.ClusterClientMessage" = akka-cluster-client
   }
   serialization-identifiers {
-    "akka.cluster.client.protobuf.ClusterClientMessageSerializer" = 15
+    "org.apache.pekko.cluster.client.protobuf.ClusterClientMessageSerializer" = 15
   }
 }
 
@@ -220,12 +220,12 @@ akka.cluster.singleton-proxy {
 # Serializer for cluster ClusterSingleton messages
 akka.actor {
   serializers {
-    akka-singleton = "akka.cluster.singleton.protobuf.ClusterSingletonMessageSerializer"
+    akka-singleton = "org.apache.pekko.cluster.singleton.protobuf.ClusterSingletonMessageSerializer"
   }
   serialization-bindings {
-    "akka.cluster.singleton.ClusterSingletonMessage" = akka-singleton
+    "org.apache.pekko.cluster.singleton.ClusterSingletonMessage" = akka-singleton
   }
   serialization-identifiers {
-    "akka.cluster.singleton.protobuf.ClusterSingletonMessageSerializer" = 14
+    "org.apache.pekko.cluster.singleton.protobuf.ClusterSingletonMessageSerializer" = 14
   }
 }
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
similarity index 94%
rename from akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala
rename to akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
index a8eba44dc7..0ffeeb8364 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala
+++ b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.client
+package org.apache.pekko.cluster.client
 
 import java.net.URLEncoder
 
@@ -12,37 +12,38 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorLogging
-import akka.actor.ActorPath
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Cancellable
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.DeadLetterSuppression
-import akka.actor.Deploy
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.actor.Identify
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.Props
-import akka.actor.ReceiveTimeout
-import akka.actor.Terminated
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.cluster.pubsub._
-import akka.japi.Util.immutableSeq
-import akka.remote.DeadlineFailureDetector
-import akka.routing.ConsistentHash
-import akka.routing.MurmurHash
-import akka.util.MessageBuffer
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorLogging
+import pekko.actor.ActorPath
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Cancellable
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.DeadLetterSuppression
+import pekko.actor.Deploy
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.actor.Identify
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.Props
+import pekko.actor.ReceiveTimeout
+import pekko.actor.Terminated
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.cluster.pubsub._
+import pekko.japi.Util.immutableSeq
+import pekko.remote.DeadlineFailureDetector
+import pekko.routing.ConsistentHash
+import pekko.routing.MurmurHash
+import pekko.util.MessageBuffer
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 @deprecated(
@@ -104,7 +105,7 @@ object ClusterClientSettings {
  *   of failed connections should be sent.
  * @param acceptableHeartbeatPause Number of potentially lost/delayed heartbeats that will
  *   be accepted before considering it to be an anomaly. The ClusterClient is using the
- *   [[akka.remote.DeadlineFailureDetector]], which will trigger if there are no heartbeats
+ *   [[pekko.remote.DeadlineFailureDetector]], which will trigger if there are no heartbeats
  *   within the duration `heartbeatInterval + acceptableHeartbeatPause`.
  * @param bufferSize If connection to the receptionist is not established the client
  *   will buffer this number of messages and deliver them the connection is established.
@@ -162,7 +163,7 @@ final class ClusterClientSettings(
    * Java API
    */
   def withInitialContacts(initialContacts: java.util.Set[ActorPath]): ClusterClientSettings = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     withInitialContacts(initialContacts.asScala.toSet)
   }
 
@@ -272,7 +273,7 @@ case object GetContactPoints extends GetContactPoints {
  * @param contactPoints The presently known list of contact points.
  */
 final case class ContactPoints(contactPoints: Set[ActorPath]) {
-  import akka.util.ccompat.JavaConverters._
+  import pekko.util.ccompat.JavaConverters._
 
   /**
    * Java API
@@ -287,7 +288,7 @@ final case class ContactPoints(contactPoints: Set[ActorPath]) {
 object ClusterClient {
 
   /**
-   * Scala API: Factory method for `ClusterClient` [[akka.actor.Props]].
+   * Scala API: Factory method for `ClusterClient` [[pekko.actor.Props]].
    */
   @deprecated(
     "Use Akka gRPC instead, see https://doc.akka.io/docs/akka/2.6/cluster-client.html#migration-to-akka-grpc",
@@ -321,7 +322,7 @@ object ClusterClient {
   /**
    * INTERNAL API
    */
-  private[akka] object Internal {
+  private[pekko] object Internal {
     case object RefreshContactsTick
     case object HeartbeatTick
     case object ReconnectTimeout
@@ -359,7 +360,7 @@ object ClusterClient {
  * to the named topic.
  *
  *  Use the factory method [[ClusterClient#props]]) to create the
- * [[akka.actor.Props]] for the actor.
+ * [[pekko.actor.Props]] for the actor.
  *
  * If the receptionist is not currently available, the client will buffer the messages
  * and then deliver them when the connection to the receptionist has been established.
@@ -568,9 +569,9 @@ object ClusterClientReceptionist extends ExtensionId[ClusterClientReceptionist]
 }
 
 /**
- * Extension that starts [[ClusterReceptionist]] and accompanying [[akka.cluster.pubsub.DistributedPubSubMediator]]
+ * Extension that starts [[ClusterReceptionist]] and accompanying [[pekko.cluster.pubsub.DistributedPubSubMediator]]
  * with settings defined in config section `akka.cluster.client.receptionist`.
- * The [[akka.cluster.pubsub.DistributedPubSubMediator]] is started by the [[akka.cluster.pubsub.DistributedPubSub]] extension.
+ * The [[pekko.cluster.pubsub.DistributedPubSubMediator]] is started by the [[pekko.cluster.pubsub.DistributedPubSub]] extension.
  */
 @deprecated(
   "Use Akka gRPC instead, see https://doc.akka.io/docs/akka/2.6/cluster-client.html#migration-to-akka-grpc",
@@ -690,7 +691,7 @@ object ClusterReceptionistSettings {
   /**
    * INTERNAL API
    */
-  private[akka] def roleOption(role: String): Option[String] =
+  private[pekko] def roleOption(role: String): Option[String] =
     if (role == "") None else Option(role)
 
 }
@@ -855,7 +856,7 @@ case object GetClusterClients extends GetClusterClients {
  * @param clusterClients The presently known list of cluster clients.
  */
 final case class ClusterClients(clusterClients: Set[ActorRef]) {
-  import akka.util.ccompat.JavaConverters._
+  import pekko.util.ccompat.JavaConverters._
 
   /**
    * Java API
@@ -870,7 +871,7 @@ final case class ClusterClients(clusterClients: Set[ActorRef]) {
 object ClusterReceptionist {
 
   /**
-   * Scala API: Factory method for `ClusterReceptionist` [[akka.actor.Props]].
+   * Scala API: Factory method for `ClusterReceptionist` [[pekko.actor.Props]].
    */
   def props(pubSubMediator: ActorRef, settings: ClusterReceptionistSettings): Props =
     Props(new ClusterReceptionist(pubSubMediator, settings)).withDeploy(Deploy.local)
@@ -878,7 +879,7 @@ object ClusterReceptionist {
   /**
    * INTERNAL API
    */
-  private[akka] object Internal {
+  private[pekko] object Internal {
     @SerialVersionUID(1L)
     case object GetContacts extends ClusterClientMessage with DeadLetterSuppression
     @SerialVersionUID(1L)
@@ -926,12 +927,12 @@ object ClusterReceptionist {
  * The receptionist can be started with the [[ClusterClientReceptionist]] or as an
  * ordinary actor (use the factory method [[ClusterReceptionist#props]]).
  *
- * The receptionist forwards messages from the client to the associated [[akka.cluster.pubsub.DistributedPubSubMediator]],
+ * The receptionist forwards messages from the client to the associated [[pekko.cluster.pubsub.DistributedPubSubMediator]],
  * i.e. the client can send messages to any actor in the cluster that is registered in the
  * `DistributedPubSubMediator`. Messages from the client are wrapped in
- * [[akka.cluster.pubsub.DistributedPubSubMediator.Send]], [[akka.cluster.pubsub.DistributedPubSubMediator.SendToAll]]
- * or [[akka.cluster.pubsub.DistributedPubSubMediator.Publish]] with the semantics described in
- * [[akka.cluster.pubsub.DistributedPubSubMediator]].
+ * [[pekko.cluster.pubsub.DistributedPubSubMediator.Send]], [[pekko.cluster.pubsub.DistributedPubSubMediator.SendToAll]]
+ * or [[pekko.cluster.pubsub.DistributedPubSubMediator.Publish]] with the semantics described in
+ * [[pekko.cluster.pubsub.DistributedPubSubMediator]].
  *
  * Response messages from the destination actor are tunneled via the receptionist
  * to avoid inbound connections from other cluster nodes to the client, i.e.
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializer.scala b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala
similarity index 84%
rename from akka-cluster-tools/src/main/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializer.scala
rename to akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala
index f26cd739c7..b1854ff25b 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializer.scala
+++ b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.client.protobuf
+package org.apache.pekko.cluster.client.protobuf
 
 import java.io.NotSerializableException
 
 import scala.annotation.nowarn
 
-import akka.actor.ExtendedActorSystem
-import akka.cluster.client.ClusterReceptionist
-import akka.cluster.client.protobuf.msg.{ ClusterClientMessages => cm }
-import akka.serialization.BaseSerializer
-import akka.serialization.SerializerWithStringManifest
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.client.ClusterReceptionist
+import pekko.cluster.client.protobuf.msg.{ ClusterClientMessages => cm }
+import pekko.serialization.BaseSerializer
+import pekko.serialization.SerializerWithStringManifest
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API: Serializer of ClusterClient messages.
  */
 @nowarn("msg=deprecated")
-private[akka] class ClusterClientMessageSerializer(val system: ExtendedActorSystem)
+private[pekko] class ClusterClientMessageSerializer(val system: ExtendedActorSystem)
     extends SerializerWithStringManifest
     with BaseSerializer {
   import ClusterReceptionist.Internal._
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
similarity index 96%
rename from akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala
rename to akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
index e658bdce99..e0da1c37f9 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala
+++ b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.pubsub
+package org.apache.pekko.cluster.pubsub
 
 import java.net.URLDecoder
 import java.net.URLEncoder
@@ -15,21 +15,22 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.annotation.DoNotInherit
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.routing.ActorRefRoutee
-import akka.routing.BroadcastRoutingLogic
-import akka.routing.ConsistentHashingRoutingLogic
-import akka.routing.RandomRoutingLogic
-import akka.routing.RoundRobinRoutingLogic
-import akka.routing.Routee
-import akka.routing.Router
-import akka.routing.RouterEnvelope
-import akka.routing.RoutingLogic
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.DoNotInherit
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.routing.ActorRefRoutee
+import pekko.routing.BroadcastRoutingLogic
+import pekko.routing.ConsistentHashingRoutingLogic
+import pekko.routing.RandomRoutingLogic
+import pekko.routing.RoundRobinRoutingLogic
+import pekko.routing.Routee
+import pekko.routing.Router
+import pekko.routing.RouterEnvelope
+import pekko.routing.RoutingLogic
 
 object DistributedPubSubSettings {
 
@@ -76,7 +77,7 @@ object DistributedPubSubSettings {
   /**
    * INTERNAL API
    */
-  private[akka] def roleOption(role: String): Option[String] =
+  private[pekko] def roleOption(role: String): Option[String] =
     if (role == "") None else Option(role)
 }
 
@@ -156,7 +157,7 @@ final class DistributedPubSubSettings(
 object DistributedPubSubMediator {
 
   /**
-   * Scala API: Factory method for `DistributedPubSubMediator` [[akka.actor.Props]].
+   * Scala API: Factory method for `DistributedPubSubMediator` [[pekko.actor.Props]].
    */
   def props(settings: DistributedPubSubSettings): Props =
     Props(new DistributedPubSubMediator(settings)).withDeploy(Deploy.local)
@@ -250,7 +251,7 @@ object DistributedPubSubMediator {
      * Java API
      */
     def getTopics(): java.util.Set[String] = {
-      import akka.util.ccompat.JavaConverters._
+      import org.apache.pekko.util.ccompat.JavaConverters._
       topics.asJava
     }
   }
@@ -275,7 +276,7 @@ object DistributedPubSubMediator {
   /**
    * INTERNAL API
    */
-  private[akka] object Internal {
+  private[pekko] object Internal {
     case object Prune
 
     @SerialVersionUID(1L)
@@ -464,12 +465,12 @@ object DistributedPubSubMediator {
     }
 
     /**
-     * Mediator uses [[akka.routing.Router]] to send messages to multiple destinations, Router in general
-     * unwraps messages from [[akka.routing.RouterEnvelope]] and sends the contents to [[akka.routing.Routee]]s.
+     * Mediator uses [[pekko.routing.Router]] to send messages to multiple destinations, Router in general
+     * unwraps messages from [[pekko.routing.RouterEnvelope]] and sends the contents to [[pekko.routing.Routee]]s.
      *
      * Using mediator services should not have an undesired effect of unwrapping messages
-     * out of [[akka.routing.RouterEnvelope]]. For this reason user messages are wrapped in
-     * [[MediatorRouterEnvelope]] which will be unwrapped by the [[akka.routing.Router]] leaving original
+     * out of [[pekko.routing.RouterEnvelope]]. For this reason user messages are wrapped in
+     * [[MediatorRouterEnvelope]] which will be unwrapped by the [[pekko.routing.Router]] leaving original
      * user message.
      */
     def wrapIfNeeded: Any => Any = {
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/PerGroupingBuffer.scala b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/PerGroupingBuffer.scala
similarity index 88%
rename from akka-cluster-tools/src/main/scala/akka/cluster/pubsub/PerGroupingBuffer.scala
rename to akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/PerGroupingBuffer.scala
index a1395815ff..1a4c80bab4 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/PerGroupingBuffer.scala
+++ b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/PerGroupingBuffer.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.pubsub
+package org.apache.pekko.cluster.pubsub
 
-import akka.actor.ActorRef
-import akka.util.{ MessageBuffer, MessageBufferMap }
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.util.{ MessageBuffer, MessageBufferMap }
 
 private[pubsub] trait PerGroupingBuffer {
 
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
similarity index 93%
rename from akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
rename to akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
index 4040be713c..69b5788e9b 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
+++ b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.pubsub.protobuf
+package org.apache.pekko.cluster.pubsub.protobuf
 
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream }
 import java.io.NotSerializableException
@@ -10,22 +10,23 @@ import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
 import scala.annotation.tailrec
 import scala.collection.immutable.TreeMap
-import akka.actor.{ Address, ExtendedActorSystem }
-import akka.actor.ActorRef
-import akka.cluster.pubsub.DistributedPubSubMediator._
-import akka.cluster.pubsub.DistributedPubSubMediator.Internal._
-import akka.cluster.pubsub.protobuf.msg.{ DistributedPubSubMessages => dm }
-import akka.protobufv3.internal.{ ByteString, MessageLite }
-import akka.remote.ByteStringUtils
-import akka.serialization._
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.{ Address, ExtendedActorSystem }
+import pekko.actor.ActorRef
+import pekko.cluster.pubsub.DistributedPubSubMediator._
+import pekko.cluster.pubsub.DistributedPubSubMediator.Internal._
+import pekko.cluster.pubsub.protobuf.msg.{ DistributedPubSubMessages => dm }
+import pekko.protobufv3.internal.{ ByteString, MessageLite }
+import pekko.remote.ByteStringUtils
+import pekko.serialization._
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API: Protobuf serializer of DistributedPubSubMediator messages.
  */
 @ccompatUsedUntil213
-private[akka] class DistributedPubSubMessageSerializer(val system: ExtendedActorSystem)
+private[pekko] class DistributedPubSubMessageSerializer(val system: ExtendedActorSystem)
     extends SerializerWithStringManifest
     with BaseSerializer {
 
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala
similarity index 96%
rename from akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
rename to akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala
index 087d0b8751..6d17676590 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
+++ b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.collection.immutable
 import scala.concurrent.Future
@@ -10,35 +10,36 @@ import scala.concurrent.Promise
 import scala.concurrent.duration._
 import scala.util.control.NonFatal
 import com.typesafe.config.Config
-import akka.AkkaException
-import akka.Done
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSelection
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.CoordinatedShutdown
-import akka.actor.DeadLetterSuppression
-import akka.actor.Deploy
-import akka.actor.FSM
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalStableApi
-import akka.cluster._
-import akka.cluster.ClusterEvent._
-import akka.coordination.lease.LeaseUsageSettings
-import akka.coordination.lease.scaladsl.Lease
-import akka.coordination.lease.scaladsl.LeaseProvider
-import akka.dispatch.Dispatchers
-import akka.event.LogMarker
-import akka.event.Logging
-import akka.event.MarkerLoggingAdapter
-import akka.pattern.ask
-import akka.pattern.pipe
-import akka.util.JavaDurationConverters._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.AkkaException
+import pekko.Done
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.ActorSelection
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.CoordinatedShutdown
+import pekko.actor.DeadLetterSuppression
+import pekko.actor.Deploy
+import pekko.actor.FSM
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.Props
+import pekko.actor.Terminated
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalStableApi
+import pekko.cluster._
+import pekko.cluster.ClusterEvent._
+import pekko.coordination.lease.LeaseUsageSettings
+import pekko.coordination.lease.scaladsl.Lease
+import pekko.coordination.lease.scaladsl.LeaseProvider
+import pekko.dispatch.Dispatchers
+import pekko.event.LogMarker
+import pekko.event.Logging
+import pekko.event.MarkerLoggingAdapter
+import pekko.pattern.ask
+import pekko.pattern.pipe
+import pekko.util.JavaDurationConverters._
+import pekko.util.Timeout
 
 object ClusterSingletonManagerSettings {
 
@@ -85,7 +86,7 @@ object ClusterSingletonManagerSettings {
   /**
    * INTERNAL API
    */
-  private[akka] def roleOption(role: String): Option[String] =
+  private[pekko] def roleOption(role: String): Option[String] =
     if (role == "") None else Option(role)
 
 }
@@ -161,7 +162,7 @@ sealed trait ClusterSingletonMessage extends Serializable
 object ClusterSingletonManager {
 
   /**
-   * Scala API: Factory method for `ClusterSingletonManager` [[akka.actor.Props]].
+   * Scala API: Factory method for `ClusterSingletonManager` [[pekko.actor.Props]].
    */
   def props(singletonProps: Props, terminationMessage: Any, settings: ClusterSingletonManagerSettings): Props =
     Props(new ClusterSingletonManager(singletonProps, terminationMessage, settings))
@@ -183,7 +184,7 @@ object ClusterSingletonManager {
   /**
    * INTERNAL API
    */
-  private[akka] object Internal {
+  private[pekko] object Internal {
 
     /**
      * Sent from new oldest to previous oldest to initiate the
@@ -442,7 +443,7 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess
  * actor from the supplied `singletonProps`.
  *
  * The singleton actor is always running on the oldest member with specified role.
- * The oldest member is determined by [[akka.cluster.Member#isOlderThan]].
+ * The oldest member is determined by [[pekko.cluster.Member#isOlderThan]].
  * This can change when removing members. A graceful hand over can normally
  * be performed when current oldest node is leaving the cluster. Be aware that
  * there is a short time period when there is no active singleton during the
@@ -460,18 +461,18 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess
  * Alternatively the singleton actor may broadcast its existence when it is started.
  *
  * Use factory method [[ClusterSingletonManager#props]] to create the
- * [[akka.actor.Props]] for the actor.
+ * [[pekko.actor.Props]] for the actor.
  *
  * Not intended for subclassing by user code.
  *
- * @param singletonProps [[akka.actor.Props]] of the singleton actor instance.
+ * @param singletonProps [[pekko.actor.Props]] of the singleton actor instance.
  *
  * @param terminationMessage When handing over to a new oldest node
  *   this `terminationMessage` is sent to the singleton actor to tell
  *   it to finish its work, close resources, and stop.
  *   The hand-over to the new oldest node is completed when the
  *   singleton actor is terminated.
- *   Note that [[akka.actor.PoisonPill]] is a perfectly fine
+ *   Note that [[pekko.actor.PoisonPill]] is a perfectly fine
  *   `terminationMessage` if you only need to stop the actor.
  *
  * @param settings see [[ClusterSingletonManagerSettings]]
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
similarity index 92%
rename from akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala
rename to akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
index 46bfcb56a5..764bd6259f 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala
+++ b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.collection.immutable
 import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.RootActorPath
-import akka.cluster.{ Cluster, Member, MemberStatus }
-import akka.cluster.ClusterEvent._
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterEvent.MemberExited
-import akka.cluster.ClusterEvent.MemberRemoved
-import akka.cluster.ClusterEvent.MemberUp
-import akka.cluster.ClusterSettings
-import akka.cluster.ClusterSettings.DataCenter
-import akka.dispatch.Dispatchers
-import akka.event.Logging
-import akka.util.MessageBuffer
+import org.apache.pekko
+import pekko.actor._
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.RootActorPath
+import pekko.cluster.{ Cluster, Member, MemberStatus }
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.ClusterEvent.MemberExited
+import pekko.cluster.ClusterEvent.MemberRemoved
+import pekko.cluster.ClusterEvent.MemberUp
+import pekko.cluster.ClusterSettings
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.dispatch.Dispatchers
+import pekko.event.Logging
+import pekko.util.MessageBuffer
 
 object ClusterSingletonProxySettings {
 
@@ -59,7 +60,7 @@ object ClusterSingletonProxySettings {
   /**
    * INTERNAL API
    */
-  private[akka] def roleOption(role: String): Option[String] =
+  private[pekko] def roleOption(role: String): Option[String] =
     if (role == "") None else Option(role)
 
 }
@@ -125,7 +126,7 @@ final class ClusterSingletonProxySettings(
 object ClusterSingletonProxy {
 
   /**
-   * Scala API: Factory method for `ClusterSingletonProxy` [[akka.actor.Props]].
+   * Scala API: Factory method for `ClusterSingletonProxy` [[pekko.actor.Props]].
    *
    * @param singletonManagerPath The logical path of the singleton manager, e.g. `/user/singletonManager`,
    *   which ends with the name you defined in `actorOf` when creating the [[ClusterSingletonManager]].
@@ -141,7 +142,7 @@ object ClusterSingletonProxy {
 }
 
 /**
- * The `ClusterSingletonProxy` works together with the [[akka.cluster.singleton.ClusterSingletonManager]] to provide a
+ * The `ClusterSingletonProxy` works together with the [[pekko.cluster.singleton.ClusterSingletonManager]] to provide a
  * distributed proxy to the singleton actor.
  *
  * The proxy can be started on every node where the singleton needs to be reached and used as if it were the singleton
@@ -152,8 +153,8 @@ object ClusterSingletonProxy {
  *
  * The proxy works by keeping track of the oldest cluster member. When a new oldest member is identified, e.g. because
  * the older one left the cluster, or at startup, the proxy will try to identify the singleton on the oldest member by
- * periodically sending an [[akka.actor.Identify]] message until the singleton responds with its
- * [[akka.actor.ActorIdentity]].
+ * periodically sending an [[pekko.actor.Identify]] message until the singleton responds with its
+ * [[pekko.actor.ActorIdentity]].
  *
  * Note that this is a best effort implementation: messages can always be lost due to the distributed nature of the
  * actors involved.
diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
similarity index 77%
rename from akka-cluster-tools/src/main/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
rename to akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
index 8d78354ca7..aecb159a26 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
+++ b/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton.protobuf
+package org.apache.pekko.cluster.singleton.protobuf
 
 import java.io.NotSerializableException
 
-import akka.actor.ExtendedActorSystem
-import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverDone
-import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverInProgress
-import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverToMe
-import akka.cluster.singleton.ClusterSingletonManager.Internal.TakeOverFromMe
-import akka.serialization.BaseSerializer
-import akka.serialization.SerializerWithStringManifest
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.singleton.ClusterSingletonManager.Internal.HandOverDone
+import pekko.cluster.singleton.ClusterSingletonManager.Internal.HandOverInProgress
+import pekko.cluster.singleton.ClusterSingletonManager.Internal.HandOverToMe
+import pekko.cluster.singleton.ClusterSingletonManager.Internal.TakeOverFromMe
+import pekko.serialization.BaseSerializer
+import pekko.serialization.SerializerWithStringManifest
 
 /**
  * INTERNAL API: Serializer of ClusterSingleton messages.
  * It is actually not using protobuf, but if we add more messages to
  * the ClusterSingleton we want to make protobuf representations of them.
  */
-private[akka] class ClusterSingletonMessageSerializer(val system: ExtendedActorSystem)
+private[pekko] class ClusterSingletonMessageSerializer(val system: ExtendedActorSystem)
     extends SerializerWithStringManifest
     with BaseSerializer {
 
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientHandoverSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientHandoverSpec.scala
similarity index 90%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientHandoverSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientHandoverSpec.scala
index cb96201d88..22a6ea87b1 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientHandoverSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientHandoverSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.client
+package org.apache.pekko.cluster.client
 
 import scala.concurrent.duration._
 
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ ActorPath, ActorRef }
-import akka.cluster.{ Cluster, MultiNodeClusterSpec }
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.{ MultiNodeConfig, STMultiNodeSpec }
-import akka.testkit.{ ImplicitSender, TestActors }
+import org.apache.pekko
+import pekko.actor.{ ActorPath, ActorRef }
+import pekko.cluster.{ Cluster, MultiNodeClusterSpec }
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.{ MultiNodeConfig, STMultiNodeSpec }
+import pekko.testkit.{ ImplicitSender, TestActors }
 
 object ClusterClientHandoverSpec extends MultiNodeConfig {
   val client = role("client")
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala
similarity index 93%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala
index 902f688fa5..a7544e10a6 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.client
+package org.apache.pekko.cluster.client
 
 import scala.annotation.nowarn
 import scala.concurrent.Await
@@ -11,24 +11,25 @@ import scala.language.postfixOps
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorPath
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.client.ClusterClientSpec.TestClientListener.LatestContactPoints
-import akka.cluster.client.ClusterClientSpec.TestReceptionistListener.LatestClusterClients
-import akka.cluster.pubsub._
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
-import akka.util.Timeout
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorPath
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.client.ClusterClientSpec.TestClientListener.LatestContactPoints
+import pekko.cluster.client.ClusterClientSpec.TestReceptionistListener.LatestClusterClients
+import pekko.cluster.pubsub._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
+import pekko.util.Timeout
+import pekko.util.unused
 
 object ClusterClientSpec extends MultiNodeConfig {
   val client = role("client")
@@ -41,7 +42,7 @@ object ClusterClientSpec extends MultiNodeConfig {
     akka.loglevel = INFO
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = 0s
     akka.cluster.client.heartbeat-interval = 1s
     akka.cluster.client.acceptable-heartbeat-pause = 3s
@@ -240,7 +241,7 @@ class ClusterClientSpec extends MultiNodeSpec(ClusterClientSpec) with STMultiNod
 
     "work with ask" in within(10 seconds) {
       runOn(client) {
-        import akka.pattern.ask
+        import pekko.pattern.ask
         val c = system.actorOf(
           ClusterClient.props(ClusterClientSettings(system).withInitialContacts(initialContacts)),
           "ask-client")
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientStopSpec.scala
similarity index 88%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientStopSpec.scala
index bf0b711b76..09bcc9f75e 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientStopSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.client
+package org.apache.pekko.cluster.client
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,12 +10,13 @@ import scala.concurrent.duration._
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Actor, Props }
-import akka.cluster.Cluster
-import akka.cluster.pubsub.{ DistributedPubSub, DistributedPubSubMediator }
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec }
-import akka.testkit.{ EventFilter, ImplicitSender }
+import org.apache.pekko
+import pekko.actor.{ Actor, Props }
+import pekko.cluster.Cluster
+import pekko.cluster.pubsub.{ DistributedPubSub, DistributedPubSubMediator }
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec }
+import pekko.testkit.{ EventFilter, ImplicitSender }
 
 object ClusterClientStopSpec extends MultiNodeConfig {
   val client = role("client")
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala
similarity index 96%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala
index 09dd273871..640579de5e 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala
@@ -2,26 +2,27 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.pubsub
+package org.apache.pekko.cluster.pubsub
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.pubsub.DistributedPubSubMediator.Internal.Delta
-import akka.cluster.pubsub.DistributedPubSubMediator.Internal.Status
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.pubsub.DistributedPubSubMediator.Internal.Delta
+import pekko.cluster.pubsub.DistributedPubSubMediator.Internal.Status
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.testkit._
 
 object DistributedPubSubMediatorSpec extends MultiNodeConfig {
   val first = role("first")
@@ -32,7 +33,7 @@ object DistributedPubSubMediatorSpec extends MultiNodeConfig {
     akka.loglevel = INFO
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = 0s
     akka.cluster.pub-sub.max-delta-elements = 500
     """))
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubRestartSpec.scala
similarity index 88%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubRestartSpec.scala
index 415c77cf38..99cc0bbba6 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubRestartSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.pubsub
+package org.apache.pekko.cluster.pubsub
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,19 +10,20 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Identify
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.cluster.Cluster
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.cluster.Cluster
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.testkit._
 
 object DistributedPubSubRestartSpec extends MultiNodeConfig {
   val first = role("first")
@@ -34,7 +35,7 @@ object DistributedPubSubRestartSpec extends MultiNodeConfig {
     akka.cluster.pub-sub.gossip-interval = 500ms
     akka.actor.provider = cluster
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = off
     """))
 
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
similarity index 88%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
index 3abfa547c7..4059900cfa 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSelection
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.testkit._
-import akka.testkit.TestEvent._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.ActorSelection
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.testkit._
+import pekko.testkit.TestEvent._
 
 object ClusterSingletonManagerChaosSpec extends MultiNodeConfig {
   val controller = role("controller")
@@ -37,7 +38,7 @@ object ClusterSingletonManagerChaosSpec extends MultiNodeConfig {
     akka.loglevel = INFO
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = 0s
     """))
 
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerDownedSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerDownedSpec.scala
similarity index 86%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerDownedSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerDownedSpec.scala
index 69932ff134..86debd5d98 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerDownedSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerDownedSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.remote.transport.ThrottlerTransportAdapter
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.remote.transport.ThrottlerTransportAdapter
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object ClusterSingletonManagerDownedSpec extends MultiNodeConfig {
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
similarity index 91%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
index 3bd40b69bc..9e3a907143 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, Address, Identify, PoisonPill, Props }
-import akka.cluster._
-import akka.cluster.MemberStatus.Up
-import akka.cluster.singleton.ClusterSingletonManagerLeaseSpec.ImportantSingleton.Response
-import akka.coordination.lease.TestLeaseActor
-import akka.coordination.lease.TestLeaseActorClient
-import akka.coordination.lease.TestLeaseActorClientExt
-import akka.remote.testkit.{ MultiNodeConfig, STMultiNodeSpec }
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, Address, Identify, PoisonPill, Props }
+import pekko.cluster._
+import pekko.cluster.MemberStatus.Up
+import pekko.cluster.singleton.ClusterSingletonManagerLeaseSpec.ImportantSingleton.Response
+import pekko.coordination.lease.TestLeaseActor
+import pekko.coordination.lease.TestLeaseActorClient
+import pekko.coordination.lease.TestLeaseActorClientExt
+import pekko.remote.testkit.{ MultiNodeConfig, STMultiNodeSpec }
+import pekko.testkit._
 
 object ClusterSingletonManagerLeaseSpec extends MultiNodeConfig {
   val controller = role("controller")
@@ -31,7 +32,7 @@ object ClusterSingletonManagerLeaseSpec extends MultiNodeConfig {
     akka.loglevel = INFO
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = 0s
     test-lease {
         lease-class = ${classOf[TestLeaseActorClient].getName}
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala
similarity index 90%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala
index a8a5a668d3..c217a51b42 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala
@@ -2,26 +2,27 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.testkit._
 
 object ClusterSingletonManagerLeave2Spec extends MultiNodeConfig {
   val first = role("first")
@@ -34,7 +35,7 @@ object ClusterSingletonManagerLeave2Spec extends MultiNodeConfig {
     akka.loglevel = INFO
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = off
     """))
 
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
similarity index 90%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
index 72f1dd9549..1bb82eccfa 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.testkit._
 
 object ClusterSingletonManagerLeaveSpec extends MultiNodeConfig {
   val first = role("first")
@@ -28,7 +29,7 @@ object ClusterSingletonManagerLeaveSpec extends MultiNodeConfig {
     akka.loglevel = INFO
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = off
     """))
 
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala
similarity index 89%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala
index b8bb100517..014a7c5462 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.MemberStatus.Removed
-import akka.cluster.MultiNodeClusterSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.STMultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.MemberStatus.Removed
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.testkit._
 import com.typesafe.config.ConfigFactory
 
 import scala.concurrent.duration._
@@ -28,7 +29,7 @@ object ClusterSingletonManagerPreparingForShutdownSpec extends MultiNodeConfig {
     akka.loglevel = INFO 
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = off
     akka.cluster.leader-actions-interval = 100ms
     """))
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala
similarity index 94%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala
index 25a48bacab..adf53697fa 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala
@@ -2,30 +2,31 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ActorSelection
-import akka.actor.Identify
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
-import akka.testkit.TestEvent._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ActorSelection
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
+import pekko.testkit.TestEvent._
 
 object ClusterSingletonManagerSpec extends MultiNodeConfig {
   val controller = role("controller")
@@ -41,7 +42,7 @@ object ClusterSingletonManagerSpec extends MultiNodeConfig {
     akka.loglevel = INFO
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = 0s
     akka.remote.artery.advanced.aeron.idle-cpu-level = 3
     """))
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
similarity index 82%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
index 1da29d97e6..ecfb3d1c88 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.testkit._
 
 object ClusterSingletonManagerStartupSpec extends MultiNodeConfig {
   val first = role("first")
@@ -29,7 +30,7 @@ object ClusterSingletonManagerStartupSpec extends MultiNodeConfig {
     akka.loglevel = INFO
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
-    akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+    akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
     akka.cluster.testkit.auto-down-unreachable-after = 0s
     """))
 
diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/MultiDcSingletonManagerSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/MultiDcSingletonManagerSpec.scala
similarity index 91%
rename from akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/MultiDcSingletonManagerSpec.scala
rename to akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/MultiDcSingletonManagerSpec.scala
index e8671a2bda..afeec20858 100644
--- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/MultiDcSingletonManagerSpec.scala
+++ b/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/MultiDcSingletonManagerSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Actor, ActorLogging, Address, PoisonPill, Props }
-import akka.cluster.Cluster
-import akka.cluster.ClusterSettings
-import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec }
-import akka.serialization.jackson.CborSerializable
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, Address, PoisonPill, Props }
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterSettings
+import pekko.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec }
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit.ImplicitSender
 
 object MultiDcSingletonManagerSpec extends MultiNodeConfig {
   val controller = role("controller")
diff --git a/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java
similarity index 97%
rename from akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java
rename to akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java
index ddeb684ed5..2fab662d63 100644
--- a/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java
+++ b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.client;
+package org.apache.pekko.cluster.client;
 
-import akka.actor.*;
+import org.apache.pekko.actor.*;
 import com.typesafe.config.ConfigFactory;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -12,7 +12,7 @@ import java.util.Set;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 import org.scalatestplus.junit.JUnitSuite;
 
 public class ClusterClientTest extends JUnitSuite {
diff --git a/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java
similarity index 92%
rename from akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java
rename to akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java
index 6b96ce0503..8fb2631c8f 100644
--- a/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java
+++ b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.pubsub;
+package org.apache.pekko.cluster.pubsub;
 
 import com.typesafe.config.ConfigFactory;
 
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.actor.AbstractActor;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
 import org.scalatestplus.junit.JUnitSuite;
 
 public class DistributedPubSubMediatorTest extends JUnitSuite {
diff --git a/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java
similarity index 89%
rename from akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java
rename to akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java
index 6d5b6b2a1c..bfafc12409 100644
--- a/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java
+++ b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton;
+package org.apache.pekko.cluster.singleton;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 
-import akka.actor.ActorRef;
-import akka.actor.Props;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Props;
 
 public class ClusterSingletonManagerTest {
 
diff --git a/akka-cluster-tools/src/test/java/akka/cluster/singleton/Consumer.java b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java
similarity index 85%
rename from akka-cluster-tools/src/test/java/akka/cluster/singleton/Consumer.java
rename to akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java
index 5f6326f01e..56d2e70336 100644
--- a/akka-cluster-tools/src/test/java/akka/cluster/singleton/Consumer.java
+++ b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java
@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton;
+package org.apache.pekko.cluster.singleton;
 
-import akka.actor.AbstractActor;
-import akka.actor.ActorRef;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.cluster.singleton.TestSingletonMessages.*;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.cluster.singleton.TestSingletonMessages.*;
 
 public class Consumer extends AbstractActor {
 
diff --git a/akka-cluster-tools/src/test/java/akka/cluster/singleton/TestSingletonMessages.java b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/TestSingletonMessages.java
similarity index 97%
rename from akka-cluster-tools/src/test/java/akka/cluster/singleton/TestSingletonMessages.java
rename to akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/TestSingletonMessages.java
index 75a1e4617a..486703c369 100644
--- a/akka-cluster-tools/src/test/java/akka/cluster/singleton/TestSingletonMessages.java
+++ b/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/TestSingletonMessages.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton;
+package org.apache.pekko.cluster.singleton;
 
 // #singleton-message-classes
 public class TestSingletonMessages {
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala
similarity index 82%
rename from akka-cluster-tools/src/test/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala
index 4fcfd6737b..129b534fcb 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.client.protobuf
+package org.apache.pekko.cluster.client.protobuf
 
 import scala.annotation.nowarn
 
-import akka.actor.ExtendedActorSystem
-import akka.cluster.client.ClusterReceptionist.Internal._
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.client.ClusterReceptionist.Internal._
+import pekko.testkit.AkkaSpec
 
 @nowarn("msg=deprecated")
 class ClusterClientMessageSerializerSpec extends AkkaSpec {
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala
similarity index 95%
rename from akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala
index 3de74cc09e..d0c1238ac1 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.pubsub
+package org.apache.pekko.cluster.pubsub
 
 import scala.concurrent.duration._
 
-import akka.actor.DeadLetter
-import akka.cluster.pubsub.DistributedPubSubMediator.{ Subscribe, _ }
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.DeadLetter
+import pekko.cluster.pubsub.DistributedPubSubMediator.{ Subscribe, _ }
+import pekko.testkit._
 
 object DistributedPubSubMediatorDeadLettersSpec {
   def config(sendToDeadLettersWhenNoSubscribers: Boolean) =
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
similarity index 95%
rename from akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
index 95a590d005..33504be168 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.pubsub
+package org.apache.pekko.cluster.pubsub
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ActorRef
-import akka.routing.{ ConsistentHashingRoutingLogic, RouterEnvelope }
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.routing.{ ConsistentHashingRoutingLogic, RouterEnvelope }
+import pekko.testkit._
 
 case class WrappedMessage(msg: String) extends RouterEnvelope {
   override def message = msg
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala
similarity index 84%
rename from akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala
index d4f5f9959a..d89cd9169a 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.pubsub.protobuf
+package org.apache.pekko.cluster.pubsub.protobuf
 
 import scala.collection.immutable.TreeMap
 
-import akka.actor.{ Address, ExtendedActorSystem }
-import akka.actor.Props
-import akka.cluster.pubsub.DistributedPubSubMediator._
-import akka.cluster.pubsub.DistributedPubSubMediator.Internal._
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.{ Address, ExtendedActorSystem }
+import pekko.actor.Props
+import pekko.cluster.pubsub.DistributedPubSubMediator._
+import pekko.cluster.pubsub.DistributedPubSubMediator.Internal._
+import pekko.testkit.AkkaSpec
 
 class DistributedPubSubMessageSerializerSpec extends AkkaSpec {
 
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeaseSpec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeaseSpec.scala
similarity index 93%
rename from akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeaseSpec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeaseSpec.scala
index 08a7aa4cd4..fd647e5986 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeaseSpec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeaseSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -12,19 +12,20 @@ import scala.util.Success
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ExtendedActorSystem
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.coordination.lease.TestLease
-import akka.coordination.lease.TestLeaseExt
-import akka.testkit.AkkaSpec
-import akka.testkit.TestException
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.coordination.lease.TestLease
+import pekko.coordination.lease.TestLeaseExt
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestException
+import pekko.testkit.TestProbe
 
 class ImportantSingleton(lifeCycleProbe: ActorRef) extends Actor with ActorLogging {
 
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala
similarity index 86%
rename from akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala
index 2d59de2142..83b9c20517 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.CoordinatedShutdown
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.singleton.ClusterSingletonLeavingSpeedSpec.TheSingleton
-import akka.testkit.AkkaSpec
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.CoordinatedShutdown
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.singleton.ClusterSingletonLeavingSpeedSpec.TheSingleton
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestProbe
 
 object ClusterSingletonLeavingSpeedSpec {
 
@@ -44,8 +45,8 @@ class ClusterSingletonLeavingSpeedSpec
     extends AkkaSpec(
       """
   akka.loglevel = DEBUG
-  akka.actor.provider = akka.cluster.ClusterActorRefProvider
-  akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+  akka.actor.provider = org.apache.pekko.cluster.ClusterActorRefProvider
+  akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
   akka.cluster.testkit.auto-down-unreachable-after = 2s
 
   # With 10 systems and setting min-number-of-hand-over-retries to 5 and gossip-interval to 2s it's possible to
@@ -73,7 +74,7 @@ class ClusterSingletonLeavingSpeedSpec
 
   override def expectedTestDuration: FiniteDuration = 10.minutes
 
-  import akka.util.ccompat._
+  import pekko.util.ccompat._
   @ccompatUsedUntil213
   def join(from: ActorSystem, to: ActorSystem, probe: ActorRef): Unit = {
 
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxySpec.scala
similarity index 94%
rename from akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxySpec.scala
index 2f112e57b6..8e273bbe4a 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
@@ -11,9 +11,10 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor._
-import akka.cluster.Cluster
-import akka.testkit.{ TestKit, TestProbe }
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.Cluster
+import pekko.testkit.{ TestKit, TestProbe }
 
 class ClusterSingletonProxySpec extends AnyWordSpecLike with Matchers with BeforeAndAfterAll {
 
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestart2Spec.scala
similarity index 86%
rename from akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestart2Spec.scala
index ded20efc97..ba40f59c2c 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestart2Spec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorSystem
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.UniqueAddress
-import akka.testkit.AkkaSpec
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorSystem
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.UniqueAddress
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestProbe
 
 object ClusterSingletonRestart2Spec {
   def singletonActorProps: Props = Props(new Singleton)
@@ -32,8 +33,8 @@ class ClusterSingletonRestart2Spec
     extends AkkaSpec("""
   akka.loglevel = INFO
   akka.cluster.roles = [singleton]
-  akka.actor.provider = akka.cluster.ClusterActorRefProvider
-  akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+  akka.actor.provider = org.apache.pekko.cluster.ClusterActorRefProvider
+  akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
   akka.cluster.testkit.auto-down-unreachable-after = 2s
   akka.cluster.singleton.min-number-of-hand-over-retries = 5
   akka.remote {
@@ -48,7 +49,7 @@ class ClusterSingletonRestart2Spec
   }
   akka.actor.serialization-bindings {
     # there is no serializer for UniqueAddress, not intended to be sent as a standalone message
-    "akka.cluster.UniqueAddress" = jackson-cbor
+    "org.apache.pekko.cluster.UniqueAddress" = jackson-cbor
   }
   """) {
 
@@ -59,7 +60,7 @@ class ClusterSingletonRestart2Spec
     ConfigFactory.parseString("akka.cluster.roles = [other]").withFallback(system.settings.config))
   var sys4: ActorSystem = null
 
-  import akka.util.ccompat._
+  import pekko.util.ccompat._
   @ccompatUsedUntil213
   def join(from: ActorSystem, to: ActorSystem): Unit = {
     if (Cluster(from).selfRoles.contains("singleton"))
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestartSpec.scala
similarity index 86%
rename from akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestartSpec.scala
index b22906466b..be7464068c 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestartSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton
+package org.apache.pekko.cluster.singleton
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorSystem
-import akka.actor.PoisonPill
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.testkit.AkkaSpec
-import akka.testkit.TestActors
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.PoisonPill
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestActors
+import pekko.testkit.TestProbe
 
 class ClusterSingletonRestartSpec
     extends AkkaSpec("""
   akka.loglevel = INFO
-  akka.actor.provider = akka.cluster.ClusterActorRefProvider
-  akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+  akka.actor.provider = org.apache.pekko.cluster.ClusterActorRefProvider
+  akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
   akka.cluster.testkit.auto-down-unreachable-after = 2s
   akka.remote {
     classic.netty.tcp {
@@ -38,7 +39,7 @@ class ClusterSingletonRestartSpec
   val sys2 = ActorSystem(system.name, system.settings.config)
   var sys3: ActorSystem = null
 
-  import akka.util.ccompat._
+  import pekko.util.ccompat._
   @ccompatUsedUntil213
   def join(from: ActorSystem, to: ActorSystem): Unit = {
     from.actorOf(
diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala
similarity index 59%
rename from akka-cluster-tools/src/test/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala
rename to akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala
index 2571cec251..7893afc17a 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala
+++ b/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.singleton.protobuf
+package org.apache.pekko.cluster.singleton.protobuf
 
-import akka.actor.ExtendedActorSystem
-import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverDone
-import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverInProgress
-import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverToMe
-import akka.cluster.singleton.ClusterSingletonManager.Internal.TakeOverFromMe
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.singleton.ClusterSingletonManager.Internal.HandOverDone
+import pekko.cluster.singleton.ClusterSingletonManager.Internal.HandOverInProgress
+import pekko.cluster.singleton.ClusterSingletonManager.Internal.HandOverToMe
+import pekko.cluster.singleton.ClusterSingletonManager.Internal.TakeOverFromMe
+import pekko.testkit.AkkaSpec
 
 class ClusterSingletonMessageSerializerSpec extends AkkaSpec {
 
diff --git a/akka-cluster-typed/src/main/java/akka/cluster/typed/internal/protobuf/ClusterMessages.java b/akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java
similarity index 54%
rename from akka-cluster-typed/src/main/java/akka/cluster/typed/internal/protobuf/ClusterMessages.java
rename to akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java
index 6406cf0a39..4e5617dcb0 100644
--- a/akka-cluster-typed/src/main/java/akka/cluster/typed/internal/protobuf/ClusterMessages.java
+++ b/akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java
@@ -5,22 +5,22 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ClusterMessages.proto
 
-package akka.cluster.typed.internal.protobuf;
+package org.apache.pekko.cluster.typed.internal.protobuf;
 
 public final class ClusterMessages {
   private ClusterMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface ReceptionistEntryOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.ReceptionistEntry)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.ReceptionistEntry)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string actorRef = 1;
@@ -36,7 +36,7 @@ public final class ClusterMessages {
      * required string actorRef = 1;
      * @return The bytes for actorRef.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getActorRefBytes();
 
     /**
@@ -62,15 +62,15 @@ public final class ClusterMessages {
     long getCreatedTimestamp();
   }
   /**
-   * Protobuf type {@code akka.cluster.typed.ReceptionistEntry}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.ReceptionistEntry}
    */
   public  static final class ReceptionistEntry extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.ReceptionistEntry)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.ReceptionistEntry)
       ReceptionistEntryOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ReceptionistEntry.newBuilder() to construct.
-    private ReceptionistEntry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ReceptionistEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ReceptionistEntry() {
@@ -80,26 +80,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ReceptionistEntry();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ReceptionistEntry(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -109,7 +109,7 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               actorRef_ = bs;
               break;
@@ -133,27 +133,27 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.class, akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.class, org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.Builder.class);
     }
 
     private int bitField0_;
@@ -175,8 +175,8 @@ public final class ClusterMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           actorRef_ = s;
@@ -188,17 +188,17 @@ public final class ClusterMessages {
      * required string actorRef = 1;
      * @return The bytes for actorRef.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getActorRefBytes() {
       java.lang.Object ref = actorRef_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         actorRef_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -256,10 +256,10 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, actorRef_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, actorRef_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeUInt64(2, systemUid_);
@@ -277,14 +277,14 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, actorRef_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, actorRef_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(2, systemUid_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, createdTimestamp_);
       }
       size += unknownFields.getSerializedSize();
@@ -297,10 +297,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry other = (akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry other = (org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry) obj;
 
       if (hasActorRef() != other.hasActorRef()) return false;
       if (hasActorRef()) {
@@ -334,12 +334,12 @@ public final class ClusterMessages {
       }
       if (hasSystemUid()) {
         hash = (37 * hash) + SYSTEMUID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSystemUid());
       }
       if (hasCreatedTimestamp()) {
         hash = (37 * hash) + CREATEDTIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getCreatedTimestamp());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -347,73 +347,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -422,7 +422,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -433,42 +433,42 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.typed.ReceptionistEntry}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.ReceptionistEntry}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.ReceptionistEntry)
-        akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntryOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.ReceptionistEntry)
+        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntryOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.class, akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.class, org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -485,19 +485,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry build() {
-        akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -505,8 +505,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry buildPartial() {
-        akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry result = new akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry result = new org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -532,44 +532,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry other) {
-        if (other == akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.getDefaultInstance()) return this;
         if (other.hasActorRef()) {
           bitField0_ |= 0x00000001;
           actorRef_ = other.actorRef_;
@@ -599,14 +599,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -632,8 +632,8 @@ public final class ClusterMessages {
       public java.lang.String getActorRef() {
         java.lang.Object ref = actorRef_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             actorRef_ = s;
@@ -647,17 +647,17 @@ public final class ClusterMessages {
        * required string actorRef = 1;
        * @return The bytes for actorRef.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getActorRefBytes() {
         java.lang.Object ref = actorRef_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           actorRef_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -691,7 +691,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder setActorRefBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -776,60 +776,60 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.ReceptionistEntry)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.ReceptionistEntry)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.ReceptionistEntry)
-    private static final akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.ReceptionistEntry)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ReceptionistEntry parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ReceptionistEntry(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface PubSubMessagePublishedOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.PubSubMessagePublished)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.PubSubMessagePublished)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Payload message = 1;
@@ -840,22 +840,22 @@ public final class ClusterMessages {
      * required .Payload message = 1;
      * @return The message.
      */
-    akka.remote.ContainerFormats.Payload getMessage();
+    org.apache.pekko.remote.ContainerFormats.Payload getMessage();
     /**
      * required .Payload message = 1;
      */
-    akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.typed.PubSubMessagePublished}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.PubSubMessagePublished}
    */
   public  static final class PubSubMessagePublished extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.PubSubMessagePublished)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.PubSubMessagePublished)
       PubSubMessagePublishedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use PubSubMessagePublished.newBuilder() to construct.
-    private PubSubMessagePublished(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private PubSubMessagePublished(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private PubSubMessagePublished() {
@@ -864,26 +864,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new PubSubMessagePublished();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private PubSubMessagePublished(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -893,11 +893,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = message_.toBuilder();
               }
-              message_ = input.readMessage(akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+              message_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(message_);
                 message_ = subBuilder.buildPartial();
@@ -914,32 +914,32 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.class, akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.class, org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.Builder.class);
     }
 
     private int bitField0_;
     public static final int MESSAGE_FIELD_NUMBER = 1;
-    private akka.remote.ContainerFormats.Payload message_;
+    private org.apache.pekko.remote.ContainerFormats.Payload message_;
     /**
      * required .Payload message = 1;
      * @return Whether the message field is set.
@@ -951,14 +951,14 @@ public final class ClusterMessages {
      * required .Payload message = 1;
      * @return The message.
      */
-    public akka.remote.ContainerFormats.Payload getMessage() {
-      return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+    public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
+      return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
     /**
      * required .Payload message = 1;
      */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
-      return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
+      return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -981,7 +981,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getMessage());
@@ -996,7 +996,7 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getMessage());
       }
       size += unknownFields.getSerializedSize();
@@ -1009,10 +1009,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished other = (akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished other = (org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished) obj;
 
       if (hasMessage() != other.hasMessage()) return false;
       if (hasMessage()) {
@@ -1039,73 +1039,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1114,7 +1114,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1125,42 +1125,42 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.typed.PubSubMessagePublished}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.PubSubMessagePublished}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.PubSubMessagePublished)
-        akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublishedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.PubSubMessagePublished)
+        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublishedOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.class, akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.class, org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getMessageFieldBuilder();
         }
@@ -1178,19 +1178,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished build() {
-        akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1198,8 +1198,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished buildPartial() {
-        akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished result = new akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished result = new org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1221,44 +1221,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished other) {
-        if (other == akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.getDefaultInstance()) return this;
         if (other.hasMessage()) {
           mergeMessage(other.getMessage());
         }
@@ -1280,14 +1280,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1298,9 +1298,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.remote.ContainerFormats.Payload message_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> messageBuilder_;
+      private org.apache.pekko.remote.ContainerFormats.Payload message_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> messageBuilder_;
       /**
        * required .Payload message = 1;
        * @return Whether the message field is set.
@@ -1312,9 +1312,9 @@ public final class ClusterMessages {
        * required .Payload message = 1;
        * @return The message.
        */
-      public akka.remote.ContainerFormats.Payload getMessage() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
         if (messageBuilder_ == null) {
-          return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+          return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
         } else {
           return messageBuilder_.getMessage();
         }
@@ -1322,7 +1322,7 @@ public final class ClusterMessages {
       /**
        * required .Payload message = 1;
        */
-      public Builder setMessage(akka.remote.ContainerFormats.Payload value) {
+      public Builder setMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1339,7 +1339,7 @@ public final class ClusterMessages {
        * required .Payload message = 1;
        */
       public Builder setMessage(
-          akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
           onChanged();
@@ -1352,13 +1352,13 @@ public final class ClusterMessages {
       /**
        * required .Payload message = 1;
        */
-      public Builder mergeMessage(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergeMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               message_ != null &&
-              message_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             message_ =
-              akka.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
           } else {
             message_ = value;
           }
@@ -1385,7 +1385,7 @@ public final class ClusterMessages {
       /**
        * required .Payload message = 1;
        */
-      public akka.remote.ContainerFormats.Payload.Builder getMessageBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getMessageBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getMessageFieldBuilder().getBuilder();
@@ -1393,23 +1393,23 @@ public final class ClusterMessages {
       /**
        * required .Payload message = 1;
        */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
         if (messageBuilder_ != null) {
           return messageBuilder_.getMessageOrBuilder();
         } else {
           return message_ == null ?
-              akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+              org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
         }
       }
       /**
        * required .Payload message = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> 
           getMessageFieldBuilder() {
         if (messageBuilder_ == null) {
-          messageBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder>(
+          messageBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getMessage(),
                   getParentForChildren(),
                   isClean());
@@ -1419,102 +1419,102 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.PubSubMessagePublished)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.PubSubMessagePublished)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.PubSubMessagePublished)
-    private static final akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.PubSubMessagePublished)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public PubSubMessagePublished parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new PubSubMessagePublished(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025ClusterMessages.proto\022\022akka.cluster.ty" +
+      "\n\025ClusterMessages.proto\022\022org.apache.pekko.cluster.ty" +
       "ped\032\026ContainerFormats.proto\"R\n\021Reception" +
       "istEntry\022\020\n\010actorRef\030\001 \002(\t\022\021\n\tsystemUid\030" +
       "\002 \002(\004\022\030\n\020createdTimestamp\030\003 \001(\003\"3\n\026PubSu" +
       "bMessagePublished\022\031\n\007message\030\001 \002(\0132\010.Pay" +
-      "loadB(\n$akka.cluster.typed.internal.prot" +
+      "loadB(\n$org.apache.pekko.cluster.typed.internal.prot" +
       "obufH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
-          akka.remote.ContainerFormats.getDescriptor(),
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
+          org.apache.pekko.remote.ContainerFormats.getDescriptor(),
         });
     internal_static_akka_cluster_typed_ReceptionistEntry_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_ReceptionistEntry_descriptor,
         new java.lang.String[] { "ActorRef", "SystemUid", "CreatedTimestamp", });
     internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor,
         new java.lang.String[] { "Message", });
-    akka.remote.ContainerFormats.getDescriptor();
+    org.apache.pekko.remote.ContainerFormats.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/akka-cluster-typed/src/main/java/akka/cluster/typed/internal/protobuf/ReliableDelivery.java b/akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java
similarity index 59%
rename from akka-cluster-typed/src/main/java/akka/cluster/typed/internal/protobuf/ReliableDelivery.java
rename to akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java
index 9f571b16de..96f5e1a699 100644
--- a/akka-cluster-typed/src/main/java/akka/cluster/typed/internal/protobuf/ReliableDelivery.java
+++ b/akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java
@@ -5,22 +5,22 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ReliableDelivery.proto
 
-package akka.cluster.typed.internal.protobuf;
+package org.apache.pekko.cluster.typed.internal.protobuf;
 
 public final class ReliableDelivery {
   private ReliableDelivery() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface SequencedMessageOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.delivery.SequencedMessage)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.delivery.SequencedMessage)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string producerId = 1;
@@ -36,7 +36,7 @@ public final class ReliableDelivery {
      * required string producerId = 1;
      * @return The bytes for producerId.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getProducerIdBytes();
 
     /**
@@ -86,7 +86,7 @@ public final class ReliableDelivery {
      * required string producerControllerRef = 5;
      * @return The bytes for producerControllerRef.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getProducerControllerRefBytes();
 
     /**
@@ -98,11 +98,11 @@ public final class ReliableDelivery {
      * required .Payload message = 6;
      * @return The message.
      */
-    akka.remote.ContainerFormats.Payload getMessage();
+    org.apache.pekko.remote.ContainerFormats.Payload getMessage();
     /**
      * required .Payload message = 6;
      */
-    akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder();
 
     /**
      * optional bool firstChunk = 7;
@@ -131,15 +131,15 @@ public final class ReliableDelivery {
    * ConsumerController
    * 
    
    *
-   * Protobuf type {@code akka.cluster.typed.delivery.SequencedMessage}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.SequencedMessage}
    */
   public  static final class SequencedMessage extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.delivery.SequencedMessage)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.SequencedMessage)
       SequencedMessageOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use SequencedMessage.newBuilder() to construct.
-    private SequencedMessage(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private SequencedMessage(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private SequencedMessage() {
@@ -150,26 +150,26 @@ public final class ReliableDelivery {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new SequencedMessage();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private SequencedMessage(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -179,7 +179,7 @@ public final class ReliableDelivery {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               producerId_ = bs;
               break;
@@ -200,17 +200,17 @@ public final class ReliableDelivery {
               break;
             }
             case 42: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000010;
               producerControllerRef_ = bs;
               break;
             }
             case 50: {
-              akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000020) != 0)) {
                 subBuilder = message_.toBuilder();
               }
-              message_ = input.readMessage(akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+              message_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(message_);
                 message_ = subBuilder.buildPartial();
@@ -237,27 +237,27 @@ public final class ReliableDelivery {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.Builder.class);
     }
 
     private int bitField0_;
@@ -279,8 +279,8 @@ public final class ReliableDelivery {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           producerId_ = s;
@@ -292,17 +292,17 @@ public final class ReliableDelivery {
      * required string producerId = 1;
      * @return The bytes for producerId.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getProducerIdBytes() {
       java.lang.Object ref = producerId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         producerId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -375,8 +375,8 @@ public final class ReliableDelivery {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           producerControllerRef_ = s;
@@ -388,22 +388,22 @@ public final class ReliableDelivery {
      * required string producerControllerRef = 5;
      * @return The bytes for producerControllerRef.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getProducerControllerRefBytes() {
       java.lang.Object ref = producerControllerRef_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         producerControllerRef_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int MESSAGE_FIELD_NUMBER = 6;
-    private akka.remote.ContainerFormats.Payload message_;
+    private org.apache.pekko.remote.ContainerFormats.Payload message_;
     /**
      * required .Payload message = 6;
      * @return Whether the message field is set.
@@ -415,14 +415,14 @@ public final class ReliableDelivery {
      * required .Payload message = 6;
      * @return The message.
      */
-    public akka.remote.ContainerFormats.Payload getMessage() {
-      return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+    public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
+      return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
     /**
      * required .Payload message = 6;
      */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
-      return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
+      return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
 
     public static final int FIRSTCHUNK_FIELD_NUMBER = 7;
@@ -499,10 +499,10 @@ public final class ReliableDelivery {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, producerId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, producerId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt64(2, seqNr_);
@@ -514,7 +514,7 @@ public final class ReliableDelivery {
         output.writeBool(4, ack_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 5, producerControllerRef_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 5, producerControllerRef_);
       }
       if (((bitField0_ & 0x00000020) != 0)) {
         output.writeMessage(6, getMessage());
@@ -535,33 +535,33 @@ public final class ReliableDelivery {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, producerId_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, producerId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(2, seqNr_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, first_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(4, ack_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(5, producerControllerRef_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(5, producerControllerRef_);
       }
       if (((bitField0_ & 0x00000020) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(6, getMessage());
       }
       if (((bitField0_ & 0x00000040) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(7, firstChunk_);
       }
       if (((bitField0_ & 0x00000080) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(8, lastChunk_);
       }
       size += unknownFields.getSerializedSize();
@@ -574,10 +574,10 @@ public final class ReliableDelivery {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage other = (akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage other = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage) obj;
 
       if (hasProducerId() != other.hasProducerId()) return false;
       if (hasProducerId()) {
@@ -636,17 +636,17 @@ public final class ReliableDelivery {
       }
       if (hasSeqNr()) {
         hash = (37 * hash) + SEQNR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSeqNr());
       }
       if (hasFirst()) {
         hash = (37 * hash) + FIRST_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getFirst());
       }
       if (hasAck()) {
         hash = (37 * hash) + ACK_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getAck());
       }
       if (hasProducerControllerRef()) {
@@ -659,12 +659,12 @@ public final class ReliableDelivery {
       }
       if (hasFirstChunk()) {
         hash = (37 * hash) + FIRSTCHUNK_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getFirstChunk());
       }
       if (hasLastChunk()) {
         hash = (37 * hash) + LASTCHUNK_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getLastChunk());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -672,73 +672,73 @@ public final class ReliableDelivery {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -747,7 +747,7 @@ public final class ReliableDelivery {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -758,7 +758,7 @@ public final class ReliableDelivery {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -767,37 +767,37 @@ public final class ReliableDelivery {
      * ConsumerController
      * 
    
      *
-     * Protobuf type {@code akka.cluster.typed.delivery.SequencedMessage}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.SequencedMessage}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.delivery.SequencedMessage)
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessageOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.delivery.SequencedMessage)
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessageOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getMessageFieldBuilder();
         }
@@ -829,19 +829,19 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage build() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -849,8 +849,8 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage buildPartial() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage result = new akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -900,44 +900,44 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage other) {
-        if (other == akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.getDefaultInstance()) return this;
         if (other.hasProducerId()) {
           bitField0_ |= 0x00000001;
           producerId_ = other.producerId_;
@@ -999,14 +999,14 @@ public final class ReliableDelivery {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1032,8 +1032,8 @@ public final class ReliableDelivery {
       public java.lang.String getProducerId() {
         java.lang.Object ref = producerId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             producerId_ = s;
@@ -1047,17 +1047,17 @@ public final class ReliableDelivery {
        * required string producerId = 1;
        * @return The bytes for producerId.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getProducerIdBytes() {
         java.lang.Object ref = producerId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           producerId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1091,7 +1091,7 @@ public final class ReliableDelivery {
        * @return This builder for chaining.
        */
       public Builder setProducerIdBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1227,8 +1227,8 @@ public final class ReliableDelivery {
       public java.lang.String getProducerControllerRef() {
         java.lang.Object ref = producerControllerRef_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             producerControllerRef_ = s;
@@ -1242,17 +1242,17 @@ public final class ReliableDelivery {
        * required string producerControllerRef = 5;
        * @return The bytes for producerControllerRef.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getProducerControllerRefBytes() {
         java.lang.Object ref = producerControllerRef_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           producerControllerRef_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1286,7 +1286,7 @@ public final class ReliableDelivery {
        * @return This builder for chaining.
        */
       public Builder setProducerControllerRefBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1296,9 +1296,9 @@ public final class ReliableDelivery {
         return this;
       }
 
-      private akka.remote.ContainerFormats.Payload message_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> messageBuilder_;
+      private org.apache.pekko.remote.ContainerFormats.Payload message_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> messageBuilder_;
       /**
        * required .Payload message = 6;
        * @return Whether the message field is set.
@@ -1310,9 +1310,9 @@ public final class ReliableDelivery {
        * required .Payload message = 6;
        * @return The message.
        */
-      public akka.remote.ContainerFormats.Payload getMessage() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
         if (messageBuilder_ == null) {
-          return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+          return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
         } else {
           return messageBuilder_.getMessage();
         }
@@ -1320,7 +1320,7 @@ public final class ReliableDelivery {
       /**
        * required .Payload message = 6;
        */
-      public Builder setMessage(akka.remote.ContainerFormats.Payload value) {
+      public Builder setMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1337,7 +1337,7 @@ public final class ReliableDelivery {
        * required .Payload message = 6;
        */
       public Builder setMessage(
-          akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
           onChanged();
@@ -1350,13 +1350,13 @@ public final class ReliableDelivery {
       /**
        * required .Payload message = 6;
        */
-      public Builder mergeMessage(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergeMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0) &&
               message_ != null &&
-              message_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             message_ =
-              akka.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
           } else {
             message_ = value;
           }
@@ -1383,7 +1383,7 @@ public final class ReliableDelivery {
       /**
        * required .Payload message = 6;
        */
-      public akka.remote.ContainerFormats.Payload.Builder getMessageBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getMessageBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
         return getMessageFieldBuilder().getBuilder();
@@ -1391,23 +1391,23 @@ public final class ReliableDelivery {
       /**
        * required .Payload message = 6;
        */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
         if (messageBuilder_ != null) {
           return messageBuilder_.getMessageOrBuilder();
         } else {
           return message_ == null ?
-              akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+              org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
         }
       }
       /**
        * required .Payload message = 6;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> 
           getMessageFieldBuilder() {
         if (messageBuilder_ == null) {
-          messageBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder>(
+          messageBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getMessage(),
                   getParentForChildren(),
                   isClean());
@@ -1491,60 +1491,60 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.delivery.SequencedMessage)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.delivery.SequencedMessage)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.delivery.SequencedMessage)
-    private static final akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.delivery.SequencedMessage)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public SequencedMessage parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new SequencedMessage(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface RegisterConsumerOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.delivery.RegisterConsumer)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.delivery.RegisterConsumer)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string consumerControllerRef = 1;
@@ -1560,7 +1560,7 @@ public final class ReliableDelivery {
      * required string consumerControllerRef = 1;
      * @return The bytes for consumerControllerRef.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getConsumerControllerRefBytes();
   }
   /**
@@ -1568,15 +1568,15 @@ public final class ReliableDelivery {
    * ProducerController
    * 
    
    *
-   * Protobuf type {@code akka.cluster.typed.delivery.RegisterConsumer}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.RegisterConsumer}
    */
   public  static final class RegisterConsumer extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.delivery.RegisterConsumer)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.RegisterConsumer)
       RegisterConsumerOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use RegisterConsumer.newBuilder() to construct.
-    private RegisterConsumer(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private RegisterConsumer(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private RegisterConsumer() {
@@ -1586,26 +1586,26 @@ public final class ReliableDelivery {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new RegisterConsumer();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private RegisterConsumer(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1615,7 +1615,7 @@ public final class ReliableDelivery {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               consumerControllerRef_ = bs;
               break;
@@ -1629,27 +1629,27 @@ public final class ReliableDelivery {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.Builder.class);
     }
 
     private int bitField0_;
@@ -1671,8 +1671,8 @@ public final class ReliableDelivery {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           consumerControllerRef_ = s;
@@ -1684,17 +1684,17 @@ public final class ReliableDelivery {
      * required string consumerControllerRef = 1;
      * @return The bytes for consumerControllerRef.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getConsumerControllerRefBytes() {
       java.lang.Object ref = consumerControllerRef_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         consumerControllerRef_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -1714,10 +1714,10 @@ public final class ReliableDelivery {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, consumerControllerRef_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, consumerControllerRef_);
       }
       unknownFields.writeTo(output);
     }
@@ -1729,7 +1729,7 @@ public final class ReliableDelivery {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, consumerControllerRef_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, consumerControllerRef_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1741,10 +1741,10 @@ public final class ReliableDelivery {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer other = (akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer other = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer) obj;
 
       if (hasConsumerControllerRef() != other.hasConsumerControllerRef()) return false;
       if (hasConsumerControllerRef()) {
@@ -1771,73 +1771,73 @@ public final class ReliableDelivery {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1846,7 +1846,7 @@ public final class ReliableDelivery {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1857,7 +1857,7 @@ public final class ReliableDelivery {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1866,37 +1866,37 @@ public final class ReliableDelivery {
      * ProducerController
      * 
    
      *
-     * Protobuf type {@code akka.cluster.typed.delivery.RegisterConsumer}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.RegisterConsumer}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.delivery.RegisterConsumer)
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumerOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.delivery.RegisterConsumer)
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumerOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -1909,19 +1909,19 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer build() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1929,8 +1929,8 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer buildPartial() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer result = new akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1948,44 +1948,44 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer other) {
-        if (other == akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.getDefaultInstance()) return this;
         if (other.hasConsumerControllerRef()) {
           bitField0_ |= 0x00000001;
           consumerControllerRef_ = other.consumerControllerRef_;
@@ -2006,14 +2006,14 @@ public final class ReliableDelivery {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2039,8 +2039,8 @@ public final class ReliableDelivery {
       public java.lang.String getConsumerControllerRef() {
         java.lang.Object ref = consumerControllerRef_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             consumerControllerRef_ = s;
@@ -2054,17 +2054,17 @@ public final class ReliableDelivery {
        * required string consumerControllerRef = 1;
        * @return The bytes for consumerControllerRef.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getConsumerControllerRefBytes() {
         java.lang.Object ref = consumerControllerRef_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           consumerControllerRef_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -2098,7 +2098,7 @@ public final class ReliableDelivery {
        * @return This builder for chaining.
        */
       public Builder setConsumerControllerRefBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2109,60 +2109,60 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.delivery.RegisterConsumer)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.delivery.RegisterConsumer)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.delivery.RegisterConsumer)
-    private static final akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.delivery.RegisterConsumer)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public RegisterConsumer parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new RegisterConsumer(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface RequestOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.delivery.Request)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.delivery.Request)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int64 confirmedSeqNr = 1;
@@ -2213,15 +2213,15 @@ public final class ReliableDelivery {
    * ProducerController
    * 
    
    *
-   * Protobuf type {@code akka.cluster.typed.delivery.Request}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Request}
    */
   public  static final class Request extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.delivery.Request)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Request)
       RequestOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Request.newBuilder() to construct.
-    private Request(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Request(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Request() {
@@ -2230,26 +2230,26 @@ public final class ReliableDelivery {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Request();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Request(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2287,27 +2287,27 @@ public final class ReliableDelivery {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.Request.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Request.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.Builder.class);
     }
 
     private int bitField0_;
@@ -2407,7 +2407,7 @@ public final class ReliableDelivery {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, confirmedSeqNr_);
@@ -2431,19 +2431,19 @@ public final class ReliableDelivery {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, confirmedSeqNr_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(2, requestUpToSeqNr_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, supportResend_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(4, viaTimeout_);
       }
       size += unknownFields.getSerializedSize();
@@ -2456,10 +2456,10 @@ public final class ReliableDelivery {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Request)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ReliableDelivery.Request other = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Request) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request other = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request) obj;
 
       if (hasConfirmedSeqNr() != other.hasConfirmedSeqNr()) return false;
       if (hasConfirmedSeqNr()) {
@@ -2494,22 +2494,22 @@ public final class ReliableDelivery {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasConfirmedSeqNr()) {
         hash = (37 * hash) + CONFIRMEDSEQNR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getConfirmedSeqNr());
       }
       if (hasRequestUpToSeqNr()) {
         hash = (37 * hash) + REQUESTUPTOSEQNR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getRequestUpToSeqNr());
       }
       if (hasSupportResend()) {
         hash = (37 * hash) + SUPPORTRESEND_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getSupportResend());
       }
       if (hasViaTimeout()) {
         hash = (37 * hash) + VIATIMEOUT_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getViaTimeout());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -2517,73 +2517,73 @@ public final class ReliableDelivery {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -2592,7 +2592,7 @@ public final class ReliableDelivery {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ReliableDelivery.Request prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2603,7 +2603,7 @@ public final class ReliableDelivery {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2612,37 +2612,37 @@ public final class ReliableDelivery {
      * ProducerController
      * 
    
      *
-     * Protobuf type {@code akka.cluster.typed.delivery.Request}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Request}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.delivery.Request)
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.RequestOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.delivery.Request)
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RequestOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ReliableDelivery.Request.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Request.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ReliableDelivery.Request.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -2661,19 +2661,19 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Request getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.Request.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Request build() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Request result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2681,8 +2681,8 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Request buildPartial() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Request result = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Request(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2712,44 +2712,44 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Request) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ReliableDelivery.Request)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ReliableDelivery.Request other) {
-        if (other == akka.cluster.typed.internal.protobuf.ReliableDelivery.Request.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.getDefaultInstance()) return this;
         if (other.hasConfirmedSeqNr()) {
           setConfirmedSeqNr(other.getConfirmedSeqNr());
         }
@@ -2786,14 +2786,14 @@ public final class ReliableDelivery {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Request parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Request) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2953,60 +2953,60 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.delivery.Request)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.delivery.Request)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.delivery.Request)
-    private static final akka.cluster.typed.internal.protobuf.ReliableDelivery.Request DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.delivery.Request)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Request();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Request getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Request parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Request(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.Request getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ResendOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.delivery.Resend)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.delivery.Resend)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int64 fromSeqNr = 1;
@@ -3024,15 +3024,15 @@ public final class ReliableDelivery {
    * ProducerController
    * 
    
    *
-   * Protobuf type {@code akka.cluster.typed.delivery.Resend}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Resend}
    */
   public  static final class Resend extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.delivery.Resend)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Resend)
       ResendOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Resend.newBuilder() to construct.
-    private Resend(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Resend(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Resend() {
@@ -3041,26 +3041,26 @@ public final class ReliableDelivery {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Resend();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Resend(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3083,27 +3083,27 @@ public final class ReliableDelivery {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.Builder.class);
     }
 
     private int bitField0_;
@@ -3140,7 +3140,7 @@ public final class ReliableDelivery {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, fromSeqNr_);
@@ -3155,7 +3155,7 @@ public final class ReliableDelivery {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, fromSeqNr_);
       }
       size += unknownFields.getSerializedSize();
@@ -3168,10 +3168,10 @@ public final class ReliableDelivery {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend other = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend other = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend) obj;
 
       if (hasFromSeqNr() != other.hasFromSeqNr()) return false;
       if (hasFromSeqNr()) {
@@ -3191,7 +3191,7 @@ public final class ReliableDelivery {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasFromSeqNr()) {
         hash = (37 * hash) + FROMSEQNR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getFromSeqNr());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -3199,73 +3199,73 @@ public final class ReliableDelivery {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3274,7 +3274,7 @@ public final class ReliableDelivery {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3285,7 +3285,7 @@ public final class ReliableDelivery {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3294,37 +3294,37 @@ public final class ReliableDelivery {
      * ProducerController
      * 
    
      *
-     * Protobuf type {@code akka.cluster.typed.delivery.Resend}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Resend}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.delivery.Resend)
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.ResendOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.delivery.Resend)
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ResendOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -3337,19 +3337,19 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend build() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3357,8 +3357,8 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend buildPartial() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend result = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3376,44 +3376,44 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend other) {
-        if (other == akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.getDefaultInstance()) return this;
         if (other.hasFromSeqNr()) {
           setFromSeqNr(other.getFromSeqNr());
         }
@@ -3432,14 +3432,14 @@ public final class ReliableDelivery {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3488,60 +3488,60 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.delivery.Resend)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.delivery.Resend)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.delivery.Resend)
-    private static final akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.delivery.Resend)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Resend parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Resend(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.Resend getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface AckOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.delivery.Ack)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.delivery.Ack)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int64 confirmedSeqNr = 1;
@@ -3559,15 +3559,15 @@ public final class ReliableDelivery {
    * ProducerController
    * 
    
    *
-   * Protobuf type {@code akka.cluster.typed.delivery.Ack}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Ack}
    */
   public  static final class Ack extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.delivery.Ack)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Ack)
       AckOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Ack.newBuilder() to construct.
-    private Ack(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Ack(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Ack() {
@@ -3576,26 +3576,26 @@ public final class ReliableDelivery {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Ack();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Ack(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3618,27 +3618,27 @@ public final class ReliableDelivery {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.Builder.class);
     }
 
     private int bitField0_;
@@ -3675,7 +3675,7 @@ public final class ReliableDelivery {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, confirmedSeqNr_);
@@ -3690,7 +3690,7 @@ public final class ReliableDelivery {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, confirmedSeqNr_);
       }
       size += unknownFields.getSerializedSize();
@@ -3703,10 +3703,10 @@ public final class ReliableDelivery {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack other = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack other = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack) obj;
 
       if (hasConfirmedSeqNr() != other.hasConfirmedSeqNr()) return false;
       if (hasConfirmedSeqNr()) {
@@ -3726,7 +3726,7 @@ public final class ReliableDelivery {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasConfirmedSeqNr()) {
         hash = (37 * hash) + CONFIRMEDSEQNR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getConfirmedSeqNr());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -3734,73 +3734,73 @@ public final class ReliableDelivery {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3809,7 +3809,7 @@ public final class ReliableDelivery {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3820,7 +3820,7 @@ public final class ReliableDelivery {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3829,37 +3829,37 @@ public final class ReliableDelivery {
      * ProducerController
      * 
    
      *
-     * Protobuf type {@code akka.cluster.typed.delivery.Ack}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Ack}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.delivery.Ack)
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.AckOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.delivery.Ack)
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.AckOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -3872,19 +3872,19 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack build() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3892,8 +3892,8 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack buildPartial() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack result = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3911,44 +3911,44 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack other) {
-        if (other == akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.getDefaultInstance()) return this;
         if (other.hasConfirmedSeqNr()) {
           setConfirmedSeqNr(other.getConfirmedSeqNr());
         }
@@ -3967,14 +3967,14 @@ public final class ReliableDelivery {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4023,60 +4023,60 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.delivery.Ack)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.delivery.Ack)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.delivery.Ack)
-    private static final akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.delivery.Ack)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Ack parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Ack(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.Ack getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface StateOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.delivery.State)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.delivery.State)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int64 currentSeqNr = 1;
@@ -4101,51 +4101,51 @@ public final class ReliableDelivery {
     long getHighestConfirmedSeqNr();
 
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
-    java.util.List 
+    java.util.List 
         getConfirmedList();
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
-    akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getConfirmed(int index);
+    org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getConfirmed(int index);
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
     int getConfirmedCount();
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
-    java.util.List 
+    java.util.List 
         getConfirmedOrBuilderList();
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
-    akka.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder getConfirmedOrBuilder(
+    org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder getConfirmedOrBuilder(
         int index);
 
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
-    java.util.List 
+    java.util.List 
         getUnconfirmedList();
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
-    akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getUnconfirmed(int index);
+    org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getUnconfirmed(int index);
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
     int getUnconfirmedCount();
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
-    java.util.List 
+    java.util.List 
         getUnconfirmedOrBuilderList();
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
-    akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder getUnconfirmedOrBuilder(
+    org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder getUnconfirmedOrBuilder(
         int index);
   }
   /**
@@ -4153,15 +4153,15 @@ public final class ReliableDelivery {
    * DurableProducerQueue
    * 
    *
-   * Protobuf type {@code akka.cluster.typed.delivery.State}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.State}
    */
   public  static final class State extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.delivery.State)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.State)
       StateOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use State.newBuilder() to construct.
-    private State(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private State(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private State() {
@@ -4172,26 +4172,26 @@ public final class ReliableDelivery {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new State();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private State(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4212,20 +4212,20 @@ public final class ReliableDelivery {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                confirmed_ = new java.util.ArrayList();
+                confirmed_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               confirmed_.add(
-                  input.readMessage(akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.PARSER, extensionRegistry));
               break;
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                unconfirmed_ = new java.util.ArrayList();
+                unconfirmed_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
               unconfirmed_.add(
-                  input.readMessage(akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -4237,10 +4237,10 @@ public final class ReliableDelivery {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
@@ -4253,17 +4253,17 @@ public final class ReliableDelivery {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.State.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.State.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.Builder.class);
     }
 
     private int bitField0_;
@@ -4302,71 +4302,71 @@ public final class ReliableDelivery {
     }
 
     public static final int CONFIRMED_FIELD_NUMBER = 3;
-    private java.util.List confirmed_;
+    private java.util.List confirmed_;
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
-    public java.util.List getConfirmedList() {
+    public java.util.List getConfirmedList() {
       return confirmed_;
     }
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getConfirmedOrBuilderList() {
       return confirmed_;
     }
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
     public int getConfirmedCount() {
       return confirmed_.size();
     }
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getConfirmed(int index) {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getConfirmed(int index) {
       return confirmed_.get(index);
     }
     /**
-     * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+     * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
      */
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder getConfirmedOrBuilder(
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder getConfirmedOrBuilder(
         int index) {
       return confirmed_.get(index);
     }
 
     public static final int UNCONFIRMED_FIELD_NUMBER = 4;
-    private java.util.List unconfirmed_;
+    private java.util.List unconfirmed_;
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
-    public java.util.List getUnconfirmedList() {
+    public java.util.List getUnconfirmedList() {
       return unconfirmed_;
     }
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getUnconfirmedOrBuilderList() {
       return unconfirmed_;
     }
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
     public int getUnconfirmedCount() {
       return unconfirmed_.size();
     }
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getUnconfirmed(int index) {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getUnconfirmed(int index) {
       return unconfirmed_.get(index);
     }
     /**
-     * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+     * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
      */
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder getUnconfirmedOrBuilder(
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder getUnconfirmedOrBuilder(
         int index) {
       return unconfirmed_.get(index);
     }
@@ -4403,7 +4403,7 @@ public final class ReliableDelivery {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, currentSeqNr_);
@@ -4427,19 +4427,19 @@ public final class ReliableDelivery {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, currentSeqNr_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(2, highestConfirmedSeqNr_);
       }
       for (int i = 0; i < confirmed_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, confirmed_.get(i));
       }
       for (int i = 0; i < unconfirmed_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, unconfirmed_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -4452,10 +4452,10 @@ public final class ReliableDelivery {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.State)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ReliableDelivery.State other = (akka.cluster.typed.internal.protobuf.ReliableDelivery.State) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State other = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State) obj;
 
       if (hasCurrentSeqNr() != other.hasCurrentSeqNr()) return false;
       if (hasCurrentSeqNr()) {
@@ -4484,12 +4484,12 @@ public final class ReliableDelivery {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasCurrentSeqNr()) {
         hash = (37 * hash) + CURRENTSEQNR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getCurrentSeqNr());
       }
       if (hasHighestConfirmedSeqNr()) {
         hash = (37 * hash) + HIGHESTCONFIRMEDSEQNR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getHighestConfirmedSeqNr());
       }
       if (getConfirmedCount() > 0) {
@@ -4505,73 +4505,73 @@ public final class ReliableDelivery {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -4580,7 +4580,7 @@ public final class ReliableDelivery {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ReliableDelivery.State prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4591,7 +4591,7 @@ public final class ReliableDelivery {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4600,37 +4600,37 @@ public final class ReliableDelivery {
      * DurableProducerQueue
      * 
      *
-     * Protobuf type {@code akka.cluster.typed.delivery.State}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.State}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.delivery.State)
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.StateOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.delivery.State)
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.StateOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ReliableDelivery.State.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.State.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ReliableDelivery.State.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getConfirmedFieldBuilder();
           getUnconfirmedFieldBuilder();
@@ -4659,19 +4659,19 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.State getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.State.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.State build() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.State result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4679,8 +4679,8 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.State buildPartial() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.State result = new akka.cluster.typed.internal.protobuf.ReliableDelivery.State(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4720,44 +4720,44 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.State) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ReliableDelivery.State)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ReliableDelivery.State other) {
-        if (other == akka.cluster.typed.internal.protobuf.ReliableDelivery.State.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.getDefaultInstance()) return this;
         if (other.hasCurrentSeqNr()) {
           setCurrentSeqNr(other.getCurrentSeqNr());
         }
@@ -4783,7 +4783,7 @@ public final class ReliableDelivery {
               confirmed_ = other.confirmed_;
               bitField0_ = (bitField0_ & ~0x00000004);
               confirmedBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getConfirmedFieldBuilder() : null;
             } else {
               confirmedBuilder_.addAllMessages(other.confirmed_);
@@ -4809,7 +4809,7 @@ public final class ReliableDelivery {
               unconfirmed_ = other.unconfirmed_;
               bitField0_ = (bitField0_ & ~0x00000008);
               unconfirmedBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getUnconfirmedFieldBuilder() : null;
             } else {
               unconfirmedBuilder_.addAllMessages(other.unconfirmed_);
@@ -4844,14 +4844,14 @@ public final class ReliableDelivery {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.State parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ReliableDelivery.State) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4936,22 +4936,22 @@ public final class ReliableDelivery {
         return this;
       }
 
-      private java.util.List confirmed_ =
+      private java.util.List confirmed_ =
         java.util.Collections.emptyList();
       private void ensureConfirmedIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          confirmed_ = new java.util.ArrayList(confirmed_);
+          confirmed_ = new java.util.ArrayList(confirmed_);
           bitField0_ |= 0x00000004;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder, akka.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder> confirmedBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder> confirmedBuilder_;
 
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
-      public java.util.List getConfirmedList() {
+      public java.util.List getConfirmedList() {
         if (confirmedBuilder_ == null) {
           return java.util.Collections.unmodifiableList(confirmed_);
         } else {
@@ -4959,7 +4959,7 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
       public int getConfirmedCount() {
         if (confirmedBuilder_ == null) {
@@ -4969,9 +4969,9 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getConfirmed(int index) {
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getConfirmed(int index) {
         if (confirmedBuilder_ == null) {
           return confirmed_.get(index);
         } else {
@@ -4979,10 +4979,10 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
       public Builder setConfirmed(
-          int index, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed value) {
+          int index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed value) {
         if (confirmedBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4996,10 +4996,10 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
       public Builder setConfirmed(
-          int index, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder builderForValue) {
         if (confirmedBuilder_ == null) {
           ensureConfirmedIsMutable();
           confirmed_.set(index, builderForValue.build());
@@ -5010,9 +5010,9 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
-      public Builder addConfirmed(akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed value) {
+      public Builder addConfirmed(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed value) {
         if (confirmedBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5026,10 +5026,10 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
       public Builder addConfirmed(
-          int index, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed value) {
+          int index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed value) {
         if (confirmedBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5043,10 +5043,10 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
       public Builder addConfirmed(
-          akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder builderForValue) {
+          org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder builderForValue) {
         if (confirmedBuilder_ == null) {
           ensureConfirmedIsMutable();
           confirmed_.add(builderForValue.build());
@@ -5057,10 +5057,10 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
       public Builder addConfirmed(
-          int index, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder builderForValue) {
         if (confirmedBuilder_ == null) {
           ensureConfirmedIsMutable();
           confirmed_.add(index, builderForValue.build());
@@ -5071,13 +5071,13 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
       public Builder addAllConfirmed(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (confirmedBuilder_ == null) {
           ensureConfirmedIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, confirmed_);
           onChanged();
         } else {
@@ -5086,7 +5086,7 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
       public Builder clearConfirmed() {
         if (confirmedBuilder_ == null) {
@@ -5099,7 +5099,7 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
       public Builder removeConfirmed(int index) {
         if (confirmedBuilder_ == null) {
@@ -5112,16 +5112,16 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder getConfirmedBuilder(
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder getConfirmedBuilder(
           int index) {
         return getConfirmedFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder getConfirmedOrBuilder(
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder getConfirmedOrBuilder(
           int index) {
         if (confirmedBuilder_ == null) {
           return confirmed_.get(index);  } else {
@@ -5129,9 +5129,9 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getConfirmedOrBuilderList() {
         if (confirmedBuilder_ != null) {
           return confirmedBuilder_.getMessageOrBuilderList();
@@ -5140,33 +5140,33 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder addConfirmedBuilder() {
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder addConfirmedBuilder() {
         return getConfirmedFieldBuilder().addBuilder(
-            akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.getDefaultInstance());
+            org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder addConfirmedBuilder(
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder addConfirmedBuilder(
           int index) {
         return getConfirmedFieldBuilder().addBuilder(
-            index, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.getDefaultInstance());
+            index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.typed.delivery.Confirmed confirmed = 3;
+       * repeated .org.apache.pekko.cluster.typed.delivery.Confirmed confirmed = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getConfirmedBuilderList() {
         return getConfirmedFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder, akka.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder> 
           getConfirmedFieldBuilder() {
         if (confirmedBuilder_ == null) {
-          confirmedBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder, akka.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder>(
+          confirmedBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder>(
                   confirmed_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
@@ -5176,22 +5176,22 @@ public final class ReliableDelivery {
         return confirmedBuilder_;
       }
 
-      private java.util.List unconfirmed_ =
+      private java.util.List unconfirmed_ =
         java.util.Collections.emptyList();
       private void ensureUnconfirmedIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          unconfirmed_ = new java.util.ArrayList(unconfirmed_);
+          unconfirmed_ = new java.util.ArrayList(unconfirmed_);
           bitField0_ |= 0x00000008;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder> unconfirmedBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder> unconfirmedBuilder_;
 
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
-      public java.util.List getUnconfirmedList() {
+      public java.util.List getUnconfirmedList() {
         if (unconfirmedBuilder_ == null) {
           return java.util.Collections.unmodifiableList(unconfirmed_);
         } else {
@@ -5199,7 +5199,7 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
       public int getUnconfirmedCount() {
         if (unconfirmedBuilder_ == null) {
@@ -5209,9 +5209,9 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getUnconfirmed(int index) {
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getUnconfirmed(int index) {
         if (unconfirmedBuilder_ == null) {
           return unconfirmed_.get(index);
         } else {
@@ -5219,10 +5219,10 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
       public Builder setUnconfirmed(
-          int index, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent value) {
+          int index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent value) {
         if (unconfirmedBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5236,10 +5236,10 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
       public Builder setUnconfirmed(
-          int index, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder builderForValue) {
         if (unconfirmedBuilder_ == null) {
           ensureUnconfirmedIsMutable();
           unconfirmed_.set(index, builderForValue.build());
@@ -5250,9 +5250,9 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
-      public Builder addUnconfirmed(akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent value) {
+      public Builder addUnconfirmed(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent value) {
         if (unconfirmedBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5266,10 +5266,10 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
       public Builder addUnconfirmed(
-          int index, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent value) {
+          int index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent value) {
         if (unconfirmedBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5283,10 +5283,10 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
       public Builder addUnconfirmed(
-          akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder builderForValue) {
+          org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder builderForValue) {
         if (unconfirmedBuilder_ == null) {
           ensureUnconfirmedIsMutable();
           unconfirmed_.add(builderForValue.build());
@@ -5297,10 +5297,10 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
       public Builder addUnconfirmed(
-          int index, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder builderForValue) {
         if (unconfirmedBuilder_ == null) {
           ensureUnconfirmedIsMutable();
           unconfirmed_.add(index, builderForValue.build());
@@ -5311,13 +5311,13 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
       public Builder addAllUnconfirmed(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (unconfirmedBuilder_ == null) {
           ensureUnconfirmedIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, unconfirmed_);
           onChanged();
         } else {
@@ -5326,7 +5326,7 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
       public Builder clearUnconfirmed() {
         if (unconfirmedBuilder_ == null) {
@@ -5339,7 +5339,7 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
       public Builder removeUnconfirmed(int index) {
         if (unconfirmedBuilder_ == null) {
@@ -5352,16 +5352,16 @@ public final class ReliableDelivery {
         return this;
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder getUnconfirmedBuilder(
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder getUnconfirmedBuilder(
           int index) {
         return getUnconfirmedFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder getUnconfirmedOrBuilder(
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder getUnconfirmedOrBuilder(
           int index) {
         if (unconfirmedBuilder_ == null) {
           return unconfirmed_.get(index);  } else {
@@ -5369,9 +5369,9 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getUnconfirmedOrBuilderList() {
         if (unconfirmedBuilder_ != null) {
           return unconfirmedBuilder_.getMessageOrBuilderList();
@@ -5380,33 +5380,33 @@ public final class ReliableDelivery {
         }
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder addUnconfirmedBuilder() {
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder addUnconfirmedBuilder() {
         return getUnconfirmedFieldBuilder().addBuilder(
-            akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.getDefaultInstance());
+            org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder addUnconfirmedBuilder(
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder addUnconfirmedBuilder(
           int index) {
         return getUnconfirmedFieldBuilder().addBuilder(
-            index, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.getDefaultInstance());
+            index, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.typed.delivery.MessageSent unconfirmed = 4;
+       * repeated .org.apache.pekko.cluster.typed.delivery.MessageSent unconfirmed = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getUnconfirmedBuilderList() {
         return getUnconfirmedFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder> 
           getUnconfirmedFieldBuilder() {
         if (unconfirmedBuilder_ == null) {
-          unconfirmedBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder>(
+          unconfirmedBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder>(
                   unconfirmed_,
                   ((bitField0_ & 0x00000008) != 0),
                   getParentForChildren(),
@@ -5417,60 +5417,60 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.delivery.State)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.delivery.State)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.delivery.State)
-    private static final akka.cluster.typed.internal.protobuf.ReliableDelivery.State DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.delivery.State)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ReliableDelivery.State();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.State getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public State parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new State(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.State getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ConfirmedOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.delivery.Confirmed)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.delivery.Confirmed)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int64 seqNr = 1;
@@ -5497,7 +5497,7 @@ public final class ReliableDelivery {
      * required string qualifier = 2;
      * @return The bytes for qualifier.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getQualifierBytes();
 
     /**
@@ -5516,15 +5516,15 @@ public final class ReliableDelivery {
    * DurableProducerQueue
    * 
    *
-   * Protobuf type {@code akka.cluster.typed.delivery.Confirmed}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Confirmed}
    */
   public  static final class Confirmed extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.delivery.Confirmed)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Confirmed)
       ConfirmedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Confirmed.newBuilder() to construct.
-    private Confirmed(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Confirmed(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Confirmed() {
@@ -5534,26 +5534,26 @@ public final class ReliableDelivery {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Confirmed();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Confirmed(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5568,7 +5568,7 @@ public final class ReliableDelivery {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               qualifier_ = bs;
               break;
@@ -5587,27 +5587,27 @@ public final class ReliableDelivery {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder.class);
     }
 
     private int bitField0_;
@@ -5646,8 +5646,8 @@ public final class ReliableDelivery {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           qualifier_ = s;
@@ -5659,17 +5659,17 @@ public final class ReliableDelivery {
      * required string qualifier = 2;
      * @return The bytes for qualifier.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getQualifierBytes() {
       java.lang.Object ref = qualifier_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         qualifier_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -5714,13 +5714,13 @@ public final class ReliableDelivery {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, seqNr_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, qualifier_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, qualifier_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt64(3, timestamp_);
@@ -5735,14 +5735,14 @@ public final class ReliableDelivery {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, seqNr_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, qualifier_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, qualifier_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, timestamp_);
       }
       size += unknownFields.getSerializedSize();
@@ -5755,10 +5755,10 @@ public final class ReliableDelivery {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed other = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed other = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed) obj;
 
       if (hasSeqNr() != other.hasSeqNr()) return false;
       if (hasSeqNr()) {
@@ -5788,7 +5788,7 @@ public final class ReliableDelivery {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasSeqNr()) {
         hash = (37 * hash) + SEQNR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSeqNr());
       }
       if (hasQualifier()) {
@@ -5797,7 +5797,7 @@ public final class ReliableDelivery {
       }
       if (hasTimestamp()) {
         hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimestamp());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -5805,73 +5805,73 @@ public final class ReliableDelivery {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5880,7 +5880,7 @@ public final class ReliableDelivery {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5891,7 +5891,7 @@ public final class ReliableDelivery {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5900,37 +5900,37 @@ public final class ReliableDelivery {
      * DurableProducerQueue
      * 
      *
-     * Protobuf type {@code akka.cluster.typed.delivery.Confirmed}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Confirmed}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.delivery.Confirmed)
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.delivery.Confirmed)
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -5947,19 +5947,19 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed build() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5967,8 +5967,8 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed buildPartial() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed result = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5994,44 +5994,44 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed other) {
-        if (other == akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.getDefaultInstance()) return this;
         if (other.hasSeqNr()) {
           setSeqNr(other.getSeqNr());
         }
@@ -6064,14 +6064,14 @@ public final class ReliableDelivery {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6134,8 +6134,8 @@ public final class ReliableDelivery {
       public java.lang.String getQualifier() {
         java.lang.Object ref = qualifier_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             qualifier_ = s;
@@ -6149,17 +6149,17 @@ public final class ReliableDelivery {
        * required string qualifier = 2;
        * @return The bytes for qualifier.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getQualifierBytes() {
         java.lang.Object ref = qualifier_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           qualifier_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -6193,7 +6193,7 @@ public final class ReliableDelivery {
        * @return This builder for chaining.
        */
       public Builder setQualifierBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -6241,60 +6241,60 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.delivery.Confirmed)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.delivery.Confirmed)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.delivery.Confirmed)
-    private static final akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.delivery.Confirmed)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Confirmed parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Confirmed(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface MessageSentOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.delivery.MessageSent)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.delivery.MessageSent)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int64 seqNr = 1;
@@ -6321,7 +6321,7 @@ public final class ReliableDelivery {
      * required string qualifier = 2;
      * @return The bytes for qualifier.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getQualifierBytes();
 
     /**
@@ -6355,11 +6355,11 @@ public final class ReliableDelivery {
      * required .Payload message = 5;
      * @return The message.
      */
-    akka.remote.ContainerFormats.Payload getMessage();
+    org.apache.pekko.remote.ContainerFormats.Payload getMessage();
     /**
      * required .Payload message = 5;
      */
-    akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder();
 
     /**
      * optional bool firstChunk = 6;
@@ -6388,15 +6388,15 @@ public final class ReliableDelivery {
    * DurableProducerQueue
    * 
    *
-   * Protobuf type {@code akka.cluster.typed.delivery.MessageSent}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.MessageSent}
    */
   public  static final class MessageSent extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.delivery.MessageSent)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.MessageSent)
       MessageSentOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use MessageSent.newBuilder() to construct.
-    private MessageSent(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private MessageSent(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private MessageSent() {
@@ -6406,26 +6406,26 @@ public final class ReliableDelivery {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new MessageSent();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private MessageSent(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6440,7 +6440,7 @@ public final class ReliableDelivery {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               qualifier_ = bs;
               break;
@@ -6456,11 +6456,11 @@ public final class ReliableDelivery {
               break;
             }
             case 42: {
-              akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) != 0)) {
                 subBuilder = message_.toBuilder();
               }
-              message_ = input.readMessage(akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+              message_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(message_);
                 message_ = subBuilder.buildPartial();
@@ -6487,27 +6487,27 @@ public final class ReliableDelivery {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder.class);
     }
 
     private int bitField0_;
@@ -6546,8 +6546,8 @@ public final class ReliableDelivery {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           qualifier_ = s;
@@ -6559,17 +6559,17 @@ public final class ReliableDelivery {
      * required string qualifier = 2;
      * @return The bytes for qualifier.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getQualifierBytes() {
       java.lang.Object ref = qualifier_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         qualifier_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -6608,7 +6608,7 @@ public final class ReliableDelivery {
     }
 
     public static final int MESSAGE_FIELD_NUMBER = 5;
-    private akka.remote.ContainerFormats.Payload message_;
+    private org.apache.pekko.remote.ContainerFormats.Payload message_;
     /**
      * required .Payload message = 5;
      * @return Whether the message field is set.
@@ -6620,14 +6620,14 @@ public final class ReliableDelivery {
      * required .Payload message = 5;
      * @return The message.
      */
-    public akka.remote.ContainerFormats.Payload getMessage() {
-      return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+    public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
+      return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
     /**
      * required .Payload message = 5;
      */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
-      return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
+      return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
     }
 
     public static final int FIRSTCHUNK_FIELD_NUMBER = 6;
@@ -6700,13 +6700,13 @@ public final class ReliableDelivery {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, seqNr_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, qualifier_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, qualifier_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBool(3, ack_);
@@ -6733,30 +6733,30 @@ public final class ReliableDelivery {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, seqNr_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, qualifier_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, qualifier_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, ack_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(4, timestamp_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(5, getMessage());
       }
       if (((bitField0_ & 0x00000020) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(6, firstChunk_);
       }
       if (((bitField0_ & 0x00000040) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(7, lastChunk_);
       }
       size += unknownFields.getSerializedSize();
@@ -6769,10 +6769,10 @@ public final class ReliableDelivery {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent other = (akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent other = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent) obj;
 
       if (hasSeqNr() != other.hasSeqNr()) return false;
       if (hasSeqNr()) {
@@ -6822,7 +6822,7 @@ public final class ReliableDelivery {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasSeqNr()) {
         hash = (37 * hash) + SEQNR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSeqNr());
       }
       if (hasQualifier()) {
@@ -6831,12 +6831,12 @@ public final class ReliableDelivery {
       }
       if (hasAck()) {
         hash = (37 * hash) + ACK_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getAck());
       }
       if (hasTimestamp()) {
         hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimestamp());
       }
       if (hasMessage()) {
@@ -6845,12 +6845,12 @@ public final class ReliableDelivery {
       }
       if (hasFirstChunk()) {
         hash = (37 * hash) + FIRSTCHUNK_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getFirstChunk());
       }
       if (hasLastChunk()) {
         hash = (37 * hash) + LASTCHUNK_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getLastChunk());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -6858,73 +6858,73 @@ public final class ReliableDelivery {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -6933,7 +6933,7 @@ public final class ReliableDelivery {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6944,7 +6944,7 @@ public final class ReliableDelivery {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -6953,37 +6953,37 @@ public final class ReliableDelivery {
      * DurableProducerQueue
      * 
      *
-     * Protobuf type {@code akka.cluster.typed.delivery.MessageSent}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.MessageSent}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.delivery.MessageSent)
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.delivery.MessageSent)
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getMessageFieldBuilder();
         }
@@ -7013,19 +7013,19 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent build() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7033,8 +7033,8 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent buildPartial() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent result = new akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7080,44 +7080,44 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent other) {
-        if (other == akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.getDefaultInstance()) return this;
         if (other.hasSeqNr()) {
           setSeqNr(other.getSeqNr());
         }
@@ -7171,14 +7171,14 @@ public final class ReliableDelivery {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7241,8 +7241,8 @@ public final class ReliableDelivery {
       public java.lang.String getQualifier() {
         java.lang.Object ref = qualifier_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             qualifier_ = s;
@@ -7256,17 +7256,17 @@ public final class ReliableDelivery {
        * required string qualifier = 2;
        * @return The bytes for qualifier.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getQualifierBytes() {
         java.lang.Object ref = qualifier_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           qualifier_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -7300,7 +7300,7 @@ public final class ReliableDelivery {
        * @return This builder for chaining.
        */
       public Builder setQualifierBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7384,9 +7384,9 @@ public final class ReliableDelivery {
         return this;
       }
 
-      private akka.remote.ContainerFormats.Payload message_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> messageBuilder_;
+      private org.apache.pekko.remote.ContainerFormats.Payload message_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> messageBuilder_;
       /**
        * required .Payload message = 5;
        * @return Whether the message field is set.
@@ -7398,9 +7398,9 @@ public final class ReliableDelivery {
        * required .Payload message = 5;
        * @return The message.
        */
-      public akka.remote.ContainerFormats.Payload getMessage() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getMessage() {
         if (messageBuilder_ == null) {
-          return message_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+          return message_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
         } else {
           return messageBuilder_.getMessage();
         }
@@ -7408,7 +7408,7 @@ public final class ReliableDelivery {
       /**
        * required .Payload message = 5;
        */
-      public Builder setMessage(akka.remote.ContainerFormats.Payload value) {
+      public Builder setMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7425,7 +7425,7 @@ public final class ReliableDelivery {
        * required .Payload message = 5;
        */
       public Builder setMessage(
-          akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageBuilder_ == null) {
           message_ = builderForValue.build();
           onChanged();
@@ -7438,13 +7438,13 @@ public final class ReliableDelivery {
       /**
        * required .Payload message = 5;
        */
-      public Builder mergeMessage(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergeMessage(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
               message_ != null &&
-              message_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              message_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             message_ =
-              akka.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(message_).mergeFrom(value).buildPartial();
           } else {
             message_ = value;
           }
@@ -7471,7 +7471,7 @@ public final class ReliableDelivery {
       /**
        * required .Payload message = 5;
        */
-      public akka.remote.ContainerFormats.Payload.Builder getMessageBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getMessageBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getMessageFieldBuilder().getBuilder();
@@ -7479,23 +7479,23 @@ public final class ReliableDelivery {
       /**
        * required .Payload message = 5;
        */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBuilder() {
         if (messageBuilder_ != null) {
           return messageBuilder_.getMessageOrBuilder();
         } else {
           return message_ == null ?
-              akka.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
+              org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : message_;
         }
       }
       /**
        * required .Payload message = 5;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> 
           getMessageFieldBuilder() {
         if (messageBuilder_ == null) {
-          messageBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder>(
+          messageBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getMessage(),
                   getParentForChildren(),
                   isClean());
@@ -7579,60 +7579,60 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.delivery.MessageSent)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.delivery.MessageSent)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.delivery.MessageSent)
-    private static final akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.delivery.MessageSent)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public MessageSent parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new MessageSent(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface CleanupOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.typed.delivery.Cleanup)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.typed.delivery.Cleanup)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated string qualifiers = 1;
@@ -7656,7 +7656,7 @@ public final class ReliableDelivery {
      * @param index The index of the value to return.
      * @return The bytes of the qualifiers at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getQualifiersBytes(int index);
   }
   /**
@@ -7664,44 +7664,44 @@ public final class ReliableDelivery {
    * DurableProducerQueue
    * 
    *
-   * Protobuf type {@code akka.cluster.typed.delivery.Cleanup}
+   * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Cleanup}
    */
   public  static final class Cleanup extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.typed.delivery.Cleanup)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.typed.delivery.Cleanup)
       CleanupOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Cleanup.newBuilder() to construct.
-    private Cleanup(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Cleanup(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Cleanup() {
-      qualifiers_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Cleanup();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Cleanup(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7711,9 +7711,9 @@ public final class ReliableDelivery {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                qualifiers_ = new akka.protobufv3.internal.LazyStringArrayList();
+                qualifiers_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               qualifiers_.add(bs);
@@ -7728,10 +7728,10 @@ public final class ReliableDelivery {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -7741,26 +7741,26 @@ public final class ReliableDelivery {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.Builder.class);
+              org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.Builder.class);
     }
 
     public static final int QUALIFIERS_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.LazyStringList qualifiers_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList qualifiers_;
     /**
      * repeated string qualifiers = 1;
      * @return A list containing the qualifiers.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getQualifiersList() {
       return qualifiers_;
     }
@@ -7784,7 +7784,7 @@ public final class ReliableDelivery {
      * @param index The index of the value to return.
      * @return The bytes of the qualifiers at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getQualifiersBytes(int index) {
       return qualifiers_.getByteString(index);
     }
@@ -7801,10 +7801,10 @@ public final class ReliableDelivery {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < qualifiers_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, qualifiers_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, qualifiers_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -7833,10 +7833,10 @@ public final class ReliableDelivery {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup)) {
+      if (!(obj instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup)) {
         return super.equals(obj);
       }
-      akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup other = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup) obj;
+      org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup other = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup) obj;
 
       if (!getQualifiersList()
           .equals(other.getQualifiersList())) return false;
@@ -7860,73 +7860,73 @@ public final class ReliableDelivery {
       return hash;
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseDelimitedFrom(
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -7935,7 +7935,7 @@ public final class ReliableDelivery {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7946,7 +7946,7 @@ public final class ReliableDelivery {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -7955,62 +7955,62 @@ public final class ReliableDelivery {
      * DurableProducerQueue
      * 
      *
-     * Protobuf type {@code akka.cluster.typed.delivery.Cleanup}
+     * Protobuf type {@code org.apache.pekko.cluster.typed.delivery.Cleanup}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.typed.delivery.Cleanup)
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.CleanupOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.typed.delivery.Cleanup)
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.CleanupOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.class, akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.Builder.class);
+                org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.Builder.class);
       }
 
-      // Construct using akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.newBuilder()
+      // Construct using org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        qualifiers_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup getDefaultInstanceForType() {
-        return akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.getDefaultInstance();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup build() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup result = buildPartial();
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup build() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8018,8 +8018,8 @@ public final class ReliableDelivery {
       }
 
       @java.lang.Override
-      public akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup buildPartial() {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup result = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup(this);
+      public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup buildPartial() {
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup result = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
           qualifiers_ = qualifiers_.getUnmodifiableView();
@@ -8036,44 +8036,44 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup) {
-          return mergeFrom((akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup) {
+          return mergeFrom((org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup other) {
-        if (other == akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup other) {
+        if (other == org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.getDefaultInstance()) return this;
         if (!other.qualifiers_.isEmpty()) {
           if (qualifiers_.isEmpty()) {
             qualifiers_ = other.qualifiers_;
@@ -8096,14 +8096,14 @@ public final class ReliableDelivery {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parsedMessage = null;
+        org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -8114,10 +8114,10 @@ public final class ReliableDelivery {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.LazyStringList qualifiers_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureQualifiersIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          qualifiers_ = new akka.protobufv3.internal.LazyStringArrayList(qualifiers_);
+          qualifiers_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(qualifiers_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -8125,7 +8125,7 @@ public final class ReliableDelivery {
        * repeated string qualifiers = 1;
        * @return A list containing the qualifiers.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getQualifiersList() {
         return qualifiers_.getUnmodifiableView();
       }
@@ -8149,7 +8149,7 @@ public final class ReliableDelivery {
        * @param index The index of the value to return.
        * @return The bytes of the qualifiers at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getQualifiersBytes(int index) {
         return qualifiers_.getByteString(index);
       }
@@ -8192,7 +8192,7 @@ public final class ReliableDelivery {
       public Builder addAllQualifiers(
           java.lang.Iterable values) {
         ensureQualifiersIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, qualifiers_);
         onChanged();
         return this;
@@ -8202,7 +8202,7 @@ public final class ReliableDelivery {
        * @return This builder for chaining.
        */
       public Builder clearQualifiers() {
-        qualifiers_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        qualifiers_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -8213,7 +8213,7 @@ public final class ReliableDelivery {
        * @return This builder for chaining.
        */
       public Builder addQualifiersBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8224,112 +8224,112 @@ public final class ReliableDelivery {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.typed.delivery.Cleanup)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.typed.delivery.Cleanup)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.typed.delivery.Cleanup)
-    private static final akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.typed.delivery.Cleanup)
+    private static final org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup();
     }
 
-    public static akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup getDefaultInstance() {
+    public static org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Cleanup parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Cleanup(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_delivery_Request_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_delivery_Resend_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_delivery_Ack_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_delivery_State_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026ReliableDelivery.proto\022\033akka.cluster.t" +
+      "\n\026ReliableDelivery.proto\022\033org.apache.pekko.cluster.t" +
       "yped.delivery\032\026ContainerFormats.proto\"\262\001" +
       "\n\020SequencedMessage\022\022\n\nproducerId\030\001 \002(\t\022\r" +
       "\n\005seqNr\030\002 \002(\003\022\r\n\005first\030\003 \002(\010\022\013\n\003ack\030\004 \002(" +
@@ -8344,76 +8344,76 @@ public final class ReliableDelivery {
       "ate\022\024\n\014currentSeqNr\030\001 \002(\003\022\035\n\025highestConf" +
       "irmedSeqNr\030\002 \002(\003\0229\n\tconfirmed\030\003 \003(\0132&.ak" +
       "ka.cluster.typed.delivery.Confirmed\022=\n\013u" +
-      "nconfirmed\030\004 \003(\0132(.akka.cluster.typed.de" +
+      "nconfirmed\030\004 \003(\0132(.org.apache.pekko.cluster.typed.de" +
       "livery.MessageSent\"@\n\tConfirmed\022\r\n\005seqNr" +
       "\030\001 \002(\003\022\021\n\tqualifier\030\002 \002(\t\022\021\n\ttimestamp\030\003" +
       " \002(\003\"\221\001\n\013MessageSent\022\r\n\005seqNr\030\001 \002(\003\022\021\n\tq" +
       "ualifier\030\002 \002(\t\022\013\n\003ack\030\003 \002(\010\022\021\n\ttimestamp" +
       "\030\004 \002(\003\022\031\n\007message\030\005 \002(\0132\010.Payload\022\022\n\nfir" +
       "stChunk\030\006 \001(\010\022\021\n\tlastChunk\030\007 \001(\010\"\035\n\007Clea" +
-      "nup\022\022\n\nqualifiers\030\001 \003(\tB(\n$akka.cluster." +
+      "nup\022\022\n\nqualifiers\030\001 \003(\tB(\n$org.apache.pekko.cluster." +
       "typed.internal.protobufH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
-          akka.remote.ContainerFormats.getDescriptor(),
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
+          org.apache.pekko.remote.ContainerFormats.getDescriptor(),
         });
     internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor,
         new java.lang.String[] { "ProducerId", "SeqNr", "First", "Ack", "ProducerControllerRef", "Message", "FirstChunk", "LastChunk", });
     internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor,
         new java.lang.String[] { "ConsumerControllerRef", });
     internal_static_akka_cluster_typed_delivery_Request_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_delivery_Request_descriptor,
         new java.lang.String[] { "ConfirmedSeqNr", "RequestUpToSeqNr", "SupportResend", "ViaTimeout", });
     internal_static_akka_cluster_typed_delivery_Resend_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_delivery_Resend_descriptor,
         new java.lang.String[] { "FromSeqNr", });
     internal_static_akka_cluster_typed_delivery_Ack_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_delivery_Ack_descriptor,
         new java.lang.String[] { "ConfirmedSeqNr", });
     internal_static_akka_cluster_typed_delivery_State_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_delivery_State_descriptor,
         new java.lang.String[] { "CurrentSeqNr", "HighestConfirmedSeqNr", "Confirmed", "Unconfirmed", });
     internal_static_akka_cluster_typed_delivery_Confirmed_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_delivery_Confirmed_descriptor,
         new java.lang.String[] { "SeqNr", "Qualifier", "Timestamp", });
     internal_static_akka_cluster_typed_delivery_MessageSent_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_delivery_MessageSent_descriptor,
         new java.lang.String[] { "SeqNr", "Qualifier", "Ack", "Timestamp", "Message", "FirstChunk", "LastChunk", });
     internal_static_akka_cluster_typed_delivery_Cleanup_descriptor =
       getDescriptor().getMessageTypes().get(8);
     internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_typed_delivery_Cleanup_descriptor,
         new java.lang.String[] { "Qualifiers", });
-    akka.remote.ContainerFormats.getDescriptor();
+    org.apache.pekko.remote.ContainerFormats.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/akka-cluster-typed/src/main/protobuf/ClusterMessages.proto b/akka-cluster-typed/src/main/protobuf/ClusterMessages.proto
index b8aa0094f4..51472184dd 100644
--- a/akka-cluster-typed/src/main/protobuf/ClusterMessages.proto
+++ b/akka-cluster-typed/src/main/protobuf/ClusterMessages.proto
@@ -4,9 +4,9 @@
 
 syntax = "proto2";
 
-package akka.cluster.typed;
+package org.apache.pekko.cluster.typed;
 
-option java_package = "akka.cluster.typed.internal.protobuf";
+option java_package = "org.apache.pekko.cluster.typed.internal.protobuf";
 option optimize_for = SPEED;
 import "ContainerFormats.proto";
 
diff --git a/akka-cluster-typed/src/main/protobuf/ReliableDelivery.proto b/akka-cluster-typed/src/main/protobuf/ReliableDelivery.proto
index 351e0f5ec3..4797f23a02 100644
--- a/akka-cluster-typed/src/main/protobuf/ReliableDelivery.proto
+++ b/akka-cluster-typed/src/main/protobuf/ReliableDelivery.proto
@@ -4,9 +4,9 @@
 
 syntax = "proto2";
 
-package akka.cluster.typed.delivery;
+package org.apache.pekko.cluster.typed.delivery;
 
-option java_package = "akka.cluster.typed.internal.protobuf";
+option java_package = "org.apache.pekko.cluster.typed.internal.protobuf";
 option optimize_for = SPEED;
 import "ContainerFormats.proto";
 
diff --git a/akka-cluster-typed/src/main/resources/reference.conf b/akka-cluster-typed/src/main/resources/reference.conf
index 4cd45a5d24..15400e0e3c 100644
--- a/akka-cluster-typed/src/main/resources/reference.conf
+++ b/akka-cluster-typed/src/main/resources/reference.conf
@@ -47,20 +47,20 @@ akka.cluster.ddata.typed {
 akka {
   actor {
     serialization-identifiers {
-      "akka.cluster.typed.internal.AkkaClusterTypedSerializer" = 28
-      "akka.cluster.typed.internal.delivery.ReliableDeliverySerializer" = 36
+      "org.apache.pekko.cluster.typed.internal.AkkaClusterTypedSerializer" = 28
+      "org.apache.pekko.cluster.typed.internal.delivery.ReliableDeliverySerializer" = 36
     }
     serializers {
-      typed-cluster = "akka.cluster.typed.internal.AkkaClusterTypedSerializer"
-      reliable-delivery = "akka.cluster.typed.internal.delivery.ReliableDeliverySerializer"
+      typed-cluster = "org.apache.pekko.cluster.typed.internal.AkkaClusterTypedSerializer"
+      reliable-delivery = "org.apache.pekko.cluster.typed.internal.delivery.ReliableDeliverySerializer"
     }
     serialization-bindings {
-      "akka.cluster.typed.internal.receptionist.ClusterReceptionist$Entry" = typed-cluster
-      "akka.actor.typed.internal.pubsub.TopicImpl$MessagePublished" = typed-cluster
-      "akka.actor.typed.delivery.internal.DeliverySerializable" = reliable-delivery
+      "org.apache.pekko.cluster.typed.internal.receptionist.ClusterReceptionist$Entry" = typed-cluster
+      "org.apache.pekko.actor.typed.internal.pubsub.TopicImpl$MessagePublished" = typed-cluster
+      "org.apache.pekko.actor.typed.delivery.internal.DeliverySerializable" = reliable-delivery
     }
   }
   cluster.configuration-compatibility-check.checkers {
-    receptionist = "akka.cluster.typed.internal.receptionist.ClusterReceptionistConfigCompatChecker"
+    receptionist = "org.apache.pekko.cluster.typed.internal.receptionist.ClusterReceptionistConfigCompatChecker"
   }
 }
diff --git a/akka-cluster-typed/src/main/scala-2.12/akka/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala b/akka-cluster-typed/src/main/scala-2.12/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
similarity index 53%
rename from akka-cluster-typed/src/main/scala-2.12/akka/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
rename to akka-cluster-typed/src/main/scala-2.12/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
index 02d85cb51b..d94cc7ebda 100644
--- a/akka-cluster-typed/src/main/scala-2.12/akka/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
+++ b/akka-cluster-typed/src/main/scala-2.12/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.receptionist
+package org.apache.pekko.cluster.typed.internal.receptionist
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.internal.receptionist.{ AbstractServiceKey, ReceptionistMessages }
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.internal.receptionist.{ AbstractServiceKey, ReceptionistMessages }
+import pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
diff --git a/akka-cluster-typed/src/main/scala-2.13/akka/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala b/akka-cluster-typed/src/main/scala-2.13/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
similarity index 53%
rename from akka-cluster-typed/src/main/scala-2.13/akka/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
rename to akka-cluster-typed/src/main/scala-2.13/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
index 02d85cb51b..d94cc7ebda 100644
--- a/akka-cluster-typed/src/main/scala-2.13/akka/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
+++ b/akka-cluster-typed/src/main/scala-2.13/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.receptionist
+package org.apache.pekko.cluster.typed.internal.receptionist
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.internal.receptionist.{ AbstractServiceKey, ReceptionistMessages }
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.internal.receptionist.{ AbstractServiceKey, ReceptionistMessages }
+import pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
diff --git a/akka-cluster-typed/src/main/scala-3/akka/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala b/akka-cluster-typed/src/main/scala-3/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
similarity index 58%
rename from akka-cluster-typed/src/main/scala-3/akka/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
rename to akka-cluster-typed/src/main/scala-3/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
index 480c61e3e7..4d0bcb971e 100644
--- a/akka-cluster-typed/src/main/scala-3/akka/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
+++ b/akka-cluster-typed/src/main/scala-3/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.receptionist
+package org.apache.pekko.cluster.typed.internal.receptionist
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.internal.receptionist.{ AbstractServiceKey, ReceptionistMessages }
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.internal.receptionist.{ AbstractServiceKey, ReceptionistMessages }
+import pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala
similarity index 91%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala
index 4390b4fd7b..4e3fcb5fef 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala
@@ -2,28 +2,29 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.internal
+package org.apache.pekko.cluster.ddata.typed.internal
 
 import scala.concurrent.duration._
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.Terminated
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.annotation.InternalApi
-import akka.cluster.{ ddata => dd }
-import akka.cluster.ddata.ReplicatedData
-import akka.pattern.ask
-import akka.util.JavaDurationConverters._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Terminated
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.annotation.InternalApi
+import pekko.cluster.{ ddata => dd }
+import pekko.cluster.ddata.ReplicatedData
+import pekko.pattern.ask
+import pekko.util.JavaDurationConverters._
+import pekko.util.Timeout
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ReplicatorBehavior {
-  import akka.cluster.ddata.typed.javadsl.{ Replicator => JReplicator }
-  import akka.cluster.ddata.typed.scaladsl.{ Replicator => SReplicator }
+@InternalApi private[pekko] object ReplicatorBehavior {
+  import pekko.cluster.ddata.typed.javadsl.{ Replicator => JReplicator }
+  import pekko.cluster.ddata.typed.scaladsl.{ Replicator => SReplicator }
 
   private case class InternalSubscribeResponse[A <: ReplicatedData](
       chg: dd.Replicator.SubscribeResponse[A],
@@ -35,7 +36,7 @@ import akka.util.Timeout
 
   def apply(
       settings: dd.ReplicatorSettings,
-      underlyingReplicator: Option[akka.actor.ActorRef]): Behavior[SReplicator.Command] = {
+      underlyingReplicator: Option[pekko.actor.ActorRef]): Behavior[SReplicator.Command] = {
 
     Behaviors.setup { ctx =>
       val classicReplicator = underlyingReplicator match {
@@ -139,7 +140,7 @@ import akka.util.Timeout
 
                 classicReplicator.tell(
                   dd.Replicator.Subscribe(cmd.key, adapter.toClassic),
-                  sender = akka.actor.ActorRef.noSender)
+                  sender = pekko.actor.ActorRef.noSender)
 
                 ctx.watch(cmd.subscriber)
 
@@ -202,7 +203,7 @@ import akka.util.Timeout
                 Behaviors.same
 
               case SReplicator.FlushChanges | JReplicator.FlushChanges =>
-                classicReplicator.tell(dd.Replicator.FlushChanges, sender = akka.actor.ActorRef.noSender)
+                classicReplicator.tell(dd.Replicator.FlushChanges, sender = pekko.actor.ActorRef.noSender)
                 Behaviors.same
 
               case unexpected =>
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala
similarity index 73%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala
index ae2544b0ad..3be3953069 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.javadsl
+package org.apache.pekko.cluster.ddata.typed.javadsl
 
 import java.util.function.{ Function => JFunction }
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.Extension
-import akka.actor.typed.ExtensionId
-import akka.actor.typed.ExtensionSetup
-import akka.actor.typed.javadsl.Behaviors
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.cluster.ddata.ReplicatedData
-import akka.cluster.ddata.SelfUniqueAddress
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Extension
+import pekko.actor.typed.ExtensionId
+import pekko.actor.typed.ExtensionSetup
+import pekko.actor.typed.javadsl.Behaviors
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.cluster.ddata.ReplicatedData
+import pekko.cluster.ddata.SelfUniqueAddress
+import pekko.util.JavaDurationConverters._
 
 object DistributedData extends ExtensionId[DistributedData] {
   def get(system: ActorSystem[_]): DistributedData = apply(system)
@@ -30,7 +31,7 @@ object DistributedData extends ExtensionId[DistributedData] {
    * provides convenient methods that adapts the response messages to the requesting actor's message protocol.
    *
    * One `ReplicatorMessageAdapter` instance can be used for a given `ReplicatedData` type,
-   * e.g. an `OrSet`. Interaction with several [[akka.cluster.ddata.Key]]s can be used via the same adapter
+   * e.g. an `OrSet`. Interaction with several [[pekko.cluster.ddata.Key]]s can be used via the same adapter
    * but they must all be of the same `ReplicatedData` type. For interaction with several different
    * `ReplicatedData` types, e.g. an `OrSet` and a `GCounter`, an adapter can be created
    * for each type.
@@ -47,7 +48,7 @@ object DistributedData extends ExtensionId[DistributedData] {
   def withReplicatorMessageAdapter[A, B <: ReplicatedData](
       factory: JFunction[ReplicatorMessageAdapter[A, B], Behavior[A]]): Behavior[A] = {
     Behaviors.setup[A] { context =>
-      val distributedData = akka.cluster.ddata.typed.scaladsl.DistributedData(context.getSystem)
+      val distributedData = pekko.cluster.ddata.typed.scaladsl.DistributedData(context.getSystem)
       val replicatorAdapter =
         new ReplicatorMessageAdapter[A, B](
           context,
@@ -64,7 +65,7 @@ object DistributedData extends ExtensionId[DistributedData] {
  * `akka.cluster.ddata` section, see `reference.conf`.
  *
  * This is using the same underlying `Replicator` instance as
- * [[akka.cluster.ddata.DistributedData]] and that means that typed
+ * [[pekko.cluster.ddata.DistributedData]] and that means that typed
  * and classic actors can share the same data.
  *
  * This class is not intended for user extension other than for test purposes (e.g.
@@ -87,13 +88,13 @@ abstract class DistributedData extends Extension {
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class DistributedDataImpl(system: ActorSystem[_]) extends DistributedData {
+@InternalApi private[pekko] class DistributedDataImpl(system: ActorSystem[_]) extends DistributedData {
 
   override val replicator: ActorRef[Replicator.Command] =
-    akka.cluster.ddata.typed.scaladsl.DistributedData(system).replicator.narrow[Replicator.Command]
+    pekko.cluster.ddata.typed.scaladsl.DistributedData(system).replicator.narrow[Replicator.Command]
 
   override val selfUniqueAddress: SelfUniqueAddress =
-    akka.cluster.ddata.typed.scaladsl.DistributedData(system).selfUniqueAddress
+    pekko.cluster.ddata.typed.scaladsl.DistributedData(system).selfUniqueAddress
 
 }
 
@@ -104,7 +105,7 @@ object DistributedDataSetup {
 }
 
 /**
- * Can be used in [[akka.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]]
+ * Can be used in [[pekko.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]]
  * to replace the default implementation of the [[DistributedData]] extension. Intended
  * for tests that need to replace extension with stub/mock implementations.
  */
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/Replicator.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/Replicator.scala
similarity index 86%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/Replicator.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/Replicator.scala
index 80f372f854..2e74cedf52 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/Replicator.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/Replicator.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.javadsl
+package org.apache.pekko.cluster.ddata.typed.javadsl
 
 import java.time.Duration
 import java.util.function.{ Function => JFunction }
 
-import akka.actor.DeadLetterSuppression
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.cluster.{ ddata => dd }
-import akka.cluster.ddata.Key
-import akka.cluster.ddata.ReplicatedData
-import akka.cluster.ddata.typed.internal.ReplicatorBehavior
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.DeadLetterSuppression
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.cluster.{ ddata => dd }
+import pekko.cluster.ddata.Key
+import pekko.cluster.ddata.ReplicatedData
+import pekko.cluster.ddata.typed.internal.ReplicatorBehavior
+import pekko.util.JavaDurationConverters._
 
 /**
- * @see [[akka.cluster.ddata.Replicator]].
+ * @see [[pekko.cluster.ddata.Replicator]].
  */
 object Replicator {
   import dd.Replicator.DefaultMajorityMinCap
@@ -33,71 +34,71 @@ object Replicator {
 
   /**
    * The `Behavior` for the `Replicator` actor.
-   * It will use the given underlying [[akka.cluster.ddata.Replicator]]
+   * It will use the given underlying [[pekko.cluster.ddata.Replicator]]
    */
-  def behavior(settings: dd.ReplicatorSettings, underlyingReplicator: akka.actor.ActorRef): Behavior[Command] =
+  def behavior(settings: dd.ReplicatorSettings, underlyingReplicator: pekko.actor.ActorRef): Behavior[Command] =
     ReplicatorBehavior(settings, Some(underlyingReplicator)).narrow[Command]
 
-  @DoNotInherit trait Command extends akka.cluster.ddata.typed.scaladsl.Replicator.Command
+  @DoNotInherit trait Command extends pekko.cluster.ddata.typed.scaladsl.Replicator.Command
 
   sealed trait ReadConsistency {
     def timeout: Duration
 
     /** INTERNAL API */
-    @InternalApi private[akka] def toClassic: dd.Replicator.ReadConsistency
+    @InternalApi private[pekko] def toClassic: dd.Replicator.ReadConsistency
   }
   case object ReadLocal extends ReadConsistency {
     override def timeout: Duration = Duration.ZERO
 
     /** INTERNAL API */
-    @InternalApi private[akka] override def toClassic = dd.Replicator.ReadLocal
+    @InternalApi private[pekko] override def toClassic = dd.Replicator.ReadLocal
   }
   final case class ReadFrom(n: Int, timeout: Duration) extends ReadConsistency {
     require(n >= 2, "ReadFrom n must be >= 2, use ReadLocal for n=1")
 
     /** INTERNAL API */
-    @InternalApi private[akka] override def toClassic = dd.Replicator.ReadFrom(n, timeout.asScala)
+    @InternalApi private[pekko] override def toClassic = dd.Replicator.ReadFrom(n, timeout.asScala)
   }
   final case class ReadMajority(timeout: Duration, minCap: Int = DefaultMajorityMinCap) extends ReadConsistency {
     def this(timeout: Duration) = this(timeout, DefaultMajorityMinCap)
 
     /** INTERNAL API */
-    @InternalApi private[akka] override def toClassic = dd.Replicator.ReadMajority(timeout.asScala, minCap)
+    @InternalApi private[pekko] override def toClassic = dd.Replicator.ReadMajority(timeout.asScala, minCap)
   }
   final case class ReadAll(timeout: Duration) extends ReadConsistency {
 
     /** INTERNAL API */
-    @InternalApi private[akka] override def toClassic = dd.Replicator.ReadAll(timeout.asScala)
+    @InternalApi private[pekko] override def toClassic = dd.Replicator.ReadAll(timeout.asScala)
   }
 
   sealed trait WriteConsistency {
     def timeout: Duration
 
     /** INTERNAL API */
-    @InternalApi private[akka] def toClassic: dd.Replicator.WriteConsistency
+    @InternalApi private[pekko] def toClassic: dd.Replicator.WriteConsistency
   }
   case object WriteLocal extends WriteConsistency {
     override def timeout: Duration = Duration.ZERO
 
     /** INTERNAL API */
-    @InternalApi private[akka] override def toClassic = dd.Replicator.WriteLocal
+    @InternalApi private[pekko] override def toClassic = dd.Replicator.WriteLocal
   }
   final case class WriteTo(n: Int, timeout: Duration) extends WriteConsistency {
     require(n >= 2, "WriteTo n must be >= 2, use WriteLocal for n=1")
 
     /** INTERNAL API */
-    @InternalApi private[akka] override def toClassic = dd.Replicator.WriteTo(n, timeout.asScala)
+    @InternalApi private[pekko] override def toClassic = dd.Replicator.WriteTo(n, timeout.asScala)
   }
   final case class WriteMajority(timeout: Duration, minCap: Int = DefaultMajorityMinCap) extends WriteConsistency {
     def this(timeout: Duration) = this(timeout, DefaultMajorityMinCap)
 
     /** INTERNAL API */
-    @InternalApi private[akka] override def toClassic = dd.Replicator.WriteMajority(timeout.asScala, minCap)
+    @InternalApi private[pekko] override def toClassic = dd.Replicator.WriteMajority(timeout.asScala, minCap)
   }
   final case class WriteAll(timeout: Duration) extends WriteConsistency {
 
     /** INTERNAL API */
-    @InternalApi private[akka] override def toClassic = dd.Replicator.WriteAll(timeout.asScala)
+    @InternalApi private[pekko] override def toClassic = dd.Replicator.WriteAll(timeout.asScala)
   }
 
   /**
@@ -334,7 +335,7 @@ object Replicator {
    * INTERNAL API
    * Obtain the instance of this class with the [[#flushChanges]] method.
    */
-  @InternalApi private[akka] case object FlushChanges extends Command
+  @InternalApi private[pekko] case object FlushChanges extends Command
 
   /**
    * The `FlushChanges` instance. Notify subscribers of changes now, otherwise they will be notified periodically
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala
similarity index 94%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala
index 42b5b68751..0d461d9312 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.javadsl
+package org.apache.pekko.cluster.ddata.typed.javadsl
 
 import java.time.Duration
 import java.util.function.{ Function => JFunction }
@@ -12,12 +12,13 @@ import scala.util.Success
 
 import scala.annotation.nowarn
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.javadsl.ActorContext
-import akka.cluster.ddata.Key
-import akka.cluster.ddata.ReplicatedData
-import akka.util.JavaDurationConverters._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.javadsl.ActorContext
+import pekko.cluster.ddata.Key
+import pekko.cluster.ddata.ReplicatedData
+import pekko.util.JavaDurationConverters._
+import pekko.util.Timeout
 
 /**
  * When interacting with the `Replicator` from an actor this class provides convenient
@@ -65,7 +66,8 @@ class ReplicatorMessageAdapter[A, B <: ReplicatedData](
    * the replicator are transformed to the message protocol of the requesting actor with
    * the given `responseAdapter` function.
    */
-  def subscribe(key: Key[B], responseAdapter: akka.japi.function.Function[Replicator.SubscribeResponse[B], A]): Unit = {
+  def subscribe(
+      key: Key[B], responseAdapter: pekko.japi.function.Function[Replicator.SubscribeResponse[B], A]): Unit = {
     // unsubscribe in case it's called more than once per key
     unsubscribe(key)
 
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorSettings.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorSettings.scala
similarity index 75%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorSettings.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorSettings.scala
index c089543cee..2a1d501f7c 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorSettings.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorSettings.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.javadsl
+package org.apache.pekko.cluster.ddata.typed.javadsl
 
 import com.typesafe.config.Config
 
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.scaladsl.adapter._
-import akka.cluster.{ ddata => dd }
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.cluster.{ ddata => dd }
 
 object ReplicatorSettings {
 
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/DistributedData.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala
similarity index 81%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/DistributedData.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala
index 6d6543da93..35d5cc8caf 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/DistributedData.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.scaladsl
+package org.apache.pekko.cluster.ddata.typed.scaladsl
 
 import scala.concurrent.duration.FiniteDuration
 
 import org.slf4j.LoggerFactory
 
-import akka.actor.ExtendedActorSystem
-import akka.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId, Props }
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.annotation.InternalApi
-import akka.cluster.{ ddata => dd }
-import akka.cluster.Cluster
-import akka.cluster.ddata.ReplicatedData
-import akka.cluster.ddata.SelfUniqueAddress
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId, Props }
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.annotation.InternalApi
+import pekko.cluster.{ ddata => dd }
+import pekko.cluster.Cluster
+import pekko.cluster.ddata.ReplicatedData
+import pekko.cluster.ddata.SelfUniqueAddress
+import pekko.util.JavaDurationConverters._
 
 object DistributedData extends ExtensionId[DistributedData] {
   def get(system: ActorSystem[_]): DistributedData = apply(system)
@@ -31,7 +32,7 @@ object DistributedData extends ExtensionId[DistributedData] {
    * provides convenient methods that adapts the response messages to the requesting actor's message protocol.
    *
    * One `ReplicatorMessageAdapter` instance can be used for a given `ReplicatedData` type,
-   * e.g. an `OrSet[String]`. Interaction with several [[akka.cluster.ddata.Key]]s can be used via the same adapter
+   * e.g. an `OrSet[String]`. Interaction with several [[pekko.cluster.ddata.Key]]s can be used via the same adapter
    * but they must all be of the same `ReplicatedData` type. For interaction with several different
    * `ReplicatedData` types, e.g. an `OrSet[String]` and a `GCounter`, an adapter can be created
    * for each type.
@@ -63,16 +64,16 @@ object DistributedData extends ExtensionId[DistributedData] {
  * `akka.cluster.ddata` section, see `reference.conf`.
  *
  * This is using the same underlying `Replicator` instance as
- * [[akka.cluster.ddata.DistributedData]] and that means that typed
+ * [[pekko.cluster.ddata.DistributedData]] and that means that typed
  * and classic actors can share the same data.
  */
 class DistributedData(system: ActorSystem[_]) extends Extension {
-  import akka.actor.typed.scaladsl.adapter._
+  import org.apache.pekko.actor.typed.scaladsl.adapter._
 
   private val settings: ReplicatorSettings = ReplicatorSettings(system)
 
   /** INTERNAL API */
-  @InternalApi private[akka] val unexpectedAskTimeout: FiniteDuration =
+  @InternalApi private[pekko] val unexpectedAskTimeout: FiniteDuration =
     system.settings.config
       .getDuration("akka.cluster.ddata.typed.replicator-message-adapter-unexpected-ask-timeout")
       .asScala
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/Replicator.scala
similarity index 96%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/Replicator.scala
index f37e06dbed..92a705ea07 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/Replicator.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.scaladsl
+package org.apache.pekko.cluster.ddata.typed.scaladsl
 
 import scala.concurrent.duration.FiniteDuration
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.cluster.{ ddata => dd }
-import akka.cluster.ddata.Key
-import akka.cluster.ddata.ReplicatedData
-import akka.cluster.ddata.typed.internal.ReplicatorBehavior
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.cluster.{ ddata => dd }
+import pekko.cluster.ddata.Key
+import pekko.cluster.ddata.ReplicatedData
+import pekko.cluster.ddata.typed.internal.ReplicatorBehavior
 
 /**
- * @see [[akka.cluster.ddata.Replicator]].
+ * @see [[pekko.cluster.ddata.Replicator]].
  */
 object Replicator {
 
@@ -26,9 +27,9 @@ object Replicator {
 
   /**
    * The `Behavior` for the `Replicator` actor.
-   * It will use the given underlying [[akka.cluster.ddata.Replicator]]
+   * It will use the given underlying [[pekko.cluster.ddata.Replicator]]
    */
-  def behavior(settings: ReplicatorSettings, underlyingReplicator: akka.actor.ActorRef): Behavior[Command] =
+  def behavior(settings: ReplicatorSettings, underlyingReplicator: pekko.actor.ActorRef): Behavior[Command] =
     ReplicatorBehavior(settings, Some(underlyingReplicator))
 
   type ReadConsistency = dd.Replicator.ReadConsistency
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala
similarity index 96%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala
index 8c0682f9a1..000e83fa95 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.scaladsl
+package org.apache.pekko.cluster.ddata.typed.scaladsl
 
 import scala.concurrent.duration.FiniteDuration
 import scala.util.Failure
 import scala.util.Success
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.scaladsl.ActorContext
-import akka.cluster.ddata.Key
-import akka.cluster.ddata.ReplicatedData
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.cluster.ddata.Key
+import pekko.cluster.ddata.ReplicatedData
+import pekko.util.Timeout
 
 object ReplicatorMessageAdapter {
   def apply[A, B <: ReplicatedData](
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala
similarity index 67%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala
index cdf4b80891..77756ed261 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.scaladsl
+package org.apache.pekko.cluster.ddata.typed.scaladsl
 
 import com.typesafe.config.Config
 
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.scaladsl.adapter._
-import akka.annotation.InternalApi
-import akka.cluster.{ ddata => dd }
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.annotation.InternalApi
+import pekko.cluster.{ ddata => dd }
 
 /**
- * @see [[akka.cluster.ddata.ReplicatorSettings]].
+ * @see [[pekko.cluster.ddata.ReplicatorSettings]].
  */
 object ReplicatorSettings {
 
@@ -34,6 +35,6 @@ object ReplicatorSettings {
    * INTERNAL API
    * The name of the actor used in DistributedData extensions.
    */
-  @InternalApi private[akka] def name(system: ActorSystem[_]): String =
+  @InternalApi private[pekko] def name(system: ActorSystem[_]): String =
     dd.ReplicatorSettings.name(system.toClassic, Some("typed"))
 }
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/package.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/package.scala
similarity index 51%
rename from akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/package.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/package.scala
index ba15f47314..69c91b468e 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/package.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/package.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed
+package org.apache.pekko.cluster.ddata.typed
 
-import akka.cluster.{ ddata => dd }
+import org.apache.pekko
+import pekko.cluster.{ ddata => dd }
 
 package object scaladsl {
 
   /**
-   * @see [[akka.cluster.ddata.ReplicatorSettings]].
+   * @see [[pekko.cluster.ddata.ReplicatorSettings]].
    */
   type ReplicatorSettings = dd.ReplicatorSettings
 }
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala
similarity index 92%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala
index 87cd4a8be1..70398aad37 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import scala.collection.immutable
 
-import akka.actor.Address
-import akka.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId }
-import akka.actor.typed.ExtensionSetup
-import akka.annotation.DoNotInherit
-import akka.cluster._
-import akka.cluster.ClusterEvent.{ ClusterDomainEvent, CurrentClusterState }
-import akka.cluster.typed.internal.AdapterClusterImpl
-import akka.japi.Util
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId }
+import pekko.actor.typed.ExtensionSetup
+import pekko.annotation.DoNotInherit
+import pekko.cluster._
+import pekko.cluster.ClusterEvent.{ ClusterDomainEvent, CurrentClusterState }
+import pekko.cluster.typed.internal.AdapterClusterImpl
+import pekko.japi.Util
 
 /**
  * Messages for subscribing to changes in the cluster state
@@ -78,7 +79,7 @@ sealed trait ClusterCommand
  * When it has successfully joined it must be restarted to be able to join another
  * cluster or to join the same cluster again.
  *
- * The name of the [[akka.actor.ActorSystem]] must be the same for all members of a
+ * The name of the [[pekko.actor.ActorSystem]] must be the same for all members of a
  * cluster.
  */
 final case class Join(address: Address) extends ClusterCommand {
@@ -219,7 +220,7 @@ object ClusterSetup {
 }
 
 /**
- * Can be used in [[akka.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]]
+ * Can be used in [[pekko.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]]
  * to replace the default implementation of the [[Cluster]] extension. Intended
  * for tests that need to replace extension with stub/mock implementations.
  */
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
similarity index 92%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
index 93fa455aae..60ad7a9330 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import scala.concurrent.duration.{ Duration, FiniteDuration, _ }
 
-import akka.actor.typed._
-import akka.annotation.{ DoNotInherit, InternalApi }
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.singleton.{
+import org.apache.pekko
+import pekko.actor.typed._
+import pekko.annotation.{ DoNotInherit, InternalApi }
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.singleton.{
   ClusterSingletonManagerSettings => ClassicClusterSingletonManagerSettings,
   ClusterSingletonProxySettings
 }
-import akka.cluster.typed.internal.AdaptedClusterSingletonImpl
-import akka.coordination.lease.LeaseUsageSettings
-import akka.util.JavaDurationConverters._
+import pekko.cluster.typed.internal.AdaptedClusterSingletonImpl
+import pekko.coordination.lease.LeaseUsageSettings
+import pekko.util.JavaDurationConverters._
 import com.typesafe.config.Config
 
 object ClusterSingletonSettings {
@@ -107,14 +108,14 @@ final class ClusterSingletonSettings(
    * INTERNAL API:
    */
   @InternalApi
-  private[akka] def toManagerSettings(singletonName: String): ClassicClusterSingletonManagerSettings =
+  private[pekko] def toManagerSettings(singletonName: String): ClassicClusterSingletonManagerSettings =
     new ClassicClusterSingletonManagerSettings(singletonName, role, removalMargin, handOverRetryInterval, leaseSettings)
 
   /**
    * INTERNAL API:
    */
   @InternalApi
-  private[akka] def toProxySettings(singletonName: String): ClusterSingletonProxySettings = {
+  private[pekko] def toProxySettings(singletonName: String): ClusterSingletonProxySettings = {
     new ClusterSingletonProxySettings(singletonName, role, singletonIdentificationInterval, bufferSize)
       .withDataCenter(dataCenter)
   }
@@ -123,7 +124,7 @@ final class ClusterSingletonSettings(
    * INTERNAL API:
    */
   @InternalApi
-  private[akka] def shouldRunManager(cluster: Cluster): Boolean = {
+  private[pekko] def shouldRunManager(cluster: Cluster): Boolean = {
     (role.isEmpty || cluster.selfMember.roles(role.get)) &&
     (dataCenter.isEmpty || dataCenter.contains(cluster.selfMember.dataCenter))
   }
@@ -146,7 +147,7 @@ object ClusterSingleton extends ExtensionId[ClusterSingleton] {
  * INTERNAL API:
  */
 @InternalApi
-private[akka] object ClusterSingletonImpl {
+private[pekko] object ClusterSingletonImpl {
   def managerNameFor(singletonName: String) = s"singletonManager$singletonName"
 }
 
@@ -176,7 +177,7 @@ final class SingletonActor[M] private (
     val settings: Option[ClusterSingletonSettings]) {
 
   /**
-   * [[akka.actor.typed.Props]] of the singleton actor, such as dispatcher settings.
+   * [[pekko.actor.typed.Props]] of the singleton actor, such as dispatcher settings.
    */
   def withProps(props: Props): SingletonActor[M] = copy(props = props)
 
@@ -228,7 +229,7 @@ object ClusterSingletonManagerSettings {
    */
   def apply(system: ActorSystem[_]): ClusterSingletonManagerSettings =
     apply(system.settings.config.getConfig("akka.cluster.singleton"))
-      .withRemovalMargin(akka.cluster.Cluster(system).downingProvider.downRemovalMargin)
+      .withRemovalMargin(pekko.cluster.Cluster(system).downingProvider.downRemovalMargin)
 
   /**
    * Create settings from a configuration with the same layout as
@@ -263,7 +264,7 @@ object ClusterSingletonManagerSettings {
   /**
    * INTERNAL API
    */
-  private[akka] def roleOption(role: String): Option[String] =
+  private[pekko] def roleOption(role: String): Option[String] =
     if (role == "") None else Option(role)
 
 }
@@ -339,7 +340,7 @@ object ClusterSingletonSetup {
 }
 
 /**
- * Can be used in [[akka.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]]
+ * Can be used in [[pekko.actor.setup.ActorSystemSetup]] when starting the [[ActorSystem]]
  * to replace the default implementation of the [[ClusterSingleton]] extension. Intended
  * for tests that need to replace extension with stub/mock implementations.
  */
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala
similarity index 83%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala
index 9a9eaf0deb..c2b2156c7a 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala
@@ -2,33 +2,34 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal
+package org.apache.pekko.cluster.typed.internal
 
-import akka.actor.typed.{ ActorRef, ActorSystem, Terminated }
-import akka.actor.typed.Behavior
-import akka.actor.typed.Props
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.internal.adapter.ActorSystemAdapter
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.annotation.InternalApi
-import akka.cluster.{ ClusterEvent, Member, MemberStatus }
-import akka.cluster.ClusterEvent.MemberEvent
-import akka.cluster.typed.PrepareForFullClusterShutdown
-import akka.cluster.typed._
+import org.apache.pekko
+import pekko.actor.typed.{ ActorRef, ActorSystem, Terminated }
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Props
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.internal.adapter.ActorSystemAdapter
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.annotation.InternalApi
+import pekko.cluster.{ ClusterEvent, Member, MemberStatus }
+import pekko.cluster.ClusterEvent.MemberEvent
+import pekko.cluster.typed.PrepareForFullClusterShutdown
+import pekko.cluster.typed._
 
 /**
  * INTERNAL API:
  */
 @InternalApi
-private[akka] object AdapterClusterImpl {
+private[pekko] object AdapterClusterImpl {
 
   private sealed trait SeenState
   private case object BeforeUp extends SeenState
   private case object Up extends SeenState
   private case class Removed(previousStatus: MemberStatus) extends SeenState
 
-  private def subscriptionsBehavior(adaptedCluster: akka.cluster.Cluster): Behavior[ClusterStateSubscription] =
+  private def subscriptionsBehavior(adaptedCluster: pekko.cluster.Cluster): Behavior[ClusterStateSubscription] =
     Behaviors.setup[ClusterStateSubscription] { ctx =>
       var seenState: SeenState = BeforeUp
       var upSubscribers: List[ActorRef[SelfUp]] = Nil
@@ -114,7 +115,7 @@ private[akka] object AdapterClusterImpl {
         .narrow[ClusterStateSubscription]
     }
 
-  private def managerBehavior(adaptedCluster: akka.cluster.Cluster): Behavior[ClusterCommand] = {
+  private def managerBehavior(adaptedCluster: pekko.cluster.Cluster): Behavior[ClusterCommand] = {
     Behaviors.receiveMessage {
       case Join(address) =>
         adaptedCluster.join(address)
@@ -145,11 +146,11 @@ private[akka] object AdapterClusterImpl {
  * INTERNAL API:
  */
 @InternalApi
-private[akka] final class AdapterClusterImpl(system: ActorSystem[_]) extends Cluster {
+private[pekko] final class AdapterClusterImpl(system: ActorSystem[_]) extends Cluster {
   import AdapterClusterImpl._
 
   require(system.isInstanceOf[ActorSystemAdapter[_]], "only adapted actor systems can be used for cluster features")
-  private val classicCluster = akka.cluster.Cluster(system)
+  private val classicCluster = pekko.cluster.Cluster(system)
 
   override def selfMember: Member = classicCluster.selfMember
   override def isTerminated: Boolean = classicCluster.isTerminated
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterSingletonImpl.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterSingletonImpl.scala
similarity index 74%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterSingletonImpl.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterSingletonImpl.scala
index 510317a86a..6633f00295 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterSingletonImpl.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterSingletonImpl.scala
@@ -2,34 +2,35 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal
+package org.apache.pekko.cluster.typed.internal
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.function.{ Function => JFunction }
 
-import akka.actor.{ ExtendedActorSystem, InvalidActorNameException }
-import akka.actor.typed.{ ActorRef, ActorSystem, Behavior }
-import akka.actor.typed.internal.{ PoisonPill, PoisonPillInterceptor }
-import akka.actor.typed.internal.adapter.ActorSystemAdapter
-import akka.actor.typed.scaladsl.Behaviors
-import akka.annotation.InternalApi
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.singleton.{ ClusterSingletonManager => OldSingletonManager, ClusterSingletonProxy }
-import akka.cluster.typed
-import akka.cluster.typed.{ Cluster, ClusterSingleton, ClusterSingletonImpl, ClusterSingletonSettings }
+import org.apache.pekko
+import pekko.actor.{ ExtendedActorSystem, InvalidActorNameException }
+import pekko.actor.typed.{ ActorRef, ActorSystem, Behavior }
+import pekko.actor.typed.internal.{ PoisonPill, PoisonPillInterceptor }
+import pekko.actor.typed.internal.adapter.ActorSystemAdapter
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.annotation.InternalApi
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.singleton.{ ClusterSingletonManager => OldSingletonManager, ClusterSingletonProxy }
+import pekko.cluster.typed
+import pekko.cluster.typed.{ Cluster, ClusterSingleton, ClusterSingletonImpl, ClusterSingletonSettings }
 
 /**
  * INTERNAL API:
  */
 @InternalApi
-private[akka] final class AdaptedClusterSingletonImpl(system: ActorSystem[_]) extends ClusterSingleton {
+private[pekko] final class AdaptedClusterSingletonImpl(system: ActorSystem[_]) extends ClusterSingleton {
   require(
     system.isInstanceOf[ActorSystemAdapter[_]],
     "only adapted actor systems can be used for the typed cluster singleton")
 
   import ClusterSingletonImpl._
 
-  import akka.actor.typed.scaladsl.adapter._
+  import pekko.actor.typed.scaladsl.adapter._
 
   private lazy val cluster = Cluster(system)
   private val classicSystem = system.toClassic.asInstanceOf[ExtendedActorSystem]
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializer.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AkkaClusterTypedSerializer.scala
similarity index 81%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializer.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AkkaClusterTypedSerializer.scala
index a2539e2a91..3c7f33a581 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializer.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AkkaClusterTypedSerializer.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal
+package org.apache.pekko.cluster.typed.internal
 
 import java.io.NotSerializableException
 
-import akka.actor.ExtendedActorSystem
-import akka.actor.typed.ActorRefResolver
-import akka.actor.typed.internal.pubsub.TopicImpl
-import akka.actor.typed.scaladsl.adapter._
-import akka.annotation.InternalApi
-import akka.cluster.typed.internal.protobuf.ClusterMessages
-import akka.cluster.typed.internal.receptionist.ClusterReceptionist.Entry
-import akka.remote.serialization.WrappedPayloadSupport
-import akka.serialization.{ BaseSerializer, SerializerWithStringManifest }
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.typed.ActorRefResolver
+import pekko.actor.typed.internal.pubsub.TopicImpl
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.annotation.InternalApi
+import pekko.cluster.typed.internal.protobuf.ClusterMessages
+import pekko.cluster.typed.internal.receptionist.ClusterReceptionist.Entry
+import pekko.remote.serialization.WrappedPayloadSupport
+import pekko.serialization.{ BaseSerializer, SerializerWithStringManifest }
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class AkkaClusterTypedSerializer(override val system: ExtendedActorSystem)
+private[pekko] final class AkkaClusterTypedSerializer(override val system: ExtendedActorSystem)
     extends SerializerWithStringManifest
     with BaseSerializer {
 
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
similarity index 89%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
index 7b2a2dde99..58e2bc4d3c 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
@@ -2,32 +2,33 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.delivery
+package org.apache.pekko.cluster.typed.internal.delivery
 
 import java.io.NotSerializableException
-import akka.actor.typed.ActorRefResolver
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.DurableProducerQueue
-import akka.actor.typed.delivery.ProducerController
-import akka.actor.typed.delivery.internal.ChunkedMessage
-import akka.actor.typed.delivery.internal.ProducerControllerImpl
-import akka.actor.typed.scaladsl.adapter._
-import akka.annotation.InternalApi
-import akka.cluster.typed.internal.protobuf.ReliableDelivery
-import akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed
-import akka.remote.ContainerFormats
-import akka.remote.ContainerFormats.Payload
-import akka.remote.serialization.WrappedPayloadSupport
-import akka.serialization.BaseSerializer
-import akka.serialization.SerializerWithStringManifest
-import akka.util.ccompat.JavaConverters._
-import akka.protobufv3.internal.ByteString
-import akka.remote.ByteStringUtils
+import org.apache.pekko
+import pekko.actor.typed.ActorRefResolver
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.DurableProducerQueue
+import pekko.actor.typed.delivery.ProducerController
+import pekko.actor.typed.delivery.internal.ChunkedMessage
+import pekko.actor.typed.delivery.internal.ProducerControllerImpl
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.annotation.InternalApi
+import pekko.cluster.typed.internal.protobuf.ReliableDelivery
+import pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed
+import pekko.remote.ContainerFormats
+import pekko.remote.ContainerFormats.Payload
+import pekko.remote.serialization.WrappedPayloadSupport
+import pekko.serialization.BaseSerializer
+import pekko.serialization.SerializerWithStringManifest
+import pekko.util.ccompat.JavaConverters._
+import pekko.protobufv3.internal.ByteString
+import pekko.remote.ByteStringUtils
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class ReliableDeliverySerializer(val system: akka.actor.ExtendedActorSystem)
+@InternalApi private[pekko] class ReliableDeliverySerializer(val system: pekko.actor.ExtendedActorSystem)
     extends SerializerWithStringManifest
     with BaseSerializer {
 
@@ -207,7 +208,7 @@ import akka.remote.ByteStringUtils
         val manifest =
           if (seqMsg.getMessage.hasMessageManifest) seqMsg.getMessage.getMessageManifest.toStringUtf8 else ""
         ChunkedMessage(
-          akka.util.ByteString.fromArrayUnsafe(seqMsg.getMessage.getEnclosedMessage.toByteArray),
+          pekko.util.ByteString.fromArrayUnsafe(seqMsg.getMessage.getEnclosedMessage.toByteArray),
           seqMsg.getFirstChunk,
           seqMsg.getLastChunk,
           seqMsg.getMessage.getSerializerId,
@@ -260,7 +261,7 @@ import akka.remote.ByteStringUtils
         val manifest =
           if (sent.getMessage.hasMessageManifest) sent.getMessage.getMessageManifest.toStringUtf8 else ""
         ChunkedMessage(
-          akka.util.ByteString.fromArrayUnsafe(sent.getMessage.getEnclosedMessage.toByteArray),
+          pekko.util.ByteString.fromArrayUnsafe(sent.getMessage.getEnclosedMessage.toByteArray),
           sent.getFirstChunk,
           sent.getLastChunk,
           sent.getMessage.getSerializerId,
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala
similarity index 95%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala
index 93421b5297..0967376ccb 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala
@@ -2,32 +2,37 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.receptionist
+package org.apache.pekko.cluster.typed.internal.receptionist
 
 import scala.concurrent.duration._
 
-import akka.actor.Address
-import akka.actor.typed.{ ActorRef, Behavior }
-import akka.actor.typed.internal.receptionist.{ AbstractServiceKey, ReceptionistBehaviorProvider, ReceptionistMessages }
-import akka.actor.typed.receptionist.Receptionist.Command
-import akka.actor.typed.receptionist.ServiceKey
-import akka.actor.typed.scaladsl.{ ActorContext, Behaviors, LoggerOps }
-import akka.actor.typed.scaladsl.adapter._
-import akka.annotation.InternalApi
-import akka.cluster.{ Cluster, ClusterEvent, UniqueAddress }
-import akka.cluster.ClusterEvent.ClusterDomainEvent
-import akka.cluster.ClusterEvent.ClusterShuttingDown
-import akka.cluster.ClusterEvent.MemberJoined
-import akka.cluster.ClusterEvent.MemberRemoved
-import akka.cluster.ClusterEvent.MemberUp
-import akka.cluster.ClusterEvent.MemberWeaklyUp
-import akka.cluster.ClusterEvent.ReachabilityEvent
-import akka.cluster.ClusterEvent.ReachableMember
-import akka.cluster.ClusterEvent.UnreachableMember
-import akka.cluster.ddata.{ ORMultiMap, ORMultiMapKey, Replicator }
-import akka.cluster.ddata.SelfUniqueAddress
-import akka.remote.AddressUidExtension
-import akka.util.TypedMultiMap
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.actor.typed.{ ActorRef, Behavior }
+import pekko.actor.typed.internal.receptionist.{
+  AbstractServiceKey,
+  ReceptionistBehaviorProvider,
+  ReceptionistMessages
+}
+import pekko.actor.typed.receptionist.Receptionist.Command
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.actor.typed.scaladsl.{ ActorContext, Behaviors, LoggerOps }
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.annotation.InternalApi
+import pekko.cluster.{ Cluster, ClusterEvent, UniqueAddress }
+import pekko.cluster.ClusterEvent.ClusterDomainEvent
+import pekko.cluster.ClusterEvent.ClusterShuttingDown
+import pekko.cluster.ClusterEvent.MemberJoined
+import pekko.cluster.ClusterEvent.MemberRemoved
+import pekko.cluster.ClusterEvent.MemberUp
+import pekko.cluster.ClusterEvent.MemberWeaklyUp
+import pekko.cluster.ClusterEvent.ReachabilityEvent
+import pekko.cluster.ClusterEvent.ReachableMember
+import pekko.cluster.ClusterEvent.UnreachableMember
+import pekko.cluster.ddata.{ ORMultiMap, ORMultiMapKey, Replicator }
+import pekko.cluster.ddata.SelfUniqueAddress
+import pekko.remote.AddressUidExtension
+import pekko.util.TypedMultiMap
 
 // just to provide a log class
 /** INTERNAL API */
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala
similarity index 68%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala
index 70ad4c04d9..ab80e6d1d4 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.receptionist
+package org.apache.pekko.cluster.typed.internal.receptionist
 
 import com.typesafe.config.Config
 
-import akka.annotation.InternalApi
-import akka.cluster.{ ConfigValidation, JoinConfigCompatChecker, Valid }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.{ ConfigValidation, JoinConfigCompatChecker, Valid }
 
 /**
  * INTERNAL API
@@ -15,7 +16,7 @@ import akka.cluster.{ ConfigValidation, JoinConfigCompatChecker, Valid }
  * Verifies that receptionist distributed-key-count are the same across cluster nodes
  */
 @InternalApi
-private[akka] final class ClusterReceptionistConfigCompatChecker extends JoinConfigCompatChecker {
+private[pekko] final class ClusterReceptionistConfigCompatChecker extends JoinConfigCompatChecker {
 
   override def requiredKeys = "akka.cluster.typed.receptionist.distributed-key-count" :: Nil
 
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala
similarity index 79%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala
index e7a8b54493..b87d9ae0a3 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.receptionist
+package org.apache.pekko.cluster.typed.internal.receptionist
 
 import scala.concurrent.duration._
 import scala.concurrent.duration.{ FiniteDuration, MILLISECONDS }
 import com.typesafe.config.Config
-import akka.actor.typed.ActorSystem
-import akka.annotation.InternalApi
-import akka.cluster.ddata.Key.KeyId
-import akka.cluster.ddata.Replicator
-import akka.cluster.ddata.Replicator.WriteConsistency
-import akka.cluster.ddata.ReplicatorSettings
-import akka.util.Helpers.toRootLowerCase
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.annotation.InternalApi
+import pekko.cluster.ddata.Key.KeyId
+import pekko.cluster.ddata.Replicator
+import pekko.cluster.ddata.Replicator.WriteConsistency
+import pekko.cluster.ddata.ReplicatorSettings
+import pekko.util.Helpers.toRootLowerCase
 
 /**
  * Internal API
  */
 @InternalApi
-private[akka] object ClusterReceptionistSettings {
+private[pekko] object ClusterReceptionistSettings {
   def apply(system: ActorSystem[_]): ClusterReceptionistSettings =
     apply(system.settings.config.getConfig("akka.cluster.typed.receptionist"))
 
@@ -54,7 +55,7 @@ private[akka] object ClusterReceptionistSettings {
  * Internal API
  */
 @InternalApi
-private[akka] case class ClusterReceptionistSettings(
+private[pekko] case class ClusterReceptionistSettings(
     writeConsistency: WriteConsistency,
     pruningInterval: FiniteDuration,
     pruneRemovedOlderThan: FiniteDuration,
diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/Registry.scala b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/Registry.scala
similarity index 86%
rename from akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/Registry.scala
rename to akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/Registry.scala
index 739e27695b..44e043ce43 100644
--- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/Registry.scala
+++ b/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/Registry.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.receptionist
+package org.apache.pekko.cluster.typed.internal.receptionist
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.internal.receptionist.AbstractServiceKey
-import akka.actor.typed.receptionist.ServiceKey
-import akka.annotation.InternalApi
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.{ ORMultiMap, ORMultiMapKey, SelfUniqueAddress }
-import akka.cluster.typed.internal.receptionist.ClusterReceptionist.{ DDataKey, EmptyORMultiMap, Entry }
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.internal.receptionist.AbstractServiceKey
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.annotation.InternalApi
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.{ ORMultiMap, ORMultiMapKey, SelfUniqueAddress }
+import pekko.cluster.typed.internal.receptionist.ClusterReceptionist.{ DDataKey, EmptyORMultiMap, Entry }
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ShardedServiceRegistry {
+@InternalApi private[pekko] object ShardedServiceRegistry {
   def apply(numberOfKeys: Int): ShardedServiceRegistry = {
     val emptyRegistries = (0 until numberOfKeys).map { n =>
       val key = ORMultiMapKey[ServiceKey[_], Entry](s"ReceptionistKey_$n")
@@ -32,7 +33,7 @@ import akka.cluster.typed.internal.receptionist.ClusterReceptionist.{ DDataKey,
  * Two level structure for keeping service registry to be able to shard entries over multiple ddata keys (to not
  * get too large ddata messages)
  */
-@InternalApi private[akka] final case class ShardedServiceRegistry(
+@InternalApi private[pekko] final case class ShardedServiceRegistry(
     serviceRegistries: Map[DDataKey, ServiceRegistry],
     nodes: Set[UniqueAddress],
     unreachable: Set[UniqueAddress]) {
@@ -103,7 +104,7 @@ import akka.cluster.typed.internal.receptionist.ClusterReceptionist.{ DDataKey,
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] final case class ServiceRegistry(entries: ORMultiMap[ServiceKey[_], Entry]) extends AnyVal {
+@InternalApi private[pekko] final case class ServiceRegistry(entries: ORMultiMap[ServiceKey[_], Entry]) extends AnyVal {
 
   // let's hide all the ugly casts we can in here
   def actorRefsFor[T](key: AbstractServiceKey): Set[ActorRef[key.Protocol]] =
@@ -141,7 +142,7 @@ import akka.cluster.typed.internal.receptionist.ClusterReceptionist.{ DDataKey,
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ServiceRegistry {
+@InternalApi private[pekko] object ServiceRegistry {
   final val Empty = ServiceRegistry(EmptyORMultiMap)
 
   def collectChangedKeys(previousRegistry: ServiceRegistry, newRegistry: ServiceRegistry): Set[AbstractServiceKey] = {
diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/ChunkLargeMessageSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/ChunkLargeMessageSpec.scala
similarity index 93%
rename from akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/ChunkLargeMessageSpec.scala
rename to akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/ChunkLargeMessageSpec.scala
index 07ee3b8959..14eda19301 100644
--- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/ChunkLargeMessageSpec.scala
+++ b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/ChunkLargeMessageSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import scala.concurrent.duration._
 import scala.util.Random
@@ -10,17 +10,18 @@ import scala.util.Random
 import com.typesafe.config.ConfigFactory
 import org.HdrHistogram.Histogram
 
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.ProducerController
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.MultiNodeClusterSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.ProducerController
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.serialization.jackson.CborSerializable
 
 object ChunkLargeMessageSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcClusterSingletonSpec.scala
similarity index 90%
rename from akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala
rename to akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcClusterSingletonSpec.scala
index 034a24954d..768315e903 100644
--- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala
+++ b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcClusterSingletonSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.scaladsl.adapter._
-import akka.cluster.{ MemberStatus, MultiNodeClusterSpec }
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.cluster.{ MemberStatus, MultiNodeClusterSpec }
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
 
 object MultiDcClusterSingletonSpecConfig extends MultiNodeConfig {
   val first: RoleName = role("first")
diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcPinger.scala b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcPinger.scala
similarity index 72%
rename from akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcPinger.scala
rename to akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcPinger.scala
index 32920a495d..5b41d6f1c8 100644
--- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcPinger.scala
+++ b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcPinger.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.serialization.jackson.CborSerializable
 
 object MultiDcPinger {
 
diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiNodeTypedClusterSpec.scala
similarity index 77%
rename from akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala
rename to akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiNodeTypedClusterSpec.scala
index 595772e672..6e00b6ae9d 100644
--- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala
+++ b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiNodeTypedClusterSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import java.util.concurrent.ConcurrentHashMap
 
@@ -14,24 +14,25 @@ import scala.language.implicitConversions
 import org.scalatest.Suite
 import org.scalatest.matchers.should.Matchers
 
-import akka.actor.ActorIdentity
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.Props
-import akka.actor.typed.SpawnProtocol
-import akka.actor.typed.scaladsl.AskPattern._
-import akka.actor.typed.scaladsl.adapter._
-import akka.actor.Address
-import akka.actor.Identify
-import akka.actor.Scheduler
-import akka.cluster.ClusterEvent
-import akka.cluster.MemberStatus
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.testkit.WatchedByCoroner
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.ActorIdentity
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Props
+import pekko.actor.typed.SpawnProtocol
+import pekko.actor.typed.scaladsl.AskPattern._
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.actor.Address
+import pekko.actor.Identify
+import pekko.actor.Scheduler
+import pekko.cluster.ClusterEvent
+import pekko.cluster.MemberStatus
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.testkit.WatchedByCoroner
+import pekko.util.Timeout
 
 trait MultiNodeTypedClusterSpec extends Suite with STMultiNodeSpec with WatchedByCoroner with Matchers {
   self: MultiNodeSpec =>
@@ -92,7 +93,7 @@ trait MultiNodeTypedClusterSpec extends Suite with STMultiNodeSpec with WatchedB
   private lazy val spawnActor =
     system.actorOf(PropsAdapter(SpawnProtocol()), "testSpawn").toTyped[SpawnProtocol.Command]
   def spawn[T](behavior: Behavior[T], name: String): ActorRef[T] = {
-    import akka.testkit.TestDuration
+    import pekko.testkit.TestDuration
     implicit val timeout: Timeout = testKitSettings.DefaultTimeout.duration.dilated
     val f: Future[ActorRef[T]] = spawnActor.ask(SpawnProtocol.Spawn(behavior, name, Props.empty, _))
 
@@ -100,7 +101,7 @@ trait MultiNodeTypedClusterSpec extends Suite with STMultiNodeSpec with WatchedB
   }
 
   def identify[A](name: String, r: RoleName): ActorRef[A] = {
-    import akka.actor.typed.scaladsl.adapter._
+    import pekko.actor.typed.scaladsl.adapter._
     val sel = system.actorSelection(node(r) / "user" / "testSpawn" / name)
     sel.tell(Identify(None), testActor)
     expectMsgType[ActorIdentity].ref.get.toTyped
diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/PubSubSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/PubSubSpec.scala
similarity index 87%
rename from akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/PubSubSpec.scala
rename to akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/PubSubSpec.scala
index 82263bda2a..24cd73706c 100644
--- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/PubSubSpec.scala
+++ b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/PubSubSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.pubsub.Topic
-import akka.actor.typed.scaladsl.adapter._
-import akka.cluster.MultiNodeClusterSpec
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.pubsub.Topic
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.serialization.jackson.CborSerializable
 
 object PubSubSpecConfig extends MultiNodeConfig {
   val first: RoleName = role("first")
diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala
similarity index 85%
rename from akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala
rename to akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala
index 89522d0058..2262766ddb 100644
--- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala
+++ b/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal
+package org.apache.pekko.cluster.typed.internal
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.receptionist.Receptionist
-import akka.actor.typed.receptionist.ServiceKey
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.MultiNodeClusterSpec
-import akka.cluster.typed.MultiDcClusterSingletonSpecConfig.first
-import akka.cluster.typed.MultiDcClusterSingletonSpecConfig.second
-import akka.cluster.typed.MultiDcClusterSingletonSpecConfig.third
-import akka.cluster.typed.MultiNodeTypedClusterSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.receptionist.Receptionist
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.cluster.typed.MultiDcClusterSingletonSpecConfig.first
+import pekko.cluster.typed.MultiDcClusterSingletonSpecConfig.second
+import pekko.cluster.typed.MultiDcClusterSingletonSpecConfig.third
+import pekko.cluster.typed.MultiNodeTypedClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
 
 object ClusterReceptionistUnreachabilitySpecConfig extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/ddata/typed/javadsl/ReplicatorDocSample.java b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocSample.java
similarity index 87%
rename from akka-cluster-typed/src/test/java/jdocs/akka/cluster/ddata/typed/javadsl/ReplicatorDocSample.java
rename to akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocSample.java
index 9199a2d79c..cc1f513ce8 100644
--- a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/ddata/typed/javadsl/ReplicatorDocSample.java
+++ b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocSample.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.ddata.typed.javadsl;
+package jdocs.org.apache.pekko.cluster.ddata.typed.javadsl;
 
 // #sample
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
-import akka.cluster.ddata.GCounter;
-import akka.cluster.ddata.Key;
-import akka.cluster.ddata.SelfUniqueAddress;
-import akka.cluster.ddata.typed.javadsl.DistributedData;
-import akka.cluster.ddata.typed.javadsl.Replicator;
-import akka.cluster.ddata.typed.javadsl.ReplicatorMessageAdapter;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
+import org.apache.pekko.cluster.ddata.GCounter;
+import org.apache.pekko.cluster.ddata.Key;
+import org.apache.pekko.cluster.ddata.SelfUniqueAddress;
+import org.apache.pekko.cluster.ddata.typed.javadsl.DistributedData;
+import org.apache.pekko.cluster.ddata.typed.javadsl.Replicator;
+import org.apache.pekko.cluster.ddata.typed.javadsl.ReplicatorMessageAdapter;
 
 // #sample
 
diff --git a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/ddata/typed/javadsl/ReplicatorDocTest.java b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
similarity index 82%
rename from akka-cluster-typed/src/test/java/jdocs/akka/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
rename to akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
index be2ae9fdfe..86686e3457 100644
--- a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
+++ b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
@@ -2,17 +2,17 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.ddata.typed.javadsl;
+package jdocs.org.apache.pekko.cluster.ddata.typed.javadsl;
 
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
-import akka.cluster.ddata.GCounter;
-import akka.cluster.ddata.GCounterKey;
-import akka.cluster.ddata.Key;
-import akka.cluster.ddata.typed.javadsl.DistributedData;
-import akka.cluster.ddata.typed.javadsl.Replicator;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.cluster.ddata.GCounter;
+import org.apache.pekko.cluster.ddata.GCounterKey;
+import org.apache.pekko.cluster.ddata.Key;
+import org.apache.pekko.cluster.ddata.typed.javadsl.DistributedData;
+import org.apache.pekko.cluster.ddata.typed.javadsl.Replicator;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
@@ -22,7 +22,7 @@ import org.scalatestplus.junit.JUnitSuite;
 
 import java.time.Duration;
 
-import static jdocs.akka.cluster.ddata.typed.javadsl.ReplicatorDocSample.Counter;
+import static jdocs.org.apache.pekko.cluster.ddata.typed.javadsl.ReplicatorDocSample.Counter;
 import static org.junit.Assert.assertEquals;
 
 public class ReplicatorDocTest extends JUnitSuite {
diff --git a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java
similarity index 91%
rename from akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java
rename to akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java
index 05a8a91f33..b27d072bb7 100644
--- a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java
+++ b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java
@@ -2,23 +2,23 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.typed;
+package jdocs.org.apache.pekko.cluster.typed;
 
 // #join-seed-nodes
-import akka.actor.Address;
-import akka.actor.AddressFromURIString;
-import akka.cluster.Member;
-import akka.cluster.typed.JoinSeedNodes;
+import org.apache.pekko.actor.Address;
+import org.apache.pekko.actor.AddressFromURIString;
+import org.apache.pekko.cluster.Member;
+import org.apache.pekko.cluster.typed.JoinSeedNodes;
 
 // #join-seed-nodes
 
 // #cluster-imports
-import akka.actor.typed.*;
-import akka.actor.typed.javadsl.*;
-import akka.cluster.ClusterEvent;
-import akka.cluster.typed.*;
+import org.apache.pekko.actor.typed.*;
+import org.apache.pekko.actor.typed.javadsl.*;
+import org.apache.pekko.cluster.ClusterEvent;
+import org.apache.pekko.cluster.typed.*;
 // #cluster-imports
-import akka.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
diff --git a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/PingSerializerExampleTest.java b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java
similarity index 84%
rename from akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/PingSerializerExampleTest.java
rename to akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java
index c00750a986..31212d3346 100644
--- a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/PingSerializerExampleTest.java
+++ b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java
@@ -2,13 +2,13 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.typed;
+package jdocs.org.apache.pekko.cluster.typed;
 
-import akka.actor.ExtendedActorSystem;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorRefResolver;
-import akka.actor.typed.javadsl.Adapter;
-import akka.serialization.SerializerWithStringManifest;
+import org.apache.pekko.actor.ExtendedActorSystem;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorRefResolver;
+import org.apache.pekko.actor.typed.javadsl.Adapter;
+import org.apache.pekko.serialization.SerializerWithStringManifest;
 
 import java.nio.charset.StandardCharsets;
 
@@ -17,7 +17,7 @@ public class PingSerializerExampleTest {
   public class Pong {}
 
   public class Ping {
-    public final akka.actor.typed.ActorRef replyTo;
+    public final org.apache.pekko.actor.typed.ActorRef replyTo;
 
     public Ping(ActorRef replyTo) {
       this.replyTo = replyTo;
diff --git a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExample.java b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java
similarity index 93%
rename from akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExample.java
rename to akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java
index 16330593dc..ccb64db6da 100644
--- a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExample.java
+++ b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java
@@ -2,17 +2,17 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.typed;
+package jdocs.org.apache.pekko.cluster.typed;
 
 // #import
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.receptionist.Receptionist;
-import akka.actor.typed.receptionist.ServiceKey;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.receptionist.Receptionist;
+import org.apache.pekko.actor.typed.receptionist.ServiceKey;
 // #import
-import akka.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.ActorSystem;
 
 public interface ReceptionistExample {
 
diff --git a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/SingletonCompileOnlyTest.java b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java
similarity index 87%
rename from akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/SingletonCompileOnlyTest.java
rename to akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java
index d0f43d5d95..b50489feaf 100644
--- a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/SingletonCompileOnlyTest.java
+++ b/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java
@@ -2,20 +2,20 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.cluster.typed;
+package jdocs.org.apache.pekko.cluster.typed;
 
-import akka.actor.typed.*;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.*;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 import java.time.Duration;
 
 // #import
-import akka.cluster.typed.ClusterSingleton;
-import akka.cluster.typed.ClusterSingletonSettings;
-import akka.cluster.typed.SingletonActor;
+import org.apache.pekko.cluster.typed.ClusterSingleton;
+import org.apache.pekko.cluster.typed.ClusterSingletonSettings;
+import org.apache.pekko.cluster.typed.SingletonActor;
 
 // #import
 
diff --git a/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java b/akka-cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java
similarity index 84%
rename from akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java
rename to akka-cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java
index 0491ec939c..e3e57195d6 100644
--- a/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java
+++ b/akka-cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java
@@ -2,11 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed;
+package org.apache.pekko.cluster.typed;
 
-import akka.cluster.ClusterEvent;
-import akka.actor.typed.ActorSystem;
-import akka.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.cluster.ClusterEvent;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.Test;
@@ -29,9 +29,9 @@ public class ClusterApiTest extends JUnitSuite {
                 + "akka.coordinated-shutdown.run-by-actor-system-terminate = off \n");
 
     ActorSystem system1 =
-        ActorSystem.wrap(akka.actor.ActorSystem.create("ClusterApiTest", config));
+        ActorSystem.wrap(org.apache.pekko.actor.ActorSystem.create("ClusterApiTest", config));
     ActorSystem system2 =
-        ActorSystem.wrap(akka.actor.ActorSystem.create("ClusterApiTest", config));
+        ActorSystem.wrap(org.apache.pekko.actor.ActorSystem.create("ClusterApiTest", config));
 
     try {
       Cluster cluster1 = Cluster.get(system1);
diff --git a/akka-cluster-typed/src/test/resources/logback-test.xml b/akka-cluster-typed/src/test/resources/logback-test.xml
index 22c45c93b6..fff8846273 100644
--- a/akka-cluster-typed/src/test/resources/logback-test.xml
+++ b/akka-cluster-typed/src/test/resources/logback-test.xml
@@ -12,16 +12,16 @@
     
-    
+    
 
     
-    
+    
         
     
 
diff --git a/akka-cluster-typed/src/test/scala/docs/akka/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala
similarity index 91%
rename from akka-cluster-typed/src/test/scala/docs/akka/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala
rename to akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala
index 2945ad8006..e637726bfd 100644
--- a/akka-cluster-typed/src/test/scala/docs/akka/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala
+++ b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala
@@ -2,23 +2,25 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.ddata.typed.scaladsl
+package docs.org.apache.pekko.cluster.ddata.typed.scaladsl
 
 import scala.concurrent.duration._
-import akka.cluster.ddata.SelfUniqueAddress
-import akka.cluster.ddata.typed.scaladsl.DistributedData
-import akka.cluster.ddata.typed.scaladsl.Replicator
-import akka.actor.testkit.typed.scaladsl._
+import org.apache.pekko
+import pekko.cluster.ddata.SelfUniqueAddress
+import pekko.cluster.ddata.typed.scaladsl.DistributedData
+import pekko.cluster.ddata.typed.scaladsl.Replicator
+import pekko.actor.testkit.typed.scaladsl._
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
 // #sample
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.ddata.GCounter
-import akka.cluster.ddata.GCounterKey
-import akka.cluster.ddata.typed.scaladsl.Replicator._
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.ddata.GCounter
+import pekko.cluster.ddata.GCounterKey
+import pekko.cluster.ddata.typed.scaladsl.Replicator._
 
 // #sample
 
diff --git a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala
similarity index 93%
rename from akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala
rename to akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala
index 512d0c28d3..63adaf1c98 100644
--- a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala
+++ b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala
@@ -2,23 +2,25 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.typed
+package docs.org.apache.pekko.cluster.typed
 
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.testkit.SocketUtil
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.ActorTestKit
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.testkit.SocketUtil
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.matchers.should.Matchers
 //#cluster-imports
-import akka.actor.typed._
-import akka.actor.typed.scaladsl._
-import akka.cluster.ClusterEvent._
-import akka.cluster.MemberStatus
-import akka.cluster.typed._
+import org.apache.pekko
+import pekko.actor.typed._
+import pekko.actor.typed.scaladsl._
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.MemberStatus
+import pekko.cluster.typed._
 //#cluster-imports
-import akka.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.testkit.typed.scaladsl.TestProbe
 import org.scalatest.concurrent.{ Eventually, ScalaFutures }
 import org.scalatest.time.{ Millis, Seconds, Span }
 
@@ -44,7 +46,7 @@ akka {
       "akka://ClusterSystem@127.0.0.1:2551",
       "akka://ClusterSystem@127.0.0.1:2552"]
     
-    downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+    downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
   }
 }
 #config-seeds
@@ -59,9 +61,9 @@ akka {
     val system: ActorSystem[_] = ???
 
     // #join-seed-nodes
-    import akka.actor.Address
-    import akka.actor.AddressFromURIString
-    import akka.cluster.typed.JoinSeedNodes
+    import pekko.actor.Address
+    import pekko.actor.AddressFromURIString
+    import pekko.cluster.typed.JoinSeedNodes
 
     val seedNodes: List[Address] =
       List("akka://ClusterSystem@127.0.0.1:2551", "akka://ClusterSystem@127.0.0.1:2552").map(AddressFromURIString.parse)
diff --git a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/DistributedPubSubExample.scala b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/DistributedPubSubExample.scala
similarity index 90%
rename from akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/DistributedPubSubExample.scala
rename to akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/DistributedPubSubExample.scala
index c474f6f809..d88d7488f1 100644
--- a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/DistributedPubSubExample.scala
+++ b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/DistributedPubSubExample.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.typed
+package docs.org.apache.pekko.cluster.typed
 
 import scala.util.{ Failure, Success, Try }
 import scala.concurrent.duration._
 
-import akka.actor.typed.{ ActorRef, ActorSystem, Behavior }
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.MemberStatus
-import akka.cluster.pubsub.{ DistributedPubSub, DistributedPubSubMediator }
-import akka.cluster.typed.{ Cluster, Join }
-import akka.event.Logging
+import org.apache.pekko
+import pekko.actor.typed.{ ActorRef, ActorSystem, Behavior }
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.MemberStatus
+import pekko.cluster.pubsub.{ DistributedPubSub, DistributedPubSubMediator }
+import pekko.cluster.typed.{ Cluster, Join }
+import pekko.event.Logging
 import com.typesafe.config.{ Config, ConfigFactory }
 
 object Ontology {
@@ -85,8 +86,8 @@ object Publisher {
     def apply(): Behavior[AnyRef] = {
       // #publisher
       Behaviors.setup[AnyRef] { context =>
-        import akka.cluster.pubsub.DistributedPubSub
-        import akka.cluster.pubsub.DistributedPubSubMediator
+        import pekko.cluster.pubsub.DistributedPubSub
+        import pekko.cluster.pubsub.DistributedPubSubMediator
         val mediator = DistributedPubSub(context.system).mediator
 
         var registry: Map[DataKey, DataType] = Map.empty
@@ -131,11 +132,11 @@ object Publisher {
 object Ingestion {
   import Ontology._
 
-  def apply(dt: DataType, mediator: akka.actor.ActorRef): Behavior[DataEvent] = {
+  def apply(dt: DataType, mediator: pekko.actor.ActorRef): Behavior[DataEvent] = {
     // #destination
     Behaviors.setup { context =>
       // register to the path
-      import akka.actor.typed.scaladsl.adapter._
+      import pekko.actor.typed.scaladsl.adapter._
       mediator ! DistributedPubSubMediator.Put(context.self.toClassic)
 
       idle(dt, mediator)
@@ -143,7 +144,7 @@ object Ingestion {
     // #destination
   }
 
-  private def idle(dt: DataType, mediator: akka.actor.ActorRef): Behavior[DataEvent] =
+  private def idle(dt: DataType, mediator: pekko.actor.ActorRef): Behavior[DataEvent] =
     Behaviors.setup { context =>
       Behaviors.receiveMessage {
         case StartIngestion(key, _, sink) if key == dt.key =>
@@ -159,7 +160,7 @@ object Ingestion {
     }
 
   /** Would normally be typed more specifically. */
-  private def active(key: DataKey, sink: Option[DataSink], mediator: akka.actor.ActorRef): Behavior[DataEvent] =
+  private def active(key: DataKey, sink: Option[DataSink], mediator: pekko.actor.ActorRef): Behavior[DataEvent] =
     // #publisher
     Behaviors.setup { context =>
       Behaviors.receiveMessagePartial[DataEvent] {
@@ -182,11 +183,11 @@ object Ingestion {
 object Subscriber {
   import Ontology._
 
-  def apply(key: DataKey, mediator: akka.actor.ActorRef): Behavior[DataEvent] = {
+  def apply(key: DataKey, mediator: pekko.actor.ActorRef): Behavior[DataEvent] = {
 
     // #subscriber
     Behaviors.setup[DataEvent] { context =>
-      import akka.actor.typed.scaladsl.adapter._
+      import pekko.actor.typed.scaladsl.adapter._
 
       mediator ! DistributedPubSubMediator.Subscribe(RegistrationTopic, context.self.toClassic)
       mediator ! DistributedPubSubMediator.Subscribe(IngestionTopic, context.self.toClassic)
@@ -220,7 +221,7 @@ object Subscriber {
     Behaviors.same
   }
 
-  private def andThen(key: DataKey, mediator: akka.actor.ActorRef): Behavior[DataEvent] = {
+  private def andThen(key: DataKey, mediator: pekko.actor.ActorRef): Behavior[DataEvent] = {
     // for the example, shutdown
     mediator ! DistributedPubSubMediator.Publish(IngestionTopic, IngestionStopped(key))
     Behaviors.stopped
@@ -230,7 +231,7 @@ object Subscriber {
 object DataService {
   import Ontology._
 
-  def apply(mediator: akka.actor.ActorRef): Behavior[DataApi] = {
+  def apply(mediator: pekko.actor.ActorRef): Behavior[DataApi] = {
     Behaviors.setup { context =>
       val registration = context.spawn(Publisher.RegistrationService(), "data-registration")
 
@@ -282,7 +283,7 @@ object DataPlatform {
 }
 
 object DistributedPubSubExample {
-  import akka.actor.testkit.typed.scaladsl.TestProbe
+  import pekko.actor.testkit.typed.scaladsl.TestProbe
   import Ontology._
 
   val config: Config = ConfigFactory.parseString(s"""
@@ -293,7 +294,7 @@ object DistributedPubSubExample {
         akka.remote.classic.netty.tcp.port = 0
         akka.remote.artery.canonical.port = 0
         akka.loglevel = INFO
-        akka.loggers = ["akka.testkit.TestEventListener"]
+        akka.loggers = ["org.apache.pekko.testkit.TestEventListener"]
     """)
 
   def createCluster(nodes: List[ActorSystem[_]]): Unit = {
@@ -323,7 +324,7 @@ object DistributedPubSubExample {
     val system3 = ActorSystem[ProvisionCommand](DataPlatform(), system.name, config)
     val nodes = List(system, system2, system3)
 
-    import akka.actor.typed.scaladsl.adapter._
+    import pekko.actor.typed.scaladsl.adapter._
     val log = Logging(system.toClassic.eventStream, system.name)
 
     createCluster(nodes)
diff --git a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/PingSerializer.scala b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala
similarity index 82%
rename from akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/PingSerializer.scala
rename to akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala
index da2882118b..0104ed8272 100644
--- a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/PingSerializer.scala
+++ b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.typed
+package docs.org.apache.pekko.cluster.typed
 
 import java.nio.charset.StandardCharsets
 
-import akka.actor.ExtendedActorSystem
-import akka.actor.typed.ActorRefResolver
-import akka.actor.typed.scaladsl.adapter._
-import akka.serialization.SerializerWithStringManifest
-import docs.akka.cluster.typed.PingPongExample.PingService
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.typed.ActorRefResolver
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.serialization.SerializerWithStringManifest
+import docs.org.apache.pekko.cluster.typed.PingPongExample.PingService
 
 //#serializer
 class PingSerializer(system: ExtendedActorSystem) extends SerializerWithStringManifest {
diff --git a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/ReceptionistExample.scala b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala
similarity index 90%
rename from akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/ReceptionistExample.scala
rename to akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala
index 6cb278099d..1df14b8d80 100644
--- a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/ReceptionistExample.scala
+++ b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.typed
+package docs.org.apache.pekko.cluster.typed
 
 //#import
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.receptionist.Receptionist
-import akka.actor.typed.receptionist.ServiceKey
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.receptionist.Receptionist
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.actor.typed.scaladsl.Behaviors
 //#import
 
 object PingPongExample {
@@ -104,7 +105,7 @@ object PingPongExample {
 
 object ReceptionistExample {
   import PingPongExample._
-  import akka.actor.typed.ActorSystem
+  import pekko.actor.typed.ActorSystem
 
   def main(args: Array[String]): Unit = {
     val system = ActorSystem[Nothing](Guardian(), "PingPongExample")
diff --git a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/SingletonCompileOnlySpec.scala b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala
similarity index 84%
rename from akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/SingletonCompileOnlySpec.scala
rename to akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala
index 1a6eefc910..05b5fb6131 100644
--- a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/SingletonCompileOnlySpec.scala
+++ b/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package docs.akka.cluster.typed
+package docs.org.apache.pekko.cluster.typed
 
-import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, SupervisorStrategy }
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.actor.typed.{ ActorRef, ActorSystem, Behavior, SupervisorStrategy }
+import pekko.actor.typed.scaladsl.Behaviors
 import scala.concurrent.duration._
 
-import akka.cluster.typed.ClusterSingletonSettings
+import pekko.cluster.typed.ClusterSingletonSettings
 
 object SingletonCompileOnlySpec {
 
@@ -41,8 +42,9 @@ object SingletonCompileOnlySpec {
   // #counter
 
   // #singleton
-  import akka.cluster.typed.ClusterSingleton
-  import akka.cluster.typed.SingletonActor
+  import org.apache.pekko
+  import pekko.cluster.typed.ClusterSingleton
+  import pekko.cluster.typed.SingletonActor
 
   val singletonManager = ClusterSingleton(system)
   // Start if needed and provide a proxy to a named singleton
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala
similarity index 91%
rename from akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala
index 1143b4b685..14500512df 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.scaladsl
+package org.apache.pekko.cluster.ddata.typed.scaladsl
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Scheduler
-import akka.cluster.ddata.GCounter
-import akka.cluster.ddata.GCounterKey
-import akka.cluster.ddata.SelfUniqueAddress
-import akka.cluster.ddata.typed.scaladsl.Replicator._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Scheduler
+import pekko.cluster.ddata.GCounter
+import pekko.cluster.ddata.GCounterKey
+import pekko.cluster.ddata.SelfUniqueAddress
+import pekko.cluster.ddata.typed.scaladsl.Replicator._
+import pekko.util.Timeout
 
 object ReplicatorCompileOnlyTest {
   sealed trait ClientCommand
@@ -23,7 +24,7 @@ object ReplicatorCompileOnlyTest {
       extends InternalMsg
 
   def shouldHaveConvenienceForAsk(): Unit = {
-    import akka.actor.typed.scaladsl.AskPattern._
+    import pekko.actor.typed.scaladsl.AskPattern._
 
     val replicator: ActorRef[Replicator.Command] = ???
     implicit val timeout: Timeout = Timeout(3.seconds)
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala
similarity index 65%
rename from akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala
index bf05b73899..611d04ba2c 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.typed.scaladsl
+package org.apache.pekko.cluster.ddata.typed.scaladsl
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 
 class ReplicatorSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
   "Replicator" must {
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorRefIgnoreSerializationSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala
similarity index 92%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorRefIgnoreSerializationSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala
index 8457d68734..a44f17d8b9 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorRefIgnoreSerializationSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.BeforeAndAfterAll
@@ -10,11 +10,12 @@ import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.{ actor => classic }
-import akka.actor.{ ExtendedActorSystem, IgnoreActorRef }
-import akka.actor.typed.{ ActorRef, ActorRefResolver, ActorSystem }
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
+import org.apache.pekko
+import pekko.{ actor => classic }
+import pekko.actor.{ ExtendedActorSystem, IgnoreActorRef }
+import pekko.actor.typed.{ ActorRef, ActorRefResolver, ActorSystem }
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
 
 class ActorRefIgnoreSerializationSpec extends AnyWordSpec with ScalaFutures with Matchers with BeforeAndAfterAll {
 
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala
similarity index 87%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala
index d61aa1f8ef..be2cce4828 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import java.nio.charset.StandardCharsets
 
@@ -18,21 +18,22 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.time.Span
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.Done
-import akka.actor.CoordinatedShutdown
-import akka.actor.ExtendedActorSystem
-import akka.actor.InvalidMessageException
-import akka.actor.testkit.typed.TestKitSettings
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.TestInbox
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorRefResolver
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.serialization.SerializerWithStringManifest
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.CoordinatedShutdown
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.InvalidMessageException
+import pekko.actor.testkit.typed.TestKitSettings
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.TestInbox
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorRefResolver
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.serialization.SerializerWithStringManifest
 
 object ActorSystemSpec {
 
@@ -80,10 +81,10 @@ class ActorSystemSpec
 
       akka.actor {
         serializers {
-          test = "akka.cluster.typed.ActorSystemSpec$TestSerializer"
+          test = "org.apache.pekko.cluster.typed.ActorSystemSpec$TestSerializer"
         }
         serialization-bindings {
-          "akka.cluster.typed.ActorSystemSpec$TestMessage" = test
+          "org.apache.pekko.cluster.typed.ActorSystemSpec$TestMessage" = test
         }
       }
     """)
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterActorLoggingSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterActorLoggingSpec.scala
similarity index 76%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterActorLoggingSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterActorLoggingSpec.scala
index b35ca5ab40..61fa168863 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterActorLoggingSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterActorLoggingSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ExtendedActorSystem
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.LoggingTestKit
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.internal.ActorMdc
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.internal.ActorMdc
+import pekko.actor.typed.scaladsl.Behaviors
 
 object ClusterActorLoggingSpec {
   def config = ConfigFactory.parseString("""
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterApiSpec.scala
similarity index 89%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterApiSpec.scala
index 03d68ee51b..f7f27ec1f1 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterApiSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.Address
-import akka.actor.testkit.typed.TestKitSettings
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.scaladsl.adapter._
-import akka.cluster.ClusterEvent._
-import akka.cluster.MemberStatus
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.actor.testkit.typed.TestKitSettings
+import pekko.actor.testkit.typed.scaladsl.ActorTestKit
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.MemberStatus
 
 object ClusterApiSpec {
   val config =
@@ -50,7 +51,7 @@ class ClusterApiSpec extends ScalaTestWithActorTestKit(ClusterApiSpec.config) wi
 
     "join a cluster and observe events from both sides" in {
 
-      val system2 = akka.actor.ActorSystem(system.name, system.settings.config)
+      val system2 = pekko.actor.ActorSystem(system.name, system.settings.config)
       val adaptedSystem2 = system2.toTyped
 
       try {
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterDispatcherSelectorSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterDispatcherSelectorSpec.scala
similarity index 77%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterDispatcherSelectorSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterDispatcherSelectorSpec.scala
index 6132fac8bd..3fe292a03f 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterDispatcherSelectorSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterDispatcherSelectorSpec.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.typed.scaladsl.DispatcherSelectorSpec
+import org.apache.pekko.actor.typed.scaladsl.DispatcherSelectorSpec
 
 class ClusterDispatcherSelectorSpec
     extends DispatcherSelectorSpec(ConfigFactory.parseString("""
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonApiSpec.scala
similarity index 87%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonApiSpec.scala
index 4fdcc6f184..79d0a2e8d1 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonApiSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,14 +10,15 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.TestKitSettings
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.TestKitSettings
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.serialization.jackson.CborSerializable
 
 object ClusterSingletonApiSpec {
 
@@ -57,7 +58,7 @@ class ClusterSingletonApiSpec
   val clusterNode1 = Cluster(system)
   val classicSystem1 = system.toClassic
 
-  val system2 = akka.actor.ActorSystem(
+  val system2 = pekko.actor.ActorSystem(
     system.name,
     ConfigFactory.parseString("""
         akka.cluster.roles = ["singleton"]
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPoisonPillSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonPoisonPillSpec.scala
similarity index 71%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPoisonPillSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonPoisonPillSpec.scala
index 2729e86073..c0030728ca 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPoisonPillSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonPoisonPillSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import scala.concurrent.duration._
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.TestKitSettings
-import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe }
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.typed.{ ActorRef, Behavior }
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.cluster.typed.ClusterSingletonPoisonPillSpec.GetSelf
+import org.apache.pekko
+import pekko.actor.testkit.typed.TestKitSettings
+import pekko.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe }
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.typed.{ ActorRef, Behavior }
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.cluster.typed.ClusterSingletonPoisonPillSpec.GetSelf
 
 object ClusterSingletonPoisonPillSpec {
 
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/GroupRouterSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/GroupRouterSpec.scala
similarity index 91%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/GroupRouterSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/GroupRouterSpec.scala
index b33e31c4a3..627b056434 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/GroupRouterSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/GroupRouterSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.receptionist.Receptionist
-import akka.actor.typed.receptionist.ServiceKey
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.GroupRouter
-import akka.actor.typed.scaladsl.Routers
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.receptionist.Receptionist
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.GroupRouter
+import pekko.actor.typed.scaladsl.Routers
+import pekko.serialization.jackson.CborSerializable
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteContextAskSpec.scala
similarity index 80%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteContextAskSpec.scala
index 44e0736a44..84a977902b 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteContextAskSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import scala.concurrent.duration._
 import scala.util.Failure
@@ -11,17 +11,18 @@ import scala.util.Success
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.receptionist.Receptionist
-import akka.actor.typed.receptionist.Receptionist.Registered
-import akka.actor.typed.receptionist.ServiceKey
-import akka.actor.typed.scaladsl.Behaviors
-import akka.serialization.jackson.CborSerializable
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.receptionist.Receptionist
+import pekko.actor.typed.receptionist.Receptionist.Registered
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.serialization.jackson.CborSerializable
+import pekko.util.Timeout
 
 object RemoteContextAskSpec {
   def config = ConfigFactory.parseString(s"""
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteDeployNotAllowedSpec.scala
similarity index 88%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteDeployNotAllowedSpec.scala
index 0495a5106f..388ba26770 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteDeployNotAllowedSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.ActorTestKit
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.scaladsl.Behaviors
 
 object RemoteDeployNotAllowedSpec {
   def config = ConfigFactory.parseString(s"""
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteMessageSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteMessageSpec.scala
similarity index 83%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteMessageSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteMessageSpec.scala
index efff4d9792..88d4996ffd 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteMessageSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteMessageSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed
+package org.apache.pekko.cluster.typed
 
 import scala.concurrent.Promise
 
 import com.typesafe.config.ConfigFactory
 
-import akka.Done
-import akka.actor.{ ActorSystem => ClassicActorSystem }
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorRefResolver
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.serialization.jackson.CborSerializable
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.{ ActorSystem => ClassicActorSystem }
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorRefResolver
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit.AkkaSpec
 
 object RemoteMessageSpec {
   def config = ConfigFactory.parseString(s"""
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala
similarity index 71%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala
index 0f5b3abd5b..60fc5ed7f3 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal
+package org.apache.pekko.cluster.typed.internal
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ExtendedActorSystem
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.cluster.typed.internal.receptionist.ClusterReceptionist
-import akka.serialization.SerializationExtension
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.cluster.typed.internal.receptionist.ClusterReceptionist
+import pekko.serialization.SerializationExtension
 
 class AkkaClusterTypedSerializerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
 
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala
similarity index 82%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala
index a128c97bfb..57f5ba6fdf 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.delivery
+package org.apache.pekko.cluster.typed.internal.delivery
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ExtendedActorSystem
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.DurableProducerQueue
-import akka.actor.typed.delivery.ProducerController
-import akka.actor.typed.delivery.internal.ChunkedMessage
-import akka.actor.typed.delivery.internal.ProducerControllerImpl
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.serialization.SerializationExtension
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.DurableProducerQueue
+import pekko.actor.typed.delivery.ProducerController
+import pekko.actor.typed.delivery.internal.ChunkedMessage
+import pekko.actor.typed.delivery.internal.ProducerControllerImpl
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.serialization.SerializationExtension
+import pekko.util.ByteString
 
 class ReliableDeliverySerializerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
 
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala
similarity index 97%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala
index 2d0a674d94..ad840990a0 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.receptionist
+package org.apache.pekko.cluster.typed.internal.receptionist
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -13,27 +13,28 @@ import com.typesafe.config.ConfigFactory
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.RootActorPath
-import akka.actor.testkit.typed.FishingOutcome
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
-import akka.actor.testkit.typed.scaladsl.FishingOutcomes
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.receptionist.Receptionist
-import akka.actor.typed.receptionist.ServiceKey
-import akka.actor.typed.scaladsl.Behaviors
-import akka.cluster.MemberStatus
-import akka.cluster.typed.Cluster
-import akka.cluster.typed.Down
-import akka.cluster.typed.Join
-import akka.cluster.typed.JoinSeedNodes
-import akka.cluster.typed.Leave
-import akka.serialization.jackson.CborSerializable
-import akka.testkit.LongRunningTest
+import org.apache.pekko
+import pekko.actor.RootActorPath
+import pekko.actor.testkit.typed.FishingOutcome
+import pekko.actor.testkit.typed.scaladsl.ActorTestKit
+import pekko.actor.testkit.typed.scaladsl.FishingOutcomes
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.receptionist.Receptionist
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.cluster.MemberStatus
+import pekko.cluster.typed.Cluster
+import pekko.cluster.typed.Down
+import pekko.cluster.typed.Join
+import pekko.cluster.typed.JoinSeedNodes
+import pekko.cluster.typed.Leave
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit.LongRunningTest
 import org.scalatest.concurrent.ScalaFutures
 
-import akka.testkit.GHExcludeAeronTest
+import pekko.testkit.GHExcludeAeronTest
 
 object ClusterReceptionistSpec {
   val config = ConfigFactory.parseString(s"""
@@ -251,7 +252,7 @@ class ClusterReceptionistSpec extends AnyWordSpec with Matchers with LogCapturin
 
         regProbe2.expectMessageType[Listing].serviceInstances(PingKey).size should ===(2)
 
-        akka.cluster.Cluster(system1).shutdown()
+        pekko.cluster.Cluster(system1).shutdown()
 
         regProbe2.expectNoMessage(3.seconds)
 
@@ -661,7 +662,7 @@ class ClusterReceptionistSpec extends AnyWordSpec with Matchers with LogCapturin
         regProbe2.expectMessageType[Listing].serviceInstances(PingKey).size should ===(1)
         regProbe2.expectNoMessage(1.second)
 
-        akka.cluster.Cluster(system1).shutdown()
+        pekko.cluster.Cluster(system1).shutdown()
         clusterNode2.manager ! Down(clusterNode1.selfMember.address)
       } finally {
         testKit1.shutdownTestKit()
@@ -713,7 +714,7 @@ class ClusterReceptionistSpec extends AnyWordSpec with Matchers with LogCapturin
         system1.receptionist ! Find(AnotherKey, regProbe1.ref)
         regProbe1.expectMessageType[Listing].serviceInstances(AnotherKey).size should ===(1)
 
-        akka.cluster.Cluster(system1).shutdown()
+        pekko.cluster.Cluster(system1).shutdown()
         clusterNode2.manager ! Down(clusterNode1.selfMember.address)
       } finally {
         testKit1.shutdownTestKit()
@@ -772,7 +773,7 @@ class ClusterReceptionistSpec extends AnyWordSpec with Matchers with LogCapturin
           case PingKey.Listing(actors) if actors.isEmpty   => FishingOutcomes.continueAndIgnore
         }
 
-        akka.cluster.Cluster(system1).shutdown()
+        pekko.cluster.Cluster(system1).shutdown()
         clusterNode2.manager ! Down(clusterNode1.selfMember.address)
       } finally {
         testKit1.shutdownTestKit()
@@ -854,7 +855,7 @@ class ClusterReceptionistSpec extends AnyWordSpec with Matchers with LogCapturin
         system.receptionist ! Register(PingKey, service, regProbe.ref)
         regProbe.expectMessage(Registered(PingKey, service))
 
-        import akka.actor.typed.scaladsl.adapter._
+        import pekko.actor.typed.scaladsl.adapter._
         val classicSystem = system.toClassic
         val replicatorPath = system.receptionist.path / "replicator"
 
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala
similarity index 82%
rename from akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala
rename to akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala
index 951253cb4b..007eb77f53 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala
+++ b/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.typed.internal.receptionist
+package org.apache.pekko.cluster.typed.internal.receptionist
 
 import scala.concurrent.duration._
 import scala.concurrent.duration.Deadline
@@ -10,13 +10,14 @@ import scala.concurrent.duration.Deadline
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.Address
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.internal.receptionist.AbstractServiceKey
-import akka.actor.typed.receptionist.ServiceKey
-import akka.cluster.UniqueAddress
-import akka.cluster.typed.internal.receptionist.ClusterReceptionistProtocol.SubscriptionsKV
-import akka.util.TypedMultiMap
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.internal.receptionist.AbstractServiceKey
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.cluster.UniqueAddress
+import pekko.cluster.typed.internal.receptionist.ClusterReceptionistProtocol.SubscriptionsKV
+import pekko.util.TypedMultiMap
 
 class ClusterReceptionistStateSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with Matchers {
 
diff --git a/akka-cluster/src/main/java/akka/cluster/protobuf/msg/ClusterMessages.java b/akka-cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java
similarity index 61%
rename from akka-cluster/src/main/java/akka/cluster/protobuf/msg/ClusterMessages.java
rename to akka-cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java
index 865868b85c..5a1cfe9f99 100644
--- a/akka-cluster/src/main/java/akka/cluster/protobuf/msg/ClusterMessages.java
+++ b/akka-cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java
@@ -5,18 +5,18 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ClusterMessages.proto
 
-package akka.cluster.protobuf.msg;
+package org.apache.pekko.cluster.protobuf.msg;
 
 public final class ClusterMessages {
   private ClusterMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   /**
    * 
    @@ -27,7 +27,7 @@ public final class ClusterMessages {
    * Protobuf enum {@code ReachabilityStatus}
    */
   public enum ReachabilityStatus
-      implements akka.protobufv3.internal.ProtocolMessageEnum {
+      implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
     /**
      * Reachable = 0;
      */
@@ -83,35 +83,35 @@ public final class ClusterMessages {
       }
     }
 
-    public static akka.protobufv3.internal.Internal.EnumLiteMap
+    public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalGetValueMap() {
       return internalValueMap;
     }
-    private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+    private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
         ReachabilityStatus> internalValueMap =
-          new akka.protobufv3.internal.Internal.EnumLiteMap() {
+          new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
             public ReachabilityStatus findValueByNumber(int number) {
               return ReachabilityStatus.forNumber(number);
             }
           };
 
-    public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.getDescriptor().getEnumTypes().get(0);
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final ReachabilityStatus[] VALUES = values();
 
     public static ReachabilityStatus valueOf(
-        akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+        org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
         throw new java.lang.IllegalArgumentException(
           "EnumValueDescriptor is not for this type.");
@@ -137,7 +137,7 @@ public final class ClusterMessages {
    * Protobuf enum {@code MemberStatus}
    */
   public enum MemberStatus
-      implements akka.protobufv3.internal.ProtocolMessageEnum {
+      implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
     /**
      * Joining = 0;
      */
@@ -247,35 +247,35 @@ public final class ClusterMessages {
       }
     }
 
-    public static akka.protobufv3.internal.Internal.EnumLiteMap
+    public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalGetValueMap() {
       return internalValueMap;
     }
-    private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+    private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
         MemberStatus> internalValueMap =
-          new akka.protobufv3.internal.Internal.EnumLiteMap() {
+          new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
             public MemberStatus findValueByNumber(int number) {
               return MemberStatus.forNumber(number);
             }
           };
 
-    public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.getDescriptor().getEnumTypes().get(1);
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.getDescriptor().getEnumTypes().get(1);
     }
 
     private static final MemberStatus[] VALUES = values();
 
     public static MemberStatus valueOf(
-        akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+        org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
         throw new java.lang.IllegalArgumentException(
           "EnumValueDescriptor is not for this type.");
@@ -294,7 +294,7 @@ public final class ClusterMessages {
 
   public interface JoinOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Join)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress node = 1;
@@ -305,11 +305,11 @@ public final class ClusterMessages {
      * required .UniqueAddress node = 1;
      * @return The node.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getNode();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getNode();
     /**
      * required .UniqueAddress node = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getNodeOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getNodeOrBuilder();
 
     /**
      * repeated string roles = 2;
@@ -333,7 +333,7 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the roles at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRolesBytes(int index);
 
     /**
@@ -350,7 +350,7 @@ public final class ClusterMessages {
      * optional string appVersion = 3;
      * @return The bytes for appVersion.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getAppVersionBytes();
   }
   /**
@@ -362,42 +362,42 @@ public final class ClusterMessages {
    * Protobuf type {@code Join}
    */
   public  static final class Join extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Join)
       JoinOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Join.newBuilder() to construct.
-    private Join(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Join(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Join() {
-      roles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       appVersion_ = "";
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Join();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Join(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -407,11 +407,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = node_.toBuilder();
               }
-              node_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
+              node_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(node_);
                 node_ = subBuilder.buildPartial();
@@ -420,16 +420,16 @@ public final class ClusterMessages {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                roles_ = new akka.protobufv3.internal.LazyStringArrayList();
+                roles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               roles_.add(bs);
               break;
             }
             case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               appVersion_ = bs;
               break;
@@ -443,10 +443,10 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -456,22 +456,22 @@ public final class ClusterMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Join_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Join_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Join_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Join_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.Join.class, akka.cluster.protobuf.msg.ClusterMessages.Join.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join.Builder.class);
     }
 
     private int bitField0_;
     public static final int NODE_FIELD_NUMBER = 1;
-    private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress node_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress node_;
     /**
      * required .UniqueAddress node = 1;
      * @return Whether the node field is set.
@@ -483,23 +483,23 @@ public final class ClusterMessages {
      * required .UniqueAddress node = 1;
      * @return The node.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getNode() {
-      return node_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getNode() {
+      return node_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
     }
     /**
      * required .UniqueAddress node = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
-      return node_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
+      return node_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
     }
 
     public static final int ROLES_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList roles_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList roles_;
     /**
      * repeated string roles = 2;
      * @return A list containing the roles.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getRolesList() {
       return roles_;
     }
@@ -523,7 +523,7 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the roles at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRolesBytes(int index) {
       return roles_.getByteString(index);
     }
@@ -546,8 +546,8 @@ public final class ClusterMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           appVersion_ = s;
@@ -559,17 +559,17 @@ public final class ClusterMessages {
      * optional string appVersion = 3;
      * @return The bytes for appVersion.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getAppVersionBytes() {
       java.lang.Object ref = appVersion_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         appVersion_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -593,16 +593,16 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getNode());
       }
       for (int i = 0; i < roles_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, roles_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, roles_.getRaw(i));
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, appVersion_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, appVersion_);
       }
       unknownFields.writeTo(output);
     }
@@ -614,7 +614,7 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getNode());
       }
       {
@@ -626,7 +626,7 @@ public final class ClusterMessages {
         size += 1 * getRolesList().size();
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, appVersion_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, appVersion_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -638,10 +638,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.Join)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.Join other = (akka.cluster.protobuf.msg.ClusterMessages.Join) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join) obj;
 
       if (hasNode() != other.hasNode()) return false;
       if (hasNode()) {
@@ -683,73 +683,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -758,7 +758,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.Join prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -769,7 +769,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -782,34 +782,34 @@ public final class ClusterMessages {
      * Protobuf type {@code Join}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Join)
-        akka.cluster.protobuf.msg.ClusterMessages.JoinOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.JoinOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Join_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Join_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Join_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Join_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.Join.class, akka.cluster.protobuf.msg.ClusterMessages.Join.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.Join.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getNodeFieldBuilder();
         }
@@ -823,7 +823,7 @@ public final class ClusterMessages {
           nodeBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
-        roles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         appVersion_ = "";
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -831,19 +831,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Join_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Join_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Join getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.Join.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Join build() {
-        akka.cluster.protobuf.msg.ClusterMessages.Join result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -851,8 +851,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Join buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.Join result = new akka.cluster.protobuf.msg.ClusterMessages.Join(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -883,44 +883,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.Join) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.Join)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Join other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.Join.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join.getDefaultInstance()) return this;
         if (other.hasNode()) {
           mergeNode(other.getNode());
         }
@@ -957,14 +957,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.Join parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.Join) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -975,9 +975,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress node_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> nodeBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress node_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> nodeBuilder_;
       /**
        * required .UniqueAddress node = 1;
        * @return Whether the node field is set.
@@ -989,9 +989,9 @@ public final class ClusterMessages {
        * required .UniqueAddress node = 1;
        * @return The node.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getNode() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getNode() {
         if (nodeBuilder_ == null) {
-          return node_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
+          return node_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
         } else {
           return nodeBuilder_.getMessage();
         }
@@ -999,7 +999,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress node = 1;
        */
-      public Builder setNode(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder setNode(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (nodeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1016,7 +1016,7 @@ public final class ClusterMessages {
        * required .UniqueAddress node = 1;
        */
       public Builder setNode(
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (nodeBuilder_ == null) {
           node_ = builderForValue.build();
           onChanged();
@@ -1029,13 +1029,13 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress node = 1;
        */
-      public Builder mergeNode(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder mergeNode(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (nodeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               node_ != null &&
-              node_ != akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+              node_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
             node_ =
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
           } else {
             node_ = value;
           }
@@ -1062,7 +1062,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress node = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getNodeBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getNodeBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getNodeFieldBuilder().getBuilder();
@@ -1070,23 +1070,23 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress node = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
         if (nodeBuilder_ != null) {
           return nodeBuilder_.getMessageOrBuilder();
         } else {
           return node_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : node_;
         }
       }
       /**
        * required .UniqueAddress node = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
           getNodeFieldBuilder() {
         if (nodeBuilder_ == null) {
-          nodeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
+          nodeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
                   getNode(),
                   getParentForChildren(),
                   isClean());
@@ -1095,10 +1095,10 @@ public final class ClusterMessages {
         return nodeBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList roles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureRolesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          roles_ = new akka.protobufv3.internal.LazyStringArrayList(roles_);
+          roles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(roles_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -1106,7 +1106,7 @@ public final class ClusterMessages {
        * repeated string roles = 2;
        * @return A list containing the roles.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getRolesList() {
         return roles_.getUnmodifiableView();
       }
@@ -1130,7 +1130,7 @@ public final class ClusterMessages {
        * @param index The index of the value to return.
        * @return The bytes of the roles at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRolesBytes(int index) {
         return roles_.getByteString(index);
       }
@@ -1173,7 +1173,7 @@ public final class ClusterMessages {
       public Builder addAllRoles(
           java.lang.Iterable values) {
         ensureRolesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, roles_);
         onChanged();
         return this;
@@ -1183,7 +1183,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearRoles() {
-        roles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        roles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -1194,7 +1194,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder addRolesBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1219,8 +1219,8 @@ public final class ClusterMessages {
       public java.lang.String getAppVersion() {
         java.lang.Object ref = appVersion_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             appVersion_ = s;
@@ -1234,17 +1234,17 @@ public final class ClusterMessages {
        * optional string appVersion = 3;
        * @return The bytes for appVersion.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getAppVersionBytes() {
         java.lang.Object ref = appVersion_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           appVersion_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1278,7 +1278,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder setAppVersionBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1289,13 +1289,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -1304,37 +1304,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Join)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.Join DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.Join();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Join getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Join parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Join(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.Join getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Join getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1342,7 +1342,7 @@ public final class ClusterMessages {
 
   public interface WelcomeOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Welcome)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress from = 1;
@@ -1353,11 +1353,11 @@ public final class ClusterMessages {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom();
     /**
      * required .UniqueAddress from = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder();
 
     /**
      * required .Gossip gossip = 2;
@@ -1368,11 +1368,11 @@ public final class ClusterMessages {
      * required .Gossip gossip = 2;
      * @return The gossip.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.Gossip getGossip();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip getGossip();
     /**
      * required .Gossip gossip = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder getGossipOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder getGossipOrBuilder();
   }
   /**
    * 
    @@ -1383,12 +1383,12 @@ public final class ClusterMessages {
    * Protobuf type {@code Welcome}
    */
   public  static final class Welcome extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Welcome)
       WelcomeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Welcome.newBuilder() to construct.
-    private Welcome(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Welcome(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Welcome() {
@@ -1397,26 +1397,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Welcome();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Welcome(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1426,11 +1426,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -1439,11 +1439,11 @@ public final class ClusterMessages {
               break;
             }
             case 18: {
-              akka.cluster.protobuf.msg.ClusterMessages.Gossip.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = gossip_.toBuilder();
               }
-              gossip_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.Gossip.PARSER, extensionRegistry);
+              gossip_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(gossip_);
                 gossip_ = subBuilder.buildPartial();
@@ -1460,32 +1460,32 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.Welcome.class, akka.cluster.protobuf.msg.ClusterMessages.Welcome.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
     /**
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
@@ -1497,18 +1497,18 @@ public final class ClusterMessages {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int GOSSIP_FIELD_NUMBER = 2;
-    private akka.cluster.protobuf.msg.ClusterMessages.Gossip gossip_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip gossip_;
     /**
      * required .Gossip gossip = 2;
      * @return Whether the gossip field is set.
@@ -1520,14 +1520,14 @@ public final class ClusterMessages {
      * required .Gossip gossip = 2;
      * @return The gossip.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.Gossip getGossip() {
-      return gossip_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip getGossip() {
+      return gossip_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
     }
     /**
      * required .Gossip gossip = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder getGossipOrBuilder() {
-      return gossip_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder getGossipOrBuilder() {
+      return gossip_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1558,7 +1558,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
@@ -1576,11 +1576,11 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getGossip());
       }
       size += unknownFields.getSerializedSize();
@@ -1593,10 +1593,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.Welcome)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.Welcome other = (akka.cluster.protobuf.msg.ClusterMessages.Welcome) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -1632,73 +1632,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1707,7 +1707,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.Welcome prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1718,7 +1718,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1731,34 +1731,34 @@ public final class ClusterMessages {
      * Protobuf type {@code Welcome}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Welcome)
-        akka.cluster.protobuf.msg.ClusterMessages.WelcomeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.WelcomeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.Welcome.class, akka.cluster.protobuf.msg.ClusterMessages.Welcome.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.Welcome.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
           getGossipFieldBuilder();
@@ -1783,19 +1783,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Welcome_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Welcome getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.Welcome.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Welcome build() {
-        akka.cluster.protobuf.msg.ClusterMessages.Welcome result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1803,8 +1803,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Welcome buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.Welcome result = new akka.cluster.protobuf.msg.ClusterMessages.Welcome(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1834,44 +1834,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.Welcome) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.Welcome)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Welcome other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.Welcome.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -1902,14 +1902,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.Welcome parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.Welcome) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1920,9 +1920,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> fromBuilder_;
       /**
        * required .UniqueAddress from = 1;
        * @return Whether the from field is set.
@@ -1934,9 +1934,9 @@ public final class ClusterMessages {
        * required .UniqueAddress from = 1;
        * @return The from.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -1944,7 +1944,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder setFrom(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1961,7 +1961,7 @@ public final class ClusterMessages {
        * required .UniqueAddress from = 1;
        */
       public Builder setFrom(
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -1974,13 +1974,13 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
             from_ =
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -2007,7 +2007,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getFromBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -2015,23 +2015,23 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
         }
       }
       /**
        * required .UniqueAddress from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -2040,9 +2040,9 @@ public final class ClusterMessages {
         return fromBuilder_;
       }
 
-      private akka.cluster.protobuf.msg.ClusterMessages.Gossip gossip_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Gossip, akka.cluster.protobuf.msg.ClusterMessages.Gossip.Builder, akka.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder> gossipBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip gossip_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder> gossipBuilder_;
       /**
        * required .Gossip gossip = 2;
        * @return Whether the gossip field is set.
@@ -2054,9 +2054,9 @@ public final class ClusterMessages {
        * required .Gossip gossip = 2;
        * @return The gossip.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Gossip getGossip() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip getGossip() {
         if (gossipBuilder_ == null) {
-          return gossip_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
+          return gossip_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
         } else {
           return gossipBuilder_.getMessage();
         }
@@ -2064,7 +2064,7 @@ public final class ClusterMessages {
       /**
        * required .Gossip gossip = 2;
        */
-      public Builder setGossip(akka.cluster.protobuf.msg.ClusterMessages.Gossip value) {
+      public Builder setGossip(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip value) {
         if (gossipBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2081,7 +2081,7 @@ public final class ClusterMessages {
        * required .Gossip gossip = 2;
        */
       public Builder setGossip(
-          akka.cluster.protobuf.msg.ClusterMessages.Gossip.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder builderForValue) {
         if (gossipBuilder_ == null) {
           gossip_ = builderForValue.build();
           onChanged();
@@ -2094,13 +2094,13 @@ public final class ClusterMessages {
       /**
        * required .Gossip gossip = 2;
        */
-      public Builder mergeGossip(akka.cluster.protobuf.msg.ClusterMessages.Gossip value) {
+      public Builder mergeGossip(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip value) {
         if (gossipBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               gossip_ != null &&
-              gossip_ != akka.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance()) {
+              gossip_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance()) {
             gossip_ =
-              akka.cluster.protobuf.msg.ClusterMessages.Gossip.newBuilder(gossip_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.newBuilder(gossip_).mergeFrom(value).buildPartial();
           } else {
             gossip_ = value;
           }
@@ -2127,7 +2127,7 @@ public final class ClusterMessages {
       /**
        * required .Gossip gossip = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Gossip.Builder getGossipBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder getGossipBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getGossipFieldBuilder().getBuilder();
@@ -2135,23 +2135,23 @@ public final class ClusterMessages {
       /**
        * required .Gossip gossip = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder getGossipOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder getGossipOrBuilder() {
         if (gossipBuilder_ != null) {
           return gossipBuilder_.getMessageOrBuilder();
         } else {
           return gossip_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance() : gossip_;
         }
       }
       /**
        * required .Gossip gossip = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Gossip, akka.cluster.protobuf.msg.ClusterMessages.Gossip.Builder, akka.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder> 
           getGossipFieldBuilder() {
         if (gossipBuilder_ == null) {
-          gossipBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.Gossip, akka.cluster.protobuf.msg.ClusterMessages.Gossip.Builder, akka.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder>(
+          gossipBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder>(
                   getGossip(),
                   getParentForChildren(),
                   isClean());
@@ -2161,13 +2161,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2176,37 +2176,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Welcome)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.Welcome DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.Welcome();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Welcome getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Welcome parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Welcome(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.Welcome getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Welcome getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2214,7 +2214,7 @@ public final class ClusterMessages {
 
   public interface InitJoinOrBuilder extends
       // @@protoc_insertion_point(interface_extends:InitJoin)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * optional string currentConfig = 1;
@@ -2230,7 +2230,7 @@ public final class ClusterMessages {
      * optional string currentConfig = 1;
      * @return The bytes for currentConfig.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getCurrentConfigBytes();
   }
   /**
@@ -2242,12 +2242,12 @@ public final class ClusterMessages {
    * Protobuf type {@code InitJoin}
    */
   public  static final class InitJoin extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:InitJoin)
       InitJoinOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use InitJoin.newBuilder() to construct.
-    private InitJoin(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private InitJoin(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private InitJoin() {
@@ -2257,26 +2257,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new InitJoin();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private InitJoin(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2286,7 +2286,7 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               currentConfig_ = bs;
               break;
@@ -2300,27 +2300,27 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.InitJoin.class, akka.cluster.protobuf.msg.ClusterMessages.InitJoin.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin.Builder.class);
     }
 
     private int bitField0_;
@@ -2342,8 +2342,8 @@ public final class ClusterMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           currentConfig_ = s;
@@ -2355,17 +2355,17 @@ public final class ClusterMessages {
      * optional string currentConfig = 1;
      * @return The bytes for currentConfig.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getCurrentConfigBytes() {
       java.lang.Object ref = currentConfig_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         currentConfig_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -2381,10 +2381,10 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, currentConfig_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, currentConfig_);
       }
       unknownFields.writeTo(output);
     }
@@ -2396,7 +2396,7 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, currentConfig_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, currentConfig_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -2408,10 +2408,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.InitJoin)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.InitJoin other = (akka.cluster.protobuf.msg.ClusterMessages.InitJoin) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin) obj;
 
       if (hasCurrentConfig() != other.hasCurrentConfig()) return false;
       if (hasCurrentConfig()) {
@@ -2438,73 +2438,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -2513,7 +2513,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.InitJoin prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2524,7 +2524,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2537,34 +2537,34 @@ public final class ClusterMessages {
      * Protobuf type {@code InitJoin}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:InitJoin)
-        akka.cluster.protobuf.msg.ClusterMessages.InitJoinOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.InitJoin.class, akka.cluster.protobuf.msg.ClusterMessages.InitJoin.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.InitJoin.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -2577,19 +2577,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoin_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.InitJoin getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.InitJoin.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.InitJoin build() {
-        akka.cluster.protobuf.msg.ClusterMessages.InitJoin result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2597,8 +2597,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.InitJoin buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.InitJoin result = new akka.cluster.protobuf.msg.ClusterMessages.InitJoin(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2616,44 +2616,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.InitJoin) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.InitJoin)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.InitJoin other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.InitJoin.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin.getDefaultInstance()) return this;
         if (other.hasCurrentConfig()) {
           bitField0_ |= 0x00000001;
           currentConfig_ = other.currentConfig_;
@@ -2671,14 +2671,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.InitJoin parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.InitJoin) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2704,8 +2704,8 @@ public final class ClusterMessages {
       public java.lang.String getCurrentConfig() {
         java.lang.Object ref = currentConfig_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             currentConfig_ = s;
@@ -2719,17 +2719,17 @@ public final class ClusterMessages {
        * optional string currentConfig = 1;
        * @return The bytes for currentConfig.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getCurrentConfigBytes() {
         java.lang.Object ref = currentConfig_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           currentConfig_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -2763,7 +2763,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder setCurrentConfigBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2774,13 +2774,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2789,37 +2789,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:InitJoin)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.InitJoin DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.InitJoin();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoin getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public InitJoin parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new InitJoin(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.InitJoin getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoin getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2827,7 +2827,7 @@ public final class ClusterMessages {
 
   public interface InitJoinAckOrBuilder extends
       // @@protoc_insertion_point(interface_extends:InitJoinAck)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Address address = 1;
@@ -2838,11 +2838,11 @@ public final class ClusterMessages {
      * required .Address address = 1;
      * @return The address.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.Address getAddress();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getAddress();
     /**
      * required .Address address = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder();
 
     /**
      * required .ConfigCheck configCheck = 2;
@@ -2853,11 +2853,11 @@ public final class ClusterMessages {
      * required .ConfigCheck configCheck = 2;
      * @return The configCheck.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck getConfigCheck();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck getConfigCheck();
     /**
      * required .ConfigCheck configCheck = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder getConfigCheckOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder getConfigCheckOrBuilder();
   }
   /**
    * 
    @@ -2868,12 +2868,12 @@ public final class ClusterMessages {
    * Protobuf type {@code InitJoinAck}
    */
   public  static final class InitJoinAck extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:InitJoinAck)
       InitJoinAckOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use InitJoinAck.newBuilder() to construct.
-    private InitJoinAck(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private InitJoinAck(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private InitJoinAck() {
@@ -2882,26 +2882,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new InitJoinAck();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private InitJoinAck(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2911,11 +2911,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.protobuf.msg.ClusterMessages.Address.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = address_.toBuilder();
               }
-              address_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.Address.PARSER, extensionRegistry);
+              address_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(address_);
                 address_ = subBuilder.buildPartial();
@@ -2924,11 +2924,11 @@ public final class ClusterMessages {
               break;
             }
             case 18: {
-              akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = configCheck_.toBuilder();
               }
-              configCheck_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.PARSER, extensionRegistry);
+              configCheck_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(configCheck_);
                 configCheck_ = subBuilder.buildPartial();
@@ -2945,32 +2945,32 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck.class, akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck.Builder.class);
     }
 
     private int bitField0_;
     public static final int ADDRESS_FIELD_NUMBER = 1;
-    private akka.cluster.protobuf.msg.ClusterMessages.Address address_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address address_;
     /**
      * required .Address address = 1;
      * @return Whether the address field is set.
@@ -2982,18 +2982,18 @@ public final class ClusterMessages {
      * required .Address address = 1;
      * @return The address.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
-      return address_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
+      return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
-      return address_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
+      return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
     }
 
     public static final int CONFIGCHECK_FIELD_NUMBER = 2;
-    private akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck configCheck_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck configCheck_;
     /**
      * required .ConfigCheck configCheck = 2;
      * @return Whether the configCheck field is set.
@@ -3005,14 +3005,14 @@ public final class ClusterMessages {
      * required .ConfigCheck configCheck = 2;
      * @return The configCheck.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck getConfigCheck() {
-      return configCheck_ == null ? akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck getConfigCheck() {
+      return configCheck_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
     }
     /**
      * required .ConfigCheck configCheck = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder getConfigCheckOrBuilder() {
-      return configCheck_ == null ? akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder getConfigCheckOrBuilder() {
+      return configCheck_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -3043,7 +3043,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getAddress());
@@ -3061,11 +3061,11 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getAddress());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getConfigCheck());
       }
       size += unknownFields.getSerializedSize();
@@ -3078,10 +3078,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck other = (akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck) obj;
 
       if (hasAddress() != other.hasAddress()) return false;
       if (hasAddress()) {
@@ -3117,73 +3117,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3192,7 +3192,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3203,7 +3203,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3216,34 +3216,34 @@ public final class ClusterMessages {
      * Protobuf type {@code InitJoinAck}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:InitJoinAck)
-        akka.cluster.protobuf.msg.ClusterMessages.InitJoinAckOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAckOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck.class, akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAddressFieldBuilder();
           getConfigCheckFieldBuilder();
@@ -3268,19 +3268,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_InitJoinAck_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck build() {
-        akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3288,8 +3288,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck result = new akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3319,44 +3319,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck.getDefaultInstance()) return this;
         if (other.hasAddress()) {
           mergeAddress(other.getAddress());
         }
@@ -3387,14 +3387,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3405,9 +3405,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.protobuf.msg.ClusterMessages.Address address_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Address, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder, akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> addressBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address address_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> addressBuilder_;
       /**
        * required .Address address = 1;
        * @return Whether the address field is set.
@@ -3419,9 +3419,9 @@ public final class ClusterMessages {
        * required .Address address = 1;
        * @return The address.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
         if (addressBuilder_ == null) {
-          return address_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
+          return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
         } else {
           return addressBuilder_.getMessage();
         }
@@ -3429,7 +3429,7 @@ public final class ClusterMessages {
       /**
        * required .Address address = 1;
        */
-      public Builder setAddress(akka.cluster.protobuf.msg.ClusterMessages.Address value) {
+      public Builder setAddress(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address value) {
         if (addressBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3446,7 +3446,7 @@ public final class ClusterMessages {
        * required .Address address = 1;
        */
       public Builder setAddress(
-          akka.cluster.protobuf.msg.ClusterMessages.Address.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
           onChanged();
@@ -3459,13 +3459,13 @@ public final class ClusterMessages {
       /**
        * required .Address address = 1;
        */
-      public Builder mergeAddress(akka.cluster.protobuf.msg.ClusterMessages.Address value) {
+      public Builder mergeAddress(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               address_ != null &&
-              address_ != akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
+              address_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
             address_ =
-              akka.cluster.protobuf.msg.ClusterMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
           } else {
             address_ = value;
           }
@@ -3492,7 +3492,7 @@ public final class ClusterMessages {
       /**
        * required .Address address = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Address.Builder getAddressBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder getAddressBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getAddressFieldBuilder().getBuilder();
@@ -3500,23 +3500,23 @@ public final class ClusterMessages {
       /**
        * required .Address address = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
         if (addressBuilder_ != null) {
           return addressBuilder_.getMessageOrBuilder();
         } else {
           return address_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
         }
       }
       /**
        * required .Address address = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Address, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder, akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> 
           getAddressFieldBuilder() {
         if (addressBuilder_ == null) {
-          addressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.Address, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder, akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder>(
+          addressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder>(
                   getAddress(),
                   getParentForChildren(),
                   isClean());
@@ -3525,9 +3525,9 @@ public final class ClusterMessages {
         return addressBuilder_;
       }
 
-      private akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck configCheck_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck, akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder, akka.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder> configCheckBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck configCheck_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder> configCheckBuilder_;
       /**
        * required .ConfigCheck configCheck = 2;
        * @return Whether the configCheck field is set.
@@ -3539,9 +3539,9 @@ public final class ClusterMessages {
        * required .ConfigCheck configCheck = 2;
        * @return The configCheck.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck getConfigCheck() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck getConfigCheck() {
         if (configCheckBuilder_ == null) {
-          return configCheck_ == null ? akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
+          return configCheck_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
         } else {
           return configCheckBuilder_.getMessage();
         }
@@ -3549,7 +3549,7 @@ public final class ClusterMessages {
       /**
        * required .ConfigCheck configCheck = 2;
        */
-      public Builder setConfigCheck(akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck value) {
+      public Builder setConfigCheck(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck value) {
         if (configCheckBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3566,7 +3566,7 @@ public final class ClusterMessages {
        * required .ConfigCheck configCheck = 2;
        */
       public Builder setConfigCheck(
-          akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder builderForValue) {
         if (configCheckBuilder_ == null) {
           configCheck_ = builderForValue.build();
           onChanged();
@@ -3579,13 +3579,13 @@ public final class ClusterMessages {
       /**
        * required .ConfigCheck configCheck = 2;
        */
-      public Builder mergeConfigCheck(akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck value) {
+      public Builder mergeConfigCheck(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck value) {
         if (configCheckBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               configCheck_ != null &&
-              configCheck_ != akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance()) {
+              configCheck_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance()) {
             configCheck_ =
-              akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.newBuilder(configCheck_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.newBuilder(configCheck_).mergeFrom(value).buildPartial();
           } else {
             configCheck_ = value;
           }
@@ -3612,7 +3612,7 @@ public final class ClusterMessages {
       /**
        * required .ConfigCheck configCheck = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder getConfigCheckBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder getConfigCheckBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getConfigCheckFieldBuilder().getBuilder();
@@ -3620,23 +3620,23 @@ public final class ClusterMessages {
       /**
        * required .ConfigCheck configCheck = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder getConfigCheckOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder getConfigCheckOrBuilder() {
         if (configCheckBuilder_ != null) {
           return configCheckBuilder_.getMessageOrBuilder();
         } else {
           return configCheck_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance() : configCheck_;
         }
       }
       /**
        * required .ConfigCheck configCheck = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck, akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder, akka.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder> 
           getConfigCheckFieldBuilder() {
         if (configCheckBuilder_ == null) {
-          configCheckBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck, akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder, akka.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder>(
+          configCheckBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder>(
                   getConfigCheck(),
                   getParentForChildren(),
                   isClean());
@@ -3646,13 +3646,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -3661,37 +3661,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:InitJoinAck)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public InitJoinAck parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new InitJoinAck(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.InitJoinAck getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.InitJoinAck getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3699,7 +3699,7 @@ public final class ClusterMessages {
 
   public interface ConfigCheckOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ConfigCheck)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .ConfigCheck.Type type = 1;
@@ -3710,7 +3710,7 @@ public final class ClusterMessages {
      * required .ConfigCheck.Type type = 1;
      * @return The type.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type getType();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type getType();
 
     /**
      * optional string clusterConfig = 2;
@@ -3726,19 +3726,19 @@ public final class ClusterMessages {
      * optional string clusterConfig = 2;
      * @return The bytes for clusterConfig.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getClusterConfigBytes();
   }
   /**
    * Protobuf type {@code ConfigCheck}
    */
   public  static final class ConfigCheck extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ConfigCheck)
       ConfigCheckOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ConfigCheck.newBuilder() to construct.
-    private ConfigCheck(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ConfigCheck(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ConfigCheck() {
@@ -3749,26 +3749,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ConfigCheck();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ConfigCheck(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3780,7 +3780,7 @@ public final class ClusterMessages {
             case 8: {
               int rawValue = input.readEnum();
                 @SuppressWarnings("deprecation")
-              akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type value = akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.valueOf(rawValue);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type value = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -3790,7 +3790,7 @@ public final class ClusterMessages {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               clusterConfig_ = bs;
               break;
@@ -3804,34 +3804,34 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.class, akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder.class);
     }
 
     /**
      * Protobuf enum {@code ConfigCheck.Type}
      */
     public enum Type
-        implements akka.protobufv3.internal.ProtocolMessageEnum {
+        implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
       /**
        * UncheckedConfig = 1;
        */
@@ -3887,35 +3887,35 @@ public final class ClusterMessages {
         }
       }
 
-      public static akka.protobufv3.internal.Internal.EnumLiteMap
+      public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
           internalGetValueMap() {
         return internalValueMap;
       }
-      private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+      private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
           Type> internalValueMap =
-            new akka.protobufv3.internal.Internal.EnumLiteMap() {
+            new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
               public Type findValueByNumber(int number) {
                 return Type.forNumber(number);
               }
             };
 
-      public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+      public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(ordinal());
       }
-      public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+      public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDescriptor().getEnumTypes().get(0);
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Type[] VALUES = values();
 
       public static Type valueOf(
-          akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+          org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
           throw new java.lang.IllegalArgumentException(
             "EnumValueDescriptor is not for this type.");
@@ -3946,10 +3946,10 @@ public final class ClusterMessages {
      * required .ConfigCheck.Type type = 1;
      * @return The type.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type getType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type getType() {
       @SuppressWarnings("deprecation")
-      akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type result = akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.valueOf(type_);
-      return result == null ? akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.UncheckedConfig : result;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.valueOf(type_);
+      return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.UncheckedConfig : result;
     }
 
     public static final int CLUSTERCONFIG_FIELD_NUMBER = 2;
@@ -3970,8 +3970,8 @@ public final class ClusterMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           clusterConfig_ = s;
@@ -3983,17 +3983,17 @@ public final class ClusterMessages {
      * optional string clusterConfig = 2;
      * @return The bytes for clusterConfig.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getClusterConfigBytes() {
       java.lang.Object ref = clusterConfig_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         clusterConfig_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4013,13 +4013,13 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeEnum(1, type_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, clusterConfig_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, clusterConfig_);
       }
       unknownFields.writeTo(output);
     }
@@ -4031,11 +4031,11 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeEnumSize(1, type_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, clusterConfig_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, clusterConfig_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -4047,10 +4047,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck other = (akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck) obj;
 
       if (hasType() != other.hasType()) return false;
       if (hasType()) {
@@ -4085,73 +4085,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -4160,7 +4160,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4171,7 +4171,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4179,34 +4179,34 @@ public final class ClusterMessages {
      * Protobuf type {@code ConfigCheck}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ConfigCheck)
-        akka.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheckOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.class, akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -4221,19 +4221,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ConfigCheck_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck build() {
-        akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4241,8 +4241,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck result = new akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4264,44 +4264,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.getDefaultInstance()) return this;
         if (other.hasType()) {
           setType(other.getType());
         }
@@ -4325,14 +4325,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4355,17 +4355,17 @@ public final class ClusterMessages {
        * required .ConfigCheck.Type type = 1;
        * @return The type.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type getType() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type getType() {
         @SuppressWarnings("deprecation")
-        akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type result = akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.valueOf(type_);
-        return result == null ? akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.UncheckedConfig : result;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.valueOf(type_);
+        return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type.UncheckedConfig : result;
       }
       /**
        * required .ConfigCheck.Type type = 1;
        * @param value The type to set.
        * @return This builder for chaining.
        */
-      public Builder setType(akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type value) {
+      public Builder setType(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4400,8 +4400,8 @@ public final class ClusterMessages {
       public java.lang.String getClusterConfig() {
         java.lang.Object ref = clusterConfig_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             clusterConfig_ = s;
@@ -4415,17 +4415,17 @@ public final class ClusterMessages {
        * optional string clusterConfig = 2;
        * @return The bytes for clusterConfig.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getClusterConfigBytes() {
         java.lang.Object ref = clusterConfig_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           clusterConfig_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -4459,7 +4459,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder setClusterConfigBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -4470,13 +4470,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -4485,37 +4485,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ConfigCheck)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ConfigCheck parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ConfigCheck(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.ConfigCheck getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ConfigCheck getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4523,7 +4523,7 @@ public final class ClusterMessages {
 
   public interface HeartbeatOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Heartbeat)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Address from = 1;
@@ -4534,11 +4534,11 @@ public final class ClusterMessages {
      * required .Address from = 1;
      * @return The from.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.Address getFrom();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getFrom();
     /**
      * required .Address from = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getFromOrBuilder();
 
     /**
      * optional int64 sequenceNr = 2;
@@ -4573,12 +4573,12 @@ public final class ClusterMessages {
    * Protobuf type {@code Heartbeat}
    */
   public  static final class Heartbeat extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Heartbeat)
       HeartbeatOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Heartbeat.newBuilder() to construct.
-    private Heartbeat(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Heartbeat(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Heartbeat() {
@@ -4587,26 +4587,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Heartbeat();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Heartbeat(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4616,11 +4616,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.protobuf.msg.ClusterMessages.Address.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.Address.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -4647,32 +4647,32 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.Heartbeat.class, akka.cluster.protobuf.msg.ClusterMessages.Heartbeat.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.cluster.protobuf.msg.ClusterMessages.Address from_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address from_;
     /**
      * required .Address from = 1;
      * @return Whether the from field is set.
@@ -4684,14 +4684,14 @@ public final class ClusterMessages {
      * required .Address from = 1;
      * @return The from.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.Address getFrom() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getFrom() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
     }
     /**
      * required .Address from = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
     }
 
     public static final int SEQUENCENR_FIELD_NUMBER = 2;
@@ -4748,7 +4748,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
@@ -4769,15 +4769,15 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(2, sequenceNr_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSInt64Size(3, creationTime_);
       }
       size += unknownFields.getSerializedSize();
@@ -4790,10 +4790,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.Heartbeat)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.Heartbeat other = (akka.cluster.protobuf.msg.ClusterMessages.Heartbeat) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -4827,12 +4827,12 @@ public final class ClusterMessages {
       }
       if (hasSequenceNr()) {
         hash = (37 * hash) + SEQUENCENR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSequenceNr());
       }
       if (hasCreationTime()) {
         hash = (37 * hash) + CREATIONTIME_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getCreationTime());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -4840,73 +4840,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -4915,7 +4915,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.Heartbeat prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4926,7 +4926,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4941,34 +4941,34 @@ public final class ClusterMessages {
      * Protobuf type {@code Heartbeat}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Heartbeat)
-        akka.cluster.protobuf.msg.ClusterMessages.HeartbeatOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartbeatOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.Heartbeat.class, akka.cluster.protobuf.msg.ClusterMessages.Heartbeat.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.Heartbeat.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
         }
@@ -4990,19 +4990,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Heartbeat_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Heartbeat getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.Heartbeat.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Heartbeat build() {
-        akka.cluster.protobuf.msg.ClusterMessages.Heartbeat result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5010,8 +5010,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Heartbeat buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.Heartbeat result = new akka.cluster.protobuf.msg.ClusterMessages.Heartbeat(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5041,44 +5041,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.Heartbeat) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.Heartbeat)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Heartbeat other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.Heartbeat.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -5106,14 +5106,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.Heartbeat parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.Heartbeat) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5124,9 +5124,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.protobuf.msg.ClusterMessages.Address from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Address, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder, akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> fromBuilder_;
       /**
        * required .Address from = 1;
        * @return Whether the from field is set.
@@ -5138,9 +5138,9 @@ public final class ClusterMessages {
        * required .Address from = 1;
        * @return The from.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Address getFrom() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -5148,7 +5148,7 @@ public final class ClusterMessages {
       /**
        * required .Address from = 1;
        */
-      public Builder setFrom(akka.cluster.protobuf.msg.ClusterMessages.Address value) {
+      public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5165,7 +5165,7 @@ public final class ClusterMessages {
        * required .Address from = 1;
        */
       public Builder setFrom(
-          akka.cluster.protobuf.msg.ClusterMessages.Address.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -5178,13 +5178,13 @@ public final class ClusterMessages {
       /**
        * required .Address from = 1;
        */
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Address value) {
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
+              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
             from_ =
-              akka.cluster.protobuf.msg.ClusterMessages.Address.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -5211,7 +5211,7 @@ public final class ClusterMessages {
       /**
        * required .Address from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Address.Builder getFromBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -5219,23 +5219,23 @@ public final class ClusterMessages {
       /**
        * required .Address from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : from_;
         }
       }
       /**
        * required .Address from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Address, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder, akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.Address, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder, akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -5319,13 +5319,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -5334,37 +5334,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Heartbeat)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.Heartbeat DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.Heartbeat();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Heartbeat getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Heartbeat parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Heartbeat(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.Heartbeat getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Heartbeat getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5372,7 +5372,7 @@ public final class ClusterMessages {
 
   public interface HeartBeatResponseOrBuilder extends
       // @@protoc_insertion_point(interface_extends:HeartBeatResponse)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress from = 1;
@@ -5383,11 +5383,11 @@ public final class ClusterMessages {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom();
     /**
      * required .UniqueAddress from = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder();
 
     /**
      * optional int64 sequenceNr = 2;
@@ -5422,12 +5422,12 @@ public final class ClusterMessages {
    * Protobuf type {@code HeartBeatResponse}
    */
   public  static final class HeartBeatResponse extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:HeartBeatResponse)
       HeartBeatResponseOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use HeartBeatResponse.newBuilder() to construct.
-    private HeartBeatResponse(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private HeartBeatResponse(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private HeartBeatResponse() {
@@ -5436,26 +5436,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new HeartBeatResponse();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private HeartBeatResponse(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5465,11 +5465,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -5496,32 +5496,32 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.class, akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
     /**
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
@@ -5533,14 +5533,14 @@ public final class ClusterMessages {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int SEQUENCENR_FIELD_NUMBER = 2;
@@ -5597,7 +5597,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
@@ -5618,15 +5618,15 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(2, sequenceNr_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, creationTime_);
       }
       size += unknownFields.getSerializedSize();
@@ -5639,10 +5639,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse other = (akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -5676,12 +5676,12 @@ public final class ClusterMessages {
       }
       if (hasSequenceNr()) {
         hash = (37 * hash) + SEQUENCENR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSequenceNr());
       }
       if (hasCreationTime()) {
         hash = (37 * hash) + CREATIONTIME_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getCreationTime());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -5689,73 +5689,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5764,7 +5764,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5775,7 +5775,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5790,34 +5790,34 @@ public final class ClusterMessages {
      * Protobuf type {@code HeartBeatResponse}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:HeartBeatResponse)
-        akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponseOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponseOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.class, akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
         }
@@ -5839,19 +5839,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_HeartBeatResponse_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse build() {
-        akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5859,8 +5859,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse result = new akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5890,44 +5890,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -5955,14 +5955,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5973,9 +5973,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> fromBuilder_;
       /**
        * required .UniqueAddress from = 1;
        * @return Whether the from field is set.
@@ -5987,9 +5987,9 @@ public final class ClusterMessages {
        * required .UniqueAddress from = 1;
        * @return The from.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -5997,7 +5997,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder setFrom(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6014,7 +6014,7 @@ public final class ClusterMessages {
        * required .UniqueAddress from = 1;
        */
       public Builder setFrom(
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -6027,13 +6027,13 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
             from_ =
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -6060,7 +6060,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getFromBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -6068,23 +6068,23 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
         }
       }
       /**
        * required .UniqueAddress from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -6168,13 +6168,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -6183,37 +6183,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:HeartBeatResponse)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public HeartBeatResponse parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new HeartBeatResponse(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.HeartBeatResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6221,7 +6221,7 @@ public final class ClusterMessages {
 
   public interface GossipEnvelopeOrBuilder extends
       // @@protoc_insertion_point(interface_extends:GossipEnvelope)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress from = 1;
@@ -6232,11 +6232,11 @@ public final class ClusterMessages {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom();
     /**
      * required .UniqueAddress from = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder();
 
     /**
      * required .UniqueAddress to = 2;
@@ -6247,11 +6247,11 @@ public final class ClusterMessages {
      * required .UniqueAddress to = 2;
      * @return The to.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getTo();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getTo();
     /**
      * required .UniqueAddress to = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getToOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getToOrBuilder();
 
     /**
      * required bytes serializedGossip = 3;
@@ -6262,7 +6262,7 @@ public final class ClusterMessages {
      * required bytes serializedGossip = 3;
      * @return The serializedGossip.
      */
-    akka.protobufv3.internal.ByteString getSerializedGossip();
+    org.apache.pekko.protobufv3.internal.ByteString getSerializedGossip();
   }
   /**
    * 
    @@ -6273,41 +6273,41 @@ public final class ClusterMessages {
    * Protobuf type {@code GossipEnvelope}
    */
   public  static final class GossipEnvelope extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:GossipEnvelope)
       GossipEnvelopeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use GossipEnvelope.newBuilder() to construct.
-    private GossipEnvelope(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private GossipEnvelope(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private GossipEnvelope() {
-      serializedGossip_ = akka.protobufv3.internal.ByteString.EMPTY;
+      serializedGossip_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new GossipEnvelope();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private GossipEnvelope(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6317,11 +6317,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -6330,11 +6330,11 @@ public final class ClusterMessages {
               break;
             }
             case 18: {
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = to_.toBuilder();
               }
-              to_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
+              to_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(to_);
                 to_ = subBuilder.buildPartial();
@@ -6356,32 +6356,32 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.class, akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
     /**
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
@@ -6393,18 +6393,18 @@ public final class ClusterMessages {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int TO_FIELD_NUMBER = 2;
-    private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress to_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress to_;
     /**
      * required .UniqueAddress to = 2;
      * @return Whether the to field is set.
@@ -6416,18 +6416,18 @@ public final class ClusterMessages {
      * required .UniqueAddress to = 2;
      * @return The to.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getTo() {
-      return to_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getTo() {
+      return to_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
     }
     /**
      * required .UniqueAddress to = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getToOrBuilder() {
-      return to_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getToOrBuilder() {
+      return to_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
     }
 
     public static final int SERIALIZEDGOSSIP_FIELD_NUMBER = 3;
-    private akka.protobufv3.internal.ByteString serializedGossip_;
+    private org.apache.pekko.protobufv3.internal.ByteString serializedGossip_;
     /**
      * required bytes serializedGossip = 3;
      * @return Whether the serializedGossip field is set.
@@ -6439,7 +6439,7 @@ public final class ClusterMessages {
      * required bytes serializedGossip = 3;
      * @return The serializedGossip.
      */
-    public akka.protobufv3.internal.ByteString getSerializedGossip() {
+    public org.apache.pekko.protobufv3.internal.ByteString getSerializedGossip() {
       return serializedGossip_;
     }
 
@@ -6475,7 +6475,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
@@ -6496,15 +6496,15 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getTo());
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, serializedGossip_);
       }
       size += unknownFields.getSerializedSize();
@@ -6517,10 +6517,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope other = (akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -6565,73 +6565,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -6640,7 +6640,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6651,7 +6651,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -6664,34 +6664,34 @@ public final class ClusterMessages {
      * Protobuf type {@code GossipEnvelope}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:GossipEnvelope)
-        akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelopeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelopeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.class, akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
           getToFieldBuilder();
@@ -6712,25 +6712,25 @@ public final class ClusterMessages {
           toBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000002);
-        serializedGossip_ = akka.protobufv3.internal.ByteString.EMPTY;
+        serializedGossip_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipEnvelope_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope build() {
-        akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6738,8 +6738,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope result = new akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6773,44 +6773,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -6847,14 +6847,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6865,9 +6865,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> fromBuilder_;
       /**
        * required .UniqueAddress from = 1;
        * @return Whether the from field is set.
@@ -6879,9 +6879,9 @@ public final class ClusterMessages {
        * required .UniqueAddress from = 1;
        * @return The from.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -6889,7 +6889,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder setFrom(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6906,7 +6906,7 @@ public final class ClusterMessages {
        * required .UniqueAddress from = 1;
        */
       public Builder setFrom(
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -6919,13 +6919,13 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
             from_ =
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -6952,7 +6952,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getFromBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -6960,23 +6960,23 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
         }
       }
       /**
        * required .UniqueAddress from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -6985,9 +6985,9 @@ public final class ClusterMessages {
         return fromBuilder_;
       }
 
-      private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress to_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> toBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress to_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> toBuilder_;
       /**
        * required .UniqueAddress to = 2;
        * @return Whether the to field is set.
@@ -6999,9 +6999,9 @@ public final class ClusterMessages {
        * required .UniqueAddress to = 2;
        * @return The to.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getTo() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getTo() {
         if (toBuilder_ == null) {
-          return to_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
+          return to_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
         } else {
           return toBuilder_.getMessage();
         }
@@ -7009,7 +7009,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress to = 2;
        */
-      public Builder setTo(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder setTo(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (toBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7026,7 +7026,7 @@ public final class ClusterMessages {
        * required .UniqueAddress to = 2;
        */
       public Builder setTo(
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (toBuilder_ == null) {
           to_ = builderForValue.build();
           onChanged();
@@ -7039,13 +7039,13 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress to = 2;
        */
-      public Builder mergeTo(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder mergeTo(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (toBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               to_ != null &&
-              to_ != akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+              to_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
             to_ =
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(to_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(to_).mergeFrom(value).buildPartial();
           } else {
             to_ = value;
           }
@@ -7072,7 +7072,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress to = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getToBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getToBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getToFieldBuilder().getBuilder();
@@ -7080,23 +7080,23 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress to = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getToOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getToOrBuilder() {
         if (toBuilder_ != null) {
           return toBuilder_.getMessageOrBuilder();
         } else {
           return to_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : to_;
         }
       }
       /**
        * required .UniqueAddress to = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
           getToFieldBuilder() {
         if (toBuilder_ == null) {
-          toBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
+          toBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
                   getTo(),
                   getParentForChildren(),
                   isClean());
@@ -7105,7 +7105,7 @@ public final class ClusterMessages {
         return toBuilder_;
       }
 
-      private akka.protobufv3.internal.ByteString serializedGossip_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString serializedGossip_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes serializedGossip = 3;
        * @return Whether the serializedGossip field is set.
@@ -7117,7 +7117,7 @@ public final class ClusterMessages {
        * required bytes serializedGossip = 3;
        * @return The serializedGossip.
        */
-      public akka.protobufv3.internal.ByteString getSerializedGossip() {
+      public org.apache.pekko.protobufv3.internal.ByteString getSerializedGossip() {
         return serializedGossip_;
       }
       /**
@@ -7125,7 +7125,7 @@ public final class ClusterMessages {
        * @param value The serializedGossip to set.
        * @return This builder for chaining.
        */
-      public Builder setSerializedGossip(akka.protobufv3.internal.ByteString value) {
+      public Builder setSerializedGossip(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7146,13 +7146,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -7161,37 +7161,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:GossipEnvelope)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public GossipEnvelope parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new GossipEnvelope(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.GossipEnvelope getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipEnvelope getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7199,7 +7199,7 @@ public final class ClusterMessages {
 
   public interface GossipStatusOrBuilder extends
       // @@protoc_insertion_point(interface_extends:GossipStatus)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress from = 1;
@@ -7210,11 +7210,11 @@ public final class ClusterMessages {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom();
     /**
      * required .UniqueAddress from = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder();
 
     /**
      * repeated string allHashes = 2;
@@ -7238,7 +7238,7 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allHashes at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getAllHashesBytes(int index);
 
     /**
@@ -7250,11 +7250,11 @@ public final class ClusterMessages {
      * required .VectorClock version = 3;
      * @return The version.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion();
     /**
      * required .VectorClock version = 3;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder();
 
     /**
      * optional bytes seenDigest = 4;
@@ -7265,7 +7265,7 @@ public final class ClusterMessages {
      * optional bytes seenDigest = 4;
      * @return The seenDigest.
      */
-    akka.protobufv3.internal.ByteString getSeenDigest();
+    org.apache.pekko.protobufv3.internal.ByteString getSeenDigest();
   }
   /**
    * 
    @@ -7276,42 +7276,42 @@ public final class ClusterMessages {
    * Protobuf type {@code GossipStatus}
    */
   public  static final class GossipStatus extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:GossipStatus)
       GossipStatusOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use GossipStatus.newBuilder() to construct.
-    private GossipStatus(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private GossipStatus(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private GossipStatus() {
-      allHashes_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
-      seenDigest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      seenDigest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new GossipStatus();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private GossipStatus(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7321,11 +7321,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -7334,20 +7334,20 @@ public final class ClusterMessages {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                allHashes_ = new akka.protobufv3.internal.LazyStringArrayList();
+                allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               allHashes_.add(bs);
               break;
             }
             case 26: {
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = version_.toBuilder();
               }
-              version_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.VectorClock.PARSER, extensionRegistry);
+              version_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(version_);
                 version_ = subBuilder.buildPartial();
@@ -7369,10 +7369,10 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -7382,22 +7382,22 @@ public final class ClusterMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.GossipStatus.class, akka.cluster.protobuf.msg.ClusterMessages.GossipStatus.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
     /**
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
@@ -7409,23 +7409,23 @@ public final class ClusterMessages {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int ALLHASHES_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList allHashes_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_;
     /**
      * repeated string allHashes = 2;
      * @return A list containing the allHashes.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getAllHashesList() {
       return allHashes_;
     }
@@ -7449,13 +7449,13 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allHashes at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getAllHashesBytes(int index) {
       return allHashes_.getByteString(index);
     }
 
     public static final int VERSION_FIELD_NUMBER = 3;
-    private akka.cluster.protobuf.msg.ClusterMessages.VectorClock version_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock version_;
     /**
      * required .VectorClock version = 3;
      * @return Whether the version field is set.
@@ -7467,18 +7467,18 @@ public final class ClusterMessages {
      * required .VectorClock version = 3;
      * @return The version.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
-      return version_ == null ? akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
+      return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
     }
     /**
      * required .VectorClock version = 3;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
-      return version_ == null ? akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
+      return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
     }
 
     public static final int SEENDIGEST_FIELD_NUMBER = 4;
-    private akka.protobufv3.internal.ByteString seenDigest_;
+    private org.apache.pekko.protobufv3.internal.ByteString seenDigest_;
     /**
      * optional bytes seenDigest = 4;
      * @return Whether the seenDigest field is set.
@@ -7490,7 +7490,7 @@ public final class ClusterMessages {
      * optional bytes seenDigest = 4;
      * @return The seenDigest.
      */
-    public akka.protobufv3.internal.ByteString getSeenDigest() {
+    public org.apache.pekko.protobufv3.internal.ByteString getSeenDigest() {
       return seenDigest_;
     }
 
@@ -7522,13 +7522,13 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
       }
       for (int i = 0; i < allHashes_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, allHashes_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, allHashes_.getRaw(i));
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(3, getVersion());
@@ -7546,7 +7546,7 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       {
@@ -7558,11 +7558,11 @@ public final class ClusterMessages {
         size += 1 * getAllHashesList().size();
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getVersion());
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(4, seenDigest_);
       }
       size += unknownFields.getSerializedSize();
@@ -7575,10 +7575,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.GossipStatus)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.GossipStatus other = (akka.cluster.protobuf.msg.ClusterMessages.GossipStatus) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -7629,73 +7629,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -7704,7 +7704,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.GossipStatus prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7715,7 +7715,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -7728,34 +7728,34 @@ public final class ClusterMessages {
      * Protobuf type {@code GossipStatus}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:GossipStatus)
-        akka.cluster.protobuf.msg.ClusterMessages.GossipStatusOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatusOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.GossipStatus.class, akka.cluster.protobuf.msg.ClusterMessages.GossipStatus.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.GossipStatus.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
           getVersionFieldBuilder();
@@ -7770,7 +7770,7 @@ public final class ClusterMessages {
           fromBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
-        allHashes_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         if (versionBuilder_ == null) {
           version_ = null;
@@ -7778,25 +7778,25 @@ public final class ClusterMessages {
           versionBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
-        seenDigest_ = akka.protobufv3.internal.ByteString.EMPTY;
+        seenDigest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipStatus_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipStatus getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.GossipStatus.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipStatus build() {
-        akka.cluster.protobuf.msg.ClusterMessages.GossipStatus result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7804,8 +7804,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipStatus buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.GossipStatus result = new akka.cluster.protobuf.msg.ClusterMessages.GossipStatus(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7844,44 +7844,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.GossipStatus) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.GossipStatus)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.GossipStatus other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.GossipStatus.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -7925,14 +7925,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.GossipStatus parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.GossipStatus) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7943,9 +7943,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> fromBuilder_;
       /**
        * required .UniqueAddress from = 1;
        * @return Whether the from field is set.
@@ -7957,9 +7957,9 @@ public final class ClusterMessages {
        * required .UniqueAddress from = 1;
        * @return The from.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -7967,7 +7967,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder setFrom(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder setFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7984,7 +7984,7 @@ public final class ClusterMessages {
        * required .UniqueAddress from = 1;
        */
       public Builder setFrom(
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -7997,13 +7997,13 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
+              from_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) {
             from_ =
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -8030,7 +8030,7 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getFromBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -8038,23 +8038,23 @@ public final class ClusterMessages {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance() : from_;
         }
       }
       /**
        * required .UniqueAddress from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -8063,10 +8063,10 @@ public final class ClusterMessages {
         return fromBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList allHashes_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureAllHashesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          allHashes_ = new akka.protobufv3.internal.LazyStringArrayList(allHashes_);
+          allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allHashes_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -8074,7 +8074,7 @@ public final class ClusterMessages {
        * repeated string allHashes = 2;
        * @return A list containing the allHashes.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAllHashesList() {
         return allHashes_.getUnmodifiableView();
       }
@@ -8098,7 +8098,7 @@ public final class ClusterMessages {
        * @param index The index of the value to return.
        * @return The bytes of the allHashes at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getAllHashesBytes(int index) {
         return allHashes_.getByteString(index);
       }
@@ -8141,7 +8141,7 @@ public final class ClusterMessages {
       public Builder addAllAllHashes(
           java.lang.Iterable values) {
         ensureAllHashesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, allHashes_);
         onChanged();
         return this;
@@ -8151,7 +8151,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllHashes() {
-        allHashes_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -8162,7 +8162,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder addAllHashesBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8172,9 +8172,9 @@ public final class ClusterMessages {
         return this;
       }
 
-      private akka.cluster.protobuf.msg.ClusterMessages.VectorClock version_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder> versionBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock version_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder> versionBuilder_;
       /**
        * required .VectorClock version = 3;
        * @return Whether the version field is set.
@@ -8186,9 +8186,9 @@ public final class ClusterMessages {
        * required .VectorClock version = 3;
        * @return The version.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
         if (versionBuilder_ == null) {
-          return version_ == null ? akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
+          return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
         } else {
           return versionBuilder_.getMessage();
         }
@@ -8196,7 +8196,7 @@ public final class ClusterMessages {
       /**
        * required .VectorClock version = 3;
        */
-      public Builder setVersion(akka.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
+      public Builder setVersion(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
         if (versionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8213,7 +8213,7 @@ public final class ClusterMessages {
        * required .VectorClock version = 3;
        */
       public Builder setVersion(
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder builderForValue) {
         if (versionBuilder_ == null) {
           version_ = builderForValue.build();
           onChanged();
@@ -8226,13 +8226,13 @@ public final class ClusterMessages {
       /**
        * required .VectorClock version = 3;
        */
-      public Builder mergeVersion(akka.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
+      public Builder mergeVersion(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
         if (versionBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
               version_ != null &&
-              version_ != akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) {
+              version_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) {
             version_ =
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock.newBuilder(version_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.newBuilder(version_).mergeFrom(value).buildPartial();
           } else {
             version_ = value;
           }
@@ -8259,7 +8259,7 @@ public final class ClusterMessages {
       /**
        * required .VectorClock version = 3;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder getVersionBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder getVersionBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getVersionFieldBuilder().getBuilder();
@@ -8267,23 +8267,23 @@ public final class ClusterMessages {
       /**
        * required .VectorClock version = 3;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
         if (versionBuilder_ != null) {
           return versionBuilder_.getMessageOrBuilder();
         } else {
           return version_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
         }
       }
       /**
        * required .VectorClock version = 3;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder> 
           getVersionFieldBuilder() {
         if (versionBuilder_ == null) {
-          versionBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder>(
+          versionBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder>(
                   getVersion(),
                   getParentForChildren(),
                   isClean());
@@ -8292,7 +8292,7 @@ public final class ClusterMessages {
         return versionBuilder_;
       }
 
-      private akka.protobufv3.internal.ByteString seenDigest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString seenDigest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * optional bytes seenDigest = 4;
        * @return Whether the seenDigest field is set.
@@ -8304,7 +8304,7 @@ public final class ClusterMessages {
        * optional bytes seenDigest = 4;
        * @return The seenDigest.
        */
-      public akka.protobufv3.internal.ByteString getSeenDigest() {
+      public org.apache.pekko.protobufv3.internal.ByteString getSeenDigest() {
         return seenDigest_;
       }
       /**
@@ -8312,7 +8312,7 @@ public final class ClusterMessages {
        * @param value The seenDigest to set.
        * @return This builder for chaining.
        */
-      public Builder setSeenDigest(akka.protobufv3.internal.ByteString value) {
+      public Builder setSeenDigest(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8333,13 +8333,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -8348,37 +8348,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:GossipStatus)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.GossipStatus DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.GossipStatus();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipStatus getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public GossipStatus parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new GossipStatus(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.GossipStatus getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipStatus getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8386,17 +8386,17 @@ public final class ClusterMessages {
 
   public interface GossipOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Gossip)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
-    java.util.List 
+    java.util.List 
         getAllAddressesList();
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getAllAddresses(int index);
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getAllAddresses(int index);
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
@@ -8404,12 +8404,12 @@ public final class ClusterMessages {
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
-    java.util.List 
+    java.util.List 
         getAllAddressesOrBuilderList();
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getAllAddressesOrBuilder(
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getAllAddressesOrBuilder(
         int index);
 
     /**
@@ -8434,7 +8434,7 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allRoles at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getAllRolesBytes(int index);
 
     /**
@@ -8459,18 +8459,18 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allHashes at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getAllHashesBytes(int index);
 
     /**
      * repeated .Member members = 4;
      */
-    java.util.List 
+    java.util.List 
         getMembersList();
     /**
      * repeated .Member members = 4;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.Member getMembers(int index);
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member getMembers(int index);
     /**
      * repeated .Member members = 4;
      */
@@ -8478,12 +8478,12 @@ public final class ClusterMessages {
     /**
      * repeated .Member members = 4;
      */
-    java.util.List 
+    java.util.List 
         getMembersOrBuilderList();
     /**
      * repeated .Member members = 4;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder getMembersOrBuilder(
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder getMembersOrBuilder(
         int index);
 
     /**
@@ -8495,11 +8495,11 @@ public final class ClusterMessages {
      * required .GossipOverview overview = 5;
      * @return The overview.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.GossipOverview getOverview();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview getOverview();
     /**
      * required .GossipOverview overview = 5;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder getOverviewOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder getOverviewOrBuilder();
 
     /**
      * required .VectorClock version = 6;
@@ -8510,21 +8510,21 @@ public final class ClusterMessages {
      * required .VectorClock version = 6;
      * @return The version.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion();
     /**
      * required .VectorClock version = 6;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder();
 
     /**
      * repeated .Tombstone tombstones = 7;
      */
-    java.util.List 
+    java.util.List 
         getTombstonesList();
     /**
      * repeated .Tombstone tombstones = 7;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.Tombstone getTombstones(int index);
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone getTombstones(int index);
     /**
      * repeated .Tombstone tombstones = 7;
      */
@@ -8532,12 +8532,12 @@ public final class ClusterMessages {
     /**
      * repeated .Tombstone tombstones = 7;
      */
-    java.util.List 
+    java.util.List 
         getTombstonesOrBuilderList();
     /**
      * repeated .Tombstone tombstones = 7;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder getTombstonesOrBuilder(
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder getTombstonesOrBuilder(
         int index);
 
     /**
@@ -8562,7 +8562,7 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allAppVersions at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getAllAppVersionsBytes(int index);
   }
   /**
@@ -8574,46 +8574,46 @@ public final class ClusterMessages {
    * Protobuf type {@code Gossip}
    */
   public  static final class Gossip extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Gossip)
       GossipOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Gossip.newBuilder() to construct.
-    private Gossip(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Gossip(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Gossip() {
       allAddresses_ = java.util.Collections.emptyList();
-      allRoles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
-      allHashes_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       members_ = java.util.Collections.emptyList();
       tombstones_ = java.util.Collections.emptyList();
-      allAppVersions_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Gossip();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Gossip(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8624,26 +8624,26 @@ public final class ClusterMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                allAddresses_ = new java.util.ArrayList();
+                allAddresses_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               allAddresses_.add(
-                  input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.PARSER, extensionRegistry));
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                allRoles_ = new akka.protobufv3.internal.LazyStringArrayList();
+                allRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               allRoles_.add(bs);
               break;
             }
             case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                allHashes_ = new akka.protobufv3.internal.LazyStringArrayList();
+                allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               allHashes_.add(bs);
@@ -8651,19 +8651,19 @@ public final class ClusterMessages {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                members_ = new java.util.ArrayList();
+                members_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
               members_.add(
-                  input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.Member.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.PARSER, extensionRegistry));
               break;
             }
             case 42: {
-              akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = overview_.toBuilder();
               }
-              overview_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.PARSER, extensionRegistry);
+              overview_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(overview_);
                 overview_ = subBuilder.buildPartial();
@@ -8672,11 +8672,11 @@ public final class ClusterMessages {
               break;
             }
             case 50: {
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = version_.toBuilder();
               }
-              version_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.VectorClock.PARSER, extensionRegistry);
+              version_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(version_);
                 version_ = subBuilder.buildPartial();
@@ -8686,17 +8686,17 @@ public final class ClusterMessages {
             }
             case 58: {
               if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                tombstones_ = new java.util.ArrayList();
+                tombstones_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000040;
               }
               tombstones_.add(
-                  input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.Tombstone.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.PARSER, extensionRegistry));
               break;
             }
             case 66: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000080) != 0)) {
-                allAppVersions_ = new akka.protobufv3.internal.LazyStringArrayList();
+                allAppVersions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
               allAppVersions_.add(bs);
@@ -8711,10 +8711,10 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -8739,32 +8739,32 @@ public final class ClusterMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.Gossip.class, akka.cluster.protobuf.msg.ClusterMessages.Gossip.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder.class);
     }
 
     private int bitField0_;
     public static final int ALLADDRESSES_FIELD_NUMBER = 1;
-    private java.util.List allAddresses_;
+    private java.util.List allAddresses_;
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
-    public java.util.List getAllAddressesList() {
+    public java.util.List getAllAddressesList() {
       return allAddresses_;
     }
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getAllAddressesOrBuilderList() {
       return allAddresses_;
     }
@@ -8777,24 +8777,24 @@ public final class ClusterMessages {
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getAllAddresses(int index) {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getAllAddresses(int index) {
       return allAddresses_.get(index);
     }
     /**
      * repeated .UniqueAddress allAddresses = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getAllAddressesOrBuilder(
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getAllAddressesOrBuilder(
         int index) {
       return allAddresses_.get(index);
     }
 
     public static final int ALLROLES_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList allRoles_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList allRoles_;
     /**
      * repeated string allRoles = 2;
      * @return A list containing the allRoles.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getAllRolesList() {
       return allRoles_;
     }
@@ -8818,18 +8818,18 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allRoles at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getAllRolesBytes(int index) {
       return allRoles_.getByteString(index);
     }
 
     public static final int ALLHASHES_FIELD_NUMBER = 3;
-    private akka.protobufv3.internal.LazyStringList allHashes_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_;
     /**
      * repeated string allHashes = 3;
      * @return A list containing the allHashes.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getAllHashesList() {
       return allHashes_;
     }
@@ -8853,23 +8853,23 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allHashes at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getAllHashesBytes(int index) {
       return allHashes_.getByteString(index);
     }
 
     public static final int MEMBERS_FIELD_NUMBER = 4;
-    private java.util.List members_;
+    private java.util.List members_;
     /**
      * repeated .Member members = 4;
      */
-    public java.util.List getMembersList() {
+    public java.util.List getMembersList() {
       return members_;
     }
     /**
      * repeated .Member members = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getMembersOrBuilderList() {
       return members_;
     }
@@ -8882,19 +8882,19 @@ public final class ClusterMessages {
     /**
      * repeated .Member members = 4;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.Member getMembers(int index) {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member getMembers(int index) {
       return members_.get(index);
     }
     /**
      * repeated .Member members = 4;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder getMembersOrBuilder(
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder getMembersOrBuilder(
         int index) {
       return members_.get(index);
     }
 
     public static final int OVERVIEW_FIELD_NUMBER = 5;
-    private akka.cluster.protobuf.msg.ClusterMessages.GossipOverview overview_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview overview_;
     /**
      * required .GossipOverview overview = 5;
      * @return Whether the overview field is set.
@@ -8906,18 +8906,18 @@ public final class ClusterMessages {
      * required .GossipOverview overview = 5;
      * @return The overview.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.GossipOverview getOverview() {
-      return overview_ == null ? akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview getOverview() {
+      return overview_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
     }
     /**
      * required .GossipOverview overview = 5;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder getOverviewOrBuilder() {
-      return overview_ == null ? akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder getOverviewOrBuilder() {
+      return overview_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
     }
 
     public static final int VERSION_FIELD_NUMBER = 6;
-    private akka.cluster.protobuf.msg.ClusterMessages.VectorClock version_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock version_;
     /**
      * required .VectorClock version = 6;
      * @return Whether the version field is set.
@@ -8929,28 +8929,28 @@ public final class ClusterMessages {
      * required .VectorClock version = 6;
      * @return The version.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
-      return version_ == null ? akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
+      return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
     }
     /**
      * required .VectorClock version = 6;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
-      return version_ == null ? akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
+      return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
     }
 
     public static final int TOMBSTONES_FIELD_NUMBER = 7;
-    private java.util.List tombstones_;
+    private java.util.List tombstones_;
     /**
      * repeated .Tombstone tombstones = 7;
      */
-    public java.util.List getTombstonesList() {
+    public java.util.List getTombstonesList() {
       return tombstones_;
     }
     /**
      * repeated .Tombstone tombstones = 7;
      */
-    public java.util.List 
+    public java.util.List 
         getTombstonesOrBuilderList() {
       return tombstones_;
     }
@@ -8963,24 +8963,24 @@ public final class ClusterMessages {
     /**
      * repeated .Tombstone tombstones = 7;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.Tombstone getTombstones(int index) {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone getTombstones(int index) {
       return tombstones_.get(index);
     }
     /**
      * repeated .Tombstone tombstones = 7;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder getTombstonesOrBuilder(
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder getTombstonesOrBuilder(
         int index) {
       return tombstones_.get(index);
     }
 
     public static final int ALLAPPVERSIONS_FIELD_NUMBER = 8;
-    private akka.protobufv3.internal.LazyStringList allAppVersions_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList allAppVersions_;
     /**
      * repeated string allAppVersions = 8;
      * @return A list containing the allAppVersions.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getAllAppVersionsList() {
       return allAppVersions_;
     }
@@ -9004,7 +9004,7 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the allAppVersions at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getAllAppVersionsBytes(int index) {
       return allAppVersions_.getByteString(index);
     }
@@ -9055,16 +9055,16 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < allAddresses_.size(); i++) {
         output.writeMessage(1, allAddresses_.get(i));
       }
       for (int i = 0; i < allRoles_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, allRoles_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, allRoles_.getRaw(i));
       }
       for (int i = 0; i < allHashes_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, allHashes_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, allHashes_.getRaw(i));
       }
       for (int i = 0; i < members_.size(); i++) {
         output.writeMessage(4, members_.get(i));
@@ -9079,7 +9079,7 @@ public final class ClusterMessages {
         output.writeMessage(7, tombstones_.get(i));
       }
       for (int i = 0; i < allAppVersions_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 8, allAppVersions_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 8, allAppVersions_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -9091,7 +9091,7 @@ public final class ClusterMessages {
 
       size = 0;
       for (int i = 0; i < allAddresses_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, allAddresses_.get(i));
       }
       {
@@ -9111,19 +9111,19 @@ public final class ClusterMessages {
         size += 1 * getAllHashesList().size();
       }
       for (int i = 0; i < members_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, members_.get(i));
       }
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(5, getOverview());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(6, getVersion());
       }
       for (int i = 0; i < tombstones_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(7, tombstones_.get(i));
       }
       {
@@ -9144,10 +9144,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.Gossip)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.Gossip other = (akka.cluster.protobuf.msg.ClusterMessages.Gossip) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip) obj;
 
       if (!getAllAddressesList()
           .equals(other.getAllAddressesList())) return false;
@@ -9219,73 +9219,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -9294,7 +9294,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.Gossip prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -9305,7 +9305,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -9318,34 +9318,34 @@ public final class ClusterMessages {
      * Protobuf type {@code Gossip}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Gossip)
-        akka.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.Gossip.class, akka.cluster.protobuf.msg.ClusterMessages.Gossip.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.Gossip.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAllAddressesFieldBuilder();
           getMembersFieldBuilder();
@@ -9363,9 +9363,9 @@ public final class ClusterMessages {
         } else {
           allAddressesBuilder_.clear();
         }
-        allRoles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
-        allHashes_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (membersBuilder_ == null) {
           members_ = java.util.Collections.emptyList();
@@ -9391,25 +9391,25 @@ public final class ClusterMessages {
         } else {
           tombstonesBuilder_.clear();
         }
-        allAppVersions_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Gossip_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Gossip getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Gossip build() {
-        akka.cluster.protobuf.msg.ClusterMessages.Gossip result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9417,8 +9417,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Gossip buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.Gossip result = new akka.cluster.protobuf.msg.ClusterMessages.Gossip(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (allAddressesBuilder_ == null) {
@@ -9490,44 +9490,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.Gossip) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.Gossip)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Gossip other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip.getDefaultInstance()) return this;
         if (allAddressesBuilder_ == null) {
           if (!other.allAddresses_.isEmpty()) {
             if (allAddresses_.isEmpty()) {
@@ -9547,7 +9547,7 @@ public final class ClusterMessages {
               allAddresses_ = other.allAddresses_;
               bitField0_ = (bitField0_ & ~0x00000001);
               allAddressesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getAllAddressesFieldBuilder() : null;
             } else {
               allAddressesBuilder_.addAllMessages(other.allAddresses_);
@@ -9593,7 +9593,7 @@ public final class ClusterMessages {
               members_ = other.members_;
               bitField0_ = (bitField0_ & ~0x00000008);
               membersBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getMembersFieldBuilder() : null;
             } else {
               membersBuilder_.addAllMessages(other.members_);
@@ -9625,7 +9625,7 @@ public final class ClusterMessages {
               tombstones_ = other.tombstones_;
               bitField0_ = (bitField0_ & ~0x00000040);
               tombstonesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getTombstonesFieldBuilder() : null;
             } else {
               tombstonesBuilder_.addAllMessages(other.tombstones_);
@@ -9681,14 +9681,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.Gossip parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.Gossip) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -9699,22 +9699,22 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private java.util.List allAddresses_ =
+      private java.util.List allAddresses_ =
         java.util.Collections.emptyList();
       private void ensureAllAddressesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          allAddresses_ = new java.util.ArrayList(allAddresses_);
+          allAddresses_ = new java.util.ArrayList(allAddresses_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> allAddressesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> allAddressesBuilder_;
 
       /**
        * repeated .UniqueAddress allAddresses = 1;
        */
-      public java.util.List getAllAddressesList() {
+      public java.util.List getAllAddressesList() {
         if (allAddressesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(allAddresses_);
         } else {
@@ -9734,7 +9734,7 @@ public final class ClusterMessages {
       /**
        * repeated .UniqueAddress allAddresses = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getAllAddresses(int index) {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getAllAddresses(int index) {
         if (allAddressesBuilder_ == null) {
           return allAddresses_.get(index);
         } else {
@@ -9745,7 +9745,7 @@ public final class ClusterMessages {
        * repeated .UniqueAddress allAddresses = 1;
        */
       public Builder setAllAddresses(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (allAddressesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9762,7 +9762,7 @@ public final class ClusterMessages {
        * repeated .UniqueAddress allAddresses = 1;
        */
       public Builder setAllAddresses(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (allAddressesBuilder_ == null) {
           ensureAllAddressesIsMutable();
           allAddresses_.set(index, builderForValue.build());
@@ -9775,7 +9775,7 @@ public final class ClusterMessages {
       /**
        * repeated .UniqueAddress allAddresses = 1;
        */
-      public Builder addAllAddresses(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+      public Builder addAllAddresses(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (allAddressesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9792,7 +9792,7 @@ public final class ClusterMessages {
        * repeated .UniqueAddress allAddresses = 1;
        */
       public Builder addAllAddresses(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress value) {
         if (allAddressesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9809,7 +9809,7 @@ public final class ClusterMessages {
        * repeated .UniqueAddress allAddresses = 1;
        */
       public Builder addAllAddresses(
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (allAddressesBuilder_ == null) {
           ensureAllAddressesIsMutable();
           allAddresses_.add(builderForValue.build());
@@ -9823,7 +9823,7 @@ public final class ClusterMessages {
        * repeated .UniqueAddress allAddresses = 1;
        */
       public Builder addAllAddresses(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder builderForValue) {
         if (allAddressesBuilder_ == null) {
           ensureAllAddressesIsMutable();
           allAddresses_.add(index, builderForValue.build());
@@ -9837,10 +9837,10 @@ public final class ClusterMessages {
        * repeated .UniqueAddress allAddresses = 1;
        */
       public Builder addAllAllAddresses(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (allAddressesBuilder_ == null) {
           ensureAllAddressesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, allAddresses_);
           onChanged();
         } else {
@@ -9877,14 +9877,14 @@ public final class ClusterMessages {
       /**
        * repeated .UniqueAddress allAddresses = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getAllAddressesBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder getAllAddressesBuilder(
           int index) {
         return getAllAddressesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .UniqueAddress allAddresses = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getAllAddressesOrBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder getAllAddressesOrBuilder(
           int index) {
         if (allAddressesBuilder_ == null) {
           return allAddresses_.get(index);  } else {
@@ -9894,7 +9894,7 @@ public final class ClusterMessages {
       /**
        * repeated .UniqueAddress allAddresses = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getAllAddressesOrBuilderList() {
         if (allAddressesBuilder_ != null) {
           return allAddressesBuilder_.getMessageOrBuilderList();
@@ -9905,31 +9905,31 @@ public final class ClusterMessages {
       /**
        * repeated .UniqueAddress allAddresses = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder addAllAddressesBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder addAllAddressesBuilder() {
         return getAllAddressesFieldBuilder().addBuilder(
-            akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance());
+            org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance());
       }
       /**
        * repeated .UniqueAddress allAddresses = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder addAllAddressesBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder addAllAddressesBuilder(
           int index) {
         return getAllAddressesFieldBuilder().addBuilder(
-            index, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance());
+            index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance());
       }
       /**
        * repeated .UniqueAddress allAddresses = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getAllAddressesBuilderList() {
         return getAllAddressesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder> 
           getAllAddressesFieldBuilder() {
         if (allAddressesBuilder_ == null) {
-          allAddressesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
+          allAddressesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder>(
                   allAddresses_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -9939,10 +9939,10 @@ public final class ClusterMessages {
         return allAddressesBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList allRoles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureAllRolesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          allRoles_ = new akka.protobufv3.internal.LazyStringArrayList(allRoles_);
+          allRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allRoles_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -9950,7 +9950,7 @@ public final class ClusterMessages {
        * repeated string allRoles = 2;
        * @return A list containing the allRoles.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAllRolesList() {
         return allRoles_.getUnmodifiableView();
       }
@@ -9974,7 +9974,7 @@ public final class ClusterMessages {
        * @param index The index of the value to return.
        * @return The bytes of the allRoles at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getAllRolesBytes(int index) {
         return allRoles_.getByteString(index);
       }
@@ -10017,7 +10017,7 @@ public final class ClusterMessages {
       public Builder addAllAllRoles(
           java.lang.Iterable values) {
         ensureAllRolesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, allRoles_);
         onChanged();
         return this;
@@ -10027,7 +10027,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllRoles() {
-        allRoles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -10038,7 +10038,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder addAllRolesBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -10048,10 +10048,10 @@ public final class ClusterMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.LazyStringList allHashes_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureAllHashesIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          allHashes_ = new akka.protobufv3.internal.LazyStringArrayList(allHashes_);
+          allHashes_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allHashes_);
           bitField0_ |= 0x00000004;
          }
       }
@@ -10059,7 +10059,7 @@ public final class ClusterMessages {
        * repeated string allHashes = 3;
        * @return A list containing the allHashes.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAllHashesList() {
         return allHashes_.getUnmodifiableView();
       }
@@ -10083,7 +10083,7 @@ public final class ClusterMessages {
        * @param index The index of the value to return.
        * @return The bytes of the allHashes at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getAllHashesBytes(int index) {
         return allHashes_.getByteString(index);
       }
@@ -10126,7 +10126,7 @@ public final class ClusterMessages {
       public Builder addAllAllHashes(
           java.lang.Iterable values) {
         ensureAllHashesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, allHashes_);
         onChanged();
         return this;
@@ -10136,7 +10136,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllHashes() {
-        allHashes_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allHashes_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -10147,7 +10147,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder addAllHashesBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -10157,22 +10157,22 @@ public final class ClusterMessages {
         return this;
       }
 
-      private java.util.List members_ =
+      private java.util.List members_ =
         java.util.Collections.emptyList();
       private void ensureMembersIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          members_ = new java.util.ArrayList(members_);
+          members_ = new java.util.ArrayList(members_);
           bitField0_ |= 0x00000008;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Member, akka.cluster.protobuf.msg.ClusterMessages.Member.Builder, akka.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder> membersBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder> membersBuilder_;
 
       /**
        * repeated .Member members = 4;
        */
-      public java.util.List getMembersList() {
+      public java.util.List getMembersList() {
         if (membersBuilder_ == null) {
           return java.util.Collections.unmodifiableList(members_);
         } else {
@@ -10192,7 +10192,7 @@ public final class ClusterMessages {
       /**
        * repeated .Member members = 4;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Member getMembers(int index) {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member getMembers(int index) {
         if (membersBuilder_ == null) {
           return members_.get(index);
         } else {
@@ -10203,7 +10203,7 @@ public final class ClusterMessages {
        * repeated .Member members = 4;
        */
       public Builder setMembers(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.Member value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member value) {
         if (membersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10220,7 +10220,7 @@ public final class ClusterMessages {
        * repeated .Member members = 4;
        */
       public Builder setMembers(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.Member.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder builderForValue) {
         if (membersBuilder_ == null) {
           ensureMembersIsMutable();
           members_.set(index, builderForValue.build());
@@ -10233,7 +10233,7 @@ public final class ClusterMessages {
       /**
        * repeated .Member members = 4;
        */
-      public Builder addMembers(akka.cluster.protobuf.msg.ClusterMessages.Member value) {
+      public Builder addMembers(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member value) {
         if (membersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10250,7 +10250,7 @@ public final class ClusterMessages {
        * repeated .Member members = 4;
        */
       public Builder addMembers(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.Member value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member value) {
         if (membersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10267,7 +10267,7 @@ public final class ClusterMessages {
        * repeated .Member members = 4;
        */
       public Builder addMembers(
-          akka.cluster.protobuf.msg.ClusterMessages.Member.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder builderForValue) {
         if (membersBuilder_ == null) {
           ensureMembersIsMutable();
           members_.add(builderForValue.build());
@@ -10281,7 +10281,7 @@ public final class ClusterMessages {
        * repeated .Member members = 4;
        */
       public Builder addMembers(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.Member.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder builderForValue) {
         if (membersBuilder_ == null) {
           ensureMembersIsMutable();
           members_.add(index, builderForValue.build());
@@ -10295,10 +10295,10 @@ public final class ClusterMessages {
        * repeated .Member members = 4;
        */
       public Builder addAllMembers(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (membersBuilder_ == null) {
           ensureMembersIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, members_);
           onChanged();
         } else {
@@ -10335,14 +10335,14 @@ public final class ClusterMessages {
       /**
        * repeated .Member members = 4;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Member.Builder getMembersBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder getMembersBuilder(
           int index) {
         return getMembersFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Member members = 4;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder getMembersOrBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder getMembersOrBuilder(
           int index) {
         if (membersBuilder_ == null) {
           return members_.get(index);  } else {
@@ -10352,7 +10352,7 @@ public final class ClusterMessages {
       /**
        * repeated .Member members = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getMembersOrBuilderList() {
         if (membersBuilder_ != null) {
           return membersBuilder_.getMessageOrBuilderList();
@@ -10363,31 +10363,31 @@ public final class ClusterMessages {
       /**
        * repeated .Member members = 4;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Member.Builder addMembersBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder addMembersBuilder() {
         return getMembersFieldBuilder().addBuilder(
-            akka.cluster.protobuf.msg.ClusterMessages.Member.getDefaultInstance());
+            org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.getDefaultInstance());
       }
       /**
        * repeated .Member members = 4;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Member.Builder addMembersBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder addMembersBuilder(
           int index) {
         return getMembersFieldBuilder().addBuilder(
-            index, akka.cluster.protobuf.msg.ClusterMessages.Member.getDefaultInstance());
+            index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.getDefaultInstance());
       }
       /**
        * repeated .Member members = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getMembersBuilderList() {
         return getMembersFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Member, akka.cluster.protobuf.msg.ClusterMessages.Member.Builder, akka.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder> 
           getMembersFieldBuilder() {
         if (membersBuilder_ == null) {
-          membersBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.Member, akka.cluster.protobuf.msg.ClusterMessages.Member.Builder, akka.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder>(
+          membersBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder>(
                   members_,
                   ((bitField0_ & 0x00000008) != 0),
                   getParentForChildren(),
@@ -10397,9 +10397,9 @@ public final class ClusterMessages {
         return membersBuilder_;
       }
 
-      private akka.cluster.protobuf.msg.ClusterMessages.GossipOverview overview_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.GossipOverview, akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder, akka.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder> overviewBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview overview_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder> overviewBuilder_;
       /**
        * required .GossipOverview overview = 5;
        * @return Whether the overview field is set.
@@ -10411,9 +10411,9 @@ public final class ClusterMessages {
        * required .GossipOverview overview = 5;
        * @return The overview.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipOverview getOverview() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview getOverview() {
         if (overviewBuilder_ == null) {
-          return overview_ == null ? akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
+          return overview_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
         } else {
           return overviewBuilder_.getMessage();
         }
@@ -10421,7 +10421,7 @@ public final class ClusterMessages {
       /**
        * required .GossipOverview overview = 5;
        */
-      public Builder setOverview(akka.cluster.protobuf.msg.ClusterMessages.GossipOverview value) {
+      public Builder setOverview(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview value) {
         if (overviewBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10438,7 +10438,7 @@ public final class ClusterMessages {
        * required .GossipOverview overview = 5;
        */
       public Builder setOverview(
-          akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder builderForValue) {
         if (overviewBuilder_ == null) {
           overview_ = builderForValue.build();
           onChanged();
@@ -10451,13 +10451,13 @@ public final class ClusterMessages {
       /**
        * required .GossipOverview overview = 5;
        */
-      public Builder mergeOverview(akka.cluster.protobuf.msg.ClusterMessages.GossipOverview value) {
+      public Builder mergeOverview(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview value) {
         if (overviewBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
               overview_ != null &&
-              overview_ != akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance()) {
+              overview_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance()) {
             overview_ =
-              akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.newBuilder(overview_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.newBuilder(overview_).mergeFrom(value).buildPartial();
           } else {
             overview_ = value;
           }
@@ -10484,7 +10484,7 @@ public final class ClusterMessages {
       /**
        * required .GossipOverview overview = 5;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder getOverviewBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder getOverviewBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getOverviewFieldBuilder().getBuilder();
@@ -10492,23 +10492,23 @@ public final class ClusterMessages {
       /**
        * required .GossipOverview overview = 5;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder getOverviewOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder getOverviewOrBuilder() {
         if (overviewBuilder_ != null) {
           return overviewBuilder_.getMessageOrBuilder();
         } else {
           return overview_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance() : overview_;
         }
       }
       /**
        * required .GossipOverview overview = 5;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.GossipOverview, akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder, akka.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder> 
           getOverviewFieldBuilder() {
         if (overviewBuilder_ == null) {
-          overviewBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.GossipOverview, akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder, akka.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder>(
+          overviewBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder>(
                   getOverview(),
                   getParentForChildren(),
                   isClean());
@@ -10517,9 +10517,9 @@ public final class ClusterMessages {
         return overviewBuilder_;
       }
 
-      private akka.cluster.protobuf.msg.ClusterMessages.VectorClock version_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder> versionBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock version_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder> versionBuilder_;
       /**
        * required .VectorClock version = 6;
        * @return Whether the version field is set.
@@ -10531,9 +10531,9 @@ public final class ClusterMessages {
        * required .VectorClock version = 6;
        * @return The version.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getVersion() {
         if (versionBuilder_ == null) {
-          return version_ == null ? akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
+          return version_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
         } else {
           return versionBuilder_.getMessage();
         }
@@ -10541,7 +10541,7 @@ public final class ClusterMessages {
       /**
        * required .VectorClock version = 6;
        */
-      public Builder setVersion(akka.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
+      public Builder setVersion(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
         if (versionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10558,7 +10558,7 @@ public final class ClusterMessages {
        * required .VectorClock version = 6;
        */
       public Builder setVersion(
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder builderForValue) {
         if (versionBuilder_ == null) {
           version_ = builderForValue.build();
           onChanged();
@@ -10571,13 +10571,13 @@ public final class ClusterMessages {
       /**
        * required .VectorClock version = 6;
        */
-      public Builder mergeVersion(akka.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
+      public Builder mergeVersion(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock value) {
         if (versionBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0) &&
               version_ != null &&
-              version_ != akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) {
+              version_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) {
             version_ =
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock.newBuilder(version_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.newBuilder(version_).mergeFrom(value).buildPartial();
           } else {
             version_ = value;
           }
@@ -10604,7 +10604,7 @@ public final class ClusterMessages {
       /**
        * required .VectorClock version = 6;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder getVersionBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder getVersionBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
         return getVersionFieldBuilder().getBuilder();
@@ -10612,23 +10612,23 @@ public final class ClusterMessages {
       /**
        * required .VectorClock version = 6;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder getVersionOrBuilder() {
         if (versionBuilder_ != null) {
           return versionBuilder_.getMessageOrBuilder();
         } else {
           return version_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance() : version_;
         }
       }
       /**
        * required .VectorClock version = 6;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder> 
           getVersionFieldBuilder() {
         if (versionBuilder_ == null) {
-          versionBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder>(
+          versionBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder>(
                   getVersion(),
                   getParentForChildren(),
                   isClean());
@@ -10637,22 +10637,22 @@ public final class ClusterMessages {
         return versionBuilder_;
       }
 
-      private java.util.List tombstones_ =
+      private java.util.List tombstones_ =
         java.util.Collections.emptyList();
       private void ensureTombstonesIsMutable() {
         if (!((bitField0_ & 0x00000040) != 0)) {
-          tombstones_ = new java.util.ArrayList(tombstones_);
+          tombstones_ = new java.util.ArrayList(tombstones_);
           bitField0_ |= 0x00000040;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Tombstone, akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder, akka.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder> tombstonesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder> tombstonesBuilder_;
 
       /**
        * repeated .Tombstone tombstones = 7;
        */
-      public java.util.List getTombstonesList() {
+      public java.util.List getTombstonesList() {
         if (tombstonesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(tombstones_);
         } else {
@@ -10672,7 +10672,7 @@ public final class ClusterMessages {
       /**
        * repeated .Tombstone tombstones = 7;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Tombstone getTombstones(int index) {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone getTombstones(int index) {
         if (tombstonesBuilder_ == null) {
           return tombstones_.get(index);
         } else {
@@ -10683,7 +10683,7 @@ public final class ClusterMessages {
        * repeated .Tombstone tombstones = 7;
        */
       public Builder setTombstones(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.Tombstone value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone value) {
         if (tombstonesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10700,7 +10700,7 @@ public final class ClusterMessages {
        * repeated .Tombstone tombstones = 7;
        */
       public Builder setTombstones(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder builderForValue) {
         if (tombstonesBuilder_ == null) {
           ensureTombstonesIsMutable();
           tombstones_.set(index, builderForValue.build());
@@ -10713,7 +10713,7 @@ public final class ClusterMessages {
       /**
        * repeated .Tombstone tombstones = 7;
        */
-      public Builder addTombstones(akka.cluster.protobuf.msg.ClusterMessages.Tombstone value) {
+      public Builder addTombstones(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone value) {
         if (tombstonesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10730,7 +10730,7 @@ public final class ClusterMessages {
        * repeated .Tombstone tombstones = 7;
        */
       public Builder addTombstones(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.Tombstone value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone value) {
         if (tombstonesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10747,7 +10747,7 @@ public final class ClusterMessages {
        * repeated .Tombstone tombstones = 7;
        */
       public Builder addTombstones(
-          akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder builderForValue) {
         if (tombstonesBuilder_ == null) {
           ensureTombstonesIsMutable();
           tombstones_.add(builderForValue.build());
@@ -10761,7 +10761,7 @@ public final class ClusterMessages {
        * repeated .Tombstone tombstones = 7;
        */
       public Builder addTombstones(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder builderForValue) {
         if (tombstonesBuilder_ == null) {
           ensureTombstonesIsMutable();
           tombstones_.add(index, builderForValue.build());
@@ -10775,10 +10775,10 @@ public final class ClusterMessages {
        * repeated .Tombstone tombstones = 7;
        */
       public Builder addAllTombstones(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (tombstonesBuilder_ == null) {
           ensureTombstonesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, tombstones_);
           onChanged();
         } else {
@@ -10815,14 +10815,14 @@ public final class ClusterMessages {
       /**
        * repeated .Tombstone tombstones = 7;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder getTombstonesBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder getTombstonesBuilder(
           int index) {
         return getTombstonesFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Tombstone tombstones = 7;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder getTombstonesOrBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder getTombstonesOrBuilder(
           int index) {
         if (tombstonesBuilder_ == null) {
           return tombstones_.get(index);  } else {
@@ -10832,7 +10832,7 @@ public final class ClusterMessages {
       /**
        * repeated .Tombstone tombstones = 7;
        */
-      public java.util.List 
+      public java.util.List 
            getTombstonesOrBuilderList() {
         if (tombstonesBuilder_ != null) {
           return tombstonesBuilder_.getMessageOrBuilderList();
@@ -10843,31 +10843,31 @@ public final class ClusterMessages {
       /**
        * repeated .Tombstone tombstones = 7;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder addTombstonesBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder addTombstonesBuilder() {
         return getTombstonesFieldBuilder().addBuilder(
-            akka.cluster.protobuf.msg.ClusterMessages.Tombstone.getDefaultInstance());
+            org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.getDefaultInstance());
       }
       /**
        * repeated .Tombstone tombstones = 7;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder addTombstonesBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder addTombstonesBuilder(
           int index) {
         return getTombstonesFieldBuilder().addBuilder(
-            index, akka.cluster.protobuf.msg.ClusterMessages.Tombstone.getDefaultInstance());
+            index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.getDefaultInstance());
       }
       /**
        * repeated .Tombstone tombstones = 7;
        */
-      public java.util.List 
+      public java.util.List 
            getTombstonesBuilderList() {
         return getTombstonesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Tombstone, akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder, akka.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder> 
           getTombstonesFieldBuilder() {
         if (tombstonesBuilder_ == null) {
-          tombstonesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.Tombstone, akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder, akka.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder>(
+          tombstonesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder>(
                   tombstones_,
                   ((bitField0_ & 0x00000040) != 0),
                   getParentForChildren(),
@@ -10877,10 +10877,10 @@ public final class ClusterMessages {
         return tombstonesBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList allAppVersions_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureAllAppVersionsIsMutable() {
         if (!((bitField0_ & 0x00000080) != 0)) {
-          allAppVersions_ = new akka.protobufv3.internal.LazyStringArrayList(allAppVersions_);
+          allAppVersions_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(allAppVersions_);
           bitField0_ |= 0x00000080;
          }
       }
@@ -10888,7 +10888,7 @@ public final class ClusterMessages {
        * repeated string allAppVersions = 8;
        * @return A list containing the allAppVersions.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAllAppVersionsList() {
         return allAppVersions_.getUnmodifiableView();
       }
@@ -10912,7 +10912,7 @@ public final class ClusterMessages {
        * @param index The index of the value to return.
        * @return The bytes of the allAppVersions at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getAllAppVersionsBytes(int index) {
         return allAppVersions_.getByteString(index);
       }
@@ -10955,7 +10955,7 @@ public final class ClusterMessages {
       public Builder addAllAllAppVersions(
           java.lang.Iterable values) {
         ensureAllAppVersionsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, allAppVersions_);
         onChanged();
         return this;
@@ -10965,7 +10965,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearAllAppVersions() {
-        allAppVersions_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        allAppVersions_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000080);
         onChanged();
         return this;
@@ -10976,7 +10976,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder addAllAppVersionsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -10987,13 +10987,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -11002,37 +11002,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Gossip)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.Gossip DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.Gossip();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Gossip getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Gossip parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Gossip(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.Gossip getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Gossip getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -11040,7 +11040,7 @@ public final class ClusterMessages {
 
   public interface GossipOverviewOrBuilder extends
       // @@protoc_insertion_point(interface_extends:GossipOverview)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * 
    @@ -11074,12 +11074,12 @@ public final class ClusterMessages {
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
-    java.util.List 
+    java.util.List 
         getObserverReachabilityList();
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability getObserverReachability(int index);
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability getObserverReachability(int index);
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
@@ -11087,12 +11087,12 @@ public final class ClusterMessages {
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
-    java.util.List 
+    java.util.List 
         getObserverReachabilityOrBuilderList();
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder getObserverReachabilityOrBuilder(
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder getObserverReachabilityOrBuilder(
         int index);
   }
   /**
@@ -11104,12 +11104,12 @@ public final class ClusterMessages {
    * Protobuf type {@code GossipOverview}
    */
   public  static final class GossipOverview extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:GossipOverview)
       GossipOverviewOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use GossipOverview.newBuilder() to construct.
-    private GossipOverview(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private GossipOverview(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private GossipOverview() {
@@ -11120,26 +11120,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new GossipOverview();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private GossipOverview(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -11171,11 +11171,11 @@ public final class ClusterMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                observerReachability_ = new java.util.ArrayList();
+                observerReachability_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               observerReachability_.add(
-                  input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -11187,10 +11187,10 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -11203,21 +11203,21 @@ public final class ClusterMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.class, akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder.class);
     }
 
     public static final int SEEN_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.Internal.IntList seen_;
+    private org.apache.pekko.protobufv3.internal.Internal.IntList seen_;
     /**
      * 
          * This is the address indexes for the nodes that have seen this gossip 
@@ -11255,17 +11255,17 @@ public final class ClusterMessages {
     }
 
     public static final int OBSERVERREACHABILITY_FIELD_NUMBER = 2;
-    private java.util.List observerReachability_;
+    private java.util.List observerReachability_;
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
-    public java.util.List getObserverReachabilityList() {
+    public java.util.List getObserverReachabilityList() {
       return observerReachability_;
     }
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getObserverReachabilityOrBuilderList() {
       return observerReachability_;
     }
@@ -11278,13 +11278,13 @@ public final class ClusterMessages {
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability getObserverReachability(int index) {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability getObserverReachability(int index) {
       return observerReachability_.get(index);
     }
     /**
      * repeated .ObserverReachability observerReachability = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder getObserverReachabilityOrBuilder(
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder getObserverReachabilityOrBuilder(
         int index) {
       return observerReachability_.get(index);
     }
@@ -11307,7 +11307,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < seen_.size(); i++) {
         output.writeInt32(1, seen_.getInt(i));
@@ -11327,14 +11327,14 @@ public final class ClusterMessages {
       {
         int dataSize = 0;
         for (int i = 0; i < seen_.size(); i++) {
-          dataSize += akka.protobufv3.internal.CodedOutputStream
+          dataSize += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt32SizeNoTag(seen_.getInt(i));
         }
         size += dataSize;
         size += 1 * getSeenList().size();
       }
       for (int i = 0; i < observerReachability_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, observerReachability_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -11347,10 +11347,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.GossipOverview)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.GossipOverview other = (akka.cluster.protobuf.msg.ClusterMessages.GossipOverview) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview) obj;
 
       if (!getSeenList()
           .equals(other.getSeenList())) return false;
@@ -11380,73 +11380,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -11455,7 +11455,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.GossipOverview prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -11466,7 +11466,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -11479,34 +11479,34 @@ public final class ClusterMessages {
      * Protobuf type {@code GossipOverview}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:GossipOverview)
-        akka.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverviewOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.class, akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getObserverReachabilityFieldBuilder();
         }
@@ -11526,19 +11526,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_GossipOverview_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipOverview getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipOverview build() {
-        akka.cluster.protobuf.msg.ClusterMessages.GossipOverview result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11546,8 +11546,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.GossipOverview buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.GossipOverview result = new akka.cluster.protobuf.msg.ClusterMessages.GossipOverview(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
           seen_.makeImmutable();
@@ -11573,44 +11573,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.GossipOverview) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.GossipOverview)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.GossipOverview other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview.getDefaultInstance()) return this;
         if (!other.seen_.isEmpty()) {
           if (seen_.isEmpty()) {
             seen_ = other.seen_;
@@ -11640,7 +11640,7 @@ public final class ClusterMessages {
               observerReachability_ = other.observerReachability_;
               bitField0_ = (bitField0_ & ~0x00000002);
               observerReachabilityBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getObserverReachabilityFieldBuilder() : null;
             } else {
               observerReachabilityBuilder_.addAllMessages(other.observerReachability_);
@@ -11664,14 +11664,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.GossipOverview parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.GossipOverview) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -11682,7 +11682,7 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.Internal.IntList seen_ = emptyIntList();
+      private org.apache.pekko.protobufv3.internal.Internal.IntList seen_ = emptyIntList();
       private void ensureSeenIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           seen_ = mutableCopy(seen_);
@@ -11769,7 +11769,7 @@ public final class ClusterMessages {
       public Builder addAllSeen(
           java.lang.Iterable values) {
         ensureSeenIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, seen_);
         onChanged();
         return this;
@@ -11789,22 +11789,22 @@ public final class ClusterMessages {
         return this;
       }
 
-      private java.util.List observerReachability_ =
+      private java.util.List observerReachability_ =
         java.util.Collections.emptyList();
       private void ensureObserverReachabilityIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          observerReachability_ = new java.util.ArrayList(observerReachability_);
+          observerReachability_ = new java.util.ArrayList(observerReachability_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder> observerReachabilityBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder> observerReachabilityBuilder_;
 
       /**
        * repeated .ObserverReachability observerReachability = 2;
        */
-      public java.util.List getObserverReachabilityList() {
+      public java.util.List getObserverReachabilityList() {
         if (observerReachabilityBuilder_ == null) {
           return java.util.Collections.unmodifiableList(observerReachability_);
         } else {
@@ -11824,7 +11824,7 @@ public final class ClusterMessages {
       /**
        * repeated .ObserverReachability observerReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability getObserverReachability(int index) {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability getObserverReachability(int index) {
         if (observerReachabilityBuilder_ == null) {
           return observerReachability_.get(index);
         } else {
@@ -11835,7 +11835,7 @@ public final class ClusterMessages {
        * repeated .ObserverReachability observerReachability = 2;
        */
       public Builder setObserverReachability(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability value) {
         if (observerReachabilityBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11852,7 +11852,7 @@ public final class ClusterMessages {
        * repeated .ObserverReachability observerReachability = 2;
        */
       public Builder setObserverReachability(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder builderForValue) {
         if (observerReachabilityBuilder_ == null) {
           ensureObserverReachabilityIsMutable();
           observerReachability_.set(index, builderForValue.build());
@@ -11865,7 +11865,7 @@ public final class ClusterMessages {
       /**
        * repeated .ObserverReachability observerReachability = 2;
        */
-      public Builder addObserverReachability(akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability value) {
+      public Builder addObserverReachability(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability value) {
         if (observerReachabilityBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11882,7 +11882,7 @@ public final class ClusterMessages {
        * repeated .ObserverReachability observerReachability = 2;
        */
       public Builder addObserverReachability(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability value) {
         if (observerReachabilityBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11899,7 +11899,7 @@ public final class ClusterMessages {
        * repeated .ObserverReachability observerReachability = 2;
        */
       public Builder addObserverReachability(
-          akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder builderForValue) {
         if (observerReachabilityBuilder_ == null) {
           ensureObserverReachabilityIsMutable();
           observerReachability_.add(builderForValue.build());
@@ -11913,7 +11913,7 @@ public final class ClusterMessages {
        * repeated .ObserverReachability observerReachability = 2;
        */
       public Builder addObserverReachability(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder builderForValue) {
         if (observerReachabilityBuilder_ == null) {
           ensureObserverReachabilityIsMutable();
           observerReachability_.add(index, builderForValue.build());
@@ -11927,10 +11927,10 @@ public final class ClusterMessages {
        * repeated .ObserverReachability observerReachability = 2;
        */
       public Builder addAllObserverReachability(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (observerReachabilityBuilder_ == null) {
           ensureObserverReachabilityIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, observerReachability_);
           onChanged();
         } else {
@@ -11967,14 +11967,14 @@ public final class ClusterMessages {
       /**
        * repeated .ObserverReachability observerReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder getObserverReachabilityBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder getObserverReachabilityBuilder(
           int index) {
         return getObserverReachabilityFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .ObserverReachability observerReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder getObserverReachabilityOrBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder getObserverReachabilityOrBuilder(
           int index) {
         if (observerReachabilityBuilder_ == null) {
           return observerReachability_.get(index);  } else {
@@ -11984,7 +11984,7 @@ public final class ClusterMessages {
       /**
        * repeated .ObserverReachability observerReachability = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getObserverReachabilityOrBuilderList() {
         if (observerReachabilityBuilder_ != null) {
           return observerReachabilityBuilder_.getMessageOrBuilderList();
@@ -11995,31 +11995,31 @@ public final class ClusterMessages {
       /**
        * repeated .ObserverReachability observerReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder addObserverReachabilityBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder addObserverReachabilityBuilder() {
         return getObserverReachabilityFieldBuilder().addBuilder(
-            akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.getDefaultInstance());
+            org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.getDefaultInstance());
       }
       /**
        * repeated .ObserverReachability observerReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder addObserverReachabilityBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder addObserverReachabilityBuilder(
           int index) {
         return getObserverReachabilityFieldBuilder().addBuilder(
-            index, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.getDefaultInstance());
+            index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.getDefaultInstance());
       }
       /**
        * repeated .ObserverReachability observerReachability = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getObserverReachabilityBuilderList() {
         return getObserverReachabilityFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder> 
           getObserverReachabilityFieldBuilder() {
         if (observerReachabilityBuilder_ == null) {
-          observerReachabilityBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder>(
+          observerReachabilityBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder>(
                   observerReachability_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -12030,13 +12030,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -12045,37 +12045,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:GossipOverview)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.GossipOverview DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.GossipOverview();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.GossipOverview getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public GossipOverview parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new GossipOverview(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.GossipOverview getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.GossipOverview getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -12083,7 +12083,7 @@ public final class ClusterMessages {
 
   public interface ObserverReachabilityOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ObserverReachability)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int32 addressIndex = 1;
@@ -12110,12 +12110,12 @@ public final class ClusterMessages {
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
-    java.util.List 
+    java.util.List 
         getSubjectReachabilityList();
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability getSubjectReachability(int index);
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability getSubjectReachability(int index);
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
@@ -12123,12 +12123,12 @@ public final class ClusterMessages {
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
-    java.util.List 
+    java.util.List 
         getSubjectReachabilityOrBuilderList();
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder getSubjectReachabilityOrBuilder(
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder getSubjectReachabilityOrBuilder(
         int index);
   }
   /**
@@ -12140,12 +12140,12 @@ public final class ClusterMessages {
    * Protobuf type {@code ObserverReachability}
    */
   public  static final class ObserverReachability extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ObserverReachability)
       ObserverReachabilityOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ObserverReachability.newBuilder() to construct.
-    private ObserverReachability(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ObserverReachability(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ObserverReachability() {
@@ -12155,26 +12155,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ObserverReachability();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ObserverReachability(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -12190,11 +12190,11 @@ public final class ClusterMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                subjectReachability_ = new java.util.ArrayList();
+                subjectReachability_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               subjectReachability_.add(
-                  input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.PARSER, extensionRegistry));
               break;
             }
             case 32: {
@@ -12211,10 +12211,10 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
@@ -12224,17 +12224,17 @@ public final class ClusterMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.class, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder.class);
     }
 
     private int bitField0_;
@@ -12273,17 +12273,17 @@ public final class ClusterMessages {
     }
 
     public static final int SUBJECTREACHABILITY_FIELD_NUMBER = 2;
-    private java.util.List subjectReachability_;
+    private java.util.List subjectReachability_;
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
-    public java.util.List getSubjectReachabilityList() {
+    public java.util.List getSubjectReachabilityList() {
       return subjectReachability_;
     }
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getSubjectReachabilityOrBuilderList() {
       return subjectReachability_;
     }
@@ -12296,13 +12296,13 @@ public final class ClusterMessages {
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability getSubjectReachability(int index) {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability getSubjectReachability(int index) {
       return subjectReachability_.get(index);
     }
     /**
      * repeated .SubjectReachability subjectReachability = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder getSubjectReachabilityOrBuilder(
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder getSubjectReachabilityOrBuilder(
         int index) {
       return subjectReachability_.get(index);
     }
@@ -12333,7 +12333,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt32(1, addressIndex_);
@@ -12354,15 +12354,15 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(1, addressIndex_);
       }
       for (int i = 0; i < subjectReachability_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, subjectReachability_.get(i));
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(4, version_);
       }
       size += unknownFields.getSerializedSize();
@@ -12375,10 +12375,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability other = (akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability) obj;
 
       if (hasAddressIndex() != other.hasAddressIndex()) return false;
       if (hasAddressIndex()) {
@@ -12409,7 +12409,7 @@ public final class ClusterMessages {
       }
       if (hasVersion()) {
         hash = (37 * hash) + VERSION_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getVersion());
       }
       if (getSubjectReachabilityCount() > 0) {
@@ -12421,73 +12421,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -12496,7 +12496,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -12507,7 +12507,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -12520,34 +12520,34 @@ public final class ClusterMessages {
      * Protobuf type {@code ObserverReachability}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ObserverReachability)
-        akka.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachabilityOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.class, akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getSubjectReachabilityFieldBuilder();
         }
@@ -12569,19 +12569,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ObserverReachability_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability build() {
-        akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -12589,8 +12589,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability result = new akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -12621,44 +12621,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability.getDefaultInstance()) return this;
         if (other.hasAddressIndex()) {
           setAddressIndex(other.getAddressIndex());
         }
@@ -12684,7 +12684,7 @@ public final class ClusterMessages {
               subjectReachability_ = other.subjectReachability_;
               bitField0_ = (bitField0_ & ~0x00000004);
               subjectReachabilityBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getSubjectReachabilityFieldBuilder() : null;
             } else {
               subjectReachabilityBuilder_.addAllMessages(other.subjectReachability_);
@@ -12714,14 +12714,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -12806,22 +12806,22 @@ public final class ClusterMessages {
         return this;
       }
 
-      private java.util.List subjectReachability_ =
+      private java.util.List subjectReachability_ =
         java.util.Collections.emptyList();
       private void ensureSubjectReachabilityIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          subjectReachability_ = new java.util.ArrayList(subjectReachability_);
+          subjectReachability_ = new java.util.ArrayList(subjectReachability_);
           bitField0_ |= 0x00000004;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder> subjectReachabilityBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder> subjectReachabilityBuilder_;
 
       /**
        * repeated .SubjectReachability subjectReachability = 2;
        */
-      public java.util.List getSubjectReachabilityList() {
+      public java.util.List getSubjectReachabilityList() {
         if (subjectReachabilityBuilder_ == null) {
           return java.util.Collections.unmodifiableList(subjectReachability_);
         } else {
@@ -12841,7 +12841,7 @@ public final class ClusterMessages {
       /**
        * repeated .SubjectReachability subjectReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability getSubjectReachability(int index) {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability getSubjectReachability(int index) {
         if (subjectReachabilityBuilder_ == null) {
           return subjectReachability_.get(index);
         } else {
@@ -12852,7 +12852,7 @@ public final class ClusterMessages {
        * repeated .SubjectReachability subjectReachability = 2;
        */
       public Builder setSubjectReachability(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability value) {
         if (subjectReachabilityBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12869,7 +12869,7 @@ public final class ClusterMessages {
        * repeated .SubjectReachability subjectReachability = 2;
        */
       public Builder setSubjectReachability(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder builderForValue) {
         if (subjectReachabilityBuilder_ == null) {
           ensureSubjectReachabilityIsMutable();
           subjectReachability_.set(index, builderForValue.build());
@@ -12882,7 +12882,7 @@ public final class ClusterMessages {
       /**
        * repeated .SubjectReachability subjectReachability = 2;
        */
-      public Builder addSubjectReachability(akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability value) {
+      public Builder addSubjectReachability(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability value) {
         if (subjectReachabilityBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12899,7 +12899,7 @@ public final class ClusterMessages {
        * repeated .SubjectReachability subjectReachability = 2;
        */
       public Builder addSubjectReachability(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability value) {
         if (subjectReachabilityBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12916,7 +12916,7 @@ public final class ClusterMessages {
        * repeated .SubjectReachability subjectReachability = 2;
        */
       public Builder addSubjectReachability(
-          akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder builderForValue) {
         if (subjectReachabilityBuilder_ == null) {
           ensureSubjectReachabilityIsMutable();
           subjectReachability_.add(builderForValue.build());
@@ -12930,7 +12930,7 @@ public final class ClusterMessages {
        * repeated .SubjectReachability subjectReachability = 2;
        */
       public Builder addSubjectReachability(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder builderForValue) {
         if (subjectReachabilityBuilder_ == null) {
           ensureSubjectReachabilityIsMutable();
           subjectReachability_.add(index, builderForValue.build());
@@ -12944,10 +12944,10 @@ public final class ClusterMessages {
        * repeated .SubjectReachability subjectReachability = 2;
        */
       public Builder addAllSubjectReachability(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (subjectReachabilityBuilder_ == null) {
           ensureSubjectReachabilityIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, subjectReachability_);
           onChanged();
         } else {
@@ -12984,14 +12984,14 @@ public final class ClusterMessages {
       /**
        * repeated .SubjectReachability subjectReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder getSubjectReachabilityBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder getSubjectReachabilityBuilder(
           int index) {
         return getSubjectReachabilityFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .SubjectReachability subjectReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder getSubjectReachabilityOrBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder getSubjectReachabilityOrBuilder(
           int index) {
         if (subjectReachabilityBuilder_ == null) {
           return subjectReachability_.get(index);  } else {
@@ -13001,7 +13001,7 @@ public final class ClusterMessages {
       /**
        * repeated .SubjectReachability subjectReachability = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getSubjectReachabilityOrBuilderList() {
         if (subjectReachabilityBuilder_ != null) {
           return subjectReachabilityBuilder_.getMessageOrBuilderList();
@@ -13012,31 +13012,31 @@ public final class ClusterMessages {
       /**
        * repeated .SubjectReachability subjectReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder addSubjectReachabilityBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder addSubjectReachabilityBuilder() {
         return getSubjectReachabilityFieldBuilder().addBuilder(
-            akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.getDefaultInstance());
+            org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.getDefaultInstance());
       }
       /**
        * repeated .SubjectReachability subjectReachability = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder addSubjectReachabilityBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder addSubjectReachabilityBuilder(
           int index) {
         return getSubjectReachabilityFieldBuilder().addBuilder(
-            index, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.getDefaultInstance());
+            index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.getDefaultInstance());
       }
       /**
        * repeated .SubjectReachability subjectReachability = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getSubjectReachabilityBuilderList() {
         return getSubjectReachabilityFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder> 
           getSubjectReachabilityFieldBuilder() {
         if (subjectReachabilityBuilder_ == null) {
-          subjectReachabilityBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder>(
+          subjectReachabilityBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder>(
                   subjectReachability_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
@@ -13047,13 +13047,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -13062,37 +13062,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ObserverReachability)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ObserverReachability parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ObserverReachability(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.ObserverReachability getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ObserverReachability getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -13100,7 +13100,7 @@ public final class ClusterMessages {
 
   public interface SubjectReachabilityOrBuilder extends
       // @@protoc_insertion_point(interface_extends:SubjectReachability)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int32 addressIndex = 1;
@@ -13122,7 +13122,7 @@ public final class ClusterMessages {
      * required .ReachabilityStatus status = 3;
      * @return The status.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus getStatus();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus getStatus();
 
     /**
      * required int64 version = 4;
@@ -13139,12 +13139,12 @@ public final class ClusterMessages {
    * Protobuf type {@code SubjectReachability}
    */
   public  static final class SubjectReachability extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SubjectReachability)
       SubjectReachabilityOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use SubjectReachability.newBuilder() to construct.
-    private SubjectReachability(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private SubjectReachability(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private SubjectReachability() {
@@ -13154,26 +13154,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new SubjectReachability();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private SubjectReachability(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -13190,7 +13190,7 @@ public final class ClusterMessages {
             case 24: {
               int rawValue = input.readEnum();
                 @SuppressWarnings("deprecation")
-              akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus value = akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.valueOf(rawValue);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus value = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(3, rawValue);
               } else {
@@ -13213,27 +13213,27 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.class, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder.class);
     }
 
     private int bitField0_;
@@ -13267,10 +13267,10 @@ public final class ClusterMessages {
      * required .ReachabilityStatus status = 3;
      * @return The status.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus getStatus() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus getStatus() {
       @SuppressWarnings("deprecation")
-      akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus result = akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.valueOf(status_);
-      return result == null ? akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.Reachable : result;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.valueOf(status_);
+      return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.Reachable : result;
     }
 
     public static final int VERSION_FIELD_NUMBER = 4;
@@ -13314,7 +13314,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt32(1, addressIndex_);
@@ -13335,15 +13335,15 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(1, addressIndex_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeEnumSize(3, status_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(4, version_);
       }
       size += unknownFields.getSerializedSize();
@@ -13356,10 +13356,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability other = (akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability) obj;
 
       if (hasAddressIndex() != other.hasAddressIndex()) return false;
       if (hasAddressIndex()) {
@@ -13396,7 +13396,7 @@ public final class ClusterMessages {
       }
       if (hasVersion()) {
         hash = (37 * hash) + VERSION_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getVersion());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -13404,73 +13404,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -13479,7 +13479,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -13490,7 +13490,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -13498,34 +13498,34 @@ public final class ClusterMessages {
      * Protobuf type {@code SubjectReachability}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:SubjectReachability)
-        akka.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachabilityOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.class, akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -13542,19 +13542,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_SubjectReachability_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability build() {
-        akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -13562,8 +13562,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability result = new akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -13589,44 +13589,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability.getDefaultInstance()) return this;
         if (other.hasAddressIndex()) {
           setAddressIndex(other.getAddressIndex());
         }
@@ -13657,14 +13657,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -13724,17 +13724,17 @@ public final class ClusterMessages {
        * required .ReachabilityStatus status = 3;
        * @return The status.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus getStatus() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus getStatus() {
         @SuppressWarnings("deprecation")
-        akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus result = akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.valueOf(status_);
-        return result == null ? akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.Reachable : result;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.valueOf(status_);
+        return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus.Reachable : result;
       }
       /**
        * required .ReachabilityStatus status = 3;
        * @param value The status to set.
        * @return This builder for chaining.
        */
-      public Builder setStatus(akka.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus value) {
+      public Builder setStatus(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ReachabilityStatus value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13792,13 +13792,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -13807,37 +13807,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:SubjectReachability)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public SubjectReachability parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new SubjectReachability(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.SubjectReachability getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.SubjectReachability getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -13845,7 +13845,7 @@ public final class ClusterMessages {
 
   public interface TombstoneOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Tombstone)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int32 addressIndex = 1;
@@ -13873,12 +13873,12 @@ public final class ClusterMessages {
    * Protobuf type {@code Tombstone}
    */
   public  static final class Tombstone extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Tombstone)
       TombstoneOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Tombstone.newBuilder() to construct.
-    private Tombstone(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Tombstone(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Tombstone() {
@@ -13887,26 +13887,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Tombstone();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Tombstone(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -13934,27 +13934,27 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.Tombstone.class, akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder.class);
     }
 
     private int bitField0_;
@@ -14012,7 +14012,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt32(1, addressIndex_);
@@ -14030,11 +14030,11 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(1, addressIndex_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(2, timestamp_);
       }
       size += unknownFields.getSerializedSize();
@@ -14047,10 +14047,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.Tombstone)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.Tombstone other = (akka.cluster.protobuf.msg.ClusterMessages.Tombstone) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone) obj;
 
       if (hasAddressIndex() != other.hasAddressIndex()) return false;
       if (hasAddressIndex()) {
@@ -14079,7 +14079,7 @@ public final class ClusterMessages {
       }
       if (hasTimestamp()) {
         hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimestamp());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -14087,73 +14087,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -14162,7 +14162,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.Tombstone prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -14173,7 +14173,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -14181,34 +14181,34 @@ public final class ClusterMessages {
      * Protobuf type {@code Tombstone}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Tombstone)
-        akka.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.TombstoneOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.Tombstone.class, akka.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.Tombstone.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -14223,19 +14223,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Tombstone_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Tombstone getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.Tombstone.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Tombstone build() {
-        akka.cluster.protobuf.msg.ClusterMessages.Tombstone result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -14243,8 +14243,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Tombstone buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.Tombstone result = new akka.cluster.protobuf.msg.ClusterMessages.Tombstone(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -14266,44 +14266,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.Tombstone) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.Tombstone)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Tombstone other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.Tombstone.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone.getDefaultInstance()) return this;
         if (other.hasAddressIndex()) {
           setAddressIndex(other.getAddressIndex());
         }
@@ -14328,14 +14328,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.Tombstone parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.Tombstone) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -14421,13 +14421,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -14436,37 +14436,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Tombstone)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.Tombstone DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.Tombstone();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Tombstone getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Tombstone parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Tombstone(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.Tombstone getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Tombstone getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -14474,7 +14474,7 @@ public final class ClusterMessages {
 
   public interface MemberOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Member)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required int32 addressIndex = 1;
@@ -14507,7 +14507,7 @@ public final class ClusterMessages {
      * required .MemberStatus status = 3;
      * @return The status.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.MemberStatus getStatus();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus getStatus();
 
     /**
      * repeated int32 rolesIndexes = 4 [packed = true];
@@ -14546,12 +14546,12 @@ public final class ClusterMessages {
    * Protobuf type {@code Member}
    */
   public  static final class Member extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Member)
       MemberOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Member.newBuilder() to construct.
-    private Member(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Member(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Member() {
@@ -14562,26 +14562,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Member();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Member(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -14603,7 +14603,7 @@ public final class ClusterMessages {
             case 24: {
               int rawValue = input.readEnum();
                 @SuppressWarnings("deprecation")
-              akka.cluster.protobuf.msg.ClusterMessages.MemberStatus value = akka.cluster.protobuf.msg.ClusterMessages.MemberStatus.valueOf(rawValue);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus value = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(3, rawValue);
               } else {
@@ -14647,10 +14647,10 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000008) != 0)) {
@@ -14660,17 +14660,17 @@ public final class ClusterMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Member_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Member_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Member_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Member_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.Member.class, akka.cluster.protobuf.msg.ClusterMessages.Member.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder.class);
     }
 
     private int bitField0_;
@@ -14721,14 +14721,14 @@ public final class ClusterMessages {
      * required .MemberStatus status = 3;
      * @return The status.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.MemberStatus getStatus() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus getStatus() {
       @SuppressWarnings("deprecation")
-      akka.cluster.protobuf.msg.ClusterMessages.MemberStatus result = akka.cluster.protobuf.msg.ClusterMessages.MemberStatus.valueOf(status_);
-      return result == null ? akka.cluster.protobuf.msg.ClusterMessages.MemberStatus.Joining : result;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.valueOf(status_);
+      return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.Joining : result;
     }
 
     public static final int ROLESINDEXES_FIELD_NUMBER = 4;
-    private akka.protobufv3.internal.Internal.IntList rolesIndexes_;
+    private org.apache.pekko.protobufv3.internal.Internal.IntList rolesIndexes_;
     /**
      * repeated int32 rolesIndexes = 4 [packed = true];
      * @return A list containing the rolesIndexes.
@@ -14795,7 +14795,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) != 0)) {
@@ -14827,33 +14827,33 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(1, addressIndex_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(2, upNumber_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeEnumSize(3, status_);
       }
       {
         int dataSize = 0;
         for (int i = 0; i < rolesIndexes_.size(); i++) {
-          dataSize += akka.protobufv3.internal.CodedOutputStream
+          dataSize += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt32SizeNoTag(rolesIndexes_.getInt(i));
         }
         size += dataSize;
         if (!getRolesIndexesList().isEmpty()) {
           size += 1;
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
         rolesIndexesMemoizedSerializedSize = dataSize;
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(5, appVersionIndex_);
       }
       size += unknownFields.getSerializedSize();
@@ -14866,10 +14866,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.Member)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.Member other = (akka.cluster.protobuf.msg.ClusterMessages.Member) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member) obj;
 
       if (hasAddressIndex() != other.hasAddressIndex()) return false;
       if (hasAddressIndex()) {
@@ -14928,73 +14928,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -15003,7 +15003,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.Member prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -15014,7 +15014,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -15027,34 +15027,34 @@ public final class ClusterMessages {
      * Protobuf type {@code Member}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Member)
-        akka.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Member_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Member_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Member_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Member_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.Member.class, akka.cluster.protobuf.msg.ClusterMessages.Member.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.Member.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -15075,19 +15075,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Member_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Member_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Member getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.Member.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Member build() {
-        akka.cluster.protobuf.msg.ClusterMessages.Member result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -15095,8 +15095,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Member buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.Member result = new akka.cluster.protobuf.msg.ClusterMessages.Member(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -15131,44 +15131,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.Member) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.Member)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Member other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.Member.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member.getDefaultInstance()) return this;
         if (other.hasAddressIndex()) {
           setAddressIndex(other.getAddressIndex());
         }
@@ -15212,14 +15212,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.Member parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.Member) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -15316,17 +15316,17 @@ public final class ClusterMessages {
        * required .MemberStatus status = 3;
        * @return The status.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.MemberStatus getStatus() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus getStatus() {
         @SuppressWarnings("deprecation")
-        akka.cluster.protobuf.msg.ClusterMessages.MemberStatus result = akka.cluster.protobuf.msg.ClusterMessages.MemberStatus.valueOf(status_);
-        return result == null ? akka.cluster.protobuf.msg.ClusterMessages.MemberStatus.Joining : result;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus result = org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.valueOf(status_);
+        return result == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus.Joining : result;
       }
       /**
        * required .MemberStatus status = 3;
        * @param value The status to set.
        * @return This builder for chaining.
        */
-      public Builder setStatus(akka.cluster.protobuf.msg.ClusterMessages.MemberStatus value) {
+      public Builder setStatus(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.MemberStatus value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15346,7 +15346,7 @@ public final class ClusterMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.Internal.IntList rolesIndexes_ = emptyIntList();
+      private org.apache.pekko.protobufv3.internal.Internal.IntList rolesIndexes_ = emptyIntList();
       private void ensureRolesIndexesIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
           rolesIndexes_ = mutableCopy(rolesIndexes_);
@@ -15409,7 +15409,7 @@ public final class ClusterMessages {
       public Builder addAllRolesIndexes(
           java.lang.Iterable values) {
         ensureRolesIndexesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, rolesIndexes_);
         onChanged();
         return this;
@@ -15463,13 +15463,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -15478,37 +15478,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Member)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.Member DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.Member();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Member getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Member parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Member(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.Member getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Member getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -15516,7 +15516,7 @@ public final class ClusterMessages {
 
   public interface VectorClockOrBuilder extends
       // @@protoc_insertion_point(interface_extends:VectorClock)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * 
    @@ -15540,12 +15540,12 @@ public final class ClusterMessages {
     /**
      * repeated .VectorClock.Version versions = 2;
      */
-    java.util.List 
+    java.util.List 
         getVersionsList();
     /**
      * repeated .VectorClock.Version versions = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getVersions(int index);
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getVersions(int index);
     /**
      * repeated .VectorClock.Version versions = 2;
      */
@@ -15553,12 +15553,12 @@ public final class ClusterMessages {
     /**
      * repeated .VectorClock.Version versions = 2;
      */
-    java.util.List 
+    java.util.List 
         getVersionsOrBuilderList();
     /**
      * repeated .VectorClock.Version versions = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder getVersionsOrBuilder(
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder getVersionsOrBuilder(
         int index);
   }
   /**
@@ -15570,12 +15570,12 @@ public final class ClusterMessages {
    * Protobuf type {@code VectorClock}
    */
   public static final class VectorClock extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:VectorClock)
       VectorClockOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use VectorClock.newBuilder() to construct.
-    private VectorClock(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private VectorClock(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private VectorClock() {
@@ -15585,26 +15585,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new VectorClock();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private VectorClock(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -15620,11 +15620,11 @@ public final class ClusterMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                versions_ = new java.util.ArrayList();
+                versions_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               versions_.add(
-                  input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -15636,10 +15636,10 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -15649,22 +15649,22 @@ public final class ClusterMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock.class, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder.class);
     }
 
     public interface VersionOrBuilder extends
         // @@protoc_insertion_point(interface_extends:VectorClock.Version)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required int32 hashIndex = 1;
@@ -15692,12 +15692,12 @@ public final class ClusterMessages {
      * Protobuf type {@code VectorClock.Version}
      */
     public static final class Version extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:VectorClock.Version)
         VersionOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Version.newBuilder() to construct.
-      private Version(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Version(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Version() {
@@ -15706,26 +15706,26 @@ public final class ClusterMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Version();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Version(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -15753,27 +15753,27 @@ public final class ClusterMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.class, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder.class);
       }
 
       private int bitField0_;
@@ -15831,7 +15831,7 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeInt32(1, hashIndex_);
@@ -15849,11 +15849,11 @@ public final class ClusterMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt32Size(1, hashIndex_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(2, timestamp_);
         }
         size += unknownFields.getSerializedSize();
@@ -15866,10 +15866,10 @@ public final class ClusterMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version)) {
+        if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version)) {
           return super.equals(obj);
         }
-        akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version other = (akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version) obj;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version) obj;
 
         if (hasHashIndex() != other.hasHashIndex()) return false;
         if (hasHashIndex()) {
@@ -15898,7 +15898,7 @@ public final class ClusterMessages {
         }
         if (hasTimestamp()) {
           hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getTimestamp());
         }
         hash = (29 * hash) + unknownFields.hashCode();
@@ -15906,73 +15906,73 @@ public final class ClusterMessages {
         return hash;
       }
 
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseDelimitedFrom(
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -15981,7 +15981,7 @@ public final class ClusterMessages {
       public static Version.Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -15992,7 +15992,7 @@ public final class ClusterMessages {
 
       @java.lang.Override
       protected Version.Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Version.Builder builder = new Version.Builder(parent);
         return builder;
       }
@@ -16000,34 +16000,34 @@ public final class ClusterMessages {
        * Protobuf type {@code VectorClock.Version}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
           // @@protoc_insertion_point(builder_implements:VectorClock.Version)
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_descriptor;
+          return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_fieldAccessorTable
+          return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.class, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder.class);
+                  org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder.class);
         }
 
-        // Construct using akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.newBuilder()
+        // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
           }
         }
@@ -16042,19 +16042,19 @@ public final class ClusterMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_descriptor;
+          return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_Version_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getDefaultInstanceForType() {
-          return akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.getDefaultInstance();
+        public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version build() {
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version result = buildPartial();
+        public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version build() {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -16062,8 +16062,8 @@ public final class ClusterMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version buildPartial() {
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version result = new akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version(this);
+        public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version buildPartial() {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -16085,44 +16085,44 @@ public final class ClusterMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version) {
-            return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version) {
+            return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version other) {
-          if (other == akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version other) {
+          if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.getDefaultInstance()) return this;
           if (other.hasHashIndex()) {
             setHashIndex(other.getHashIndex());
           }
@@ -16147,14 +16147,14 @@ public final class ClusterMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parsedMessage = null;
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -16240,13 +16240,13 @@ public final class ClusterMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -16255,37 +16255,37 @@ public final class ClusterMessages {
       }
 
       // @@protoc_insertion_point(class_scope:VectorClock.Version)
-      private static final akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version DEFAULT_INSTANCE;
+      private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version();
       }
 
-      public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getDefaultInstance() {
+      public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Version parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Version(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -16318,17 +16318,17 @@ public final class ClusterMessages {
     }
 
     public static final int VERSIONS_FIELD_NUMBER = 2;
-    private java.util.List versions_;
+    private java.util.List versions_;
     /**
      * repeated .VectorClock.Version versions = 2;
      */
-    public java.util.List getVersionsList() {
+    public java.util.List getVersionsList() {
       return versions_;
     }
     /**
      * repeated .VectorClock.Version versions = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getVersionsOrBuilderList() {
       return versions_;
     }
@@ -16341,13 +16341,13 @@ public final class ClusterMessages {
     /**
      * repeated .VectorClock.Version versions = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getVersions(int index) {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getVersions(int index) {
       return versions_.get(index);
     }
     /**
      * repeated .VectorClock.Version versions = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder getVersionsOrBuilder(
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder getVersionsOrBuilder(
         int index) {
       return versions_.get(index);
     }
@@ -16370,7 +16370,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt64(1, timestamp_);
@@ -16388,11 +16388,11 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(1, timestamp_);
       }
       for (int i = 0; i < versions_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, versions_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -16405,10 +16405,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.VectorClock)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.VectorClock other = (akka.cluster.protobuf.msg.ClusterMessages.VectorClock) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock) obj;
 
       if (hasTimestamp() != other.hasTimestamp()) return false;
       if (hasTimestamp()) {
@@ -16430,7 +16430,7 @@ public final class ClusterMessages {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasTimestamp()) {
         hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimestamp());
       }
       if (getVersionsCount() > 0) {
@@ -16442,73 +16442,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -16517,7 +16517,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.VectorClock prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -16528,7 +16528,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -16541,34 +16541,34 @@ public final class ClusterMessages {
      * Protobuf type {@code VectorClock}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:VectorClock)
-        akka.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClockOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.VectorClock.class, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.VectorClock.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getVersionsFieldBuilder();
         }
@@ -16588,19 +16588,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_VectorClock_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock build() {
-        akka.cluster.protobuf.msg.ClusterMessages.VectorClock result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -16608,8 +16608,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.VectorClock result = new akka.cluster.protobuf.msg.ClusterMessages.VectorClock(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -16636,44 +16636,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.VectorClock) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.VectorClock)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.VectorClock other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.getDefaultInstance()) return this;
         if (other.hasTimestamp()) {
           setTimestamp(other.getTimestamp());
         }
@@ -16696,7 +16696,7 @@ public final class ClusterMessages {
               versions_ = other.versions_;
               bitField0_ = (bitField0_ & ~0x00000002);
               versionsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getVersionsFieldBuilder() : null;
             } else {
               versionsBuilder_.addAllMessages(other.versions_);
@@ -16720,14 +16720,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.VectorClock parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.VectorClock) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -16791,22 +16791,22 @@ public final class ClusterMessages {
         return this;
       }
 
-      private java.util.List versions_ =
+      private java.util.List versions_ =
         java.util.Collections.emptyList();
       private void ensureVersionsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          versions_ = new java.util.ArrayList(versions_);
+          versions_ = new java.util.ArrayList(versions_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder> versionsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder> versionsBuilder_;
 
       /**
        * repeated .VectorClock.Version versions = 2;
        */
-      public java.util.List getVersionsList() {
+      public java.util.List getVersionsList() {
         if (versionsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(versions_);
         } else {
@@ -16826,7 +16826,7 @@ public final class ClusterMessages {
       /**
        * repeated .VectorClock.Version versions = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getVersions(int index) {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version getVersions(int index) {
         if (versionsBuilder_ == null) {
           return versions_.get(index);
         } else {
@@ -16837,7 +16837,7 @@ public final class ClusterMessages {
        * repeated .VectorClock.Version versions = 2;
        */
       public Builder setVersions(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version value) {
         if (versionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16854,7 +16854,7 @@ public final class ClusterMessages {
        * repeated .VectorClock.Version versions = 2;
        */
       public Builder setVersions(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder builderForValue) {
         if (versionsBuilder_ == null) {
           ensureVersionsIsMutable();
           versions_.set(index, builderForValue.build());
@@ -16867,7 +16867,7 @@ public final class ClusterMessages {
       /**
        * repeated .VectorClock.Version versions = 2;
        */
-      public Builder addVersions(akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version value) {
+      public Builder addVersions(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version value) {
         if (versionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16884,7 +16884,7 @@ public final class ClusterMessages {
        * repeated .VectorClock.Version versions = 2;
        */
       public Builder addVersions(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version value) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version value) {
         if (versionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16901,7 +16901,7 @@ public final class ClusterMessages {
        * repeated .VectorClock.Version versions = 2;
        */
       public Builder addVersions(
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder builderForValue) {
         if (versionsBuilder_ == null) {
           ensureVersionsIsMutable();
           versions_.add(builderForValue.build());
@@ -16915,7 +16915,7 @@ public final class ClusterMessages {
        * repeated .VectorClock.Version versions = 2;
        */
       public Builder addVersions(
-          int index, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder builderForValue) {
         if (versionsBuilder_ == null) {
           ensureVersionsIsMutable();
           versions_.add(index, builderForValue.build());
@@ -16929,10 +16929,10 @@ public final class ClusterMessages {
        * repeated .VectorClock.Version versions = 2;
        */
       public Builder addAllVersions(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (versionsBuilder_ == null) {
           ensureVersionsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, versions_);
           onChanged();
         } else {
@@ -16969,14 +16969,14 @@ public final class ClusterMessages {
       /**
        * repeated .VectorClock.Version versions = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder getVersionsBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder getVersionsBuilder(
           int index) {
         return getVersionsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .VectorClock.Version versions = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder getVersionsOrBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder getVersionsOrBuilder(
           int index) {
         if (versionsBuilder_ == null) {
           return versions_.get(index);  } else {
@@ -16986,7 +16986,7 @@ public final class ClusterMessages {
       /**
        * repeated .VectorClock.Version versions = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getVersionsOrBuilderList() {
         if (versionsBuilder_ != null) {
           return versionsBuilder_.getMessageOrBuilderList();
@@ -16997,31 +16997,31 @@ public final class ClusterMessages {
       /**
        * repeated .VectorClock.Version versions = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder addVersionsBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder addVersionsBuilder() {
         return getVersionsFieldBuilder().addBuilder(
-            akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.getDefaultInstance());
+            org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.getDefaultInstance());
       }
       /**
        * repeated .VectorClock.Version versions = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder addVersionsBuilder(
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder addVersionsBuilder(
           int index) {
         return getVersionsFieldBuilder().addBuilder(
-            index, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.getDefaultInstance());
+            index, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.getDefaultInstance());
       }
       /**
        * repeated .VectorClock.Version versions = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getVersionsBuilderList() {
         return getVersionsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder> 
           getVersionsFieldBuilder() {
         if (versionsBuilder_ == null) {
-          versionsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder, akka.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder>(
+          versionsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.VersionOrBuilder>(
                   versions_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -17032,13 +17032,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -17047,37 +17047,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:VectorClock)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.VectorClock DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.VectorClock();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.VectorClock getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public VectorClock parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new VectorClock(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.VectorClock getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -17085,7 +17085,7 @@ public final class ClusterMessages {
 
   public interface EmptyOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Empty)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
   }
   /**
    * 
    @@ -17096,12 +17096,12 @@ public final class ClusterMessages {
    * Protobuf type {@code Empty}
    */
   public  static final class Empty extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Empty)
       EmptyOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Empty.newBuilder() to construct.
-    private Empty(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Empty(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Empty() {
@@ -17110,25 +17110,25 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Empty();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Empty(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -17146,27 +17146,27 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.Empty.class, akka.cluster.protobuf.msg.ClusterMessages.Empty.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -17181,7 +17181,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       unknownFields.writeTo(output);
     }
@@ -17202,10 +17202,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.Empty)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.Empty other = (akka.cluster.protobuf.msg.ClusterMessages.Empty) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -17223,73 +17223,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -17298,7 +17298,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.Empty prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -17309,7 +17309,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -17322,34 +17322,34 @@ public final class ClusterMessages {
      * Protobuf type {@code Empty}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Empty)
-        akka.cluster.protobuf.msg.ClusterMessages.EmptyOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.EmptyOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.Empty.class, akka.cluster.protobuf.msg.ClusterMessages.Empty.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.Empty.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -17360,19 +17360,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Empty_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Empty getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.Empty.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Empty build() {
-        akka.cluster.protobuf.msg.ClusterMessages.Empty result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -17380,8 +17380,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Empty buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.Empty result = new akka.cluster.protobuf.msg.ClusterMessages.Empty(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty(this);
         onBuilt();
         return result;
       }
@@ -17392,44 +17392,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.Empty) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.Empty)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Empty other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.Empty.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -17442,14 +17442,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.Empty parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.Empty) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -17460,13 +17460,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -17475,37 +17475,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Empty)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.Empty DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.Empty();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Empty getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Empty parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Empty(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.Empty getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Empty getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -17513,7 +17513,7 @@ public final class ClusterMessages {
 
   public interface AddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Address)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string system = 1;
@@ -17529,7 +17529,7 @@ public final class ClusterMessages {
      * required string system = 1;
      * @return The bytes for system.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes();
 
     /**
@@ -17546,7 +17546,7 @@ public final class ClusterMessages {
      * required string hostname = 2;
      * @return The bytes for hostname.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes();
 
     /**
@@ -17574,7 +17574,7 @@ public final class ClusterMessages {
      * optional string protocol = 4;
      * @return The bytes for protocol.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes();
   }
   /**
@@ -17586,12 +17586,12 @@ public final class ClusterMessages {
    * Protobuf type {@code Address}
    */
   public  static final class Address extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Address.newBuilder() to construct.
-    private Address(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Address(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Address() {
@@ -17603,26 +17603,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Address();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Address(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -17632,13 +17632,13 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               system_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               hostname_ = bs;
               break;
@@ -17649,7 +17649,7 @@ public final class ClusterMessages {
               break;
             }
             case 34: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000008;
               protocol_ = bs;
               break;
@@ -17663,27 +17663,27 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Address_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Address_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Address_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Address_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.Address.class, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder.class);
     }
 
     private int bitField0_;
@@ -17705,8 +17705,8 @@ public final class ClusterMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           system_ = s;
@@ -17718,17 +17718,17 @@ public final class ClusterMessages {
      * required string system = 1;
      * @return The bytes for system.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         system_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -17750,8 +17750,8 @@ public final class ClusterMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           hostname_ = s;
@@ -17763,17 +17763,17 @@ public final class ClusterMessages {
      * required string hostname = 2;
      * @return The bytes for hostname.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         hostname_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -17812,8 +17812,8 @@ public final class ClusterMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           protocol_ = s;
@@ -17825,17 +17825,17 @@ public final class ClusterMessages {
      * optional string protocol = 4;
      * @return The bytes for protocol.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         protocol_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -17863,19 +17863,19 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, system_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, system_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, hostname_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, hostname_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeUInt32(3, port_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, protocol_);
       }
       unknownFields.writeTo(output);
     }
@@ -17887,17 +17887,17 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, system_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, system_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, hostname_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, hostname_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(3, port_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, protocol_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -17909,10 +17909,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.Address)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.Address other = (akka.cluster.protobuf.msg.ClusterMessages.Address) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address) obj;
 
       if (hasSystem() != other.hasSystem()) return false;
       if (hasSystem()) {
@@ -17966,73 +17966,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -18041,7 +18041,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.Address prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -18052,7 +18052,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -18065,34 +18065,34 @@ public final class ClusterMessages {
      * Protobuf type {@code Address}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Address)
-        akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Address_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Address_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Address_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.Address.class, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.Address.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -18111,19 +18111,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Address_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Address getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Address build() {
-        akka.cluster.protobuf.msg.ClusterMessages.Address result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -18131,8 +18131,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Address buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.Address result = new akka.cluster.protobuf.msg.ClusterMessages.Address(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -18162,44 +18162,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.Address) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.Address)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Address other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) return this;
         if (other.hasSystem()) {
           bitField0_ |= 0x00000001;
           system_ = other.system_;
@@ -18239,14 +18239,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.Address parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.Address) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -18272,8 +18272,8 @@ public final class ClusterMessages {
       public java.lang.String getSystem() {
         java.lang.Object ref = system_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             system_ = s;
@@ -18287,17 +18287,17 @@ public final class ClusterMessages {
        * required string system = 1;
        * @return The bytes for system.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getSystemBytes() {
         java.lang.Object ref = system_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           system_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -18331,7 +18331,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder setSystemBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -18356,8 +18356,8 @@ public final class ClusterMessages {
       public java.lang.String getHostname() {
         java.lang.Object ref = hostname_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             hostname_ = s;
@@ -18371,17 +18371,17 @@ public final class ClusterMessages {
        * required string hostname = 2;
        * @return The bytes for hostname.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getHostnameBytes() {
         java.lang.Object ref = hostname_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           hostname_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -18415,7 +18415,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder setHostnameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -18477,8 +18477,8 @@ public final class ClusterMessages {
       public java.lang.String getProtocol() {
         java.lang.Object ref = protocol_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             protocol_ = s;
@@ -18492,17 +18492,17 @@ public final class ClusterMessages {
        * optional string protocol = 4;
        * @return The bytes for protocol.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getProtocolBytes() {
         java.lang.Object ref = protocol_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           protocol_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -18536,7 +18536,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder setProtocolBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -18547,13 +18547,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -18562,37 +18562,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Address)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.Address DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.Address();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Address getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
    
-        PARSER = new akka.protobufv3.internal.AbstractParser
    () {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
    
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser
    () {
       @java.lang.Override
       public Address parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Address(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser
     parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser
     parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser
     getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser
     getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.Address getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -18600,7 +18600,7 @@ public final class ClusterMessages {
 
   public interface UniqueAddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:UniqueAddress)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Address address = 1;
@@ -18611,11 +18611,11 @@ public final class ClusterMessages {
      * required .Address address = 1;
      * @return The address.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.Address getAddress();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getAddress();
     /**
      * required .Address address = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder();
 
     /**
      * required uint32 uid = 2;
@@ -18656,12 +18656,12 @@ public final class ClusterMessages {
    * Protobuf type {@code UniqueAddress}
    */
   public  static final class UniqueAddress extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:UniqueAddress)
       UniqueAddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use UniqueAddress.newBuilder() to construct.
-    private UniqueAddress(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private UniqueAddress(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private UniqueAddress() {
@@ -18670,26 +18670,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new UniqueAddress();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private UniqueAddress(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -18699,11 +18699,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.protobuf.msg.ClusterMessages.Address.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = address_.toBuilder();
               }
-              address_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.Address.PARSER, extensionRegistry);
+              address_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(address_);
                 address_ = subBuilder.buildPartial();
@@ -18730,32 +18730,32 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.class, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder.class);
     }
 
     private int bitField0_;
     public static final int ADDRESS_FIELD_NUMBER = 1;
-    private akka.cluster.protobuf.msg.ClusterMessages.Address address_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address address_;
     /**
      * required .Address address = 1;
      * @return Whether the address field is set.
@@ -18767,14 +18767,14 @@ public final class ClusterMessages {
      * required .Address address = 1;
      * @return The address.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
-      return address_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
+      return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
-      return address_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
+      return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
     }
 
     public static final int UID_FIELD_NUMBER = 2;
@@ -18843,7 +18843,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getAddress());
@@ -18864,15 +18864,15 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getAddress());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(2, uid_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(3, uid2_);
       }
       size += unknownFields.getSerializedSize();
@@ -18885,10 +18885,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress other = (akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress) obj;
 
       if (hasAddress() != other.hasAddress()) return false;
       if (hasAddress()) {
@@ -18933,73 +18933,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -19008,7 +19008,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -19019,7 +19019,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -19032,34 +19032,34 @@ public final class ClusterMessages {
      * Protobuf type {@code UniqueAddress}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:UniqueAddress)
-        akka.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.class, akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAddressFieldBuilder();
         }
@@ -19081,19 +19081,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_UniqueAddress_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress build() {
-        akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -19101,8 +19101,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress result = new akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -19132,44 +19132,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress.getDefaultInstance()) return this;
         if (other.hasAddress()) {
           mergeAddress(other.getAddress());
         }
@@ -19200,14 +19200,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -19218,9 +19218,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.protobuf.msg.ClusterMessages.Address address_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Address, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder, akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> addressBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address address_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> addressBuilder_;
       /**
        * required .Address address = 1;
        * @return Whether the address field is set.
@@ -19232,9 +19232,9 @@ public final class ClusterMessages {
        * required .Address address = 1;
        * @return The address.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address getAddress() {
         if (addressBuilder_ == null) {
-          return address_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
+          return address_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
         } else {
           return addressBuilder_.getMessage();
         }
@@ -19242,7 +19242,7 @@ public final class ClusterMessages {
       /**
        * required .Address address = 1;
        */
-      public Builder setAddress(akka.cluster.protobuf.msg.ClusterMessages.Address value) {
+      public Builder setAddress(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address value) {
         if (addressBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19259,7 +19259,7 @@ public final class ClusterMessages {
        * required .Address address = 1;
        */
       public Builder setAddress(
-          akka.cluster.protobuf.msg.ClusterMessages.Address.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
           onChanged();
@@ -19272,13 +19272,13 @@ public final class ClusterMessages {
       /**
        * required .Address address = 1;
        */
-      public Builder mergeAddress(akka.cluster.protobuf.msg.ClusterMessages.Address value) {
+      public Builder mergeAddress(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               address_ != null &&
-              address_ != akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
+              address_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance()) {
             address_ =
-              akka.cluster.protobuf.msg.ClusterMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
           } else {
             address_ = value;
           }
@@ -19305,7 +19305,7 @@ public final class ClusterMessages {
       /**
        * required .Address address = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Address.Builder getAddressBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder getAddressBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getAddressFieldBuilder().getBuilder();
@@ -19313,23 +19313,23 @@ public final class ClusterMessages {
       /**
        * required .Address address = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder getAddressOrBuilder() {
         if (addressBuilder_ != null) {
           return addressBuilder_.getMessageOrBuilder();
         } else {
           return address_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.getDefaultInstance() : address_;
         }
       }
       /**
        * required .Address address = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Address, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder, akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder> 
           getAddressFieldBuilder() {
         if (addressBuilder_ == null) {
-          addressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.Address, akka.cluster.protobuf.msg.ClusterMessages.Address.Builder, akka.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder>(
+          addressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Address.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.AddressOrBuilder>(
                   getAddress(),
                   getParentForChildren(),
                   isClean());
@@ -19429,13 +19429,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -19444,37 +19444,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:UniqueAddress)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public UniqueAddress parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new UniqueAddress(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.UniqueAddress getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.UniqueAddress getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -19482,7 +19482,7 @@ public final class ClusterMessages {
 
   public interface ClusterRouterPoolOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ClusterRouterPool)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Pool pool = 1;
@@ -19493,11 +19493,11 @@ public final class ClusterMessages {
      * required .Pool pool = 1;
      * @return The pool.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.Pool getPool();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool getPool();
     /**
      * required .Pool pool = 1;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder getPoolOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder getPoolOrBuilder();
 
     /**
      * required .ClusterRouterPoolSettings settings = 2;
@@ -19508,22 +19508,22 @@ public final class ClusterMessages {
      * required .ClusterRouterPoolSettings settings = 2;
      * @return The settings.
      */
-    akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getSettings();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getSettings();
     /**
      * required .ClusterRouterPoolSettings settings = 2;
      */
-    akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder getSettingsOrBuilder();
+    org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder getSettingsOrBuilder();
   }
   /**
    * Protobuf type {@code ClusterRouterPool}
    */
   public  static final class ClusterRouterPool extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ClusterRouterPool)
       ClusterRouterPoolOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ClusterRouterPool.newBuilder() to construct.
-    private ClusterRouterPool(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ClusterRouterPool(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ClusterRouterPool() {
@@ -19532,26 +19532,26 @@ public final class ClusterMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ClusterRouterPool();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ClusterRouterPool(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -19561,11 +19561,11 @@ public final class ClusterMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.protobuf.msg.ClusterMessages.Pool.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = pool_.toBuilder();
               }
-              pool_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.Pool.PARSER, extensionRegistry);
+              pool_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(pool_);
                 pool_ = subBuilder.buildPartial();
@@ -19574,11 +19574,11 @@ public final class ClusterMessages {
               break;
             }
             case 18: {
-              akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder subBuilder = null;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = settings_.toBuilder();
               }
-              settings_ = input.readMessage(akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.PARSER, extensionRegistry);
+              settings_ = input.readMessage(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(settings_);
                 settings_ = subBuilder.buildPartial();
@@ -19595,32 +19595,32 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.class, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.Builder.class);
     }
 
     private int bitField0_;
     public static final int POOL_FIELD_NUMBER = 1;
-    private akka.cluster.protobuf.msg.ClusterMessages.Pool pool_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool pool_;
     /**
      * required .Pool pool = 1;
      * @return Whether the pool field is set.
@@ -19632,18 +19632,18 @@ public final class ClusterMessages {
      * required .Pool pool = 1;
      * @return The pool.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.Pool getPool() {
-      return pool_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool getPool() {
+      return pool_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
     }
     /**
      * required .Pool pool = 1;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder getPoolOrBuilder() {
-      return pool_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder getPoolOrBuilder() {
+      return pool_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
     }
 
     public static final int SETTINGS_FIELD_NUMBER = 2;
-    private akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings settings_;
+    private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings settings_;
     /**
      * required .ClusterRouterPoolSettings settings = 2;
      * @return Whether the settings field is set.
@@ -19655,14 +19655,14 @@ public final class ClusterMessages {
      * required .ClusterRouterPoolSettings settings = 2;
      * @return The settings.
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getSettings() {
-      return settings_ == null ? akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getSettings() {
+      return settings_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
     }
     /**
      * required .ClusterRouterPoolSettings settings = 2;
      */
-    public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder getSettingsOrBuilder() {
-      return settings_ == null ? akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder getSettingsOrBuilder() {
+      return settings_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -19693,7 +19693,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getPool());
@@ -19711,11 +19711,11 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getPool());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getSettings());
       }
       size += unknownFields.getSerializedSize();
@@ -19728,10 +19728,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool other = (akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool) obj;
 
       if (hasPool() != other.hasPool()) return false;
       if (hasPool()) {
@@ -19767,73 +19767,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -19842,7 +19842,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -19853,7 +19853,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -19861,34 +19861,34 @@ public final class ClusterMessages {
      * Protobuf type {@code ClusterRouterPool}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ClusterRouterPool)
-        akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.class, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getPoolFieldBuilder();
           getSettingsFieldBuilder();
@@ -19913,19 +19913,19 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPool_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool build() {
-        akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -19933,8 +19933,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool result = new akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -19964,44 +19964,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool.getDefaultInstance()) return this;
         if (other.hasPool()) {
           mergePool(other.getPool());
         }
@@ -20032,14 +20032,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -20050,9 +20050,9 @@ public final class ClusterMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.protobuf.msg.ClusterMessages.Pool pool_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Pool, akka.cluster.protobuf.msg.ClusterMessages.Pool.Builder, akka.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder> poolBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool pool_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder> poolBuilder_;
       /**
        * required .Pool pool = 1;
        * @return Whether the pool field is set.
@@ -20064,9 +20064,9 @@ public final class ClusterMessages {
        * required .Pool pool = 1;
        * @return The pool.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Pool getPool() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool getPool() {
         if (poolBuilder_ == null) {
-          return pool_ == null ? akka.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
+          return pool_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
         } else {
           return poolBuilder_.getMessage();
         }
@@ -20074,7 +20074,7 @@ public final class ClusterMessages {
       /**
        * required .Pool pool = 1;
        */
-      public Builder setPool(akka.cluster.protobuf.msg.ClusterMessages.Pool value) {
+      public Builder setPool(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool value) {
         if (poolBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -20091,7 +20091,7 @@ public final class ClusterMessages {
        * required .Pool pool = 1;
        */
       public Builder setPool(
-          akka.cluster.protobuf.msg.ClusterMessages.Pool.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder builderForValue) {
         if (poolBuilder_ == null) {
           pool_ = builderForValue.build();
           onChanged();
@@ -20104,13 +20104,13 @@ public final class ClusterMessages {
       /**
        * required .Pool pool = 1;
        */
-      public Builder mergePool(akka.cluster.protobuf.msg.ClusterMessages.Pool value) {
+      public Builder mergePool(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool value) {
         if (poolBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               pool_ != null &&
-              pool_ != akka.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance()) {
+              pool_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance()) {
             pool_ =
-              akka.cluster.protobuf.msg.ClusterMessages.Pool.newBuilder(pool_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.newBuilder(pool_).mergeFrom(value).buildPartial();
           } else {
             pool_ = value;
           }
@@ -20137,7 +20137,7 @@ public final class ClusterMessages {
       /**
        * required .Pool pool = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.Pool.Builder getPoolBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder getPoolBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getPoolFieldBuilder().getBuilder();
@@ -20145,23 +20145,23 @@ public final class ClusterMessages {
       /**
        * required .Pool pool = 1;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder getPoolOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder getPoolOrBuilder() {
         if (poolBuilder_ != null) {
           return poolBuilder_.getMessageOrBuilder();
         } else {
           return pool_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance() : pool_;
         }
       }
       /**
        * required .Pool pool = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.Pool, akka.cluster.protobuf.msg.ClusterMessages.Pool.Builder, akka.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder> 
           getPoolFieldBuilder() {
         if (poolBuilder_ == null) {
-          poolBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.Pool, akka.cluster.protobuf.msg.ClusterMessages.Pool.Builder, akka.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder>(
+          poolBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder>(
                   getPool(),
                   getParentForChildren(),
                   isClean());
@@ -20170,9 +20170,9 @@ public final class ClusterMessages {
         return poolBuilder_;
       }
 
-      private akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings settings_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder> settingsBuilder_;
+      private org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings settings_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder> settingsBuilder_;
       /**
        * required .ClusterRouterPoolSettings settings = 2;
        * @return Whether the settings field is set.
@@ -20184,9 +20184,9 @@ public final class ClusterMessages {
        * required .ClusterRouterPoolSettings settings = 2;
        * @return The settings.
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getSettings() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getSettings() {
         if (settingsBuilder_ == null) {
-          return settings_ == null ? akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
+          return settings_ == null ? org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
         } else {
           return settingsBuilder_.getMessage();
         }
@@ -20194,7 +20194,7 @@ public final class ClusterMessages {
       /**
        * required .ClusterRouterPoolSettings settings = 2;
        */
-      public Builder setSettings(akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings value) {
+      public Builder setSettings(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings value) {
         if (settingsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -20211,7 +20211,7 @@ public final class ClusterMessages {
        * required .ClusterRouterPoolSettings settings = 2;
        */
       public Builder setSettings(
-          akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder builderForValue) {
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder builderForValue) {
         if (settingsBuilder_ == null) {
           settings_ = builderForValue.build();
           onChanged();
@@ -20224,13 +20224,13 @@ public final class ClusterMessages {
       /**
        * required .ClusterRouterPoolSettings settings = 2;
        */
-      public Builder mergeSettings(akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings value) {
+      public Builder mergeSettings(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings value) {
         if (settingsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               settings_ != null &&
-              settings_ != akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance()) {
+              settings_ != org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance()) {
             settings_ =
-              akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.newBuilder(settings_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.newBuilder(settings_).mergeFrom(value).buildPartial();
           } else {
             settings_ = value;
           }
@@ -20257,7 +20257,7 @@ public final class ClusterMessages {
       /**
        * required .ClusterRouterPoolSettings settings = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder getSettingsBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder getSettingsBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getSettingsFieldBuilder().getBuilder();
@@ -20265,23 +20265,23 @@ public final class ClusterMessages {
       /**
        * required .ClusterRouterPoolSettings settings = 2;
        */
-      public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder getSettingsOrBuilder() {
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder getSettingsOrBuilder() {
         if (settingsBuilder_ != null) {
           return settingsBuilder_.getMessageOrBuilder();
         } else {
           return settings_ == null ?
-              akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance() : settings_;
         }
       }
       /**
        * required .ClusterRouterPoolSettings settings = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder> 
           getSettingsFieldBuilder() {
         if (settingsBuilder_ == null) {
-          settingsBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder>(
+          settingsBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder>(
                   getSettings(),
                   getParentForChildren(),
                   isClean());
@@ -20291,13 +20291,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -20306,37 +20306,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ClusterRouterPool)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ClusterRouterPool parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ClusterRouterPool(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPool getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -20344,7 +20344,7 @@ public final class ClusterMessages {
 
   public interface PoolOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Pool)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required uint32 serializerId = 1;
@@ -20371,7 +20371,7 @@ public final class ClusterMessages {
      * required string manifest = 2;
      * @return The bytes for manifest.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getManifestBytes();
 
     /**
@@ -20383,48 +20383,48 @@ public final class ClusterMessages {
      * required bytes data = 3;
      * @return The data.
      */
-    akka.protobufv3.internal.ByteString getData();
+    org.apache.pekko.protobufv3.internal.ByteString getData();
   }
   /**
    * Protobuf type {@code Pool}
    */
   public  static final class Pool extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Pool)
       PoolOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Pool.newBuilder() to construct.
-    private Pool(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Pool(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Pool() {
       manifest_ = "";
-      data_ = akka.protobufv3.internal.ByteString.EMPTY;
+      data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Pool();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Pool(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -20439,7 +20439,7 @@ public final class ClusterMessages {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               manifest_ = bs;
               break;
@@ -20458,27 +20458,27 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.Pool.class, akka.cluster.protobuf.msg.ClusterMessages.Pool.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder.class);
     }
 
     private int bitField0_;
@@ -20517,8 +20517,8 @@ public final class ClusterMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           manifest_ = s;
@@ -20530,22 +20530,22 @@ public final class ClusterMessages {
      * required string manifest = 2;
      * @return The bytes for manifest.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getManifestBytes() {
       java.lang.Object ref = manifest_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         manifest_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int DATA_FIELD_NUMBER = 3;
-    private akka.protobufv3.internal.ByteString data_;
+    private org.apache.pekko.protobufv3.internal.ByteString data_;
     /**
      * required bytes data = 3;
      * @return Whether the data field is set.
@@ -20557,7 +20557,7 @@ public final class ClusterMessages {
      * required bytes data = 3;
      * @return The data.
      */
-    public akka.protobufv3.internal.ByteString getData() {
+    public org.apache.pekko.protobufv3.internal.ByteString getData() {
       return data_;
     }
 
@@ -20585,13 +20585,13 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt32(1, serializerId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, manifest_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, manifest_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(3, data_);
@@ -20606,14 +20606,14 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(1, serializerId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, manifest_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, manifest_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, data_);
       }
       size += unknownFields.getSerializedSize();
@@ -20626,10 +20626,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.Pool)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.Pool other = (akka.cluster.protobuf.msg.ClusterMessages.Pool) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool) obj;
 
       if (hasSerializerId() != other.hasSerializerId()) return false;
       if (hasSerializerId()) {
@@ -20674,73 +20674,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -20749,7 +20749,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.Pool prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -20760,7 +20760,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -20768,34 +20768,34 @@ public final class ClusterMessages {
      * Protobuf type {@code Pool}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Pool)
-        akka.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.PoolOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.Pool.class, akka.cluster.protobuf.msg.ClusterMessages.Pool.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.Pool.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -20806,25 +20806,25 @@ public final class ClusterMessages {
         bitField0_ = (bitField0_ & ~0x00000001);
         manifest_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
-        data_ = akka.protobufv3.internal.ByteString.EMPTY;
+        data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_Pool_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Pool getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Pool build() {
-        akka.cluster.protobuf.msg.ClusterMessages.Pool result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -20832,8 +20832,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.Pool buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.Pool result = new akka.cluster.protobuf.msg.ClusterMessages.Pool(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -20859,44 +20859,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.Pool) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.Pool)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.Pool other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool.getDefaultInstance()) return this;
         if (other.hasSerializerId()) {
           setSerializerId(other.getSerializerId());
         }
@@ -20929,14 +20929,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.Pool parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.Pool) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -20999,8 +20999,8 @@ public final class ClusterMessages {
       public java.lang.String getManifest() {
         java.lang.Object ref = manifest_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             manifest_ = s;
@@ -21014,17 +21014,17 @@ public final class ClusterMessages {
        * required string manifest = 2;
        * @return The bytes for manifest.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getManifestBytes() {
         java.lang.Object ref = manifest_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           manifest_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -21058,7 +21058,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder setManifestBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -21068,7 +21068,7 @@ public final class ClusterMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.ByteString data_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString data_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes data = 3;
        * @return Whether the data field is set.
@@ -21080,7 +21080,7 @@ public final class ClusterMessages {
        * required bytes data = 3;
        * @return The data.
        */
-      public akka.protobufv3.internal.ByteString getData() {
+      public org.apache.pekko.protobufv3.internal.ByteString getData() {
         return data_;
       }
       /**
@@ -21088,7 +21088,7 @@ public final class ClusterMessages {
        * @param value The data to set.
        * @return This builder for chaining.
        */
-      public Builder setData(akka.protobufv3.internal.ByteString value) {
+      public Builder setData(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -21109,13 +21109,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -21124,37 +21124,37 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Pool)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.Pool DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.Pool();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.Pool getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Pool parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Pool(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.Pool getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.Pool getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -21162,7 +21162,7 @@ public final class ClusterMessages {
 
   public interface ClusterRouterPoolSettingsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ClusterRouterPoolSettings)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required uint32 totalInstances = 1;
@@ -21211,7 +21211,7 @@ public final class ClusterMessages {
      * optional string useRole = 4;
      * @return The bytes for useRole.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getUseRoleBytes();
 
     /**
@@ -21236,49 +21236,49 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the useRoles at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getUseRolesBytes(int index);
   }
   /**
    * Protobuf type {@code ClusterRouterPoolSettings}
    */
   public  static final class ClusterRouterPoolSettings extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ClusterRouterPoolSettings)
       ClusterRouterPoolSettingsOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ClusterRouterPoolSettings.newBuilder() to construct.
-    private ClusterRouterPoolSettings(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ClusterRouterPoolSettings(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ClusterRouterPoolSettings() {
       useRole_ = "";
-      useRoles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ClusterRouterPoolSettings();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ClusterRouterPoolSettings(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -21303,15 +21303,15 @@ public final class ClusterMessages {
               break;
             }
             case 34: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000008;
               useRole_ = bs;
               break;
             }
             case 42: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                useRoles_ = new akka.protobufv3.internal.LazyStringArrayList();
+                useRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
               useRoles_.add(bs);
@@ -21326,10 +21326,10 @@ public final class ClusterMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000010) != 0)) {
@@ -21339,17 +21339,17 @@ public final class ClusterMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_descriptor;
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_fieldAccessorTable
+      return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.class, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder.class);
+              org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder.class);
     }
 
     private int bitField0_;
@@ -21422,8 +21422,8 @@ public final class ClusterMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           useRole_ = s;
@@ -21435,27 +21435,27 @@ public final class ClusterMessages {
      * optional string useRole = 4;
      * @return The bytes for useRole.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getUseRoleBytes() {
       java.lang.Object ref = useRole_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         useRole_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int USEROLES_FIELD_NUMBER = 5;
-    private akka.protobufv3.internal.LazyStringList useRoles_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList useRoles_;
     /**
      * repeated string useRoles = 5;
      * @return A list containing the useRoles.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getUseRolesList() {
       return useRoles_;
     }
@@ -21479,7 +21479,7 @@ public final class ClusterMessages {
      * @param index The index of the value to return.
      * @return The bytes of the useRoles at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getUseRolesBytes(int index) {
       return useRoles_.getByteString(index);
     }
@@ -21508,7 +21508,7 @@ public final class ClusterMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt32(1, totalInstances_);
@@ -21520,10 +21520,10 @@ public final class ClusterMessages {
         output.writeBool(3, allowLocalRoutees_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, useRole_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, useRole_);
       }
       for (int i = 0; i < useRoles_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 5, useRoles_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 5, useRoles_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -21535,19 +21535,19 @@ public final class ClusterMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(1, totalInstances_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(2, maxInstancesPerNode_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, allowLocalRoutees_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, useRole_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, useRole_);
       }
       {
         int dataSize = 0;
@@ -21567,10 +21567,10 @@ public final class ClusterMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings)) {
+      if (!(obj instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings)) {
         return super.equals(obj);
       }
-      akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings other = (akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings) obj;
+      org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings other = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings) obj;
 
       if (hasTotalInstances() != other.hasTotalInstances()) return false;
       if (hasTotalInstances()) {
@@ -21615,7 +21615,7 @@ public final class ClusterMessages {
       }
       if (hasAllowLocalRoutees()) {
         hash = (37 * hash) + ALLOWLOCALROUTEES_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getAllowLocalRoutees());
       }
       if (hasUseRole()) {
@@ -21631,73 +21631,73 @@ public final class ClusterMessages {
       return hash;
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseDelimitedFrom(
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -21706,7 +21706,7 @@ public final class ClusterMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -21717,7 +21717,7 @@ public final class ClusterMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -21725,34 +21725,34 @@ public final class ClusterMessages {
      * Protobuf type {@code ClusterRouterPoolSettings}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ClusterRouterPoolSettings)
-        akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettingsOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_fieldAccessorTable
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.class, akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder.class);
+                org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.class, org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.Builder.class);
       }
 
-      // Construct using akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.newBuilder()
+      // Construct using org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -21767,25 +21767,25 @@ public final class ClusterMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         useRole_ = "";
         bitField0_ = (bitField0_ & ~0x00000008);
-        useRoles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_descriptor;
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.internal_static_ClusterRouterPoolSettings_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getDefaultInstanceForType() {
-        return akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings build() {
-        akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings result = buildPartial();
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings build() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -21793,8 +21793,8 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings buildPartial() {
-        akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings result = new akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings(this);
+      public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings buildPartial() {
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings result = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -21829,44 +21829,44 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings) {
-          return mergeFrom((akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings) {
+          return mergeFrom((org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings other) {
-        if (other == akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings other) {
+        if (other == org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings.getDefaultInstance()) return this;
         if (other.hasTotalInstances()) {
           setTotalInstances(other.getTotalInstances());
         }
@@ -21912,14 +21912,14 @@ public final class ClusterMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parsedMessage = null;
+        org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -22056,8 +22056,8 @@ public final class ClusterMessages {
       public java.lang.String getUseRole() {
         java.lang.Object ref = useRole_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             useRole_ = s;
@@ -22071,17 +22071,17 @@ public final class ClusterMessages {
        * optional string useRole = 4;
        * @return The bytes for useRole.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getUseRoleBytes() {
         java.lang.Object ref = useRole_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           useRole_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -22115,7 +22115,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder setUseRoleBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -22125,10 +22125,10 @@ public final class ClusterMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.LazyStringList useRoles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureUseRolesIsMutable() {
         if (!((bitField0_ & 0x00000010) != 0)) {
-          useRoles_ = new akka.protobufv3.internal.LazyStringArrayList(useRoles_);
+          useRoles_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(useRoles_);
           bitField0_ |= 0x00000010;
          }
       }
@@ -22136,7 +22136,7 @@ public final class ClusterMessages {
        * repeated string useRoles = 5;
        * @return A list containing the useRoles.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getUseRolesList() {
         return useRoles_.getUnmodifiableView();
       }
@@ -22160,7 +22160,7 @@ public final class ClusterMessages {
        * @param index The index of the value to return.
        * @return The bytes of the useRoles at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getUseRolesBytes(int index) {
         return useRoles_.getByteString(index);
       }
@@ -22203,7 +22203,7 @@ public final class ClusterMessages {
       public Builder addAllUseRoles(
           java.lang.Iterable values) {
         ensureUseRolesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, useRoles_);
         onChanged();
         return this;
@@ -22213,7 +22213,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder clearUseRoles() {
-        useRoles_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        useRoles_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
@@ -22224,7 +22224,7 @@ public final class ClusterMessages {
        * @return This builder for chaining.
        */
       public Builder addUseRolesBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -22235,13 +22235,13 @@ public final class ClusterMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -22250,163 +22250,163 @@ public final class ClusterMessages {
     }
 
     // @@protoc_insertion_point(class_scope:ClusterRouterPoolSettings)
-    private static final akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings DEFAULT_INSTANCE;
+    private static final org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings();
     }
 
-    public static akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getDefaultInstance() {
+    public static org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ClusterRouterPoolSettings parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ClusterRouterPoolSettings(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.protobuf.msg.ClusterMessages.ClusterRouterPoolSettings getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Join_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Join_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Welcome_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Welcome_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_InitJoin_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_InitJoin_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_InitJoinAck_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_InitJoinAck_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ConfigCheck_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ConfigCheck_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Heartbeat_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Heartbeat_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_HeartBeatResponse_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_HeartBeatResponse_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_GossipEnvelope_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_GossipEnvelope_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_GossipStatus_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_GossipStatus_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Gossip_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Gossip_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_GossipOverview_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_GossipOverview_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ObserverReachability_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ObserverReachability_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_SubjectReachability_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_SubjectReachability_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Tombstone_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Tombstone_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Member_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Member_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_VectorClock_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_VectorClock_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_VectorClock_Version_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_VectorClock_Version_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Empty_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Empty_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Address_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Address_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_UniqueAddress_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_UniqueAddress_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ClusterRouterPool_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ClusterRouterPool_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Pool_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Pool_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ClusterRouterPoolSettings_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ClusterRouterPoolSettings_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -22468,148 +22468,149 @@ public final class ClusterMessages {
       "ing\020\000\022\006\n\002Up\020\001\022\013\n\007Leaving\020\002\022\013\n\007Exiting\020\003\022" +
       "\010\n\004Down\020\004\022\013\n\007Removed\020\005\022\014\n\010WeaklyUp\020\006\022\030\n\024" +
       "PreparingForShutdown\020\007\022\024\n\020ReadyForShutdo" +
-      "wn\020\010B\035\n\031akka.cluster.protobuf.msgH\001"
+      "wn\020\010B)\n%org.apache.pekko.cluster.protobu" +
+      "f.msgH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_Join_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Join_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Join_descriptor,
         new java.lang.String[] { "Node", "Roles", "AppVersion", });
     internal_static_Welcome_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_Welcome_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Welcome_descriptor,
         new java.lang.String[] { "From", "Gossip", });
     internal_static_InitJoin_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_InitJoin_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_InitJoin_descriptor,
         new java.lang.String[] { "CurrentConfig", });
     internal_static_InitJoinAck_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_InitJoinAck_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_InitJoinAck_descriptor,
         new java.lang.String[] { "Address", "ConfigCheck", });
     internal_static_ConfigCheck_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_ConfigCheck_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ConfigCheck_descriptor,
         new java.lang.String[] { "Type", "ClusterConfig", });
     internal_static_Heartbeat_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_Heartbeat_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Heartbeat_descriptor,
         new java.lang.String[] { "From", "SequenceNr", "CreationTime", });
     internal_static_HeartBeatResponse_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_HeartBeatResponse_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HeartBeatResponse_descriptor,
         new java.lang.String[] { "From", "SequenceNr", "CreationTime", });
     internal_static_GossipEnvelope_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_GossipEnvelope_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GossipEnvelope_descriptor,
         new java.lang.String[] { "From", "To", "SerializedGossip", });
     internal_static_GossipStatus_descriptor =
       getDescriptor().getMessageTypes().get(8);
     internal_static_GossipStatus_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GossipStatus_descriptor,
         new java.lang.String[] { "From", "AllHashes", "Version", "SeenDigest", });
     internal_static_Gossip_descriptor =
       getDescriptor().getMessageTypes().get(9);
     internal_static_Gossip_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Gossip_descriptor,
         new java.lang.String[] { "AllAddresses", "AllRoles", "AllHashes", "Members", "Overview", "Version", "Tombstones", "AllAppVersions", });
     internal_static_GossipOverview_descriptor =
       getDescriptor().getMessageTypes().get(10);
     internal_static_GossipOverview_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GossipOverview_descriptor,
         new java.lang.String[] { "Seen", "ObserverReachability", });
     internal_static_ObserverReachability_descriptor =
       getDescriptor().getMessageTypes().get(11);
     internal_static_ObserverReachability_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ObserverReachability_descriptor,
         new java.lang.String[] { "AddressIndex", "Version", "SubjectReachability", });
     internal_static_SubjectReachability_descriptor =
       getDescriptor().getMessageTypes().get(12);
     internal_static_SubjectReachability_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SubjectReachability_descriptor,
         new java.lang.String[] { "AddressIndex", "Status", "Version", });
     internal_static_Tombstone_descriptor =
       getDescriptor().getMessageTypes().get(13);
     internal_static_Tombstone_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Tombstone_descriptor,
         new java.lang.String[] { "AddressIndex", "Timestamp", });
     internal_static_Member_descriptor =
       getDescriptor().getMessageTypes().get(14);
     internal_static_Member_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Member_descriptor,
         new java.lang.String[] { "AddressIndex", "UpNumber", "Status", "RolesIndexes", "AppVersionIndex", });
     internal_static_VectorClock_descriptor =
       getDescriptor().getMessageTypes().get(15);
     internal_static_VectorClock_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_VectorClock_descriptor,
         new java.lang.String[] { "Timestamp", "Versions", });
     internal_static_VectorClock_Version_descriptor =
       internal_static_VectorClock_descriptor.getNestedTypes().get(0);
     internal_static_VectorClock_Version_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_VectorClock_Version_descriptor,
         new java.lang.String[] { "HashIndex", "Timestamp", });
     internal_static_Empty_descriptor =
       getDescriptor().getMessageTypes().get(16);
     internal_static_Empty_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Empty_descriptor,
         new java.lang.String[] { });
     internal_static_Address_descriptor =
       getDescriptor().getMessageTypes().get(17);
     internal_static_Address_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Address_descriptor,
         new java.lang.String[] { "System", "Hostname", "Port", "Protocol", });
     internal_static_UniqueAddress_descriptor =
       getDescriptor().getMessageTypes().get(18);
     internal_static_UniqueAddress_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UniqueAddress_descriptor,
         new java.lang.String[] { "Address", "Uid", "Uid2", });
     internal_static_ClusterRouterPool_descriptor =
       getDescriptor().getMessageTypes().get(19);
     internal_static_ClusterRouterPool_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ClusterRouterPool_descriptor,
         new java.lang.String[] { "Pool", "Settings", });
     internal_static_Pool_descriptor =
       getDescriptor().getMessageTypes().get(20);
     internal_static_Pool_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Pool_descriptor,
         new java.lang.String[] { "SerializerId", "Manifest", "Data", });
     internal_static_ClusterRouterPoolSettings_descriptor =
       getDescriptor().getMessageTypes().get(21);
     internal_static_ClusterRouterPoolSettings_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ClusterRouterPoolSettings_descriptor,
         new java.lang.String[] { "TotalInstances", "MaxInstancesPerNode", "AllowLocalRoutees", "UseRole", "UseRoles", });
   }
diff --git a/akka-cluster/src/main/protobuf/ClusterMessages.proto b/akka-cluster/src/main/protobuf/ClusterMessages.proto
index ca7183bc03..d52f47671c 100644
--- a/akka-cluster/src/main/protobuf/ClusterMessages.proto
+++ b/akka-cluster/src/main/protobuf/ClusterMessages.proto
@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-option java_package = "akka.cluster.protobuf.msg";
+option java_package = "org.apache.pekko.cluster.protobuf.msg";
 option optimize_for = SPEED;
 
 /****************************************
diff --git a/akka-cluster/src/main/resources/reference.conf b/akka-cluster/src/main/resources/reference.conf
index 6fa0e94586..65890b55a0 100644
--- a/akka-cluster/src/main/resources/reference.conf
+++ b/akka-cluster/src/main/resources/reference.conf
@@ -43,8 +43,8 @@ akka {
     # e.g. by keeping the larger side of the partition and shutting down the smaller side.
     # Disable with "off" or specify a duration to enable.
     #
-    # When using the `akka.cluster.sbr.SplitBrainResolver` as downing provider it will use
-    # the akka.cluster.split-brain-resolver.stable-after as the default down-removal-margin
+    # When using the `org.apache.pekko.cluster.sbr.SplitBrainResolver` as downing provider it will use
+    # the org.apache.pekko.cluster.split-brain-resolver.stable-after as the default down-removal-margin
     # if this down-removal-margin is undefined.
     down-removal-margin = off
 
@@ -52,7 +52,7 @@ akka {
     # If this setting is left empty the `NoDowning` provider is used and no automatic downing will be performed.
     #
     # If specified the value must be the fully qualified class name of a subclass of
-    # `akka.cluster.DowningProvider` having a public one argument constructor accepting an `ActorSystem`
+    # `org.apache.pekko.cluster.DowningProvider` having a public one argument constructor accepting an `ActorSystem`
     downing-provider-class = ""
 
     # Artery only setting
@@ -116,12 +116,12 @@ akka {
     min-nr-of-members = 1
 
     # Enable/disable info level logging of cluster events.
-    # These are logged with logger name `akka.cluster.Cluster`.
+    # These are logged with logger name `org.apache.pekko.cluster.Cluster`.
     log-info = on
 
     # Enable/disable verbose info-level logging of cluster events
     # for temporary troubleshooting. Defaults to 'off'.
-    # These are logged with logger name `akka.cluster.Cluster`.
+    # These are logged with logger name `org.apache.pekko.cluster.Cluster`.
     log-info-verbose = off
 
     # Enable or disable JMX MBeans for management of the cluster
@@ -181,10 +181,10 @@ akka {
     failure-detector {
 
       # FQCN of the failure detector implementation.
-      # It must implement akka.remote.FailureDetector and have
+      # It must implement org.apache.pekko.remote.FailureDetector and have
       # a public constructor with a com.typesafe.config.Config and
-      # akka.actor.EventStream parameter.
-      implementation-class = "akka.remote.PhiAccrualFailureDetector"
+      # org.apache.pekko.actor.EventStream parameter.
+      implementation-class = "org.apache.pekko.remote.PhiAccrualFailureDetector"
 
       # How often keep-alive heartbeat messages should be sent to each connection.
       heartbeat-interval = 1 s
@@ -250,10 +250,10 @@ akka {
 
       failure-detector {
         # FQCN of the failure detector implementation.
-        # It must implement akka.remote.FailureDetector and have
+        # It must implement org.apache.pekko.remote.FailureDetector and have
         # a public constructor with a com.typesafe.config.Config and
-        # akka.actor.EventStream parameter.
-        implementation-class = "akka.remote.DeadlineFailureDetector"
+        # org.apache.pekko.actor.EventStream parameter.
+        implementation-class = "org.apache.pekko.remote.DeadlineFailureDetector"
   
         # Number of potentially lost/delayed heartbeats that will be
         # accepted before considering it to be an anomaly.
@@ -283,7 +283,7 @@ akka {
 
     debug {
       # Log heartbeat events (very verbose, useful mostly when debugging heartbeating issues).
-      # These are logged with logger name `akka.cluster.ClusterHeartbeat`.
+      # These are logged with logger name `org.apache.pekko.cluster.ClusterHeartbeat`.
       verbose-heartbeat-logging = off
 
       # log verbose details about gossip
@@ -307,7 +307,7 @@ akka {
       # Checkers defined in reference.conf can be disabled by application by using empty string value
       # for the named entry.
       checkers {
-        akka-cluster = "akka.cluster.JoinConfigCompatCheckCluster"
+        akka-cluster = "org.apache.pekko.cluster.JoinConfigCompatCheckCluster"
       }
 
       # Some configuration properties might not be appropriate to transfer between nodes
@@ -369,16 +369,16 @@ akka {
   # Protobuf serializer for cluster messages
   actor {
     serializers {
-      akka-cluster = "akka.cluster.protobuf.ClusterMessageSerializer"
+      akka-cluster = "org.apache.pekko.cluster.protobuf.ClusterMessageSerializer"
     }
 
     serialization-bindings {
-      "akka.cluster.ClusterMessage" = akka-cluster
-      "akka.cluster.routing.ClusterRouterPool" = akka-cluster
+      "org.apache.pekko.cluster.ClusterMessage" = akka-cluster
+      "org.apache.pekko.cluster.routing.ClusterRouterPool" = akka-cluster
     }
     
     serialization-identifiers {
-      "akka.cluster.protobuf.ClusterMessageSerializer" = 5
+      "org.apache.pekko.cluster.protobuf.ClusterMessageSerializer" = 5
     }
     
   }
@@ -388,7 +388,7 @@ akka {
 #//#split-brain-resolver
 
 # To enable the split brain resolver you first need to enable the provider in your application.conf:
-# akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+# akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
 
 akka.cluster.split-brain-resolver {
   # Select one of the available strategies (see descriptions below):
diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
similarity index 94%
rename from akka-cluster/src/main/scala/akka/cluster/Cluster.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
index f29e36a447..77ab4a0d76 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.io.Closeable
 import java.util.concurrent.ThreadFactory
@@ -17,18 +17,19 @@ import scala.util.control.NonFatal
 import scala.annotation.nowarn
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.ConfigurationException
-import akka.actor._
-import akka.annotation.InternalApi
-import akka.cluster.ClusterSettings.DataCenter
-import akka.dispatch.MonitorableThreadFactory
-import akka.event.{ Logging, LoggingAdapter }
-import akka.event.LogMarker
-import akka.event.Logging.LogLevel
-import akka.event.MarkerLoggingAdapter
-import akka.japi.Util
-import akka.pattern._
-import akka.remote.{ UniqueAddress => _, _ }
+import org.apache.pekko
+import pekko.ConfigurationException
+import pekko.actor._
+import pekko.annotation.InternalApi
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.dispatch.MonitorableThreadFactory
+import pekko.event.{ Logging, LoggingAdapter }
+import pekko.event.LogMarker
+import pekko.event.Logging.LogLevel
+import pekko.event.MarkerLoggingAdapter
+import pekko.japi.Util
+import pekko.pattern._
+import pekko.remote.{ UniqueAddress => _, _ }
 
 /**
  * Cluster Extension Id and factory for creating Cluster extension.
@@ -57,7 +58,7 @@ object Cluster extends ExtensionId[Cluster] with ExtensionIdProvider {
  * information is retrieved through [[#subscribe]]. Commands to operate the cluster is
  * available through methods in this class, such as [[#join]], [[#down]] and [[#leave]].
  *
- * Each cluster [[Member]] is identified by its [[akka.actor.Address]], and
+ * Each cluster [[Member]] is identified by its [[pekko.actor.Address]], and
  * the cluster address of this actor system is [[#selfAddress]]. A member also has a status;
  * initially [[MemberStatus]] `Joining` followed by [[MemberStatus]] `Up`.
  */
@@ -135,7 +136,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
   }
 
   private def checkAutoDownUsage(): Unit = {
-    if (settings.DowningProviderClassName == "akka.cluster.AutoDowning" ||
+    if (settings.DowningProviderClassName == "org.apache.pekko.cluster.AutoDowning" ||
       (settings.config.hasPath("auto-down-unreachable-after") && settings.config.getString(
         "auto-down-unreachable-after") != "off"))
       logWarning(
@@ -250,10 +251,10 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
 
   /**
    * Subscribe to one or more cluster domain events.
-   * The `to` classes can be [[akka.cluster.ClusterEvent.ClusterDomainEvent]]
+   * The `to` classes can be [[pekko.cluster.ClusterEvent.ClusterDomainEvent]]
    * or subclasses.
    *
-   * A snapshot of [[akka.cluster.ClusterEvent.CurrentClusterState]]
+   * A snapshot of [[pekko.cluster.ClusterEvent.CurrentClusterState]]
    * will be sent to the subscriber as the first message.
    */
   @varargs def subscribe(subscriber: ActorRef, to: Class[_]*): Unit =
@@ -261,7 +262,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
 
   /**
    * Subscribe to one or more cluster domain events.
-   * The `to` classes can be [[akka.cluster.ClusterEvent.ClusterDomainEvent]]
+   * The `to` classes can be [[pekko.cluster.ClusterEvent.ClusterDomainEvent]]
    * or subclasses.
    *
    * If `initialStateMode` is `ClusterEvent.InitialStateAsEvents` the events corresponding
@@ -269,7 +270,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
    * have seen if you were listening to the events when they occurred in the past.
    *
    * If `initialStateMode` is `ClusterEvent.InitialStateAsSnapshot` a snapshot of
-   * [[akka.cluster.ClusterEvent.CurrentClusterState]] will be sent to the subscriber as the
+   * [[pekko.cluster.ClusterEvent.CurrentClusterState]] will be sent to the subscriber as the
    * first message.
    *
    * Note that for large clusters it is more efficient to use `InitialStateAsSnapshot`.
@@ -278,7 +279,8 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
     require(to.length > 0, "at least one `ClusterDomainEvent` class is required")
     require(
       to.forall(classOf[ClusterDomainEvent].isAssignableFrom),
-      s"subscribe to `akka.cluster.ClusterEvent.ClusterDomainEvent` or subclasses, was [${to.map(_.getName).mkString(", ")}]")
+      s"subscribe to `org.apache.pekko.cluster.ClusterEvent.ClusterDomainEvent` or subclasses, was [${to.map(
+          _.getName).mkString(", ")}]")
     clusterCore ! InternalClusterAction.Subscribe(subscriber, initialStateMode, to.toSet)
   }
 
@@ -312,7 +314,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
    * When it has successfully joined it must be restarted to be able to join another
    * cluster or to join the same cluster again.
    *
-   * The name of the [[akka.actor.ActorSystem]] must be the same for all members of a
+   * The name of the [[pekko.actor.ActorSystem]] must be the same for all members of a
    * cluster.
    */
   def join(address: Address): Unit = {
@@ -407,7 +409,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
    * The supplied thunk will be run, once, when current cluster member is `Removed`.
    * If the cluster has already been shutdown the thunk will run on the caller thread immediately.
    * If this is called "at the same time" as `shutdown()` there is a possibility that the the thunk
-   * is not invoked. It's often better to use [[akka.actor.CoordinatedShutdown]] for this purpose.
+   * is not invoked. It's often better to use [[pekko.actor.CoordinatedShutdown]] for this purpose.
    */
   def registerOnMemberRemoved[T](code: => T): Unit =
     registerOnMemberRemoved(new Runnable { override def run(): Unit = code })
@@ -416,7 +418,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
    * Java API: The supplied thunk will be run, once, when current cluster member is `Removed`.
    * If the cluster has already been shutdown the thunk will run on the caller thread immediately.
    * If this is called "at the same time" as `shutdown()` there is a possibility that the the thunk
-   * is not invoked. It's often better to use [[akka.actor.CoordinatedShutdown]] for this purpose.
+   * is not invoked. It's often better to use [[pekko.actor.CoordinatedShutdown]] for this purpose.
    */
   def registerOnMemberRemoved(callback: Runnable): Unit = {
     if (_isTerminated.get())
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterActorRefProvider.scala
similarity index 79%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterActorRefProvider.scala
index 6222280b01..fc80011d27 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterActorRefProvider.scala
@@ -2,43 +2,44 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
-import akka.ConfigurationException
-import akka.actor.ActorPath
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.ActorSystemImpl
-import akka.actor.Address
-import akka.actor.Deploy
-import akka.actor.DynamicAccess
-import akka.actor.NoScopeGiven
-import akka.actor.Scope
-import akka.annotation.InternalApi
-import akka.cluster.routing.ClusterRouterGroup
-import akka.cluster.routing.ClusterRouterGroupSettings
-import akka.cluster.routing.ClusterRouterPool
-import akka.cluster.routing.ClusterRouterPoolSettings
-import akka.event.EventStream
-import akka.remote.RemoteActorRefProvider
-import akka.remote.RemoteDeployer
-import akka.remote.routing.RemoteRouterConfig
-import akka.routing.Group
-import akka.routing.Pool
+import org.apache.pekko
+import pekko.ConfigurationException
+import pekko.actor.ActorPath
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.ActorSystemImpl
+import pekko.actor.Address
+import pekko.actor.Deploy
+import pekko.actor.DynamicAccess
+import pekko.actor.NoScopeGiven
+import pekko.actor.Scope
+import pekko.annotation.InternalApi
+import pekko.cluster.routing.ClusterRouterGroup
+import pekko.cluster.routing.ClusterRouterGroupSettings
+import pekko.cluster.routing.ClusterRouterPool
+import pekko.cluster.routing.ClusterRouterPoolSettings
+import pekko.event.EventStream
+import pekko.remote.RemoteActorRefProvider
+import pekko.remote.RemoteDeployer
+import pekko.remote.routing.RemoteRouterConfig
+import pekko.routing.Group
+import pekko.routing.Pool
 
 /**
  * INTERNAL API
  *
- * The `ClusterActorRefProvider` will load the [[akka.cluster.Cluster]]
+ * The `ClusterActorRefProvider` will load the [[pekko.cluster.Cluster]]
  * extension, i.e. the cluster will automatically be started when
  * the `ClusterActorRefProvider` is used.
  */
 @InternalApi
-private[akka] class ClusterActorRefProvider(
+private[pekko] class ClusterActorRefProvider(
     _systemName: String,
     _settings: ActorSystem.Settings,
     _eventStream: EventStream,
@@ -81,7 +82,7 @@ private[akka] class ClusterActorRefProvider(
  * Deployer of cluster aware routers.
  */
 @InternalApi
-private[akka] class ClusterDeployer(_settings: ActorSystem.Settings, _pm: DynamicAccess)
+private[pekko] class ClusterDeployer(_settings: ActorSystem.Settings, _pm: DynamicAccess)
     extends RemoteDeployer(_settings, _pm) {
 
   override def parseConfig(path: String, config: Config): Option[Deploy] = {
@@ -132,7 +133,7 @@ private[akka] class ClusterDeployer(_settings: ActorSystem.Settings, _pm: Dynami
 abstract class ClusterScope extends Scope
 
 /**
- * Cluster aware scope of a [[akka.actor.Deploy]]
+ * Cluster aware scope of a [[pekko.actor.Deploy]]
  */
 case object ClusterScope extends ClusterScope {
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala
similarity index 98%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala
index ce409a8142..71c9cf0118 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.Future
@@ -13,20 +13,21 @@ import scala.util.control.NonFatal
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.Done
-import akka.actor._
-import akka.actor.SupervisorStrategy.Stop
-import akka.annotation.InternalApi
-import akka.cluster.ClusterEvent._
-import akka.cluster.MemberStatus._
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.event.ActorWithLogClass
-import akka.event.Logging
-import akka.pattern.ask
-import akka.remote.{ QuarantinedEvent => ClassicQuarantinedEvent }
-import akka.remote.artery.QuarantinedEvent
-import akka.util.Timeout
-import akka.util.Version
+import org.apache.pekko
+import pekko.Done
+import pekko.actor._
+import pekko.actor.SupervisorStrategy.Stop
+import pekko.annotation.InternalApi
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.MemberStatus._
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.event.ActorWithLogClass
+import pekko.event.Logging
+import pekko.pattern.ask
+import pekko.remote.{ QuarantinedEvent => ClassicQuarantinedEvent }
+import pekko.remote.artery.QuarantinedEvent
+import pekko.util.Timeout
+import pekko.util.Version
 
 /**
  * Base trait for all cluster messages. All ClusterMessage's are serializable.
@@ -36,7 +37,7 @@ trait ClusterMessage extends Serializable
 /**
  * INTERNAL API
  * Cluster commands sent by the USER via
- * [[akka.cluster.Cluster]] extension
+ * [[pekko.cluster.Cluster]] extension
  * or JMX.
  */
 @InternalApi
@@ -161,8 +162,8 @@ private[cluster] object InternalClusterAction {
   case object GetClusterCoreRef
 
   /**
-   * Command to [[akka.cluster.ClusterDaemon]] to create a
-   * [[akka.cluster.OnMemberStatusChangedListener]].
+   * Command to [[pekko.cluster.ClusterDaemon]] to create a
+   * [[pekko.cluster.OnMemberStatusChangedListener]].
    */
   final case class AddOnMemberUpListener(callback: Runnable) extends NoSerializationVerificationNeeded
 
@@ -176,7 +177,7 @@ private[cluster] object InternalClusterAction {
       with DeadLetterSuppression
 
   /**
-   * @param receiver [[akka.cluster.ClusterEvent.CurrentClusterState]] will be sent to the `receiver`
+   * @param receiver [[pekko.cluster.ClusterEvent.CurrentClusterState]] will be sent to the `receiver`
    */
   final case class SendCurrentClusterState(receiver: ActorRef) extends SubscriptionMessage
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala
similarity index 97%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala
index 5a15203c88..c05cfbe91c 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.collection.immutable.{ SortedSet, VectorBuilder }
@@ -11,15 +11,16 @@ import scala.runtime.AbstractFunction5
 import scala.annotation.nowarn
 import language.postfixOps
 
-import akka.actor.{ Actor, ActorRef, Address }
-import akka.actor.DeadLetterSuppression
-import akka.annotation.{ DoNotInherit, InternalApi }
-import akka.cluster.ClusterEvent._
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.MemberStatus._
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.event.EventStream
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, Address }
+import pekko.actor.DeadLetterSuppression
+import pekko.annotation.{ DoNotInherit, InternalApi }
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.MemberStatus._
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.event.EventStream
+import pekko.util.ccompat._
 
 /**
  * Domain events published to the event bus.
@@ -34,7 +35,7 @@ object ClusterEvent {
 
   /**
    * When using this subscription mode a snapshot of
-   * [[akka.cluster.ClusterEvent.CurrentClusterState]] will be sent to the
+   * [[pekko.cluster.ClusterEvent.CurrentClusterState]] will be sent to the
    * subscriber as the first message.
    */
   case object InitialStateAsSnapshot extends SubscriptionInitialStateMode
@@ -99,7 +100,7 @@ object ClusterEvent {
       val leader: Option[Address],
       val roleLeaderMap: Map[String, Option[Address]],
       val unreachableDataCenters: Set[DataCenter],
-      @InternalApi private[akka] val memberTombstones: Set[UniqueAddress])
+      @InternalApi private[pekko] val memberTombstones: Set[UniqueAddress])
       extends Product5[
         immutable.SortedSet[Member], Set[Member], Set[Address], Option[Address], Map[String, Option[Address]]]
       with Serializable {
@@ -129,7 +130,7 @@ object ClusterEvent {
      * Java API: get current member list.
      */
     def getMembers: java.lang.Iterable[Member] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       members.asJava
     }
 
@@ -222,7 +223,7 @@ object ClusterEvent {
      * Returns true if the address is a cluster member and that member is `MemberStatus.Up`.
      */
     @InternalApi
-    private[akka] def isMemberUp(address: Address): Boolean =
+    private[pekko] def isMemberUp(address: Address): Boolean =
       members.exists(m => m.address == address && m.status == MemberStatus.Up)
 
     // for binary compatibility (used to be a case class)
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala
similarity index 96%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala
index 0082a0547e..0133a86e0a 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.TimeUnit
 
 import scala.annotation.tailrec
 import scala.collection.immutable
 
-import akka.actor.Actor
-import akka.actor.ActorPath
-import akka.actor.ActorSelection
-import akka.actor.Address
-import akka.actor.DeadLetterSuppression
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.annotation.InternalApi
-import akka.cluster.ClusterEvent._
-import akka.event.ActorWithLogClass
-import akka.event.Logging
-import akka.remote.FailureDetectorRegistry
-import akka.remote.HeartbeatMessage
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorPath
+import pekko.actor.ActorSelection
+import pekko.actor.Address
+import pekko.actor.DeadLetterSuppression
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.annotation.InternalApi
+import pekko.cluster.ClusterEvent._
+import pekko.event.ActorWithLogClass
+import pekko.event.Logging
+import pekko.remote.FailureDetectorRegistry
+import pekko.remote.HeartbeatMessage
+import pekko.util.ccompat._
 
 /**
  * INTERNAL API.
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterJmx.scala
similarity index 97%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterJmx.scala
index 59370329dd..38f20adb37 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterJmx.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.lang.management.ManagementFactory
 import javax.management.InstanceAlreadyExistsException
@@ -10,8 +10,9 @@ import javax.management.InstanceNotFoundException
 import javax.management.ObjectName
 import javax.management.StandardMBean
 
-import akka.actor.AddressFromURIString
-import akka.event.LoggingAdapter
+import org.apache.pekko
+import pekko.actor.AddressFromURIString
+import pekko.event.LoggingAdapter
 
 /**
  * Interface for the cluster JMX MBean.
@@ -135,7 +136,7 @@ trait ClusterNodeMBean {
 /**
  * INTERNAL API
  */
-private[akka] class ClusterJmx(cluster: Cluster, log: LoggingAdapter) {
+private[pekko] class ClusterJmx(cluster: Cluster, log: LoggingAdapter) {
 
   private val mBeanServer = ManagementFactory.getPlatformMBeanServer
   private val clusterMBeanName =
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterLogClass.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogClass.scala
similarity index 65%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterLogClass.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogClass.scala
index 1a893c3d6f..d66126a1d2 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterLogClass.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogClass.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ClusterLogClass {
+@InternalApi private[pekko] object ClusterLogClass {
 
   val ClusterCore: Class[Cluster] = classOf[Cluster]
   val ClusterHeartbeat: Class[ClusterHeartbeat] = classOf[ClusterHeartbeat]
@@ -20,9 +20,9 @@ import akka.annotation.InternalApi
 /**
  * INTERNAL API: Logger class for (verbose) heartbeat logging.
  */
-@InternalApi private[akka] class ClusterHeartbeat
+@InternalApi private[pekko] class ClusterHeartbeat
 
 /**
  * INTERNAL API: Logger class for (verbose) gossip logging.
  */
-@InternalApi private[akka] class ClusterGossip
+@InternalApi private[pekko] class ClusterGossip
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterLogMarker.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogMarker.scala
similarity index 94%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterLogMarker.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogMarker.scala
index 07b86bb289..8147b212aa 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterLogMarker.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogMarker.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.actor.Address
-import akka.annotation.ApiMayChange
-import akka.annotation.InternalApi
-import akka.cluster.sbr.DowningStrategy
-import akka.event.LogMarker
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.annotation.ApiMayChange
+import pekko.annotation.InternalApi
+import pekko.cluster.sbr.DowningStrategy
+import pekko.event.LogMarker
 
 /**
  * This is public with the purpose to document the used markers and properties of log events.
@@ -21,7 +22,7 @@ object ClusterLogMarker {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] object Properties {
+  @InternalApi private[pekko] object Properties {
     val MemberStatus = "akkaMemberStatus"
     val SbrDecision = "akkaSbrDecision"
   }
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala
similarity index 94%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala
index 52fe787c49..9e4630cfc6 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala
@@ -2,28 +2,29 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.io.Closeable
 import java.util.concurrent.atomic.AtomicReference
 
 import scala.collection.immutable
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.Deploy
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.cluster.ClusterEvent._
-import akka.dispatch.RequiresMessageQueue
-import akka.dispatch.UnboundedMessageQueueSemantics
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.Deploy
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.cluster.ClusterEvent._
+import pekko.dispatch.RequiresMessageQueue
+import pekko.dispatch.UnboundedMessageQueueSemantics
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ClusterReadView {
+@InternalApi private[pekko] object ClusterReadView {
   final case class State(
       clusterState: CurrentClusterState,
       reachability: Reachability,
@@ -38,7 +39,7 @@ import akka.dispatch.UnboundedMessageQueueSemantics
  * Read view of cluster state, updated via subscription of
  * cluster events published on the event bus.
  */
-@InternalApi private[akka] class ClusterReadView(cluster: Cluster) extends Closeable {
+@InternalApi private[pekko] class ClusterReadView(cluster: Cluster) extends Closeable {
   import ClusterReadView.State
   import cluster.ClusterLogger._
 
@@ -171,7 +172,7 @@ import akka.dispatch.UnboundedMessageQueueSemantics
   def unreachableMembers: Set[Member] = _state.get().clusterState.unreachable
 
   /**
-   * Member status for this node ([[akka.cluster.MemberStatus]]).
+   * Member status for this node ([[pekko.cluster.MemberStatus]]).
    *
    * NOTE: If the node has been removed from the cluster (and shut down) then it's status is set to the 'REMOVED' tombstone state
    *       and is no longer present in the node ring or any other part of the gossiping state. However in order to maintain the
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterRemoteWatcher.scala
similarity index 88%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterRemoteWatcher.scala
index 40929dda2e..ec19a681b5 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterRemoteWatcher.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration.FiniteDuration
-import akka.actor._
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterEvent.MemberEvent
-import akka.cluster.ClusterEvent.MemberJoined
-import akka.cluster.ClusterEvent.MemberRemoved
-import akka.cluster.ClusterEvent.MemberTombstonesChanged
-import akka.cluster.ClusterEvent.MemberUp
-import akka.cluster.ClusterEvent.MemberWeaklyUp
-import akka.dispatch.Dispatchers
-import akka.dispatch.sysmsg.DeathWatchNotification
-import akka.event.ActorWithLogClass
-import akka.event.Logging
-import akka.remote.FailureDetectorRegistry
-import akka.remote.RARP
-import akka.remote.RemoteSettings
-import akka.remote.RemoteWatcher
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.ClusterEvent.MemberEvent
+import pekko.cluster.ClusterEvent.MemberJoined
+import pekko.cluster.ClusterEvent.MemberRemoved
+import pekko.cluster.ClusterEvent.MemberTombstonesChanged
+import pekko.cluster.ClusterEvent.MemberUp
+import pekko.cluster.ClusterEvent.MemberWeaklyUp
+import pekko.dispatch.Dispatchers
+import pekko.dispatch.sysmsg.DeathWatchNotification
+import pekko.event.ActorWithLogClass
+import pekko.event.Logging
+import pekko.remote.FailureDetectorRegistry
+import pekko.remote.RARP
+import pekko.remote.RemoteSettings
+import pekko.remote.RemoteWatcher
 
 /**
  * INTERNAL API
@@ -28,7 +29,7 @@ import akka.remote.RemoteWatcher
 private[cluster] object ClusterRemoteWatcher {
 
   /**
-   * Factory method for `ClusterRemoteWatcher` [[akka.actor.Props]].
+   * Factory method for `ClusterRemoteWatcher` [[pekko.actor.Props]].
    */
   def props(failureDetector: FailureDetectorRegistry[Address], settings: RemoteSettings): Props =
     Props(
@@ -48,9 +49,9 @@ private[cluster] object ClusterRemoteWatcher {
 /**
  * INTERNAL API
  *
- * Specialization of [[akka.remote.RemoteWatcher]] that keeps
+ * Specialization of [[pekko.remote.RemoteWatcher]] that keeps
  * track of cluster member nodes and is responsible for watchees on cluster nodes.
- * [[akka.actor.AddressTerminated]] is published when node is removed from cluster.
+ * [[pekko.actor.AddressTerminated]] is published when node is removed from cluster.
  *
  * `RemoteWatcher` handles non-cluster nodes. `ClusterRemoteWatcher` will take
  * over responsibility from `RemoteWatcher` if a watch is added before a node is member
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala
similarity index 93%
rename from akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala
index cf53faccb3..f632955dea 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.duration._
@@ -10,12 +10,13 @@ import scala.concurrent.duration._
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigObject
 
-import akka.actor.Address
-import akka.actor.AddressFromURIString
-import akka.annotation.InternalApi
-import akka.japi.Util.immutableSeq
-import akka.util.Helpers.{ toRootLowerCase, ConfigOps, Requiring }
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.actor.AddressFromURIString
+import pekko.annotation.InternalApi
+import pekko.japi.Util.immutableSeq
+import pekko.util.Helpers.{ toRootLowerCase, ConfigOps, Requiring }
+import pekko.util.Version
 
 object ClusterSettings {
   type DataCenter = String
@@ -24,13 +25,13 @@ object ClusterSettings {
    * INTERNAL API.
    */
   @InternalApi
-  private[akka] val DcRolePrefix = "dc-"
+  private[pekko] val DcRolePrefix = "dc-"
 
   /**
    * INTERNAL API.
    */
   @InternalApi
-  private[akka] val DefaultDataCenter: DataCenter = "default"
+  private[pekko] val DefaultDataCenter: DataCenter = "default"
 
 }
 
@@ -165,7 +166,7 @@ final class ClusterSettings(val config: Config, val systemName: String) {
     cc.getInt("min-nr-of-members")
   }.requiring(_ > 0, "min-nr-of-members must be > 0")
   val MinNrOfMembersOfRole: Map[String, Int] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     cc.getConfig("role")
       .root
       .asScala
@@ -185,7 +186,7 @@ final class ClusterSettings(val config: Config, val systemName: String) {
 
   val ByPassConfigCompatCheck: Boolean = !cc.getBoolean("configuration-compatibility-check.enforce-on-join")
   val ConfigCompatCheckers: Set[String] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     cc.getConfig("configuration-compatibility-check.checkers")
       .root
       .unwrapped
@@ -199,7 +200,7 @@ final class ClusterSettings(val config: Config, val systemName: String) {
   }
 
   val SensitiveConfigPaths = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
 
     val sensitiveKeys =
       cc.getConfig("configuration-compatibility-check.sensitive-config-paths")
diff --git a/akka-cluster/src/main/scala/akka/cluster/CoordinatedShutdownLeave.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/CoordinatedShutdownLeave.scala
similarity index 81%
rename from akka-cluster/src/main/scala/akka/cluster/CoordinatedShutdownLeave.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/CoordinatedShutdownLeave.scala
index f04a4a6928..4cd26d257f 100644
--- a/akka-cluster/src/main/scala/akka/cluster/CoordinatedShutdownLeave.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/CoordinatedShutdownLeave.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.Done
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.ClusterEvent._
-import akka.cluster.MemberStatus._
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.MemberStatus._
 
 /**
  * INTERNAL API
  */
-private[akka] object CoordinatedShutdownLeave {
+private[pekko] object CoordinatedShutdownLeave {
   def props(): Props = Props[CoordinatedShutdownLeave]()
 
   case object LeaveReq
@@ -23,7 +24,7 @@ private[akka] object CoordinatedShutdownLeave {
 /**
  * INTERNAL API
  */
-private[akka] class CoordinatedShutdownLeave extends Actor {
+private[pekko] class CoordinatedShutdownLeave extends Actor {
   import CoordinatedShutdownLeave.LeaveReq
 
   val cluster = Cluster(context.system)
diff --git a/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/CrossDcClusterHeartbeat.scala
similarity index 96%
rename from akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/CrossDcClusterHeartbeat.scala
index b29cd056c2..fd8006f5a2 100644
--- a/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/CrossDcClusterHeartbeat.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.SortedSet
 import scala.collection.immutable
 
-import akka.actor.{ Actor, ActorSelection, Address, NoSerializationVerificationNeeded }
-import akka.annotation.InternalApi
-import akka.cluster.ClusterEvent._
-import akka.cluster.ClusterSettings.DataCenter
-import akka.event.ActorWithLogClass
-import akka.event.Logging
-import akka.remote.FailureDetectorRegistry
-import akka.util.ConstantFun
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorSelection, Address, NoSerializationVerificationNeeded }
+import pekko.annotation.InternalApi
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.event.ActorWithLogClass
+import pekko.event.Logging
+import pekko.remote.FailureDetectorRegistry
+import pekko.util.ConstantFun
+import pekko.util.ccompat._
 
 /**
  * INTERNAL API
@@ -216,7 +217,7 @@ private[cluster] class CrossDcHeartbeatSender extends Actor {
 
 /** INTERNAL API */
 @InternalApi
-private[akka] object CrossDcHeartbeatSender {
+private[pekko] object CrossDcHeartbeatSender {
 
   // -- messages intended only for local messaging during testing --
   sealed trait InspectionCommand extends NoSerializationVerificationNeeded
diff --git a/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala
similarity index 86%
rename from akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala
index a6c9080d32..e38e82ec6c 100644
--- a/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration.FiniteDuration
 
-import akka.ConfigurationException
-import akka.actor.{ ActorSystem, ExtendedActorSystem, Props }
+import org.apache.pekko
+import pekko.ConfigurationException
+import pekko.actor.{ ActorSystem, ExtendedActorSystem, Props }
 
 /**
  * INTERNAL API
@@ -17,7 +18,7 @@ private[cluster] object DowningProvider {
   /**
    * @param fqcn Fully qualified class name of the implementation to be loaded.
    * @param system Actor system used to load the implemntation
-   * @return the provider or throws a [[akka.ConfigurationException]] if loading it fails
+   * @return the provider or throws a [[pekko.ConfigurationException]] if loading it fails
    */
   def load(fqcn: String, system: ActorSystem): DowningProvider = {
     val eas = system.asInstanceOf[ExtendedActorSystem]
@@ -33,7 +34,7 @@ private[cluster] object DowningProvider {
 
 /**
  * API for plugins that will handle downing of cluster nodes. Concrete plugins must subclass and
- * have a public one argument constructor accepting an [[akka.actor.ActorSystem]].
+ * have a public one argument constructor accepting an [[pekko.actor.ActorSystem]].
  *
  * A custom `DowningProvider` can be configured with `akka.cluster.downing-provider-class`
  *
@@ -56,7 +57,7 @@ abstract class DowningProvider {
 
   /**
    * If a props is returned it is created as a child of the core cluster daemon on cluster startup.
-   * It should then handle downing using the regular [[akka.cluster.Cluster]] APIs.
+   * It should then handle downing using the regular [[pekko.cluster.Cluster]] APIs.
    * The actor will run on the same dispatcher as the cluster actor if dispatcher not configured.
    *
    * May throw an exception which will then immediately lead to Cluster stopping, as the downing
diff --git a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/Gossip.scala
similarity index 99%
rename from akka-cluster/src/main/scala/akka/cluster/Gossip.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/Gossip.scala
index 4d20415475..b5913046d5 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/Gossip.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.nio.charset.StandardCharsets
 import java.security.MessageDigest
@@ -12,7 +12,7 @@ import scala.concurrent.duration.Deadline
 
 import ClusterSettings.DataCenter
 import MemberStatus._
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
diff --git a/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatCheckCluster.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala
similarity index 88%
rename from akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatCheckCluster.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala
index 0ca9727afd..c66712b3c1 100644
--- a/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatCheckCluster.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.{ immutable => im }
 
 import com.typesafe.config.Config
 
-import akka.annotation.InternalApi
-import akka.cluster.sbr.SplitBrainResolverProvider
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.sbr.SplitBrainResolverProvider
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object JoinConfigCompatCheckCluster {
+@InternalApi private[pekko] object JoinConfigCompatCheckCluster {
   private val DowningProviderPath = "akka.cluster.downing-provider-class"
   private val SbrStrategyPath = "akka.cluster.split-brain-resolver.active-strategy"
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatChecker.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala
similarity index 95%
rename from akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatChecker.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala
index 639d91c99e..9fb6ae0cdf 100644
--- a/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatChecker.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.{ immutable => im }
 
 import com.typesafe.config.{ Config, ConfigFactory, ConfigValue }
 
-import akka.actor.ExtendedActorSystem
-import akka.annotation.{ DoNotInherit, InternalApi }
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.{ DoNotInherit, InternalApi }
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 abstract class JoinConfigCompatChecker {
 
@@ -66,7 +67,7 @@ object JoinConfigCompatChecker {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def checkEquality(
+  @InternalApi private[pekko] def checkEquality(
       keys: im.Seq[String],
       toCheck: Config,
       actualConfig: Config): ConfigValidation = {
diff --git a/akka-cluster/src/main/scala/akka/cluster/Member.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/Member.scala
similarity index 96%
rename from akka-cluster/src/main/scala/akka/cluster/Member.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/Member.scala
index 601d2949ba..f491796716 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Member.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/Member.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.runtime.AbstractFunction2
 
 import scala.annotation.nowarn
 
-import akka.actor.Address
-import akka.annotation.InternalApi
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.MemberStatus._
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.annotation.InternalApi
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.MemberStatus._
+import pekko.util.Version
 
 /**
  * Represents the address, current status, and roles of a cluster member node.
@@ -105,7 +106,7 @@ object Member {
    * Create a new member with status Joining.
    */
   @InternalApi
-  private[akka] def apply(uniqueAddress: UniqueAddress, roles: Set[String], appVersion: Version): Member =
+  private[pekko] def apply(uniqueAddress: UniqueAddress, roles: Set[String], appVersion: Version): Member =
     new Member(uniqueAddress, Int.MaxValue, Joining, roles, appVersion)
 
   /**
@@ -174,7 +175,7 @@ object Member {
    * INTERNAL API.
    */
   @InternalApi
-  private[akka] def pickHighestPriority(
+  private[pekko] def pickHighestPriority(
       a: Set[Member],
       b: Set[Member],
       tombstones: Map[UniqueAddress, Long]): Set[Member] = {
@@ -309,7 +310,7 @@ object UniqueAddress extends AbstractFunction2[Address, Int, UniqueAddress] {
   @deprecated("Use Long UID apply instead", since = "2.4.11")
   def apply(address: Address, uid: Int) = new UniqueAddress(address, uid.toLong)
 
-  def apply(remoteUniqueAddress: akka.remote.UniqueAddress): UniqueAddress =
+  def apply(remoteUniqueAddress: pekko.remote.UniqueAddress): UniqueAddress =
     new UniqueAddress(remoteUniqueAddress.address, remoteUniqueAddress.uid)
 
   def apply(address: Address, longUid: Long) = new UniqueAddress(address, longUid)
diff --git a/akka-cluster/src/main/scala/akka/cluster/MembershipState.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala
similarity index 97%
rename from akka-cluster/src/main/scala/akka/cluster/MembershipState.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala
index 195591c345..77c3cdb9ee 100644
--- a/akka-cluster/src/main/scala/akka/cluster/MembershipState.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -11,16 +11,17 @@ import scala.collection.SortedSet
 import scala.collection.immutable
 import scala.util.Random
 
-import akka.annotation.InternalApi
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.MemberStatus._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.MemberStatus._
+import pekko.util.ccompat._
 
 /**
  * INTERNAL API
  */
 @ccompatUsedUntil213
-@InternalApi private[akka] object MembershipState {
+@InternalApi private[pekko] object MembershipState {
   import MemberStatus._
   private val leaderMemberStatus = Set[MemberStatus](Up, Leaving, PreparingForShutdown, ReadyForShutdown)
   private val convergenceMemberStatus = Set[MemberStatus](Up, Leaving, PreparingForShutdown, ReadyForShutdown)
@@ -34,7 +35,7 @@ import akka.util.ccompat._
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] final case class MembershipState(
+@InternalApi private[pekko] final case class MembershipState(
     latestGossip: Gossip,
     selfUniqueAddress: UniqueAddress,
     selfDc: DataCenter,
@@ -233,7 +234,7 @@ import akka.util.ccompat._
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class GossipTargetSelector(
+@InternalApi private[pekko] class GossipTargetSelector(
     reduceGossipDifferentViewProbability: Double,
     crossDcGossipProbability: Double) {
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/Reachability.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala
similarity index 99%
rename from akka-cluster/src/main/scala/akka/cluster/Reachability.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala
index 5b2455ba20..9e2e007c56 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Reachability.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 
-import akka.annotation.InternalApi
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.util.ccompat._
 
 /**
  * INTERNAL API
diff --git a/akka-cluster/src/main/scala/akka/cluster/SeedNodeProcess.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala
similarity index 96%
rename from akka-cluster/src/main/scala/akka/cluster/SeedNodeProcess.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala
index 7fb489e8c1..969b87a35a 100644
--- a/akka-cluster/src/main/scala/akka/cluster/SeedNodeProcess.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.duration.{ Deadline, _ }
 
-import akka.actor.{ Actor, ActorRef, Address, CoordinatedShutdown, ReceiveTimeout }
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, Address, CoordinatedShutdown, ReceiveTimeout }
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.util.unused
 
 /**
  * INTERNAL API.
@@ -293,7 +294,7 @@ private[cluster] final class JoinSeedNodeProcess(
   }
 
   @InternalStableApi
-  private[akka] def onReceiveTimeout(@unused seedNodes: immutable.IndexedSeq[Address], @unused attempt: Int): Unit = {}
+  private[pekko] def onReceiveTimeout(@unused seedNodes: immutable.IndexedSeq[Address], @unused attempt: Int): Unit = {}
 
   def done: Actor.Receive = {
     case InitJoinAck(_, _) => // already received one, skip rest
diff --git a/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/VectorClock.scala
similarity index 99%
rename from akka-cluster/src/main/scala/akka/cluster/VectorClock.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/VectorClock.scala
index a152196a88..51fdfe1371 100644
--- a/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/VectorClock.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.security.MessageDigest
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/protobuf/ClusterMessageSerializer.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
similarity index 92%
rename from akka-cluster/src/main/scala/akka/cluster/protobuf/ClusterMessageSerializer.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
index e4a96f8f53..cf6bc77e6a 100644
--- a/akka-cluster/src/main/scala/akka/cluster/protobuf/ClusterMessageSerializer.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.protobuf
+package org.apache.pekko.cluster.protobuf
 
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream }
 import java.util.zip.{ GZIPInputStream, GZIPOutputStream }
@@ -11,41 +11,42 @@ import scala.collection.immutable
 import scala.concurrent.duration.Deadline
 import scala.annotation.nowarn
 import com.typesafe.config.{ Config, ConfigFactory, ConfigRenderOptions }
-import akka.actor.{ Address, ExtendedActorSystem }
-import akka.annotation.InternalApi
-import akka.cluster._
-import akka.cluster.InternalClusterAction._
-import akka.cluster.protobuf.msg.{ ClusterMessages => cm }
-import akka.cluster.routing.{ ClusterRouterPool, ClusterRouterPoolSettings }
-import akka.protobufv3.internal.MessageLite
-import akka.remote.ByteStringUtils
-import akka.routing.Pool
-import akka.serialization._
-import akka.util.Version
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.{ Address, ExtendedActorSystem }
+import pekko.annotation.InternalApi
+import pekko.cluster._
+import pekko.cluster.InternalClusterAction._
+import pekko.cluster.protobuf.msg.{ ClusterMessages => cm }
+import pekko.cluster.routing.{ ClusterRouterPool, ClusterRouterPoolSettings }
+import pekko.protobufv3.internal.MessageLite
+import pekko.remote.ByteStringUtils
+import pekko.routing.Pool
+import pekko.serialization._
+import pekko.util.Version
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API
  */
 @InternalApi
 @ccompatUsedUntil213
-private[akka] object ClusterMessageSerializer {
+private[pekko] object ClusterMessageSerializer {
   // Kept for one version iteration from 2.6.4 to allow rolling migration to short manifests
   // can be removed in 2.6.6 or later.
-  val OldJoinManifest = s"akka.cluster.InternalClusterAction$$Join"
-  val OldWelcomeManifest = s"akka.cluster.InternalClusterAction$$Welcome"
-  val OldLeaveManifest = s"akka.cluster.ClusterUserAction$$Leave"
-  val OldDownManifest = s"akka.cluster.ClusterUserAction$$Down"
-  val OldInitJoinManifest = s"akka.cluster.InternalClusterAction$$InitJoin$$"
-  val OldInitJoinAckManifest = s"akka.cluster.InternalClusterAction$$InitJoinAck"
-  val OldInitJoinNackManifest = s"akka.cluster.InternalClusterAction$$InitJoinNack"
-  val HeartBeatManifestPre2523 = s"akka.cluster.ClusterHeartbeatSender$$Heartbeat"
-  val HeartBeatRspManifest2523 = s"akka.cluster.ClusterHeartbeatSender$$HeartbeatRsp"
-  val OldExitingConfirmedManifest = s"akka.cluster.InternalClusterAction$$ExitingConfirmed"
-  val OldGossipStatusManifest = "akka.cluster.GossipStatus"
-  val OldGossipEnvelopeManifest = "akka.cluster.GossipEnvelope"
-  val OldClusterRouterPoolManifest = "akka.cluster.routing.ClusterRouterPool"
+  val OldJoinManifest = s"org.apache.pekko.cluster.InternalClusterAction$$Join"
+  val OldWelcomeManifest = s"org.apache.pekko.cluster.InternalClusterAction$$Welcome"
+  val OldLeaveManifest = s"org.apache.pekko.cluster.ClusterUserAction$$Leave"
+  val OldDownManifest = s"org.apache.pekko.cluster.ClusterUserAction$$Down"
+  val OldInitJoinManifest = s"org.apache.pekko.cluster.InternalClusterAction$$InitJoin$$"
+  val OldInitJoinAckManifest = s"org.apache.pekko.cluster.InternalClusterAction$$InitJoinAck"
+  val OldInitJoinNackManifest = s"org.apache.pekko.cluster.InternalClusterAction$$InitJoinNack"
+  val HeartBeatManifestPre2523 = s"org.apache.pekko.cluster.ClusterHeartbeatSender$$Heartbeat"
+  val HeartBeatRspManifest2523 = s"org.apache.pekko.cluster.ClusterHeartbeatSender$$HeartbeatRsp"
+  val OldExitingConfirmedManifest = s"org.apache.pekko.cluster.InternalClusterAction$$ExitingConfirmed"
+  val OldGossipStatusManifest = "org.apache.pekko.cluster.GossipStatus"
+  val OldGossipEnvelopeManifest = "org.apache.pekko.cluster.GossipEnvelope"
+  val OldClusterRouterPoolManifest = "org.apache.pekko.cluster.routing.ClusterRouterPool"
 
   // is handled on the deserializing side in 2.6.2 and then on the serializing side in 2.6.3
   val JoinManifest = "J"
@@ -197,15 +198,15 @@ final class ClusterMessageSerializer(val system: ExtendedActorSystem)
   private def uniqueAddressFromBinary(bytes: Array[Byte]): UniqueAddress =
     uniqueAddressFromProto(cm.UniqueAddress.parseFrom(bytes))
 
-  private[akka] def addressToProto(address: Address): cm.Address.Builder = address match {
+  private[pekko] def addressToProto(address: Address): cm.Address.Builder = address match {
     case Address(protocol, actorSystem, Some(host), Some(port)) =>
       cm.Address.newBuilder().setSystem(actorSystem).setHostname(host).setPort(port).setProtocol(protocol)
     case _ => throw new IllegalArgumentException(s"Address [$address] could not be serialized: host or port missing.")
   }
 
-  private[akka] def addressToProtoByteArray(address: Address): Array[Byte] = addressToProto(address).build.toByteArray
+  private[pekko] def addressToProtoByteArray(address: Address): Array[Byte] = addressToProto(address).build.toByteArray
 
-  private[akka] def uniqueAddressToProto(uniqueAddress: UniqueAddress): cm.UniqueAddress.Builder = {
+  private[pekko] def uniqueAddressToProto(uniqueAddress: UniqueAddress): cm.UniqueAddress.Builder = {
     cm.UniqueAddress
       .newBuilder()
       .setAddress(addressToProto(uniqueAddress.address))
@@ -321,7 +322,7 @@ final class ClusterMessageSerializer(val system: ExtendedActorSystem)
 
       InternalClusterAction.InitJoinAck(addressFromProto(i.getAddress), configCheck)
     } catch {
-      case _: akka.protobufv3.internal.InvalidProtocolBufferException =>
+      case _: pekko.protobufv3.internal.InvalidProtocolBufferException =>
         // nodes previous to 2.5.9 sends just an address
         InternalClusterAction.InitJoinAck(addressFromBinary(bytes), UncheckedConfig)
     }
diff --git a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala
similarity index 92%
rename from akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala
index 25d23a200c..3395745fec 100644
--- a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.routing
+package org.apache.pekko.cluster.routing
 
 import java.util.concurrent.atomic.AtomicInteger
 import scala.annotation.{ tailrec, varargs }
@@ -10,26 +10,27 @@ import scala.collection.immutable
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
-import akka.actor._
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.japi.Util.immutableSeq
-import akka.remote.RemoteScope
-import akka.routing.ActorRefRoutee
-import akka.routing.ActorSelectionRoutee
-import akka.routing.Group
-import akka.routing.Pool
-import akka.routing.Resizer
-import akka.routing.Routee
-import akka.routing.Router
-import akka.routing.RouterActor
-import akka.routing.RouterConfig
-import akka.routing.RouterPoolActor
-import akka.routing.RoutingLogic
-import akka.util.HashCode
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.japi.Util.immutableSeq
+import pekko.remote.RemoteScope
+import pekko.routing.ActorRefRoutee
+import pekko.routing.ActorSelectionRoutee
+import pekko.routing.Group
+import pekko.routing.Pool
+import pekko.routing.Resizer
+import pekko.routing.Routee
+import pekko.routing.Router
+import pekko.routing.RouterActor
+import pekko.routing.RouterConfig
+import pekko.routing.RouterPoolActor
+import pekko.routing.RoutingLogic
+import pekko.util.HashCode
+import pekko.util.ccompat.JavaConverters._
 
 object ClusterRouterGroupSettings {
   @deprecated("useRole has been replaced with useRoles", since = "2.5.4")
@@ -310,7 +311,7 @@ final class ClusterRouterPoolSettings(
 /**
  * INTERNAL API
  */
-private[akka] object ClusterRouterSettingsBase {
+private[pekko] object ClusterRouterSettingsBase {
   def useRoleOption(role: String): Option[String] = role match {
     case null | "" => None
     case _         => Some(role)
@@ -332,7 +333,7 @@ private[akka] object ClusterRouterSettingsBase {
 /**
  * INTERNAL API
  */
-private[akka] trait ClusterRouterSettingsBase {
+private[pekko] trait ClusterRouterSettingsBase {
   def totalInstances: Int
   def allowLocalRoutees: Boolean
   def useRoles: Set[String]
@@ -343,10 +344,10 @@ private[akka] trait ClusterRouterSettingsBase {
 }
 
 /**
- * [[akka.routing.RouterConfig]] implementation for deployment on cluster nodes.
- * Delegates other duties to the local [[akka.routing.RouterConfig]],
+ * [[pekko.routing.RouterConfig]] implementation for deployment on cluster nodes.
+ * Delegates other duties to the local [[pekko.routing.RouterConfig]],
  * which makes it possible to mix this with the built-in routers such as
- * [[akka.routing.RoundRobinGroup]] or custom routers.
+ * [[pekko.routing.RoundRobinGroup]] or custom routers.
  */
 @SerialVersionUID(1L)
 final case class ClusterRouterGroup(local: Group, settings: ClusterRouterGroupSettings)
@@ -365,7 +366,7 @@ final case class ClusterRouterGroup(local: Group, settings: ClusterRouterGroupSe
   /**
    * INTERNAL API
    */
-  override private[akka] def createRouterActor(): RouterActor = new ClusterRouterGroupActor(settings)
+  override private[pekko] def createRouterActor(): RouterActor = new ClusterRouterGroupActor(settings)
 
   override def withFallback(other: RouterConfig): RouterConfig = other match {
     case ClusterRouterGroup(_: ClusterRouterGroup, _) =>
@@ -379,10 +380,10 @@ final case class ClusterRouterGroup(local: Group, settings: ClusterRouterGroupSe
 }
 
 /**
- * [[akka.routing.RouterConfig]] implementation for deployment on cluster nodes.
- * Delegates other duties to the local [[akka.routing.RouterConfig]],
+ * [[pekko.routing.RouterConfig]] implementation for deployment on cluster nodes.
+ * Delegates other duties to the local [[pekko.routing.RouterConfig]],
  * which makes it possible to mix this with the built-in routers such as
- * [[akka.routing.RoundRobinGroup]] or custom routers.
+ * [[pekko.routing.RoundRobinGroup]] or custom routers.
  */
 @SerialVersionUID(1L)
 final case class ClusterRouterPool(local: Pool, settings: ClusterRouterPoolSettings)
@@ -396,7 +397,7 @@ final case class ClusterRouterPool(local: Pool, settings: ClusterRouterPoolSetti
   /**
    * INTERNAL API
    */
-  override private[akka] def newRoutee(routeeProps: Props, context: ActorContext): Routee = {
+  override private[pekko] def newRoutee(routeeProps: Props, context: ActorContext): Routee = {
     val name = "c" + childNameCounter.incrementAndGet
     val ref = context
       .asInstanceOf[ActorCell]
@@ -421,7 +422,7 @@ final case class ClusterRouterPool(local: Pool, settings: ClusterRouterPoolSetti
   /**
    * INTERNAL API
    */
-  override private[akka] def createRouterActor(): RouterActor =
+  override private[pekko] def createRouterActor(): RouterActor =
     new ClusterRouterPoolActor(local.supervisorStrategy, settings)
 
   override def supervisorStrategy: SupervisorStrategy = local.supervisorStrategy
@@ -440,7 +441,7 @@ final case class ClusterRouterPool(local: Pool, settings: ClusterRouterPoolSetti
 /**
  * INTERNAL API
  */
-private[akka] trait ClusterRouterConfigBase extends RouterConfig {
+private[pekko] trait ClusterRouterConfigBase extends RouterConfig {
   def local: RouterConfig
   def settings: ClusterRouterSettingsBase
   override def createRouter(system: ActorSystem): Router = local.createRouter(system)
@@ -457,7 +458,7 @@ private[akka] trait ClusterRouterConfigBase extends RouterConfig {
 /**
  * INTERNAL API
  */
-private[akka] class ClusterRouterPoolActor(
+private[pekko] class ClusterRouterPoolActor(
     supervisorStrategy: SupervisorStrategy,
     val settings: ClusterRouterPoolSettings)
     extends RouterPoolActor(supervisorStrategy)
@@ -512,7 +513,7 @@ private[akka] class ClusterRouterPoolActor(
 /**
  * INTERNAL API
  */
-private[akka] class ClusterRouterGroupActor(val settings: ClusterRouterGroupSettings)
+private[pekko] class ClusterRouterGroupActor(val settings: ClusterRouterGroupSettings)
     extends RouterActor
     with ClusterRouterActor {
 
@@ -580,7 +581,7 @@ private[akka] class ClusterRouterGroupActor(val settings: ClusterRouterGroupSett
  * The router actor, subscribes to cluster events and
  * adjusts the routees.
  */
-private[akka] trait ClusterRouterActor { this: RouterActor =>
+private[pekko] trait ClusterRouterActor { this: RouterActor =>
 
   def settings: ClusterRouterSettingsBase
 
@@ -598,7 +599,7 @@ private[akka] trait ClusterRouterActor { this: RouterActor =>
   override def postStop(): Unit = cluster.unsubscribe(self)
 
   var nodes: immutable.SortedSet[Address] = {
-    import akka.cluster.Member.addressOrdering
+    import pekko.cluster.Member.addressOrdering
     cluster.readView.members.collect {
       case m if isAvailable(m) => m.address
     }
@@ -612,7 +613,7 @@ private[akka] trait ClusterRouterActor { this: RouterActor =>
   private def satisfiesRoles(memberRoles: Set[String]): Boolean = settings.useRoles.subsetOf(memberRoles)
 
   def availableNodes: immutable.SortedSet[Address] = {
-    import akka.cluster.Member.addressOrdering
+    import pekko.cluster.Member.addressOrdering
     if (nodes.isEmpty && settings.allowLocalRoutees && satisfiesRoles(cluster.selfRoles))
       // use my own node, cluster information not updated yet
       immutable.SortedSet(cluster.selfAddress)
@@ -660,7 +661,7 @@ private[akka] trait ClusterRouterActor { this: RouterActor =>
 
   def clusterReceive: Receive = {
     case s: CurrentClusterState =>
-      import akka.cluster.Member.addressOrdering
+      import pekko.cluster.Member.addressOrdering
       nodes = s.members.collect { case m if isAvailable(m) => m.address }
       addRoutees()
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/sbr/DowningStrategy.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/DowningStrategy.scala
similarity index 97%
rename from akka-cluster/src/main/scala/akka/cluster/sbr/DowningStrategy.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/DowningStrategy.scala
index 2b987bcc9f..733e5ebcd4 100644
--- a/akka-cluster/src/main/scala/akka/cluster/sbr/DowningStrategy.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/DowningStrategy.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.collection.immutable
 import scala.concurrent.duration.Duration
 import scala.concurrent.duration.FiniteDuration
-import akka.actor.Address
-import akka.annotation.InternalApi
-import akka.annotation.InternalStableApi
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.cluster.Reachability
-import akka.cluster.UniqueAddress
-import akka.coordination.lease.scaladsl.Lease
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.annotation.InternalApi
+import pekko.annotation.InternalStableApi
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.cluster.Reachability
+import pekko.cluster.UniqueAddress
+import pekko.coordination.lease.scaladsl.Lease
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object DowningStrategy {
+@InternalApi private[pekko] object DowningStrategy {
   sealed trait Decision {
     def isIndirectlyConnected: Boolean
   }
@@ -56,7 +57,7 @@ import akka.coordination.lease.scaladsl.Lease
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] abstract class DowningStrategy(val selfDc: DataCenter, selfUniqueAddress: UniqueAddress) {
+@InternalApi private[pekko] abstract class DowningStrategy(val selfDc: DataCenter, selfUniqueAddress: UniqueAddress) {
   import DowningStrategy._
 
   // may contain Joining and WeaklyUp
diff --git a/akka-cluster/src/main/scala/akka/cluster/sbr/SplitBrainResolver.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala
similarity index 96%
rename from akka-cluster/src/main/scala/akka/cluster/sbr/SplitBrainResolver.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala
index 8797defea3..9d41725d36 100644
--- a/akka-cluster/src/main/scala/akka/cluster/sbr/SplitBrainResolver.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import java.time.Instant
 import java.time.temporal.ChronoUnit
@@ -10,27 +10,28 @@ import java.time.temporal.ChronoUnit
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.actor.Stash
-import akka.actor.Timers
-import akka.annotation.InternalApi
-import akka.annotation.InternalStableApi
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent
-import akka.cluster.ClusterEvent._
-import akka.cluster.ClusterLogMarker
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.Member
-import akka.cluster.Reachability
-import akka.cluster.UniqueAddress
-import akka.cluster.sbr.DowningStrategy.Decision
-import akka.event.DiagnosticMarkerBusLoggingAdapter
-import akka.event.Logging
-import akka.pattern.pipe
-import akka.remote.artery.ThisActorSystemQuarantinedEvent
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.actor.Stash
+import pekko.actor.Timers
+import pekko.annotation.InternalApi
+import pekko.annotation.InternalStableApi
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.ClusterLogMarker
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.Member
+import pekko.cluster.Reachability
+import pekko.cluster.UniqueAddress
+import pekko.cluster.sbr.DowningStrategy.Decision
+import pekko.event.DiagnosticMarkerBusLoggingAdapter
+import pekko.event.Logging
+import pekko.pattern.pipe
+import pekko.remote.artery.ThisActorSystemQuarantinedEvent
 
 /**
  * INTERNAL API
@@ -355,7 +356,7 @@ import akka.remote.artery.ThisActorSystemQuarantinedEvent
     }
   }
 
-  private def thisActorSystemWasQuarantined(remoteUnique: akka.remote.UniqueAddress): Unit = {
+  private def thisActorSystemWasQuarantined(remoteUnique: pekko.remote.UniqueAddress): Unit = {
     val remote = UniqueAddress(remoteUnique.address, remoteUnique.uid)
     if (Cluster(context.system).state.members.exists(m => m.uniqueAddress == remote)) {
       actOnDecision(DowningStrategy.DownSelfQuarantinedByRemote)
diff --git a/akka-cluster/src/main/scala/akka/cluster/sbr/SplitBrainResolverProvider.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverProvider.scala
similarity index 86%
rename from akka-cluster/src/main/scala/akka/cluster/sbr/SplitBrainResolverProvider.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverProvider.scala
index fc866d76db..d9c630ad95 100644
--- a/akka-cluster/src/main/scala/akka/cluster/sbr/SplitBrainResolverProvider.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverProvider.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.duration.Duration
 import scala.concurrent.duration.FiniteDuration
 
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.DowningProvider
-import akka.coordination.lease.scaladsl.LeaseProvider
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.DowningProvider
+import pekko.coordination.lease.scaladsl.LeaseProvider
 
 /**
  * See reference documentation: https://doc.akka.io/docs/akka/current/split-brain-resolver.html
  *
  * Enabled with configuration:
  * {{{
- * akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+ * akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
  * }}}
  */
 final class SplitBrainResolverProvider(system: ActorSystem) extends DowningProvider {
diff --git a/akka-cluster/src/main/scala/akka/cluster/sbr/SplitBrainResolverSettings.scala b/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala
similarity index 95%
rename from akka-cluster/src/main/scala/akka/cluster/sbr/SplitBrainResolverSettings.scala
rename to akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala
index 7a995349aa..787337c535 100644
--- a/akka-cluster/src/main/scala/akka/cluster/sbr/SplitBrainResolverSettings.scala
+++ b/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -11,10 +11,11 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.ConfigurationException
-import akka.annotation.InternalApi
-import akka.util.Helpers
-import akka.util.Helpers.Requiring
+import org.apache.pekko
+import pekko.ConfigurationException
+import pekko.annotation.InternalApi
+import pekko.util.Helpers
+import pekko.util.Helpers.Requiring
 
 /**
  * INTERNAL API
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/AttemptSysMsgRedeliverySpec.scala
similarity index 86%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/AttemptSysMsgRedeliverySpec.scala
index 9aafb60bc3..9d60b3183a 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/AttemptSysMsgRedeliverySpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 object AttemptSysMsgRedeliveryMultiJvmSpec extends MultiNodeConfig {
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
similarity index 96%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
index f968f2bf22..4832b5e6a2 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 final case class ClientDowningNodeThatIsUnreachableMultiNodeConfig(failureDetectorPuppet: Boolean)
     extends MultiNodeConfig {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUpSpec.scala
similarity index 95%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUpSpec.scala
index d288581e88..92eaad0975 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUpSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 final case class ClientDowningNodeThatIsUpMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterAccrualFailureDetectorSpec.scala
similarity index 94%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterAccrualFailureDetectorSpec.scala
index 56feb8ed29..ef5c388598 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterAccrualFailureDetectorSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 object ClusterAccrualFailureDetectorMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterDeathWatchSpec.scala
similarity index 97%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterDeathWatchSpec.scala
index eead5fbbdd..e39d6a44e2 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterDeathWatchSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.TimeoutException
 
@@ -13,13 +13,14 @@ import scala.language.postfixOps
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.ScalaFutures
 
-import akka.actor._
-import akka.cluster.MultiNodeClusterSpec.EndActor
-import akka.remote.RemoteActorRef
-import akka.remote.RemoteWatcher
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
-import akka.testkit.TestEvent._
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.MultiNodeClusterSpec.EndActor
+import pekko.remote.RemoteActorRef
+import pekko.remote.RemoteWatcher
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
+import pekko.testkit.TestEvent._
 
 object ClusterDeathWatchMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterShutdownSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterShutdownSpec.scala
similarity index 94%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterShutdownSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterShutdownSpec.scala
index 957cb8dd53..aaeff7c308 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterShutdownSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterShutdownSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.cluster.MemberStatus.Removed
-import akka.remote.testkit.MultiNodeConfig
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.cluster.MemberStatus.Removed
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.util.ccompat._
 import org.scalatest.concurrent.Eventually
 
 import scala.concurrent.duration._
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterWatcherNoClusterWatcheeSpec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterWatcherNoClusterWatcheeSpec.scala
index 49f2514c8a..f7a9bc4241 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterWatcherNoClusterWatcheeSpec.scala
@@ -2,26 +2,27 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.ScalaFutures
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.remote.RARP
-import akka.remote.RemoteWatcher.Heartbeat
-import akka.remote.RemoteWatcher.Stats
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit.ImplicitSender
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.actor.Terminated
+import pekko.remote.RARP
+import pekko.remote.RemoteWatcher.Heartbeat
+import pekko.remote.RemoteWatcher.Stats
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit.ImplicitSender
+import pekko.testkit.TestProbe
 
 class ClusterWatcherNoClusterWatcheeConfig(val useUnsafe: Boolean, artery: Boolean) extends MultiNodeConfig {
 
@@ -33,7 +34,7 @@ class ClusterWatcherNoClusterWatcheeConfig(val useUnsafe: Boolean, artery: Boole
       akka.remote.log-remote-lifecycle-events = off
       akka.remote.artery.enabled = $artery
       akka.log-dead-letters = off
-      akka.loggers =["akka.testkit.TestEventListener"]
+      akka.loggers =["org.apache.pekko.testkit.TestEventListener"]
       akka.actor.allow-java-serialization = on
      """)))
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ConvergenceSpec.scala
similarity index 96%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ConvergenceSpec.scala
index cca8791281..b8aa4a6489 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ConvergenceSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Address
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 final case class ConvergenceMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DeterministicOldestWhenJoiningSpec.scala
similarity index 89%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DeterministicOldestWhenJoiningSpec.scala
index a2a35e2655..33e8d324d7 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DeterministicOldestWhenJoiningSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Address
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterEvent.MemberUp
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.ClusterEvent.MemberUp
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object DeterministicOldestWhenJoiningMultiJvmSpec extends MultiNodeConfig {
   val seed1 = role("seed1")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/DisallowJoinOfTwoClustersSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DisallowJoinOfTwoClustersSpec.scala
similarity index 93%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/DisallowJoinOfTwoClustersSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DisallowJoinOfTwoClustersSpec.scala
index 6d57f1981e..d2c72cc8db 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/DisallowJoinOfTwoClustersSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DisallowJoinOfTwoClustersSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object DisallowJoinOfTwoClustersMultiJvmSpec extends MultiNodeConfig {
   val a1 = role("a1")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala
similarity index 89%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala
index 643453b020..e301cc9873 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala
@@ -2,18 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
-
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.RootActorPath
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
-import akka.remote.artery.ArterySettings
-import akka.remote.artery.ThisActorSystemQuarantinedEvent
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter
-import akka.testkit.LongRunningTest
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.RootActorPath
+import pekko.remote.artery.ArterySettings
+import pekko.remote.artery.ThisActorSystemQuarantinedEvent
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter
+import pekko.testkit.LongRunningTest
 import com.typesafe.config.ConfigFactory
 
 object DowningWhenOtherHasQuarantinedThisActorSystemSpec extends MultiNodeConfig {
@@ -27,7 +27,7 @@ object DowningWhenOtherHasQuarantinedThisActorSystemSpec extends MultiNodeConfig
       .withFallback(
         ConfigFactory.parseString("""
         akka.remote.artery.enabled = on
-        akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         # speed up decision
         akka.cluster.split-brain-resolver.stable-after = 5s
         """)))
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialHeartbeatSpec.scala
similarity index 90%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialHeartbeatSpec.scala
index 93be9ba0df..da1b804798 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialHeartbeatSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 object InitialHeartbeatMultiJvmSpec extends MultiNodeConfig {
   val controller = role("controller")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialMembersOfNewDcSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialMembersOfNewDcSpec.scala
similarity index 94%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/InitialMembersOfNewDcSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialMembersOfNewDcSpec.scala
index 8468fdcd83..56937b5533 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialMembersOfNewDcSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialMembersOfNewDcSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.remote.testkit._
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.remote.testkit._
+import pekko.testkit.ImplicitSender
 
 object InitialMembersOfNewDcSpec extends MultiNodeConfig {
   commonConfig(ConfigFactory.parseString(s"""
@@ -25,7 +26,7 @@ object InitialMembersOfNewDcSpec extends MultiNodeConfig {
     akka.loglevel = INFO
     akka.log-dead-letters = off
     akka.log-dead-letters-during-shutdown = off
-    akka.loggers = ["akka.testkit.TestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.TestEventListener"]
     """))
 
   val one = role("one")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinInProgressSpec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinInProgressSpec.scala
index 0565a082e5..828af8eb7f 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinInProgressSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object JoinInProgressMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinSeedNodeSpec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinSeedNodeSpec.scala
index 9f0ea550e1..5336a79d58 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinSeedNodeSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Address
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
+import pekko.util.Version
 
 object JoinSeedNodeMultiJvmSpec extends MultiNodeConfig {
   val seed1 = role("seed1")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LargeMessageClusterSpec.scala
similarity index 87%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LargeMessageClusterSpec.scala
index 41fc1ae760..213a20eea2 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LargeMessageClusterSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.ExtendedActorSystem
-import akka.actor.Identify
-import akka.cluster.ClusterEvent.UnreachableMember
-import akka.remote.RARP
-import akka.remote.artery.ArterySettings
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.serialization.SerializerWithStringManifest
-import akka.testkit._
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Identify
+import pekko.cluster.ClusterEvent.UnreachableMember
+import pekko.remote.RARP
+import pekko.remote.artery.ArterySettings
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.serialization.SerializerWithStringManifest
+import pekko.testkit._
+import pekko.util.unused
 
 import java.io.NotSerializableException
 
@@ -31,16 +32,16 @@ object LargeMessageClusterMultiJvmSpec extends MultiNodeConfig {
   commonConfig(ConfigFactory.parseString(s"""
     akka {
       cluster.debug.verbose-heartbeat-logging = on
-      loggers = ["akka.testkit.TestEventListener"]
+      loggers = ["org.apache.pekko.testkit.TestEventListener"]
 
       actor {
         provider = cluster
 
         serializers {
-          test = "akka.cluster.LargeMessageClusterMultiJvmSpec$$SlowSerializer"
+          test = "org.apache.pekko.cluster.LargeMessageClusterMultiJvmSpec$$SlowSerializer"
         }
         serialization-bindings {
-          "akka.cluster.LargeMessageClusterMultiJvmSpec$$Slow" = test
+          "org.apache.pekko.cluster.LargeMessageClusterMultiJvmSpec$$Slow" = test
         }
       }
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningAllOtherNodesSpec.scala
similarity index 90%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningAllOtherNodesSpec.scala
index be6349c5a4..faa5db042e 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningAllOtherNodesSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object LeaderDowningAllOtherNodesMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
@@ -23,7 +24,7 @@ object LeaderDowningAllOtherNodesMultiJvmSpec extends MultiNodeConfig {
     debugConfig(on = false)
       .withFallback(ConfigFactory.parseString("""
       akka.cluster.failure-detector.monitored-by-nr-of-members = 2
-      akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+      akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
       akka.cluster.testkit.auto-down-unreachable-after = 1s
       """))
       .withFallback(MultiNodeClusterSpec.clusterConfig))
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
similarity index 95%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
index 0feb8d89cc..54911a5163 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 final case class LeaderDowningNodeThatIsUnreachableMultiNodeConfig(failureDetectorPuppet: Boolean)
     extends MultiNodeConfig {
@@ -22,7 +23,7 @@ final case class LeaderDowningNodeThatIsUnreachableMultiNodeConfig(failureDetect
   commonConfig(
     debugConfig(on = false)
       .withFallback(ConfigFactory.parseString("""
-      akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+      akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
       akka.cluster.testkit.auto-down-unreachable-after = 2s"""))
       .withFallback(MultiNodeClusterSpec.clusterConfig(failureDetectorPuppet)))
 }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderElectionSpec.scala
similarity index 97%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderElectionSpec.scala
index 6db9921840..1ff88eafdb 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderElectionSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import language.postfixOps
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 final case class LeaderElectionMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig {
   val controller = role("controller")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderLeavingSpec.scala
similarity index 89%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderLeavingSpec.scala
index d5a4880891..66d1142ce7 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderLeavingSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.Deploy
-import akka.actor.Props
-import akka.cluster.MemberStatus._
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Deploy
+import pekko.actor.Props
+import pekko.cluster.MemberStatus._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object LeaderLeavingMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
@@ -23,7 +24,7 @@ object LeaderLeavingMultiJvmSpec extends MultiNodeConfig {
   commonConfig(
     debugConfig(on = false)
       .withFallback(ConfigFactory.parseString("""
-      akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+      akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
       akka.cluster.testkit.auto-down-unreachable-after = 0s"""))
       .withFallback(MultiNodeClusterSpec.clusterConfigWithFailureDetectorPuppet))
 }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MBeanSpec.scala
similarity index 98%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MBeanSpec.scala
index 30eaf81653..fad27ab363 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MBeanSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.lang.management.ManagementFactory
 
@@ -13,8 +13,9 @@ import javax.management.InstanceNotFoundException
 import javax.management.ObjectName
 import language.postfixOps
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object MBeanMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MemberWeaklyUpSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MemberWeaklyUpSpec.scala
similarity index 93%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MemberWeaklyUpSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MemberWeaklyUpSpec.scala
index ef9205456f..21ccf490b1 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MemberWeaklyUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MemberWeaklyUpSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 import scala.language.postfixOps
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.MemberStatus.WeaklyUp
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.MemberStatus.WeaklyUp
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 object MemberWeaklyUpSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerExitingSpec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerExitingSpec.scala
index 468f4d5363..dfe00b3aa6 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerExitingSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.actor.Actor
-import akka.actor.Deploy
-import akka.actor.Props
-import akka.cluster.MemberStatus._
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Deploy
+import pekko.actor.Props
+import pekko.cluster.MemberStatus._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object MembershipChangeListenerExitingMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala
similarity index 93%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala
index b6566608dd..453ddedd21 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.actor.Actor
-import akka.actor.Deploy
-import akka.actor.Props
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Deploy
+import pekko.actor.Props
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object MembershipChangeListenerUpMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MinMembersBeforeUpSpec.scala
similarity index 95%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MinMembersBeforeUpSpec.scala
index 70297cc077..62bf2960f7 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MinMembersBeforeUpSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.MemberStatus._
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.cluster.MemberStatus._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object MinMembersBeforeUpMultiJvmSpec extends MultiNodeConfig {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcClusterSpec.scala
similarity index 96%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcClusterSpec.scala
index a525aac6dc..9a8410799d 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcClusterSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.MemberStatus.Up
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
+import org.apache.pekko
+import pekko.cluster.MemberStatus.Up
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
 
 class MultiDcSpecConfig(crossDcConnections: Int = 5) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala
similarity index 95%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala
index ab57f3b970..c1e446cb1d 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.collection.immutable.SortedSet
@@ -10,13 +10,14 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorRef
-import akka.actor.ActorSelection
-import akka.annotation.InternalApi
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSelection
+import pekko.annotation.InternalApi
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object MultiDcHeartbeatTakingOverSpecMultiJvmSpec extends MultiNodeConfig {
@@ -43,7 +44,7 @@ object MultiDcHeartbeatTakingOverSpecMultiJvmSpec extends MultiNodeConfig {
     akka {
       actor.provider = cluster
 
-      loggers = ["akka.testkit.TestEventListener"]
+      loggers = ["org.apache.pekko.testkit.TestEventListener"]
       loglevel = INFO
 
       remote.classic.log-remote-lifecycle-events = off
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcJoin2Spec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoin2Spec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcJoin2Spec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoin2Spec.scala
index 8a587a3d4f..0ce37fe7d1 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcJoin2Spec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoin2Spec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Address
-import akka.cluster.ClusterEvent.InitialStateAsEvents
-import akka.cluster.ClusterEvent.MemberUp
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.ClusterEvent.InitialStateAsEvents
+import pekko.cluster.ClusterEvent.MemberUp
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 // Similar to MultiDcJoinSpec, but slightly different scenario
 object MultiDcJoin2MultiJvmSpec extends MultiNodeConfig {
@@ -38,7 +39,7 @@ object MultiDcJoin2MultiJvmSpec extends MultiNodeConfig {
     akka {
       actor.provider = cluster
 
-      loggers = ["akka.testkit.TestEventListener"]
+      loggers = ["org.apache.pekko.testkit.TestEventListener"]
       loglevel = INFO
 
       remote.log-remote-lifecycle-events = off
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcJoinSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoinSpec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcJoinSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoinSpec.scala
index 99cb7cec12..414fc61c95 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcJoinSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoinSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.ClusterEvent.InitialStateAsEvents
-import akka.cluster.ClusterEvent.MemberUp
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.ClusterEvent.InitialStateAsEvents
+import pekko.cluster.ClusterEvent.MemberUp
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 // reproducer for issue #29280
 object MultiDcJoinMultiJvmSpec extends MultiNodeConfig {
@@ -37,7 +38,7 @@ object MultiDcJoinMultiJvmSpec extends MultiNodeConfig {
     akka {
       actor.provider = cluster
 
-      loggers = ["akka.testkit.TestEventListener"]
+      loggers = ["org.apache.pekko.testkit.TestEventListener"]
       loglevel = INFO
 
       remote.log-remote-lifecycle-events = off
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcLastNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcLastNodeSpec.scala
similarity index 95%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcLastNodeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcLastNodeSpec.scala
index fbcf3e1217..e310db167b 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcLastNodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcLastNodeSpec.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.remote.testkit.MultiNodeConfig
+import org.apache.pekko.remote.testkit.MultiNodeConfig
 
 object MultiDcLastNodeSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSplitBrainSpec.scala
similarity index 96%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSplitBrainSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSplitBrainSpec.scala
index fbf97572ba..ed039e6f53 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSplitBrainSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSplitBrainSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorSystem
-import akka.cluster.ClusterEvent._
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.cluster.ClusterEvent._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit.TestProbe
 
 object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
@@ -40,7 +41,7 @@ object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig {
       akka.cluster {
         gossip-interval                     = 500ms
         leader-actions-interval             = 1s
-        downing-provider-class = akka.cluster.testkit.AutoDowning
+        downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
         testkit.auto-down-unreachable-after = 1s
       }
     """)
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSunnyWeatherSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala
similarity index 95%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSunnyWeatherSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala
index 062b0ccd8c..9f55a85b9f 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSunnyWeatherSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.collection.immutable.SortedSet
@@ -10,11 +10,12 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorRef
-import akka.annotation.InternalApi
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.annotation.InternalApi
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object MultiDcSunnyWeatherMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
@@ -39,7 +40,7 @@ object MultiDcSunnyWeatherMultiJvmSpec extends MultiNodeConfig {
     akka {
       actor.provider = cluster
 
-      loggers = ["akka.testkit.TestEventListener"]
+      loggers = ["org.apache.pekko.testkit.TestEventListener"]
       loglevel = INFO
 
       remote.log-remote-lifecycle-events = off
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala
similarity index 90%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala
index b593d74f29..7bcb0f1016 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.ConcurrentHashMap
 
@@ -15,24 +15,26 @@ import com.typesafe.config.{ Config, ConfigFactory }
 import org.scalatest.{ Canceled, Outcome, Suite }
 import org.scalatest.exceptions.TestCanceledException
 
-import akka.actor.{ Actor, ActorRef, ActorSystem, Address, Deploy, PoisonPill, Props, RootActorPath }
-import akka.cluster.ClusterEvent.{ MemberEvent, MemberRemoved }
-import akka.event.Logging.ErrorLevel
-import akka.remote.DefaultFailureDetectorRegistry
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.{ MultiNodeSpec, STMultiNodeSpec }
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
-import akka.testkit.TestEvent._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, ActorSystem, Address, Deploy, PoisonPill, Props, RootActorPath }
+import pekko.cluster.ClusterEvent.{ MemberEvent, MemberRemoved }
+import pekko.event.Logging.ErrorLevel
+import pekko.remote.DefaultFailureDetectorRegistry
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.{ MultiNodeSpec, STMultiNodeSpec }
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
+import pekko.testkit.TestEvent._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object MultiNodeClusterSpec {
 
   def clusterConfigWithFailureDetectorPuppet: Config =
     ConfigFactory
-      .parseString("akka.cluster.failure-detector.implementation-class = akka.cluster.FailureDetectorPuppet")
+      .parseString(
+        "akka.cluster.failure-detector.implementation-class = org.apache.pekko.cluster.FailureDetectorPuppet")
       .withFallback(clusterConfig)
 
   def clusterConfig(failureDetectorPuppet: Boolean): Config =
@@ -62,7 +64,7 @@ object MultiNodeClusterSpec {
     akka.remote {
       log-remote-lifecycle-events = off
     }
-    akka.loggers = ["akka.testkit.TestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.TestEventListener"]
     akka.test {
       single-expect-default = 5 s
     }
@@ -132,13 +134,13 @@ abstract class MultiNodeClusterSpec(multiNodeconfig: MultiNodeConfig)
         classOf[GossipEnvelope],
         classOf[GossipStatus],
         classOf[InternalClusterAction.Tick],
-        classOf[akka.actor.PoisonPill],
-        classOf[akka.dispatch.sysmsg.DeathWatchNotification],
-        classOf[akka.remote.transport.AssociationHandle.Disassociated],
-        //        akka.remote.transport.AssociationHandle.Disassociated.getClass,
-        classOf[akka.remote.transport.ActorTransportAdapter.DisassociateUnderlying],
-        //        akka.remote.transport.ActorTransportAdapter.DisassociateUnderlying.getClass,
-        classOf[akka.remote.transport.AssociationHandle.InboundPayload])(sys)
+        classOf[pekko.actor.PoisonPill],
+        classOf[pekko.dispatch.sysmsg.DeathWatchNotification],
+        classOf[pekko.remote.transport.AssociationHandle.Disassociated],
+        //        pekko.remote.transport.AssociationHandle.Disassociated.getClass,
+        classOf[pekko.remote.transport.ActorTransportAdapter.DisassociateUnderlying],
+        //        pekko.remote.transport.ActorTransportAdapter.DisassociateUnderlying.getClass,
+        classOf[pekko.remote.transport.AssociationHandle.InboundPayload])(sys)
 
     }
   }
@@ -396,7 +398,7 @@ abstract class MultiNodeClusterSpec(multiNodeconfig: MultiNodeConfig)
 
   /**
    * Marks a node as available in the failure detector if
-   * [[akka.cluster.FailureDetectorPuppet]] is used as
+   * [[pekko.cluster.FailureDetectorPuppet]] is used as
    * failure detector.
    */
   def markNodeAsAvailable(address: Address): Unit =
@@ -404,7 +406,7 @@ abstract class MultiNodeClusterSpec(multiNodeconfig: MultiNodeConfig)
 
   /**
    * Marks a node as unavailable in the failure detector if
-   * [[akka.cluster.FailureDetectorPuppet]] is used as
+   * [[pekko.cluster.FailureDetectorPuppet]] is used as
    * failure detector.
    */
   def markNodeAsUnavailable(address: Address): Unit = {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeChurnSpec.scala
similarity index 91%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeChurnSpec.scala
index b84f88d0fa..4154af459b 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeChurnSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.event.Logging.Info
-import akka.remote.RARP
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
-import akka.testkit.TestKit
+import org.apache.pekko
+import pekko.actor._
+import pekko.event.Logging.Info
+import pekko.remote.RARP
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
+import pekko.testkit.TestKit
 
 object NodeChurnMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
@@ -24,7 +25,7 @@ object NodeChurnMultiJvmSpec extends MultiNodeConfig {
   commonConfig(
     debugConfig(on = false)
       .withFallback(ConfigFactory.parseString("""
-      akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+      akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
       akka.cluster.testkit.auto-down-unreachable-after = 1s
       akka.cluster.prune-gossip-tombstones-after = 1s
       akka.remote.classic.log-frame-size-exceeding = 1200b
@@ -39,7 +40,8 @@ object NodeChurnMultiJvmSpec extends MultiNodeConfig {
 
   class LogListener(testActor: ActorRef) extends Actor {
     def receive = {
-      case Info(_, _, msg: String) if msg.startsWith("New maximum payload size for [akka.cluster.GossipEnvelope]") =>
+      case Info(_, _, msg: String)
+          if msg.startsWith("New maximum payload size for [org.apache.pekko.cluster.GossipEnvelope]") =>
         testActor ! msg
       case _ =>
     }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeDowningAndBeingRemovedSpec.scala
similarity index 93%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeDowningAndBeingRemovedSpec.scala
index 1609ea0e3a..be52750526 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeDowningAndBeingRemovedSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object NodeDowningAndBeingRemovedMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
similarity index 94%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
index 97dd9a2f69..e073568fe4 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object NodeLeavingAndExitingAndBeingRemovedMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingSpec.scala
similarity index 89%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingSpec.scala
index e475d433fd..dddb369e54 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.actor.Actor
-import akka.actor.Deploy
-import akka.actor.Props
-import akka.cluster.MemberStatus._
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Deploy
+import pekko.actor.Props
+import pekko.cluster.MemberStatus._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object NodeLeavingAndExitingMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeMembershipSpec.scala
similarity index 93%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeMembershipSpec.scala
index e5cf1ceb89..61921a4942 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeMembershipSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object NodeMembershipMultiJvmSpec extends MultiNodeConfig {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeUpSpec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeUpSpec.scala
index b3548f6c59..35c57e508e 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeUpSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.atomic.AtomicReference
 
 import scala.collection.immutable.SortedSet
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.Props
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Props
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object NodeUpMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/QuickRestartSpec.scala
similarity index 95%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/QuickRestartSpec.scala
index 835d60fcde..778be83912 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/QuickRestartSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -11,9 +11,10 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ ActorSystem, Address }
-import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, Address }
+import pekko.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
+import pekko.testkit._
 
 // This test was a reproducer for issue #20639
 object QuickRestartMultiJvmSpec extends MultiNodeConfig {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RemoteFeaturesWithClusterSpec.scala
similarity index 88%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RemoteFeaturesWithClusterSpec.scala
index b318ca157a..149bf32c6b 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RemoteFeaturesWithClusterSpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.ScalaFutures
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.AddressFromURIString
-import akka.actor.Props
-import akka.actor.RepointableActorRef
-import akka.cluster.ClusterRemoteFeatures.AddressPing
-import akka.remote.RARP
-import akka.remote.RemoteActorRef
-import akka.remote.RemoteActorRefProvider
-import akka.remote.RemoteWatcher.Heartbeat
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.AddressFromURIString
+import pekko.actor.Props
+import pekko.actor.RepointableActorRef
+import pekko.cluster.ClusterRemoteFeatures.AddressPing
+import pekko.remote.RARP
+import pekko.remote.RemoteActorRef
+import pekko.remote.RemoteActorRefProvider
+import pekko.remote.RemoteWatcher.Heartbeat
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit.ImplicitSender
 
 class ClusterRemoteFeaturesConfig(artery: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartFirstSeedNodeSpec.scala
similarity index 91%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartFirstSeedNodeSpec.scala
index 3ef694b8c3..f2c94800aa 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartFirstSeedNodeSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.duration._
@@ -10,17 +10,18 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Actor
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Deploy
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.cluster.MemberStatus._
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Deploy
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.cluster.MemberStatus._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object RestartFirstSeedNodeMultiJvmSpec extends MultiNodeConfig {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode2Spec.scala
similarity index 89%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode2Spec.scala
index 55a37a943f..fe9f1188ae 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode2Spec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Deploy
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.cluster.MemberStatus._
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Deploy
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.cluster.MemberStatus._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object RestartNode2SpecMultiJvmSpec extends MultiNodeConfig {
@@ -29,7 +30,7 @@ object RestartNode2SpecMultiJvmSpec extends MultiNodeConfig {
   commonConfig(
     debugConfig(on = false)
       .withFallback(ConfigFactory.parseString("""
-      akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+      akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
       akka.cluster.testkit.auto-down-unreachable-after = 2s
       akka.cluster.retry-unsuccessful-join-after = 3s
       akka.cluster.allow-weakly-up-members = off
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode3Spec.scala
similarity index 91%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode3Spec.scala
index 15bb27f6bc..0a3f9d58c5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode3Spec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Deploy
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.cluster.MemberStatus._
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Deploy
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.cluster.MemberStatus._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object RestartNode3MultiJvmSpec extends MultiNodeConfig {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNodeSpec.scala
similarity index 89%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNodeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNodeSpec.scala
index 2c574c22bb..9b1b53a749 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNodeSpec.scala
@@ -2,29 +2,30 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.Done
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Deploy
-import akka.actor.Identify
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.actor.Terminated
-import akka.cluster.MemberStatus._
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Deploy
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.actor.Terminated
+import pekko.cluster.MemberStatus._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object RestartNodeMultiJvmSpec extends MultiNodeConfig {
@@ -35,7 +36,7 @@ object RestartNodeMultiJvmSpec extends MultiNodeConfig {
   commonConfig(
     debugConfig(on = false)
       .withFallback(ConfigFactory.parseString("""
-      akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+      akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
       akka.cluster.testkit.auto-down-unreachable-after = 5s
       akka.cluster.allow-weakly-up-members = off
       #akka.remote.use-passive-connections = off
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SharedMediaDriverSupport.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/SharedMediaDriverSupport.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala
index 01706c9872..5057ff0b3c 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SharedMediaDriverSupport.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.io.File
 import java.util.concurrent.atomic.AtomicReference
@@ -17,12 +17,13 @@ import io.aeron.driver.MediaDriver
 import io.aeron.driver.ThreadingMode
 import org.agrona.IoUtil
 
-import akka.remote.RemoteSettings
-import akka.remote.artery.ArterySettings
-import akka.remote.artery.ArterySettings.AeronUpd
-import akka.remote.artery.aeron.TaskRunner
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
+import org.apache.pekko
+import pekko.remote.RemoteSettings
+import pekko.remote.artery.ArterySettings
+import pekko.remote.artery.ArterySettings.AeronUpd
+import pekko.remote.artery.aeron.TaskRunner
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
 
 object SharedMediaDriverSupport {
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SingletonClusterSpec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SingletonClusterSpec.scala
index 2372a04026..b704febcdc 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SingletonClusterSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Address
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 final case class SingletonClusterMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig {
   val first = role("first")
@@ -21,7 +22,7 @@ final case class SingletonClusterMultiNodeConfig(failureDetectorPuppet: Boolean)
     debugConfig(on = false)
       .withFallback(ConfigFactory.parseString("""
       akka.cluster {
-        downing-provider-class = akka.cluster.testkit.AutoDowning
+        downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
         testkit.auto-down-unreachable-after = 0s
         failure-detector.threshold = 4
       }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainQuarantineSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainQuarantineSpec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainQuarantineSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainQuarantineSpec.scala
index fc9e5e774a..d03ab076a7 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainQuarantineSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainQuarantineSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.RootActorPath
-import akka.remote.artery.ArterySettings
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter
-import akka.testkit.LongRunningTest
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.RootActorPath
+import pekko.remote.artery.ArterySettings
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter
+import pekko.testkit.LongRunningTest
 import com.typesafe.config.ConfigFactory
 
 import scala.concurrent.duration._
@@ -28,7 +29,7 @@ object SplitBrainQuarantineSpec extends MultiNodeConfig {
       .withFallback(ConfigFactory.parseString(
         """
         akka.remote.artery.enabled = on
-        akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         # we dont really want this to hit, but we need the sbr enabled to know the quarantining
         # downing does not trigger
         akka.cluster.split-brain-resolver.stable-after = 5 minutes
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainSpec.scala
similarity index 92%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainSpec.scala
index d2c454bb1e..61e6cb0306 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 final case class SplitBrainMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig {
   val first = role("first")
@@ -25,7 +26,7 @@ final case class SplitBrainMultiNodeConfig(failureDetectorPuppet: Boolean) exten
       .withFallback(ConfigFactory.parseString("""
         akka.remote.retry-gate-closed-for = 3 s
         akka.cluster {
-          downing-provider-class = akka.cluster.testkit.AutoDowning
+          downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
           testkit.auto-down-unreachable-after = 1s
           failure-detector.threshold = 4
         }"""))
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StreamRefSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala
similarity index 90%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/StreamRefSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala
index 47f91a4f71..f78231358b 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StreamRefSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
@@ -11,23 +11,24 @@ import scala.util.Success
 
 import com.typesafe.config.ConfigFactory
 
-import akka.Done
-import akka.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, Identify, Props }
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.serialization.jackson.CborSerializable
-import akka.stream.Materializer
-import akka.stream.RemoteStreamRefActorTerminatedException
-import akka.stream.SinkRef
-import akka.stream.SourceRef
-import akka.stream.scaladsl.Keep
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.stream.scaladsl.StreamRefs
-import akka.stream.testkit.TestSubscriber
-import akka.stream.testkit.scaladsl.TestSink
-import akka.testkit._
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, Identify, Props }
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.serialization.jackson.CborSerializable
+import pekko.stream.Materializer
+import pekko.stream.RemoteStreamRefActorTerminatedException
+import pekko.stream.SinkRef
+import pekko.stream.SourceRef
+import pekko.stream.scaladsl.Keep
+import pekko.stream.scaladsl.Sink
+import pekko.stream.scaladsl.Source
+import pekko.stream.scaladsl.StreamRefs
+import pekko.stream.testkit.TestSubscriber
+import pekko.stream.testkit.scaladsl.TestSink
+import pekko.testkit._
+import pekko.util.JavaDurationConverters._
 
 object StreamRefSpec extends MultiNodeConfig {
   val first = role("first")
@@ -39,7 +40,7 @@ object StreamRefSpec extends MultiNodeConfig {
       .withFallback(ConfigFactory.parseString("""
         akka.stream.materializer.stream-ref.subscription-timeout = 10 s
         akka.cluster {
-          downing-provider-class = akka.cluster.testkit.AutoDowning
+          downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
           testkit.auto-down-unreachable-after = 1s
         }"""))
       .withFallback(MultiNodeClusterSpec.clusterConfig))
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
similarity index 95%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
index a7132781de..510ccb7616 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.lang.management.ManagementFactory
 
@@ -15,33 +15,34 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.BeforeAndAfterEach
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Deploy
-import akka.actor.Identify
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.actor.Terminated
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterEvent.CurrentInternalStats
-import akka.cluster.ClusterEvent.InitialStateAsSnapshot
-import akka.cluster.ClusterEvent.MemberDowned
-import akka.cluster.ClusterEvent.MemberEvent
-import akka.remote.DefaultFailureDetectorRegistry
-import akka.remote.PhiAccrualFailureDetector
-import akka.remote.RARP
-import akka.remote.artery.ArterySettings.AeronUpd
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.transport.ThrottlerTransportAdapter
-import akka.testkit.TestEvent._
-import akka.testkit._
-import akka.util.Helpers.ConfigOps
-import akka.util.Helpers.Requiring
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Deploy
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.actor.Terminated
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.ClusterEvent.CurrentInternalStats
+import pekko.cluster.ClusterEvent.InitialStateAsSnapshot
+import pekko.cluster.ClusterEvent.MemberDowned
+import pekko.cluster.ClusterEvent.MemberEvent
+import pekko.remote.DefaultFailureDetectorRegistry
+import pekko.remote.PhiAccrualFailureDetector
+import pekko.remote.RARP
+import pekko.remote.artery.ArterySettings.AeronUpd
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.transport.ThrottlerTransportAdapter
+import pekko.testkit.TestEvent._
+import pekko.testkit._
+import pekko.util.Helpers.ConfigOps
+import pekko.util.Helpers.Requiring
 
 /**
  * This test is intended to be used as long running stress test
@@ -102,13 +103,13 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
     akka.actor.provider = cluster
     akka.cluster {
       failure-detector.acceptable-heartbeat-pause =  3s
-      downing-provider-class = akka.cluster.sbr.SplitBrainResolverProvider
+      downing-provider-class = org.apache.pekko.cluster.sbr.SplitBrainResolverProvider
       split-brain-resolver {
           stable-after = 10s
       }
       publish-stats-interval = 1s
     }
-    akka.loggers = ["akka.testkit.TestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.TestEventListener"]
     akka.loglevel = INFO
     akka.remote.log-remote-lifecycle-events = off
     akka.actor.default-dispatcher.fork-join-executor {
@@ -195,11 +196,11 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
     private var reportTo: Option[ActorRef] = None
     private var results = Vector.empty[ClusterResult]
     private var phiValuesObservedByNode = {
-      import akka.cluster.Member.addressOrdering
+      import pekko.cluster.Member.addressOrdering
       immutable.SortedMap.empty[Address, immutable.SortedSet[PhiValue]]
     }
     private var clusterStatsObservedByNode = {
-      import akka.cluster.Member.addressOrdering
+      import pekko.cluster.Member.addressOrdering
       immutable.SortedMap.empty[Address, CurrentInternalStats]
     }
 
@@ -400,7 +401,7 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig {
   case object PhiTick
   final case class PhiResult(from: Address, phiValues: immutable.SortedSet[PhiValue])
   final case class PhiValue(address: Address, countAboveOne: Int, count: Int, max: Double) extends Ordered[PhiValue] {
-    import akka.cluster.Member.addressOrdering
+    import pekko.cluster.Member.addressOrdering
     def compare(that: PhiValue) = addressOrdering.compare(this.address, that.address)
   }
   final case class ReportTo(ref: Option[ActorRef])
@@ -518,7 +519,7 @@ abstract class StressSpec extends MultiNodeClusterSpec(StressMultiJvmSpec) with
       .append(" MB")
     sb.append("\n")
 
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     val args = runtime.getInputArguments.asScala.filterNot(_.contains("classpath")).mkString("\n  ")
     sb.append("Args:\n  ").append(args)
     sb.append("\n")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SunnyWeatherSpec.scala
similarity index 87%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SunnyWeatherSpec.scala
index 0b46859fb0..7c7adb92ab 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SunnyWeatherSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.atomic.AtomicReference
 
@@ -10,10 +10,11 @@ import scala.collection.immutable.SortedSet
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.Props
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Props
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object SunnyWeatherMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
@@ -27,12 +28,12 @@ object SunnyWeatherMultiJvmSpec extends MultiNodeConfig {
   commonConfig(ConfigFactory.parseString("""
     akka {
       actor.provider = cluster
-      loggers = ["akka.testkit.TestEventListener"]
+      loggers = ["org.apache.pekko.testkit.TestEventListener"]
       loglevel = INFO
       remote.log-remote-lifecycle-events = off
       cluster {
         failure-detector.monitored-by-nr-of-members = 3
-        downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         split-brain-resolver.active-strategy = keep-majority
       }
     }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala
similarity index 94%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala
index 8f975818c0..93f7392ee2 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 import scala.util.control.NoStackTrace
@@ -10,19 +10,20 @@ import scala.util.control.NoStackTrace
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.remote.RARP
-import akka.remote.artery.QuarantinedEvent
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.actor.Terminated
+import pekko.remote.RARP
+import pekko.remote.artery.QuarantinedEvent
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
 
 object SurviveNetworkInstabilityMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
@@ -97,13 +98,13 @@ abstract class SurviveNetworkInstabilitySpec
     if (remoteSettings.Artery.Enabled)
       classOf[QuarantinedEvent]
     else
-      classOf[akka.remote.QuarantinedEvent]
+      classOf[pekko.remote.QuarantinedEvent]
 
   @nowarn
   def quarantinedEventFrom(event: Any): Address = {
     event match {
-      case QuarantinedEvent(uniqueAddress)          => uniqueAddress.address
-      case akka.remote.QuarantinedEvent(address, _) => address
+      case QuarantinedEvent(uniqueAddress)           => uniqueAddress.address
+      case pekko.remote.QuarantinedEvent(address, _) => address
     }
 
   }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/TransitionSpec.scala
similarity index 97%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/TransitionSpec.scala
index 50e06dfe0a..98e6ee880a 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/TransitionSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import InternalClusterAction._
 import MemberStatus._
 import com.typesafe.config.ConfigFactory
 import language.implicitConversions
 
-import akka.actor.Address
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object TransitionMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/UnreachableNodeJoinsAgainSpec.scala
similarity index 93%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/UnreachableNodeJoinsAgainSpec.scala
index cdde59b6a3..77e6b47b21 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/UnreachableNodeJoinsAgainSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.Await
@@ -11,16 +11,17 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.ActorSystem
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.cluster.MultiNodeClusterSpec.EndActor
-import akka.remote.RARP
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.cluster.MultiNodeClusterSpec.EndActor
+import pekko.remote.RARP
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object UnreachableNodeJoinsAgainMultiNodeConfig extends MultiNodeConfig {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingGroupSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingGroupSpec.scala
similarity index 88%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingGroupSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingGroupSpec.scala
index feb989ab50..56332359f9 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingGroupSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingGroupSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.routing
+package org.apache.pekko.cluster.routing
 
 import scala.concurrent.Await
 
-import akka.actor.{ Actor, ActorRef, Props }
-import akka.cluster.MultiNodeClusterSpec
-import akka.pattern.ask
-import akka.remote.testkit.MultiNodeConfig
-import akka.routing.{ Broadcast, ConsistentHashingGroup, GetRoutees, Routees }
-import akka.routing.ConsistentHashingRouter.ConsistentHashMapping
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, Props }
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.pattern.ask
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.routing.{ Broadcast, ConsistentHashingGroup, GetRoutees, Routees }
+import pekko.routing.ConsistentHashingRouter.ConsistentHashMapping
+import pekko.testkit._
 
 object ClusterConsistentHashingGroupMultiJvmSpec extends MultiNodeConfig {
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingRouterSpec.scala
similarity index 90%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingRouterSpec.scala
index dd72475c90..c303897bb9 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingRouterSpec.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.routing
+package org.apache.pekko.cluster.routing
 
 import scala.concurrent.Await
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.Props
-import akka.cluster.MultiNodeClusterSpec
-import akka.pattern.ask
-import akka.remote.testkit.MultiNodeConfig
-import akka.routing.ActorRefRoutee
-import akka.routing.ConsistentHashingPool
-import akka.routing.ConsistentHashingRouter.ConsistentHashMapping
-import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope
-import akka.routing.FromConfig
-import akka.routing.GetRoutees
-import akka.routing.Routees
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.Props
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.pattern.ask
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.routing.ActorRefRoutee
+import pekko.routing.ConsistentHashingPool
+import pekko.routing.ConsistentHashingRouter.ConsistentHashMapping
+import pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope
+import pekko.routing.FromConfig
+import pekko.routing.GetRoutees
+import pekko.routing.Routees
+import pekko.testkit._
 
 object ClusterConsistentHashingRouterMultiJvmSpec extends MultiNodeConfig {
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterRoundRobinSpec.scala
similarity index 93%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterRoundRobinSpec.scala
index eb6c415420..9b99218279 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterRoundRobinSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.routing
+package org.apache.pekko.cluster.routing
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,23 +10,24 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.cluster.MultiNodeClusterSpec
-import akka.pattern.ask
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.routing.ActorRefRoutee
-import akka.routing.ActorSelectionRoutee
-import akka.routing.FromConfig
-import akka.routing.GetRoutees
-import akka.routing.RoundRobinPool
-import akka.routing.RoutedActorRef
-import akka.routing.Routees
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.Props
+import pekko.actor.Terminated
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.pattern.ask
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.routing.ActorRefRoutee
+import pekko.routing.ActorSelectionRoutee
+import pekko.routing.FromConfig
+import pekko.routing.GetRoutees
+import pekko.routing.RoundRobinPool
+import pekko.routing.RoutedActorRef
+import pekko.routing.Routees
+import pekko.testkit._
 
 object ClusterRoundRobinMultiJvmSpec extends MultiNodeConfig {
 
@@ -52,7 +53,7 @@ object ClusterRoundRobinMultiJvmSpec extends MultiNodeConfig {
   commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString(s"""
       akka.actor {
         serialization-bindings {
-          "akka.cluster.routing.ClusterRoundRobinMultiJvmSpec$$Reply" = java-test
+          "org.apache.pekko.cluster.routing.ClusterRoundRobinMultiJvmSpec$$Reply" = java-test
         }
 
         deployment {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/UseRoleIgnoredSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/UseRoleIgnoredSpec.scala
similarity index 95%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/routing/UseRoleIgnoredSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/UseRoleIgnoredSpec.scala
index 4ec5427e6d..c1228d95a8 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/UseRoleIgnoredSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/UseRoleIgnoredSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.cluster.routing
+package org.apache.pekko.cluster.routing
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,17 +10,18 @@ import scala.language.postfixOps
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.cluster.MultiNodeClusterSpec
-import akka.pattern.ask
-import akka.remote.testkit.MultiNodeConfig
-import akka.routing.GetRoutees
-import akka.routing.RoundRobinGroup
-import akka.routing.RoundRobinPool
-import akka.routing.Routees
-import akka.testkit._
-import akka.testkit.DefaultTimeout
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.pattern.ask
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.routing.GetRoutees
+import pekko.routing.RoundRobinGroup
+import pekko.routing.RoundRobinPool
+import pekko.routing.Routees
+import pekko.testkit._
+import pekko.testkit.DefaultTimeout
+import pekko.testkit.ImplicitSender
 
 object UseRoleIgnoredMultiJvmSpec extends MultiNodeConfig {
 
@@ -61,7 +62,7 @@ abstract class UseRoleIgnoredSpec
     extends MultiNodeClusterSpec(UseRoleIgnoredMultiJvmSpec)
     with ImplicitSender
     with DefaultTimeout {
-  import akka.cluster.routing.UseRoleIgnoredMultiJvmSpec._
+  import pekko.cluster.routing.UseRoleIgnoredMultiJvmSpec._
 
   def receiveReplies(routeeType: RouteeType, expectedReplies: Int): Map[Address, Int] = {
     val zero = Map.empty[Address, Int] ++ roles.map(address(_) -> 0)
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala
similarity index 91%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala
index 84f025f10e..9cb427824e 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.MultiNodeClusterSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter
 
 object DownAllIndirectlyConnected5NodeSpec extends MultiNodeConfig {
   val node1 = role("node1")
@@ -25,7 +26,7 @@ object DownAllIndirectlyConnected5NodeSpec extends MultiNodeConfig {
     akka {
       loglevel = INFO
       cluster {
-        downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         split-brain-resolver.active-strategy = keep-majority
         split-brain-resolver.stable-after = 6s
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/DownAllUnstable5NodeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllUnstable5NodeSpec.scala
similarity index 91%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/DownAllUnstable5NodeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllUnstable5NodeSpec.scala
index b1decbed0e..bd5f552452 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/DownAllUnstable5NodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllUnstable5NodeSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.MultiNodeClusterSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter
 
 object DownAllUnstable5NodeSpec extends MultiNodeConfig {
   val node1 = role("node1")
@@ -25,7 +26,7 @@ object DownAllUnstable5NodeSpec extends MultiNodeConfig {
     akka {
       loglevel = INFO
       cluster {
-        downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         failure-detector.acceptable-heartbeat-pause = 3s
         split-brain-resolver.active-strategy = keep-majority
         split-brain-resolver.stable-after = 10s
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/IndirectlyConnected3NodeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected3NodeSpec.scala
similarity index 88%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/IndirectlyConnected3NodeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected3NodeSpec.scala
index 99b4158554..077019695d 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/IndirectlyConnected3NodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected3NodeSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.MultiNodeClusterSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter
 
 object IndirectlyConnected3NodeSpec extends MultiNodeConfig {
   val node1 = role("node1")
@@ -23,7 +24,7 @@ object IndirectlyConnected3NodeSpec extends MultiNodeConfig {
     akka {
       loglevel = INFO
       cluster {
-        downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         split-brain-resolver.active-strategy = keep-majority
         split-brain-resolver.stable-after = 6s
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/IndirectlyConnected5NodeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected5NodeSpec.scala
similarity index 90%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/IndirectlyConnected5NodeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected5NodeSpec.scala
index bfd06cd3c2..32cc3ddc25 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/IndirectlyConnected5NodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected5NodeSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.cluster.MultiNodeClusterSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter
 
 object IndirectlyConnected5NodeSpec extends MultiNodeConfig {
   val node1 = role("node1")
@@ -25,7 +26,7 @@ object IndirectlyConnected5NodeSpec extends MultiNodeConfig {
     akka {
       loglevel = INFO
       cluster {
-        downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         split-brain-resolver.active-strategy = keep-majority
         split-brain-resolver.stable-after = 6s
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/LeaseMajority5NodeSpec.scala b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/LeaseMajority5NodeSpec.scala
similarity index 91%
rename from akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/LeaseMajority5NodeSpec.scala
rename to akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/LeaseMajority5NodeSpec.scala
index 0bedd7e1ca..33ff93deee 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/sbr/LeaseMajority5NodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/LeaseMajority5NodeSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.cluster.MemberStatus
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter
+import org.apache.pekko
+import pekko.cluster.MemberStatus
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.MultiNodeClusterSpec
-import akka.coordination.lease.TestLease
-import akka.coordination.lease.TestLeaseExt
+import pekko.cluster.MultiNodeClusterSpec
+import pekko.coordination.lease.TestLease
+import pekko.coordination.lease.TestLeaseExt
 
 object LeaseMajority5NodeSpec extends MultiNodeConfig {
   val node1 = role("node1")
@@ -33,7 +34,7 @@ object LeaseMajority5NodeSpec extends MultiNodeConfig {
         periodic-tasks-initial-delay        = 300 ms
         failure-detector.heartbeat-interval = 500 ms
       
-        downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         split-brain-resolver {
           active-strategy = lease-majority
           stable-after = 1.5s
@@ -80,7 +81,7 @@ class LeaseMajority5NodeSpec extends MultiNodeClusterSpec(LeaseMajority5NodeSpec
      * Sort the roles in the address order used by the cluster node ring.
      */
     implicit val clusterOrdering: Ordering[RoleName] = new Ordering[RoleName] {
-      import akka.cluster.Member.addressOrdering
+      import pekko.cluster.Member.addressOrdering
       def compare(x: RoleName, y: RoleName): Int = addressOrdering.compare(node(x).address, node(y).address)
     }
     roles.toList.sorted
diff --git a/akka-cluster/src/test/java/akka/cluster/ClusterJavaCompileTest.java b/akka-cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java
similarity index 80%
rename from akka-cluster/src/test/java/akka/cluster/ClusterJavaCompileTest.java
rename to akka-cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java
index ab7c749b72..20fa6f33f7 100644
--- a/akka-cluster/src/test/java/akka/cluster/ClusterJavaCompileTest.java
+++ b/akka-cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java
@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster;
+package org.apache.pekko.cluster;
 
-import akka.actor.ActorSystem;
-import akka.actor.Address;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Address;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterConfigSpec.scala
similarity index 91%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterConfigSpec.scala
index 5931f01b60..49ea9dfc03 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterConfigSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
@@ -10,12 +10,13 @@ import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Address
-import akka.dispatch.Dispatchers
-import akka.remote.PhiAccrualFailureDetector
-import akka.testkit.AkkaSpec
-import akka.util.Helpers.ConfigOps
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.dispatch.Dispatchers
+import pekko.remote.PhiAccrualFailureDetector
+import pekko.testkit.AkkaSpec
+import pekko.util.Helpers.ConfigOps
+import pekko.util.Version
 
 @nowarn
 class ClusterConfigSpec extends AkkaSpec {
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDeathWatchNotificationSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeathWatchNotificationSpec.scala
similarity index 96%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterDeathWatchNotificationSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeathWatchNotificationSpec.scala
index 086f011e87..d8dc845686 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDeathWatchNotificationSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeathWatchNotificationSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
-import akka.actor._
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit._
 import com.typesafe.config.ConfigFactory
 
-import akka.remote.artery.ArteryMultiNodeSpec
-import akka.remote.artery.ArterySpecSupport
+import pekko.remote.artery.ArteryMultiNodeSpec
+import pekko.remote.artery.ArterySpecSupport
 
 object ClusterDeathWatchNotificationSpec {
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeployerSpec.scala
similarity index 88%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeployerSpec.scala
index 34e8b4fd55..dcb45b1664 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeployerSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import com.typesafe.config._
 
-import akka.actor._
-import akka.cluster.routing.ClusterRouterGroup
-import akka.cluster.routing.ClusterRouterGroupSettings
-import akka.cluster.routing.ClusterRouterPool
-import akka.cluster.routing.ClusterRouterPoolSettings
-import akka.routing._
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.cluster.routing.ClusterRouterGroup
+import pekko.cluster.routing.ClusterRouterGroupSettings
+import pekko.cluster.routing.ClusterRouterPool
+import pekko.cluster.routing.ClusterRouterPoolSettings
+import pekko.routing._
+import pekko.testkit._
 
 object ClusterDeployerSpec {
   val deployerConf = ConfigFactory.parseString(
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventPublisherSpec.scala
similarity index 95%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventPublisherSpec.scala
index 24d6723f6e..4f22dd9eea 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventPublisherSpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable.SortedSet
 
 import org.scalatest.BeforeAndAfterEach
 
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.cluster.ClusterEvent._
-import akka.cluster.ClusterSettings.DefaultDataCenter
-import akka.cluster.InternalClusterAction._
-import akka.cluster.MemberStatus._
-import akka.remote.RARP
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.ClusterSettings.DefaultDataCenter
+import pekko.cluster.InternalClusterAction._
+import pekko.cluster.MemberStatus._
+import pekko.remote.RARP
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.TestProbe
 
 object ClusterDomainEventPublisherSpec {
   val config = """
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventSpec.scala
similarity index 99%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventSpec.scala
index d0a6c21893..16c91972ab 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventSpec.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable.SortedSet
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 import org.scalatest.BeforeAndAfterAll
 
 class ClusterDomainEventSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll {
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatReceiverSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatReceiverSpec.scala
similarity index 75%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatReceiverSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatReceiverSpec.scala
index 120869cea6..ead5a11c66 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatReceiverSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatReceiverSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.cluster.ClusterHeartbeatSender.{ Heartbeat, HeartbeatRsp }
-import akka.testkit.{ AkkaSpec, ImplicitSender }
+import org.apache.pekko
+import pekko.cluster.ClusterHeartbeatSender.{ Heartbeat, HeartbeatRsp }
+import pekko.testkit.{ AkkaSpec, ImplicitSender }
 
 class ClusterHeartbeatReceiverSpec extends AkkaSpec("""
     akka.actor.provider = cluster 
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderSpec.scala
similarity index 75%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderSpec.scala
index 5f628c82fa..4e6da6b23d 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.actor.{ ActorSelection, Address, Props }
-import akka.cluster.ClusterEvent.{ CurrentClusterState, MemberUp }
-import akka.cluster.ClusterHeartbeatSender.Heartbeat
-import akka.cluster.ClusterHeartbeatSenderSpec.TestClusterHeartBeatSender
-import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.{ ActorSelection, Address, Props }
+import pekko.cluster.ClusterEvent.{ CurrentClusterState, MemberUp }
+import pekko.cluster.ClusterHeartbeatSender.Heartbeat
+import pekko.cluster.ClusterHeartbeatSenderSpec.TestClusterHeartBeatSender
+import pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
+import pekko.util.Version
 
 object ClusterHeartbeatSenderSpec {
   class TestClusterHeartBeatSender(probe: TestProbe) extends ClusterHeartbeatSender {
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderStateSpec.scala
similarity index 98%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderStateSpec.scala
index e5133270a9..d9f5ed281b 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderStateSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.ThreadLocalRandom
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.remote.DefaultFailureDetectorRegistry
-import akka.remote.FailureDetector
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.remote.DefaultFailureDetectorRegistry
+import pekko.remote.FailureDetector
 
 object ClusterHeartbeatSenderStateSpec {
   class FailureDetectorStub extends FailureDetector {
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterLogSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterLogSpec.scala
similarity index 87%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterLogSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterLogSpec.scala
index 622120a303..5cd101fc43 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterLogSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterLogSpec.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.actor.{ Address, ExtendedActorSystem }
-import akka.testkit.{ AkkaSpec, EventFilter, ImplicitSender }
+import org.apache.pekko
+import pekko.actor.{ Address, ExtendedActorSystem }
+import pekko.testkit.{ AkkaSpec, EventFilter, ImplicitSender }
 
 object ClusterLogSpec {
   val config = """
     akka.cluster {
-      downing-provider-class = akka.cluster.testkit.AutoDowning
+      downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
       testkit.auto-down-unreachable-after = 0s
       publish-stats-interval = 0 s # always, when it happens
-      failure-detector.implementation-class = akka.cluster.FailureDetectorPuppet
+      failure-detector.implementation-class = org.apache.pekko.cluster.FailureDetectorPuppet
     }
     akka.actor.provider = "cluster"
     akka.remote.log-remote-lifecycle-events = off
     akka.remote.classic.netty.tcp.port = 0
     akka.remote.artery.canonical.port = 0
     akka.loglevel = "INFO"
-    akka.loggers = ["akka.testkit.TestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.TestEventListener"]
     """
 
 }
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
similarity index 94%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
index 98fee94168..dfcd35fd43 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.lang.management.ManagementFactory
 
@@ -12,31 +12,32 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.CoordinatedShutdown
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.cluster.ClusterEvent._
-import akka.cluster.ClusterEvent.MemberEvent
-import akka.cluster.InternalClusterAction._
-import akka.stream.Materializer
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.stream.scaladsl.StreamRefs
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.TestProbe
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.CoordinatedShutdown
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.ClusterEvent.MemberEvent
+import pekko.cluster.InternalClusterAction._
+import pekko.stream.Materializer
+import pekko.stream.scaladsl.Sink
+import pekko.stream.scaladsl.Source
+import pekko.stream.scaladsl.StreamRefs
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.TestProbe
+import pekko.util.Version
 
 object ClusterSpec {
   val config = """
     akka.cluster {
-      downing-provider-class = akka.cluster.testkit.AutoDowning
+      downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
       testkit.auto-down-unreachable-after = 0s
       periodic-tasks-initial-delay = 120 seconds // turn off scheduled tasks
       publish-stats-interval = 0 s # always, when it happens
-      failure-detector.implementation-class = akka.cluster.FailureDetectorPuppet
+      failure-detector.implementation-class = org.apache.pekko.cluster.FailureDetectorPuppet
       app-version = "1.2.3"
     }
     akka.actor.provider = "cluster"
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterTestKit.scala
similarity index 98%
rename from akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterTestKit.scala
index 8fbb191bf6..50dbd72c0f 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterTestKit.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration.{ FiniteDuration, _ }
 import scala.util.Random
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.actor.ActorSystem
-import akka.testkit.{ AkkaSpec, TestKitBase }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.testkit.{ AkkaSpec, TestKitBase }
 
 /**
  * Builds on TestKitBase to provide some extra utilities to run cluster test.
diff --git a/akka-cluster/src/test/scala/akka/cluster/CrossDcHeartbeatSenderSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/CrossDcHeartbeatSenderSpec.scala
similarity index 77%
rename from akka-cluster/src/test/scala/akka/cluster/CrossDcHeartbeatSenderSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/CrossDcHeartbeatSenderSpec.scala
index 53b2083e68..039507b226 100644
--- a/akka-cluster/src/test/scala/akka/cluster/CrossDcHeartbeatSenderSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/CrossDcHeartbeatSenderSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable.SortedSet
 
-import akka.actor.ActorSelection
-import akka.actor.Address
-import akka.actor.Props
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterHeartbeatSender.Heartbeat
-import akka.cluster.CrossDcHeartbeatSender.ReportStatus
-import akka.cluster.CrossDcHeartbeatSenderSpec.TestCrossDcHeartbeatSender
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.TestProbe
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.ActorSelection
+import pekko.actor.Address
+import pekko.actor.Props
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.ClusterHeartbeatSender.Heartbeat
+import pekko.cluster.CrossDcHeartbeatSender.ReportStatus
+import pekko.cluster.CrossDcHeartbeatSenderSpec.TestCrossDcHeartbeatSender
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.TestProbe
+import pekko.util.Version
 
 object CrossDcHeartbeatSenderSpec {
   class TestCrossDcHeartbeatSender(heartbeatProbe: TestProbe) extends CrossDcHeartbeatSender {
diff --git a/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/DowningProviderSpec.scala
similarity index 84%
rename from akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/DowningProviderSpec.scala
index 75f3f088b6..4b617ca16c 100644
--- a/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/DowningProviderSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.atomic.AtomicBoolean
 import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import akka.ConfigurationException
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.testkit.TestKit.awaitCond
-import akka.testkit.TestKit.shutdownActorSystem
-import akka.util.unused
+import org.apache.pekko
+import pekko.ConfigurationException
+import pekko.actor.ActorSystem
+import pekko.actor.Props
+import pekko.testkit.TestKit.awaitCond
+import pekko.testkit.TestKit.shutdownActorSystem
+import pekko.util.unused
 
 import scala.util.control.NonFatal
 
@@ -56,7 +57,7 @@ class DowningProviderSpec extends AnyWordSpec with Matchers {
 
   "The downing provider mechanism" should {
 
-    "default to akka.cluster.NoDowning" in {
+    "default to org.apache.pekko.cluster.NoDowning" in {
       val system = ActorSystem("default", baseConf)
       Cluster(system).downingProvider shouldBe an[NoDowning]
       shutdownActorSystem(system)
@@ -66,7 +67,7 @@ class DowningProviderSpec extends AnyWordSpec with Matchers {
       val system = ActorSystem(
         "auto-downing",
         ConfigFactory.parseString("""
-          akka.cluster.downing-provider-class="akka.cluster.DummyDowningProvider"
+          akka.cluster.downing-provider-class="org.apache.pekko.cluster.DummyDowningProvider"
         """).withFallback(baseConf))
 
       Cluster(system).downingProvider shouldBe a[DummyDowningProvider]
@@ -84,7 +85,7 @@ class DowningProviderSpec extends AnyWordSpec with Matchers {
             ActorSystem(
               "auto-downing",
               ConfigFactory.parseString("""
-          akka.cluster.downing-provider-class="akka.cluster.FailingDowningProvider"
+          akka.cluster.downing-provider-class="org.apache.pekko.cluster.FailingDowningProvider"
         """).withFallback(baseConf)))
         } catch {
           case NonFatal(_) =>
diff --git a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/FailureDetectorPuppet.scala
similarity index 85%
rename from akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/FailureDetectorPuppet.scala
index ae828cc491..b621ce63be 100644
--- a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/FailureDetectorPuppet.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import java.util.concurrent.atomic.AtomicReference
 
 import com.typesafe.config.Config
 
-import akka.event.EventStream
-import akka.remote.FailureDetector
-import akka.util.unused
+import org.apache.pekko
+import pekko.event.EventStream
+import pekko.remote.FailureDetector
+import pekko.util.unused
 
 /**
  * User controllable "puppet" failure detector.
diff --git a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipSpec.scala
similarity index 99%
rename from akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipSpec.scala
index 957dbafe12..1fa985596f 100644
--- a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable.SortedSet
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.ClusterSettings.DefaultDataCenter
-import akka.cluster.Gossip.vclockName
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.ClusterSettings.DefaultDataCenter
+import pekko.cluster.Gossip.vclockName
 
 class GossipSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/GossipTargetSelectorSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipTargetSelectorSpec.scala
similarity index 98%
rename from akka-cluster/src/test/scala/akka/cluster/GossipTargetSelectorSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipTargetSelectorSpec.scala
index 2810eecebc..d75e5ce258 100644
--- a/akka-cluster/src/test/scala/akka/cluster/GossipTargetSelectorSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipTargetSelectorSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable.SortedSet
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.MemberStatus.Up
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.MemberStatus.Up
 
 class GossipTargetSelectorSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingPerfSpec.scala
similarity index 80%
rename from akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingPerfSpec.scala
index 1d1511c577..e95fb7fef1 100644
--- a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingPerfSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 class HeartbeatNodeRingPerfSpec extends AnyWordSpec with Matchers {
 
-  val nodesSize = sys.props.get("akka.cluster.HeartbeatNodeRingPerfSpec.nodesSize").getOrElse("250").toInt
+  val nodesSize = sys.props.get("org.apache.pekko.cluster.HeartbeatNodeRingPerfSpec.nodesSize").getOrElse("250").toInt
   // increase for serious measurements
-  val iterations = sys.props.get("akka.cluster.HeartbeatNodeRingPerfSpec.iterations").getOrElse("1000").toInt
+  val iterations =
+    sys.props.get("org.apache.pekko.cluster.HeartbeatNodeRingPerfSpec.iterations").getOrElse("1000").toInt
 
   def createHeartbeatNodeRingOfSize(size: Int): HeartbeatNodeRing = {
     val nodes = (1 to size).map(n => UniqueAddress(Address("akka", "sys", "node-" + n, 2552), n.toLong))
diff --git a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingSpec.scala
similarity index 96%
rename from akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingSpec.scala
index 1199208cf8..3fd1735670 100644
--- a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingSpec.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 class HeartbeatNodeRingSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckClusterSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala
similarity index 83%
rename from akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckClusterSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala
index f486380e44..ac0d04ddbc 100644
--- a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckClusterSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ExtendedActorSystem
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.testkit.AkkaSpec
 
 class JoinConfigCompatCheckClusterSpec extends AkkaSpec {
 
@@ -64,11 +65,11 @@ class JoinConfigCompatCheckClusterSpec extends AkkaSpec {
     "be valid when same downing-provider" in {
       val oldConfig =
         ConfigFactory.parseString("""
-        akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         """).withFallback(system.settings.config)
       val newConfig =
         ConfigFactory.parseString("""
-        akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         """).withFallback(system.settings.config)
       checkInitJoin(oldConfig, newConfig) should ===(Valid)
     }
@@ -82,7 +83,7 @@ class JoinConfigCompatCheckClusterSpec extends AkkaSpec {
           .withFallback(system.settings.config)
       val newConfig =
         ConfigFactory.parseString("""
-        akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         """).withFallback(system.settings.config)
       checkInitJoin(oldConfig, newConfig) should ===(Valid)
     }
@@ -90,11 +91,11 @@ class JoinConfigCompatCheckClusterSpec extends AkkaSpec {
     "be invalid when different downing-provider" in {
       val oldConfig =
         ConfigFactory.parseString("""
-        akka.cluster.downing-provider-class = "akka.cluster.testkit.AutoDowning"
+        akka.cluster.downing-provider-class = "org.apache.pekko.cluster.testkit.AutoDowning"
         """).withFallback(system.settings.config)
       val newConfig =
         ConfigFactory.parseString("""
-        akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         """).withFallback(system.settings.config)
       checkInitJoin(oldConfig, newConfig).getClass should ===(classOf[Invalid])
     }
@@ -102,12 +103,12 @@ class JoinConfigCompatCheckClusterSpec extends AkkaSpec {
     "be invalid when different sbr strategy" in {
       val oldConfig =
         ConfigFactory.parseString("""
-        akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         akka.cluster.split-brain-resolver.active-strategy = keep-majority
         """).withFallback(system.settings.config)
       val newConfig =
         ConfigFactory.parseString("""
-        akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         akka.cluster.split-brain-resolver.active-strategy = keep-oldest
         """).withFallback(system.settings.config)
       checkInitJoin(oldConfig, newConfig).getClass should ===(classOf[Invalid])
diff --git a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala
similarity index 90%
rename from akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala
index 459820bdb3..5255d0f91d 100644
--- a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.{ immutable => im }
 import scala.concurrent.duration._
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.testkit.GHExcludeAeronTest
-import akka.testkit.LongRunningTest
+import org.apache.pekko
+import pekko.testkit.GHExcludeAeronTest
+import pekko.testkit.LongRunningTest
 
 object JoinConfigCompatCheckerRollingUpdateSpec {
 
@@ -18,7 +19,7 @@ object JoinConfigCompatCheckerRollingUpdateSpec {
       akka.log-dead-letters = off
       akka.log-dead-letters-during-shutdown = off
       akka.remote.log-remote-lifecycle-events = off
-      akka.cluster.downing-provider-class = akka.cluster.testkit.AutoDowning
+      akka.cluster.downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
       akka.cluster.testkit.auto-down-unreachable-after = 0s
       akka.cluster {
         jmx.enabled                         = off
@@ -35,7 +36,7 @@ object JoinConfigCompatCheckerRollingUpdateSpec {
   private val v2 = ConfigFactory.parseString("""
       akka.cluster.new-configuration = "v2"
       akka.cluster.configuration-compatibility-check.checkers {
-        rolling-upgrade-test = "akka.cluster.JoinConfigCompatRollingUpdateChecker"
+        rolling-upgrade-test = "org.apache.pekko.cluster.JoinConfigCompatRollingUpdateChecker"
       }
     """)
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerSpec.scala
similarity index 93%
rename from akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerSpec.scala
index 41ec39bf7d..ccf8f9cab7 100644
--- a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerSpec.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.{ immutable => im }
 import scala.concurrent.duration._
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.testkit.{ AkkaSpec, LongRunningTest }
+import org.apache.pekko.testkit.{ AkkaSpec, LongRunningTest }
 
 object JoinConfigCompatCheckerSpec {
 
@@ -35,7 +35,7 @@ object JoinConfigCompatCheckerSpec {
         configuration-compatibility-check {
           enforce-on-join = on
           checkers {
-           akka-cluster-test = "akka.cluster.JoinConfigCompatCheckerTest"
+           akka-cluster-test = "org.apache.pekko.cluster.JoinConfigCompatCheckerTest"
           }
           sensitive-config-paths {
             akka = [ "akka.cluster.sensitive.properties" ]
@@ -77,7 +77,7 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
               configuration-compatibility-check {
                 enforce-on-join = on
                 checkers {
-                 akka-cluster-test = "akka.cluster.JoinConfigCompatCheckerTest"
+                 akka-cluster-test = "org.apache.pekko.cluster.JoinConfigCompatCheckerTest"
                 }
               }
             }
@@ -118,8 +118,8 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
               configuration-compatibility-check {
                 enforce-on-join = on
                 checkers {
-                 akka-cluster-test = "akka.cluster.JoinConfigCompatCheckerTest"
-                 akka-cluster-extra = "akka.cluster.JoinConfigCompatCheckerExtraTest"
+                 akka-cluster-test = "org.apache.pekko.cluster.JoinConfigCompatCheckerTest"
+                 akka-cluster-extra = "org.apache.pekko.cluster.JoinConfigCompatCheckerExtraTest"
                 }
               }
             }
@@ -196,8 +196,8 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
               configuration-compatibility-check {
                 enforce-on-join = off
                 checkers {
-                 akka-cluster-test = "akka.cluster.JoinConfigCompatCheckerTest"
-                 akka-cluster-extra = "akka.cluster.JoinConfigCompatCheckerExtraTest"
+                 akka-cluster-test = "org.apache.pekko.cluster.JoinConfigCompatCheckerTest"
+                 akka-cluster-extra = "org.apache.pekko.cluster.JoinConfigCompatCheckerExtraTest"
                 }
               }
             }
@@ -230,7 +230,7 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
                 # not enforcing config compat check
                 enforce-on-join = off
                 checkers {
-                 akka-cluster-test = "akka.cluster.JoinConfigCompatCheckerTest"
+                 akka-cluster-test = "org.apache.pekko.cluster.JoinConfigCompatCheckerTest"
                 }
               }
              # this config is incompatible
@@ -261,7 +261,7 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
             akka.cluster {
 
               # using explicit downing provider class
-              downing-provider-class = "akka.cluster.testkit.AutoDowning"
+              downing-provider-class = "org.apache.pekko.cluster.testkit.AutoDowning"
               testkit.auto-down-unreachable-after = 0s
 
               configuration-compatibility-check {
@@ -331,7 +331,7 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
               configuration-compatibility-check {
                 enforce-on-join = on
                 checkers {
-                 akka-cluster-test = "akka.cluster.JoinConfigCompatCheckerTest"
+                 akka-cluster-test = "org.apache.pekko.cluster.JoinConfigCompatCheckerTest"
                 }
               }
             }
@@ -378,8 +378,8 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
               configuration-compatibility-check {
                 enforce-on-join = on
                 checkers {
-                 akka-cluster-test = "akka.cluster.JoinConfigCompatCheckerTest"
-                 akka-cluster-extra = "akka.cluster.JoinConfigCompatCheckerExtraTest"
+                 akka-cluster-test = "org.apache.pekko.cluster.JoinConfigCompatCheckerTest"
+                 akka-cluster-extra = "org.apache.pekko.cluster.JoinConfigCompatCheckerExtraTest"
                 }
               }
             }
@@ -470,8 +470,8 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
               configuration-compatibility-check {
                 enforce-on-join = off
                 checkers {
-                 akka-cluster-test = "akka.cluster.JoinConfigCompatCheckerTest"
-                 akka-cluster-extra = "akka.cluster.JoinConfigCompatCheckerExtraTest"
+                 akka-cluster-test = "org.apache.pekko.cluster.JoinConfigCompatCheckerTest"
+                 akka-cluster-extra = "org.apache.pekko.cluster.JoinConfigCompatCheckerExtraTest"
                 }
               }
             }
@@ -514,7 +514,7 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
                 # not enforcing config compat check
                 enforce-on-join = off
                 checkers {
-                 akka-cluster-test = "akka.cluster.JoinConfigCompatCheckerTest"
+                 akka-cluster-test = "org.apache.pekko.cluster.JoinConfigCompatCheckerTest"
                 }
               }
              # this config is incompatible
@@ -570,7 +570,7 @@ class JoinConfigCompatCheckerSpec extends AkkaSpec with ClusterTestKit {
                 enforce-on-join = on
                 checkers {
                   # rogue checker to trick the cluster to leak sensitive data
-                  rogue-checker = "akka.cluster.RogueJoinConfigCompatCheckerTest"
+                  rogue-checker = "org.apache.pekko.cluster.RogueJoinConfigCompatCheckerTest"
                 }
 
                 # unset sensitive config paths
diff --git a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatPreDefinedChecksSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatPreDefinedChecksSpec.scala
similarity index 99%
rename from akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatPreDefinedChecksSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatPreDefinedChecksSpec.scala
index cecf368ae3..9f7a5dfc09 100644
--- a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatPreDefinedChecksSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatPreDefinedChecksSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.{ immutable => im }
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/MemberOrderingSpec.scala
similarity index 97%
rename from akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/MemberOrderingSpec.scala
index a255c6b750..c953072ed5 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/MemberOrderingSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable.SortedSet
 import scala.util.Random
@@ -10,9 +10,10 @@ import scala.util.Random
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.actor.AddressFromURIString
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.actor.AddressFromURIString
+import pekko.util.Version
 
 class MemberOrderingSpec extends AnyWordSpec with Matchers {
   import Member.addressOrdering
diff --git a/akka-cluster/src/test/scala/akka/cluster/MembershipStateSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/MembershipStateSpec.scala
similarity index 96%
rename from akka-cluster/src/test/scala/akka/cluster/MembershipStateSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/MembershipStateSpec.scala
index 44ff9a9630..324267d3b6 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MembershipStateSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/MembershipStateSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable.SortedSet
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.MemberStatus.Up
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.MemberStatus.Up
 
 class MembershipStateSpec extends AnyWordSpec with Matchers {
   // DC-a is in reverse age order
diff --git a/akka-cluster/src/test/scala/akka/cluster/ReachabilityPerfSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilityPerfSpec.scala
similarity index 93%
rename from akka-cluster/src/test/scala/akka/cluster/ReachabilityPerfSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilityPerfSpec.scala
index d396afe854..2e04c0d906 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ReachabilityPerfSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilityPerfSpec.scala
@@ -2,19 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.annotation.nowarn
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 class ReachabilityPerfSpec extends AnyWordSpec with Matchers {
 
-  val nodesSize = sys.props.get("akka.cluster.ReachabilityPerfSpec.nodesSize").getOrElse("250").toInt
+  val nodesSize = sys.props.get("org.apache.pekko.cluster.ReachabilityPerfSpec.nodesSize").getOrElse("250").toInt
   // increase for serious measurements
-  val iterations = sys.props.get("akka.cluster.ReachabilityPerfSpec.iterations").getOrElse("100").toInt
+  val iterations = sys.props.get("org.apache.pekko.cluster.ReachabilityPerfSpec.iterations").getOrElse("100").toInt
 
   val address = Address("akka", "sys", "a", 2552)
   val node = Address("akka", "sys", "a", 2552)
diff --git a/akka-cluster/src/test/scala/akka/cluster/ReachabilitySpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilitySpec.scala
similarity index 99%
rename from akka-cluster/src/test/scala/akka/cluster/ReachabilitySpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilitySpec.scala
index 26b109e0f8..cb76668634 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ReachabilitySpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilitySpec.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 class ReachabilitySpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/ResetSystemMessageSeqNrSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ResetSystemMessageSeqNrSpec.scala
similarity index 91%
rename from akka-cluster/src/test/scala/akka/cluster/ResetSystemMessageSeqNrSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ResetSystemMessageSeqNrSpec.scala
index 91d79d58ee..2b0cfc5a3a 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ResetSystemMessageSeqNrSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ResetSystemMessageSeqNrSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
-import akka.actor.ActorIdentity
-import akka.actor.Identify
-import akka.actor.PoisonPill
-import akka.remote.artery.ArteryMultiNodeSpec
-import akka.testkit.ImplicitSender
-import akka.testkit.TestActors
+import org.apache.pekko
+import pekko.actor.ActorIdentity
+import pekko.actor.Identify
+import pekko.actor.PoisonPill
+import pekko.remote.artery.ArteryMultiNodeSpec
+import pekko.testkit.ImplicitSender
+import pekko.testkit.TestActors
 
 /**
  * Reproducer for issue #24847
diff --git a/akka-cluster/src/test/scala/akka/cluster/ShutdownAfterJoinSeedNodesSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ShutdownAfterJoinSeedNodesSpec.scala
similarity index 92%
rename from akka-cluster/src/test/scala/akka/cluster/ShutdownAfterJoinSeedNodesSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/ShutdownAfterJoinSeedNodesSpec.scala
index 312e76d223..4f04c68e5d 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ShutdownAfterJoinSeedNodesSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/ShutdownAfterJoinSeedNodesSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.testkit._
 
 object ShutdownAfterJoinSeedNodesSpec {
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/StartupWithOneThreadSpec.scala
similarity index 90%
rename from akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/StartupWithOneThreadSpec.scala
index 62387b3075..d87f6a49be 100644
--- a/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/StartupWithOneThreadSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.Address
-import akka.actor.Props
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.Address
+import pekko.actor.Props
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
 
 object StartupWithOneThreadSpec {
   val config = """
diff --git a/akka-cluster/src/test/scala/akka/cluster/TestMember.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/TestMember.scala
similarity index 90%
rename from akka-cluster/src/test/scala/akka/cluster/TestMember.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/TestMember.scala
index a9c8727b88..da9967b3e1 100644
--- a/akka-cluster/src/test/scala/akka/cluster/TestMember.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/TestMember.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
-import akka.actor.Address
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.util.Version
 
 object TestMember {
   def apply(address: Address, status: MemberStatus): Member =
diff --git a/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockPerfSpec.scala
similarity index 92%
rename from akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockPerfSpec.scala
index 4dda76b4db..dcd478073f 100644
--- a/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockPerfSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable.{ SortedSet, TreeMap }
 
@@ -32,9 +32,9 @@ class VectorClockPerfSpec extends AnyWordSpec with Matchers {
   import VectorClock._
   import VectorClockPerfSpec._
 
-  val clockSize = sys.props.get("akka.cluster.VectorClockPerfSpec.clockSize").getOrElse("1000").toInt
+  val clockSize = sys.props.get("org.apache.pekko.cluster.VectorClockPerfSpec.clockSize").getOrElse("1000").toInt
   // increase for serious measurements
-  val iterations = sys.props.get("akka.cluster.VectorClockPerfSpec.iterations").getOrElse("1000").toInt
+  val iterations = sys.props.get("org.apache.pekko.cluster.VectorClockPerfSpec.iterations").getOrElse("1000").toInt
 
   val (vcBefore, nodes) = createVectorClockOfSize(clockSize)
   val firstNode = nodes.head
diff --git a/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockSpec.scala
similarity index 99%
rename from akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockSpec.scala
index 7418626883..66c484f0e9 100644
--- a/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockSpec.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster
+package org.apache.pekko.cluster
 
 import scala.collection.immutable.TreeMap
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 
 class VectorClockSpec extends AkkaSpec {
   import VectorClock._
diff --git a/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializerSpec.scala
similarity index 96%
rename from akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializerSpec.scala
index 6921138d82..fa521a50fa 100644
--- a/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializerSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.protobuf
+package org.apache.pekko.cluster.protobuf
 
 import collection.immutable.SortedSet
 
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Address, ExtendedActorSystem }
-import akka.cluster._
-import akka.cluster.InternalClusterAction.CompatibleConfig
-import akka.cluster.routing.{ ClusterRouterPool, ClusterRouterPoolSettings }
-import akka.routing.RoundRobinPool
-import akka.testkit.AkkaSpec
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.{ Address, ExtendedActorSystem }
+import pekko.cluster._
+import pekko.cluster.InternalClusterAction.CompatibleConfig
+import pekko.cluster.routing.{ ClusterRouterPool, ClusterRouterPoolSettings }
+import pekko.routing.RoundRobinPool
+import pekko.testkit.AkkaSpec
+import pekko.util.Version
 
 @nowarn
 class ClusterMessageSerializerSpec extends AkkaSpec("akka.actor.provider = cluster") {
diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/routing/ClusterRouterSupervisorSpec.scala
similarity index 86%
rename from akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/routing/ClusterRouterSupervisorSpec.scala
index 5ddf2408e3..29bf9a8d59 100644
--- a/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/routing/ClusterRouterSupervisorSpec.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.routing
+package org.apache.pekko.cluster.routing
 
-import akka.actor._
-import akka.actor.OneForOneStrategy
-import akka.routing.RoundRobinPool
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.actor.OneForOneStrategy
+import pekko.routing.RoundRobinPool
+import pekko.testkit._
 
 object ClusterRouterSupervisorSpec {
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/sbr/LeaseMajoritySpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/LeaseMajoritySpec.scala
similarity index 95%
rename from akka-cluster/src/test/scala/akka/cluster/sbr/LeaseMajoritySpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/LeaseMajoritySpec.scala
index 14ed35a522..2ce2011dcc 100644
--- a/akka-cluster/src/test/scala/akka/cluster/sbr/LeaseMajoritySpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/LeaseMajoritySpec.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.Eventually
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/sbr/SplitBrainResolverSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSpec.scala
similarity index 98%
rename from akka-cluster/src/test/scala/akka/cluster/sbr/SplitBrainResolverSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSpec.scala
index 3d4047057b..51d1ab1cbb 100644
--- a/akka-cluster/src/test/scala/akka/cluster/sbr/SplitBrainResolverSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
@@ -10,28 +10,29 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.Eventually
 
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.cluster.ClusterEvent.LeaderChanged
-import akka.cluster.ClusterEvent.MemberExited
-import akka.cluster.ClusterEvent.MemberRemoved
-import akka.cluster.ClusterEvent.MemberUp
-import akka.cluster.ClusterEvent.MemberWeaklyUp
-import akka.cluster.ClusterEvent.ReachabilityChanged
-import akka.cluster.ClusterEvent.ReachableDataCenter
-import akka.cluster.ClusterEvent.ReachableMember
-import akka.cluster.ClusterEvent.UnreachableDataCenter
-import akka.cluster.ClusterEvent.UnreachableMember
-import akka.cluster.ClusterSettings.DataCenter
-import akka.cluster.MemberStatus._
-import akka.cluster._
-import akka.coordination.lease.LeaseSettings
-import akka.coordination.lease.TestLease
-import akka.coordination.lease.TimeoutSettings
-import akka.testkit.AkkaSpec
-import akka.testkit.EventFilter
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.cluster.ClusterEvent.LeaderChanged
+import pekko.cluster.ClusterEvent.MemberExited
+import pekko.cluster.ClusterEvent.MemberRemoved
+import pekko.cluster.ClusterEvent.MemberUp
+import pekko.cluster.ClusterEvent.MemberWeaklyUp
+import pekko.cluster.ClusterEvent.ReachabilityChanged
+import pekko.cluster.ClusterEvent.ReachableDataCenter
+import pekko.cluster.ClusterEvent.ReachableMember
+import pekko.cluster.ClusterEvent.UnreachableDataCenter
+import pekko.cluster.ClusterEvent.UnreachableMember
+import pekko.cluster.ClusterSettings.DataCenter
+import pekko.cluster.MemberStatus._
+import pekko.cluster._
+import pekko.coordination.lease.LeaseSettings
+import pekko.coordination.lease.TestLease
+import pekko.coordination.lease.TimeoutSettings
+import pekko.testkit.AkkaSpec
+import pekko.testkit.EventFilter
 
 object SplitBrainResolverSpec {
 
@@ -96,7 +97,7 @@ class SplitBrainResolverSpec
     extends AkkaSpec("""
   |akka {
   |  actor.provider = cluster
-  |  cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+  |  cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
   |  cluster.split-brain-resolver.active-strategy=keep-majority
   |  remote {
   |    netty.tcp {
diff --git a/akka-cluster/src/test/scala/akka/cluster/sbr/TestAddresses.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/TestAddresses.scala
similarity index 87%
rename from akka-cluster/src/test/scala/akka/cluster/sbr/TestAddresses.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/TestAddresses.scala
index f49f0279b2..7fc76978a0 100644
--- a/akka-cluster/src/test/scala/akka/cluster/sbr/TestAddresses.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/TestAddresses.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.cluster.sbr
+package org.apache.pekko.cluster.sbr
 
-import akka.actor.Address
-import akka.cluster.ClusterSettings
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.cluster.MemberStatus.Up
-import akka.cluster.MemberStatus.WeaklyUp
-import akka.cluster.UniqueAddress
-import akka.util.Version
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.ClusterSettings
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.cluster.MemberStatus.Up
+import pekko.cluster.MemberStatus.WeaklyUp
+import pekko.cluster.UniqueAddress
+import pekko.util.Version
 
 /**
  * Needed since the Member constructor is akka private
diff --git a/akka-cluster/src/test/scala/akka/cluster/testkit/AutoDown.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDown.scala
similarity index 92%
rename from akka-cluster/src/test/scala/akka/cluster/testkit/AutoDown.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDown.scala
index e214a6e457..87c731cd14 100644
--- a/akka-cluster/src/test/scala/akka/cluster/testkit/AutoDown.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDown.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.testkit
+package org.apache.pekko.cluster.testkit
 
 import scala.concurrent.duration.Duration
 import scala.concurrent.duration.FiniteDuration
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Cancellable
-import akka.actor.Props
-import akka.actor.Scheduler
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
-import akka.cluster.DowningProvider
-import akka.cluster.Member
-import akka.cluster.MembershipState
-import akka.cluster.UniqueAddress
-import akka.util.Helpers.ConfigOps
-import akka.util.Helpers.Requiring
-import akka.util.Helpers.toRootLowerCase
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Cancellable
+import pekko.actor.Props
+import pekko.actor.Scheduler
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.DowningProvider
+import pekko.cluster.Member
+import pekko.cluster.MembershipState
+import pekko.cluster.UniqueAddress
+import pekko.util.Helpers.ConfigOps
+import pekko.util.Helpers.Requiring
+import pekko.util.Helpers.toRootLowerCase
 
 /**
  * Downing provider used for testing.
diff --git a/akka-cluster/src/test/scala/akka/cluster/testkit/AutoDownSpec.scala b/akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDownSpec.scala
similarity index 90%
rename from akka-cluster/src/test/scala/akka/cluster/testkit/AutoDownSpec.scala
rename to akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDownSpec.scala
index d7aa07e874..2e260828d6 100644
--- a/akka-cluster/src/test/scala/akka/cluster/testkit/AutoDownSpec.scala
+++ b/akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDownSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.testkit
+package org.apache.pekko.cluster.testkit
 
 import scala.concurrent.duration._
 
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.Props
-import akka.actor.Scheduler
-import akka.cluster.ClusterEvent._
-import akka.cluster.Member
-import akka.cluster.MemberStatus._
-import akka.cluster.TestMember
-import akka.remote.RARP
-import akka.testkit.AkkaSpec
-import akka.testkit.TimingTest
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.Props
+import pekko.actor.Scheduler
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus._
+import pekko.cluster.TestMember
+import pekko.remote.RARP
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TimingTest
 
 object AutoDownSpec {
   final case class DownCalled(address: Address)
diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseException.scala b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseException.scala
similarity index 84%
rename from akka-coordination/src/main/scala/akka/coordination/lease/LeaseException.scala
rename to akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseException.scala
index 3ef4ff8415..733e3de446 100644
--- a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseException.scala
+++ b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseException.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease
+package org.apache.pekko.coordination.lease
 
 class LeaseException(message: String) extends RuntimeException(message)
 
diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseSettings.scala b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseSettings.scala
similarity index 94%
rename from akka-coordination/src/main/scala/akka/coordination/lease/LeaseSettings.scala
rename to akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseSettings.scala
index d800f7192c..f1c2ae757a 100644
--- a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseSettings.scala
+++ b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseSettings.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease
+package org.apache.pekko.coordination.lease
 
 import com.typesafe.config.Config
 
diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseUsageSettings.scala
similarity index 53%
rename from akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala
rename to akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseUsageSettings.scala
index e9a9134732..40023ad0cd 100644
--- a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala
+++ b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseUsageSettings.scala
@@ -2,14 +2,16 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease
+package org.apache.pekko.coordination.lease
 
 import scala.concurrent.duration.FiniteDuration
 
-import akka.util.JavaDurationConverters._
-import akka.util.PrettyDuration._
+import org.apache.pekko
+import pekko.util.JavaDurationConverters._
+import pekko.util.PrettyDuration._
 
-final class LeaseUsageSettings private[akka] (val leaseImplementation: String, val leaseRetryInterval: FiniteDuration) {
+final class LeaseUsageSettings private[pekko] (val leaseImplementation: String,
+    val leaseRetryInterval: FiniteDuration) {
   def getLeaseRetryInterval(): java.time.Duration = leaseRetryInterval.asJava
 
   override def toString = s"LeaseUsageSettings($leaseImplementation, ${leaseRetryInterval.pretty})"
diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/TimeoutSettings.scala
similarity index 96%
rename from akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala
rename to akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/TimeoutSettings.scala
index 9d18165e3a..8637f313b7 100644
--- a/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala
+++ b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/TimeoutSettings.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease
+package org.apache.pekko.coordination.lease
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.{ Config, ConfigValueType }
 
-import akka.util.JavaDurationConverters._
+import org.apache.pekko.util.JavaDurationConverters._
 
 object TimeoutSettings {
   def apply(config: Config): TimeoutSettings = {
diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/internal/LeaseAdapter.scala b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/internal/LeaseAdapter.scala
similarity index 73%
rename from akka-coordination/src/main/scala/akka/coordination/lease/internal/LeaseAdapter.scala
rename to akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/internal/LeaseAdapter.scala
index f588ee5b18..891b0483d7 100644
--- a/akka-coordination/src/main/scala/akka/coordination/lease/internal/LeaseAdapter.scala
+++ b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/internal/LeaseAdapter.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease.internal
+package org.apache.pekko.coordination.lease.internal
 
 import java.util.Optional
 import java.util.concurrent.CompletionStage
@@ -13,16 +13,17 @@ import scala.compat.java8.OptionConverters._
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 
-import akka.annotation.InternalApi
-import akka.coordination.lease.LeaseSettings
-import akka.coordination.lease.javadsl.{ Lease => JavaLease }
-import akka.coordination.lease.scaladsl.{ Lease => ScalaLease }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.coordination.lease.LeaseSettings
+import pekko.coordination.lease.javadsl.{ Lease => JavaLease }
+import pekko.coordination.lease.scaladsl.{ Lease => ScalaLease }
 
 /**
  * INTERNAL API
  */
 @InternalApi
-final private[akka] class LeaseAdapter(delegate: ScalaLease)(implicit val ec: ExecutionContext) extends JavaLease {
+final private[pekko] class LeaseAdapter(delegate: ScalaLease)(implicit val ec: ExecutionContext) extends JavaLease {
 
   override def acquire(): CompletionStage[java.lang.Boolean] = delegate.acquire().map(Boolean.box).toJava
 
@@ -39,7 +40,7 @@ final private[akka] class LeaseAdapter(delegate: ScalaLease)(implicit val ec: Ex
  * INTERNAL API
  */
 @InternalApi
-final private[akka] class LeaseAdapterToScala(val delegate: JavaLease)(implicit val ec: ExecutionContext)
+final private[pekko] class LeaseAdapterToScala(val delegate: JavaLease)(implicit val ec: ExecutionContext)
     extends ScalaLease(delegate.getSettings()) {
 
   override def acquire(): Future[Boolean] =
diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/Lease.scala b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/Lease.scala
similarity index 91%
rename from akka-coordination/src/main/scala/akka/coordination/lease/javadsl/Lease.scala
rename to akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/Lease.scala
index 224066194b..6bc82d31e1 100644
--- a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/Lease.scala
+++ b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/Lease.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease.javadsl
+package org.apache.pekko.coordination.lease.javadsl
 
 import java.util.Optional
 import java.util.concurrent.CompletionStage
 
-import akka.coordination.lease.LeaseSettings
+import org.apache.pekko
+import pekko.coordination.lease.LeaseSettings
 
 abstract class Lease() {
 
@@ -18,7 +19,7 @@ abstract class Lease() {
    * if the lease could be acquired, i.e. no other owner is holding the lease.
    *
    * The returned `Future` will be completed with `false` if the lease for certain couldn't be
-   * acquired, e.g. because some other owner is holding it. It's completed with [[akka.coordination.lease.LeaseException]]
+   * acquired, e.g. because some other owner is holding it. It's completed with [[pekko.coordination.lease.LeaseException]]
    * failure if it might not have been able to acquire the lease, e.g. communication timeout
    * with the lease resource.
    *
diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/LeaseProvider.scala
similarity index 77%
rename from akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala
rename to akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/LeaseProvider.scala
index 283f3870d8..f2ac7922c4 100644
--- a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala
+++ b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/LeaseProvider.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease.javadsl
+package org.apache.pekko.coordination.lease.javadsl
 
-import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
-import akka.actor.ClassicActorSystemProvider
-import akka.coordination.lease.internal.LeaseAdapter
-import akka.coordination.lease.internal.LeaseAdapterToScala
-import akka.coordination.lease.scaladsl.{ LeaseProvider => ScalaLeaseProvider }
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
+import pekko.actor.ClassicActorSystemProvider
+import pekko.coordination.lease.internal.LeaseAdapter
+import pekko.coordination.lease.internal.LeaseAdapterToScala
+import pekko.coordination.lease.scaladsl.{ LeaseProvider => ScalaLeaseProvider }
 
 object LeaseProvider extends ExtensionId[LeaseProvider] with ExtensionIdProvider {
   override def get(system: ActorSystem): LeaseProvider = super.get(system)
@@ -27,7 +28,7 @@ class LeaseProvider(system: ExtendedActorSystem) extends Extension {
   /**
    * The configuration define at `configPath` must have a property `lease-class` that defines
    * the fully qualified class name of the Lease implementation.
-   * The class must implement [[Lease]] and have constructor with [[akka.coordination.lease.LeaseSettings]] parameter and
+   * The class must implement [[Lease]] and have constructor with [[pekko.coordination.lease.LeaseSettings]] parameter and
    * optionally ActorSystem parameter.
    *
    * @param leaseName the name of the lease resource
diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/Lease.scala
similarity index 85%
rename from akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala
rename to akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/Lease.scala
index 2de097e06f..99f8518f24 100644
--- a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala
+++ b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/Lease.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease.scaladsl
+package org.apache.pekko.coordination.lease.scaladsl
 
 import scala.concurrent.Future
 
-import akka.coordination.lease.LeaseSettings
+import org.apache.pekko
+import pekko.coordination.lease.LeaseSettings
 
 abstract class Lease(val settings: LeaseSettings) {
 
@@ -15,11 +16,11 @@ abstract class Lease(val settings: LeaseSettings) {
    * if the lease could be acquired, i.e. no other owner is holding the lease.
    *
    * The returned `Future` will be completed with `false` if the lease for certain couldn't be
-   * acquired, e.g. because some other owner is holding it. It's completed with [[akka.coordination.lease.LeaseException]]
+   * acquired, e.g. because some other owner is holding it. It's completed with [[pekko.coordination.lease.LeaseException]]
    * failure if it might not have been able to acquire the lease, e.g. communication timeout
    * with the lease resource.
    *
-   * The lease will be held by the [[akka.coordination.lease.LeaseSettings.ownerName]] until it is released
+   * The lease will be held by the [[pekko.coordination.lease.LeaseSettings.ownerName]] until it is released
    * with [[Lease.release]]. A Lease implementation will typically also lose the ownership
    * if it can't maintain its authority, e.g. if it crashes or is partitioned from the lease
    * resource for too long.
diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala
similarity index 85%
rename from akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala
rename to akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala
index fa42a45257..5f66b9369e 100644
--- a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala
+++ b/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease.scaladsl
+package org.apache.pekko.coordination.lease.scaladsl
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.function.{ Function => JFunction }
@@ -11,15 +11,16 @@ import scala.collection.immutable
 import scala.reflect.ClassTag
 import scala.util.{ Failure, Success, Try }
 
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.coordination.lease.LeaseSettings
-import akka.coordination.lease.internal.LeaseAdapterToScala
-import akka.event.Logging
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.coordination.lease.LeaseSettings
+import pekko.coordination.lease.internal.LeaseAdapterToScala
+import pekko.event.Logging
 
 object LeaseProvider extends ExtensionId[LeaseProvider] with ExtensionIdProvider {
   override def get(system: ActorSystem): LeaseProvider = super.get(system)
@@ -41,7 +42,7 @@ final class LeaseProvider(system: ExtendedActorSystem) extends Extension {
   /**
    * The configuration define at `configPath` must have a property `lease-class` that defines
    * the fully qualified class name of the Lease implementation.
-   * The class must implement [[Lease]] and have constructor with [[akka.coordination.lease.LeaseSettings]] parameter and
+   * The class must implement [[Lease]] and have constructor with [[pekko.coordination.lease.LeaseSettings]] parameter and
    * optionally ActorSystem parameter.
    *
    * @param leaseName the name of the lease resource
@@ -52,7 +53,7 @@ final class LeaseProvider(system: ExtendedActorSystem) extends Extension {
     internalGetLease(leaseName, configPath, ownerName)
   }
 
-  private[akka] def internalGetLease(leaseName: String, configPath: String, ownerName: String): Lease = {
+  private[pekko] def internalGetLease(leaseName: String, configPath: String, ownerName: String): Lease = {
     val leaseKey = LeaseKey(leaseName, configPath, ownerName)
     leases.computeIfAbsent(
       leaseKey,
@@ -69,7 +70,7 @@ final class LeaseProvider(system: ExtendedActorSystem) extends Extension {
             loadLease[Lease](settings).recoverWith {
               case _: ClassCastException =>
                 // Try and load a java implementation
-                loadLease[akka.coordination.lease.javadsl.Lease](settings).map(javaLease =>
+                loadLease[pekko.coordination.lease.javadsl.Lease](settings).map(javaLease =>
                   new LeaseAdapterToScala(javaLease)(system.dispatchers.internalDispatcher))
             }
 
diff --git a/akka-coordination/src/test/java/akka/coordination/lease/javadsl/LeaseProviderTest.java b/akka-coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java
similarity index 83%
rename from akka-coordination/src/test/java/akka/coordination/lease/javadsl/LeaseProviderTest.java
rename to akka-coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java
index b4d02c8864..72895a746a 100644
--- a/akka-coordination/src/test/java/akka/coordination/lease/javadsl/LeaseProviderTest.java
+++ b/akka-coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java
@@ -2,11 +2,11 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease.javadsl;
+package org.apache.pekko.coordination.lease.javadsl;
 
-import akka.actor.ActorSystem;
-import akka.coordination.lease.scaladsl.LeaseProviderSpec;
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.coordination.lease.scaladsl.LeaseProviderSpec;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/akka-coordination/src/test/scala/akka/coordination/lease/TestLease.scala b/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala
similarity index 86%
rename from akka-coordination/src/test/scala/akka/coordination/lease/TestLease.scala
rename to akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala
index 2f8e9c3750..ddbb6e82f9 100644
--- a/akka-coordination/src/test/scala/akka/coordination/lease/TestLease.scala
+++ b/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease
+package org.apache.pekko.coordination.lease
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicReference
@@ -12,16 +12,17 @@ import scala.concurrent.Promise
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.coordination.lease.scaladsl.Lease
-import akka.event.Logging
-import akka.testkit.TestProbe
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.coordination.lease.scaladsl.Lease
+import pekko.event.Logging
+import pekko.testkit.TestProbe
+import pekko.util.ccompat.JavaConverters._
 
 object TestLeaseExt extends ExtensionId[TestLeaseExt] with ExtensionIdProvider {
   override def get(system: ActorSystem): TestLeaseExt = super.get(system)
diff --git a/akka-coordination/src/test/scala/akka/coordination/lease/TestLeaseActor.scala b/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala
similarity index 86%
rename from akka-coordination/src/test/scala/akka/coordination/lease/TestLeaseActor.scala
rename to akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala
index 05355fe92c..3d3a637085 100644
--- a/akka-coordination/src/test/scala/akka/coordination/lease/TestLeaseActor.scala
+++ b/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala
@@ -2,28 +2,29 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease
+package org.apache.pekko.coordination.lease
 
 import java.util.concurrent.atomic.AtomicReference
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.actor.Props
-import akka.coordination.lease.scaladsl.Lease
-import akka.event.Logging
-import akka.pattern.ask
-import akka.testkit.JavaSerializable
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.actor.Props
+import pekko.coordination.lease.scaladsl.Lease
+import pekko.event.Logging
+import pekko.pattern.ask
+import pekko.testkit.JavaSerializable
+import pekko.util.Timeout
 
 object TestLeaseActor {
   def props(): Props =
diff --git a/akka-coordination/src/test/scala/akka/coordination/lease/TimeoutSettingsSpec.scala b/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TimeoutSettingsSpec.scala
similarity index 97%
rename from akka-coordination/src/test/scala/akka/coordination/lease/TimeoutSettingsSpec.scala
rename to akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TimeoutSettingsSpec.scala
index 64983456d6..b303666eb2 100644
--- a/akka-coordination/src/test/scala/akka/coordination/lease/TimeoutSettingsSpec.scala
+++ b/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TimeoutSettingsSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease
+package org.apache.pekko.coordination.lease
 
 import scala.concurrent.duration._
 
diff --git a/akka-coordination/src/test/scala/akka/coordination/lease/scaladsl/LeaseProviderSpec.scala b/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProviderSpec.scala
similarity index 95%
rename from akka-coordination/src/test/scala/akka/coordination/lease/scaladsl/LeaseProviderSpec.scala
rename to akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProviderSpec.scala
index 708540f56a..039f29c698 100644
--- a/akka-coordination/src/test/scala/akka/coordination/lease/scaladsl/LeaseProviderSpec.scala
+++ b/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProviderSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.coordination.lease.scaladsl
+package org.apache.pekko.coordination.lease.scaladsl
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ExtendedActorSystem
-import akka.coordination.lease.LeaseSettings
-import akka.testkit.{ AkkaSpec, EventFilter }
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.coordination.lease.LeaseSettings
+import pekko.testkit.{ AkkaSpec, EventFilter }
 
 object LeaseProviderSpec {
   class LeaseA(settings: LeaseSettings) extends Lease(settings) {
diff --git a/akka-discovery/src/main/resources/reference.conf b/akka-discovery/src/main/resources/reference.conf
index d6e9b6ab96..c12a811a62 100644
--- a/akka-discovery/src/main/resources/reference.conf
+++ b/akka-discovery/src/main/resources/reference.conf
@@ -23,7 +23,7 @@ akka.discovery {
 
   # Config based service discovery
   config {
-    class = akka.discovery.config.ConfigServiceDiscovery
+    class = org.apache.pekko.discovery.config.ConfigServiceDiscovery
 
     # Location of the services in configuration
     services-path = "akka.discovery.config.services"
@@ -59,7 +59,7 @@ akka.discovery {
 
   # Aggregate multiple service discovery mechanisms
   aggregate {
-    class = akka.discovery.aggregate.AggregateServiceDiscovery
+    class = org.apache.pekko.discovery.aggregate.AggregateServiceDiscovery
 
     # List of service discovery methods to try in order. E.g config then fall back to DNS
     # ["config", "akka-dns"]
@@ -69,7 +69,7 @@ akka.discovery {
 
   # DNS based service discovery
   akka-dns {
-    class = akka.discovery.dns.DnsServiceDiscovery
+    class = org.apache.pekko.discovery.dns.DnsServiceDiscovery
   }
 }
 
diff --git a/akka-discovery/src/main/scala/akka/discovery/Discovery.scala b/akka-discovery/src/main/scala/org/apache/pekko/discovery/Discovery.scala
similarity index 79%
rename from akka-discovery/src/main/scala/akka/discovery/Discovery.scala
rename to akka-discovery/src/main/scala/org/apache/pekko/discovery/Discovery.scala
index 6d27011683..8839ee451d 100644
--- a/akka-discovery/src/main/scala/akka/discovery/Discovery.scala
+++ b/akka-discovery/src/main/scala/org/apache/pekko/discovery/Discovery.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery
+package org.apache.pekko.discovery
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.function.{ Function => JFunction }
 
 import scala.util.{ Failure, Success, Try }
 
-import akka.actor._
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.InternalApi
 
 final class Discovery(implicit system: ExtendedActorSystem) extends Extension {
 
@@ -59,11 +60,19 @@ final class Discovery(implicit system: ExtendedActorSystem) extends Extension {
     val config = system.settings.config
     val dynamic = system.dynamicAccess
 
-    def classNameFromConfig(path: String): String =
-      if (config.hasPath(path)) config.getString(path)
-      else
-        throw new IllegalArgumentException(
-          s"$path must point to a FQN of a `akka.discovery.ServiceDiscovery` implementation")
+    def classNameFromConfig(path: String): String = {
+      if (config.hasPath(path))
+        config.getString(path)
+      else {
+        // TODO: Update the org.apache.pekko to akka workaround when HOCON config gets updated
+        val replacePath = path.replace("org.apache.pekko", "akka")
+        if (config.hasPath(replacePath))
+          config.getString(replacePath)
+        else
+          throw new IllegalArgumentException(
+            s"$path must point to a FQN of a `org.apache.pekko.discovery.ServiceDiscovery` implementation")
+      }
+    }
 
     def create(clazzName: String): Try[ServiceDiscovery] = {
       dynamic
@@ -78,14 +87,14 @@ final class Discovery(implicit system: ExtendedActorSystem) extends Extension {
         }
     }
 
-    val configName = "akka.discovery." + method + ".class"
+    val configName = "org.apache.pekko.discovery." + method + ".class"
     val instanceTry = create(classNameFromConfig(configName))
 
     instanceTry match {
       case Failure(e @ (_: ClassNotFoundException | _: NoSuchMethodException)) =>
         throw new IllegalArgumentException(
           s"Illegal [$configName] value or incompatible class! " +
-          "The implementation class MUST extend akka.discovery.ServiceDiscovery and take an " +
+          "The implementation class MUST extend org.apache.pekko.discovery.ServiceDiscovery and take an " +
           "ExtendedActorSystem as constructor argument.",
           e)
       case Failure(e)        => throw e
@@ -111,9 +120,9 @@ object Discovery extends ExtensionId[Discovery] with ExtensionIdProvider {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def checkClassPathForOldDiscovery(system: ExtendedActorSystem): Unit = {
+  private[pekko] def checkClassPathForOldDiscovery(system: ExtendedActorSystem): Unit = {
     try {
-      system.dynamicAccess.getClassFor[Any]("akka.discovery.SimpleServiceDiscovery").get
+      system.dynamicAccess.getClassFor[Any]("org.apache.pekko.discovery.SimpleServiceDiscovery").get
       throw new RuntimeException(
         "Old version of Akka Discovery from Akka Management found on the classpath. Remove `com.lightbend.akka.discovery:akka-discovery` from the classpath..")
     } catch {
diff --git a/akka-discovery/src/main/scala/akka/discovery/ServiceDiscovery.scala b/akka-discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala
similarity index 98%
rename from akka-discovery/src/main/scala/akka/discovery/ServiceDiscovery.scala
rename to akka-discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala
index 6a02878055..9c4f40451e 100644
--- a/akka-discovery/src/main/scala/akka/discovery/ServiceDiscovery.scala
+++ b/akka-discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery
+package org.apache.pekko.discovery
 
 import java.net.InetAddress
 import java.util.Optional
@@ -14,8 +14,9 @@ import scala.compat.java8.OptionConverters._
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
 
-import akka.actor.{ DeadLetterSuppression, NoSerializationVerificationNeeded }
-import akka.util.HashCode
+import org.apache.pekko
+import pekko.actor.{ DeadLetterSuppression, NoSerializationVerificationNeeded }
+import pekko.util.HashCode
 
 object ServiceDiscovery {
 
@@ -44,7 +45,7 @@ object ServiceDiscovery {
      * Java API
      */
     def getAddresses: java.util.List[ResolvedTarget] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       addresses.asJava
     }
 
diff --git a/akka-discovery/src/main/scala/akka/discovery/aggregate/AggregateServiceDiscovery.scala b/akka-discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala
similarity index 81%
rename from akka-discovery/src/main/scala/akka/discovery/aggregate/AggregateServiceDiscovery.scala
rename to akka-discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala
index e0b803ba6b..6e29ddb686 100644
--- a/akka-discovery/src/main/scala/akka/discovery/aggregate/AggregateServiceDiscovery.scala
+++ b/akka-discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery.aggregate
+package org.apache.pekko.discovery.aggregate
 
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
@@ -10,15 +10,16 @@ import scala.util.control.NonFatal
 
 import com.typesafe.config.Config
 
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.discovery.{ Discovery, Lookup, ServiceDiscovery }
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.discovery.aggregate.AggregateServiceDiscovery.Methods
-import akka.dispatch.MessageDispatcher
-import akka.event.Logging
-import akka.util.Helpers.Requiring
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.InternalApi
+import pekko.discovery.{ Discovery, Lookup, ServiceDiscovery }
+import pekko.discovery.ServiceDiscovery.Resolved
+import pekko.discovery.aggregate.AggregateServiceDiscovery.Methods
+import pekko.dispatch.MessageDispatcher
+import pekko.event.Logging
+import pekko.util.Helpers.Requiring
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API
@@ -46,7 +47,7 @@ private object AggregateServiceDiscovery {
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class AggregateServiceDiscovery(system: ExtendedActorSystem) extends ServiceDiscovery {
+private[pekko] final class AggregateServiceDiscovery(system: ExtendedActorSystem) extends ServiceDiscovery {
 
   private val log = Logging(system, classOf[AggregateServiceDiscovery])
 
diff --git a/akka-discovery/src/main/scala/akka/discovery/config/ConfigServiceDiscovery.scala b/akka-discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala
similarity index 77%
rename from akka-discovery/src/main/scala/akka/discovery/config/ConfigServiceDiscovery.scala
rename to akka-discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala
index af865b901d..0606505f16 100644
--- a/akka-discovery/src/main/scala/akka/discovery/config/ConfigServiceDiscovery.scala
+++ b/akka-discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery.config
+package org.apache.pekko.discovery.config
 
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
 
 import com.typesafe.config.{ Config, ConfigUtil }
 
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.discovery.{ Lookup, ServiceDiscovery }
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.event.Logging
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.InternalApi
+import pekko.discovery.{ Lookup, ServiceDiscovery }
+import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import pekko.event.Logging
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API
@@ -48,7 +49,7 @@ private object ConfigServicesParser {
  * INTERNAL API
  */
 @InternalApi
-private[akka] class ConfigServiceDiscovery(system: ExtendedActorSystem) extends ServiceDiscovery {
+private[pekko] class ConfigServiceDiscovery(system: ExtendedActorSystem) extends ServiceDiscovery {
 
   private val log = Logging(system, classOf[ConfigServiceDiscovery])
 
diff --git a/akka-discovery/src/main/scala/akka/discovery/dns/DnsServiceDiscovery.scala b/akka-discovery/src/main/scala/org/apache/pekko/discovery/dns/DnsServiceDiscovery.scala
similarity index 88%
rename from akka-discovery/src/main/scala/akka/discovery/dns/DnsServiceDiscovery.scala
rename to akka-discovery/src/main/scala/org/apache/pekko/discovery/dns/DnsServiceDiscovery.scala
index 8ae7f36bb9..19e6fcf09f 100644
--- a/akka-discovery/src/main/scala/akka/discovery/dns/DnsServiceDiscovery.scala
+++ b/akka-discovery/src/main/scala/org/apache/pekko/discovery/dns/DnsServiceDiscovery.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery.dns
+package org.apache.pekko.discovery.dns
 
 import java.net.InetAddress
 
@@ -13,22 +13,23 @@ import scala.concurrent.duration.FiniteDuration
 import scala.util.Failure
 import scala.util.Success
 
-import akka.actor.ActorRef
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.discovery._
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.dispatch.MessageDispatcher
-import akka.event.Logging
-import akka.io.{ Dns, IO }
-import akka.io.SimpleDnsCache
-import akka.io.dns.{ AAAARecord, ARecord, DnsProtocol, SRVRecord }
-import akka.io.dns.DnsProtocol.{ Ip, Srv }
-import akka.io.dns.internal.AsyncDnsManager
-import akka.pattern.AskTimeoutException
-import akka.pattern.ask
-import akka.util.OptionVal
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.InternalApi
+import pekko.discovery._
+import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import pekko.dispatch.MessageDispatcher
+import pekko.event.Logging
+import pekko.io.{ Dns, IO }
+import pekko.io.SimpleDnsCache
+import pekko.io.dns.{ AAAARecord, ARecord, DnsProtocol, SRVRecord }
+import pekko.io.dns.DnsProtocol.{ Ip, Srv }
+import pekko.io.dns.internal.AsyncDnsManager
+import pekko.pattern.AskTimeoutException
+import pekko.pattern.ask
+import pekko.util.OptionVal
+import pekko.util.Timeout
 
 /**
  * INTERNAL API
@@ -66,7 +67,7 @@ private object DnsServiceDiscovery {
  * INTERNAL API
  */
 @InternalApi
-private[akka] class DnsServiceDiscovery(system: ExtendedActorSystem) extends ServiceDiscovery {
+private[pekko] class DnsServiceDiscovery(system: ExtendedActorSystem) extends ServiceDiscovery {
 
   import DnsServiceDiscovery._
   import ServiceDiscovery._
@@ -146,7 +147,7 @@ private[akka] class DnsServiceDiscovery(system: ExtendedActorSystem) extends Ser
 
   private def convertToTimeout(timeout: FiniteDuration): PartialFunction[Throwable, Future[Resolved]] = {
     case _: AskTimeoutException =>
-      import akka.util.PrettyDuration._
+      import pekko.util.PrettyDuration._
       Future.failed(new DiscoveryTimeoutException(s"Dns resolve did not respond within ${timeout.pretty}"))
   }
 
diff --git a/akka-discovery/src/test/java/jdoc/akka/discovery/CompileOnlyTest.java b/akka-discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java
similarity index 80%
rename from akka-discovery/src/test/java/jdoc/akka/discovery/CompileOnlyTest.java
rename to akka-discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java
index f9d569bfb7..a9713f275f 100644
--- a/akka-discovery/src/test/java/jdoc/akka/discovery/CompileOnlyTest.java
+++ b/akka-discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java
@@ -2,12 +2,12 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package jdoc.akka.discovery;
+package jdoc.org.apache.pekko.discovery;
 
-import akka.actor.ActorSystem;
-import akka.discovery.Lookup;
-import akka.discovery.Discovery;
-import akka.discovery.ServiceDiscovery;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.discovery.Lookup;
+import org.apache.pekko.discovery.Discovery;
+import org.apache.pekko.discovery.ServiceDiscovery;
 
 import java.time.Duration;
 import java.util.concurrent.CompletionStage;
diff --git a/akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala b/akka-discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala
similarity index 72%
rename from akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala
rename to akka-discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala
index 69885b5100..e85ff40dd4 100644
--- a/akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala
+++ b/akka-discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package doc.akka.discovery
+package doc.org.apache.pekko.discovery
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
@@ -13,14 +13,14 @@ import scala.concurrent.ExecutionContext.Implicits.global
 object CompileOnlySpec {
 
   // #loading
-  import akka.discovery.Discovery
+  import org.apache.pekko.discovery.Discovery
 
   val system = ActorSystem()
   val serviceDiscovery = Discovery(system).discovery
   // #loading
 
   // #basic
-  import akka.discovery.Lookup
+  import org.apache.pekko.discovery.Lookup
 
   serviceDiscovery.lookup(Lookup("akka.io"), 1.second)
   // Convenience for a Lookup with only a serviceName
@@ -28,8 +28,9 @@ object CompileOnlySpec {
   // #basic
 
   // #full
-  import akka.discovery.Lookup
-  import akka.discovery.ServiceDiscovery.Resolved
+  import org.apache.pekko
+  import pekko.discovery.Lookup
+  import pekko.discovery.ServiceDiscovery.Resolved
 
   val lookup: Future[Resolved] =
     serviceDiscovery.lookup(Lookup("akka.io").withPortName("remoting").withProtocol("tcp"), 1.second)
diff --git a/akka-discovery/src/test/scala/akka/discovery/DiscoveryConfigurationSpec.scala b/akka-discovery/src/test/scala/org/apache/pekko/discovery/DiscoveryConfigurationSpec.scala
similarity index 94%
rename from akka-discovery/src/test/scala/akka/discovery/DiscoveryConfigurationSpec.scala
rename to akka-discovery/src/test/scala/org/apache/pekko/discovery/DiscoveryConfigurationSpec.scala
index 56ee8f6337..cb9a82ee7d 100644
--- a/akka-discovery/src/test/scala/akka/discovery/DiscoveryConfigurationSpec.scala
+++ b/akka-discovery/src/test/scala/org/apache/pekko/discovery/DiscoveryConfigurationSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery
+package org.apache.pekko.discovery
 
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
@@ -11,9 +11,10 @@ import com.typesafe.config.ConfigFactory
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.ActorSystem
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.testkit.TestKit
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.discovery.ServiceDiscovery.Resolved
+import pekko.testkit.TestKit
 
 class DiscoveryConfigurationSpec extends AnyWordSpec with Matchers {
 
@@ -28,7 +29,7 @@ class DiscoveryConfigurationSpec extends AnyWordSpec with Matchers {
       } finally TestKit.shutdownActorSystem(sys)
     }
 
-    "select implementation from config by config name (inside akka.discovery namespace)" in {
+    "select implementation from config by config name (inside org.apache.pekko.discovery namespace)" in {
       val className = classOf[FakeTestDiscovery].getCanonicalName
 
       val sys = ActorSystem(
diff --git a/akka-discovery/src/test/scala/akka/discovery/LookupSpec.scala b/akka-discovery/src/test/scala/org/apache/pekko/discovery/LookupSpec.scala
similarity index 99%
rename from akka-discovery/src/test/scala/akka/discovery/LookupSpec.scala
rename to akka-discovery/src/test/scala/org/apache/pekko/discovery/LookupSpec.scala
index 8c3df02149..22ce6388dd 100644
--- a/akka-discovery/src/test/scala/akka/discovery/LookupSpec.scala
+++ b/akka-discovery/src/test/scala/org/apache/pekko/discovery/LookupSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery
+package org.apache.pekko.discovery
 
 import org.scalatest.OptionValues
 import org.scalatest.matchers.should.Matchers
diff --git a/akka-discovery/src/test/scala/akka/discovery/aggregate/AggregateServiceDiscoverySpec.scala b/akka-discovery/src/test/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscoverySpec.scala
similarity index 88%
rename from akka-discovery/src/test/scala/akka/discovery/aggregate/AggregateServiceDiscoverySpec.scala
rename to akka-discovery/src/test/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscoverySpec.scala
index 091f6fbb8d..b6b18d75f9 100644
--- a/akka-discovery/src/test/scala/akka/discovery/aggregate/AggregateServiceDiscoverySpec.scala
+++ b/akka-discovery/src/test/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscoverySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery.aggregate
+package org.apache.pekko.discovery.aggregate
 
 import scala.collection.immutable
 import scala.concurrent.Future
@@ -14,11 +14,12 @@ import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.{ ActorSystem, ExtendedActorSystem }
-import akka.discovery.{ Discovery, Lookup, ServiceDiscovery }
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.testkit.TestKit
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, ExtendedActorSystem }
+import pekko.discovery.{ Discovery, Lookup, ServiceDiscovery }
+import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import pekko.testkit.TestKit
+import pekko.util.unused
 
 class StubbedServiceDiscovery(@unused system: ExtendedActorSystem) extends ServiceDiscovery {
 
@@ -50,7 +51,7 @@ object AggregateServiceDiscoverySpec {
       }
 
       akka.discovery.stubbed1 {
-        class = akka.discovery.aggregate.StubbedServiceDiscovery
+        class = org.apache.pekko.discovery.aggregate.StubbedServiceDiscovery
       }
 
       akka.discovery.config.services = {
diff --git a/akka-discovery/src/test/scala/akka/discovery/config/ConfigServiceDiscoverySpec.scala b/akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServiceDiscoverySpec.scala
similarity index 89%
rename from akka-discovery/src/test/scala/akka/discovery/config/ConfigServiceDiscoverySpec.scala
rename to akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServiceDiscoverySpec.scala
index 7e27aac057..f0d85e025b 100644
--- a/akka-discovery/src/test/scala/akka/discovery/config/ConfigServiceDiscoverySpec.scala
+++ b/akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServiceDiscoverySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery.config
+package org.apache.pekko.discovery.config
 
 import scala.collection.immutable
 import scala.concurrent.duration._
@@ -13,10 +13,10 @@ import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ActorSystem
-import akka.discovery.Discovery
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.testkit.TestKit
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.discovery.Discovery
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.testkit.TestKit
 
 object ConfigServiceDiscoverySpec {
 
diff --git a/akka-discovery/src/test/scala/akka/discovery/config/ConfigServicesParserSpec.scala b/akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServicesParserSpec.scala
similarity index 86%
rename from akka-discovery/src/test/scala/akka/discovery/config/ConfigServicesParserSpec.scala
rename to akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServicesParserSpec.scala
index c2b8773d6d..21af531879 100644
--- a/akka-discovery/src/test/scala/akka/discovery/config/ConfigServicesParserSpec.scala
+++ b/akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServicesParserSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery.config
+package org.apache.pekko.discovery.config
 
 import scala.collection.immutable
 
@@ -10,8 +10,9 @@ import com.typesafe.config.{ Config, ConfigFactory }
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.config.ConfigServicesParserSpec._
+import org.apache.pekko
+import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import pekko.discovery.config.ConfigServicesParserSpec._
 
 object ConfigServicesParserSpec {
   val exampleConfig: Config = ConfigFactory.parseString("""
diff --git a/akka-discovery/src/test/scala/akka/discovery/dns/DnsDiscoverySpec.scala b/akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsDiscoverySpec.scala
similarity index 92%
rename from akka-discovery/src/test/scala/akka/discovery/dns/DnsDiscoverySpec.scala
rename to akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsDiscoverySpec.scala
index c753376128..c224d300a6 100644
--- a/akka-discovery/src/test/scala/akka/discovery/dns/DnsDiscoverySpec.scala
+++ b/akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsDiscoverySpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.discovery.dns
+package org.apache.pekko.discovery.dns
 
 import java.net.InetAddress
 
 import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
-import akka.actor.ActorSystem
-import akka.discovery.{ Discovery, Lookup }
-import akka.discovery.ServiceDiscovery
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.io.dns.DockerBindDnsService
-import akka.testkit.{ SocketUtil, TestKit }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.discovery.{ Discovery, Lookup }
+import pekko.discovery.ServiceDiscovery
+import pekko.discovery.ServiceDiscovery.ResolvedTarget
+import pekko.io.dns.DockerBindDnsService
+import pekko.testkit.{ SocketUtil, TestKit }
 
 object DnsDiscoverySpec {
 
diff --git a/akka-discovery/src/test/scala/akka/discovery/dns/DnsServiceDiscoverySpec.scala b/akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsServiceDiscoverySpec.scala
similarity index 89%
rename from akka-discovery/src/test/scala/akka/discovery/dns/DnsServiceDiscoverySpec.scala
rename to akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsServiceDiscoverySpec.scala
index 81f4a3f968..a8702d4f6c 100644
--- a/akka-discovery/src/test/scala/akka/discovery/dns/DnsServiceDiscoverySpec.scala
+++ b/akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsServiceDiscoverySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.discovery.dns
+package org.apache.pekko.discovery.dns
 
 import java.net.{ Inet6Address, InetAddress }
 
@@ -13,16 +13,17 @@ import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ActorRef
-import akka.actor.ExtendedActorSystem
-import akka.discovery
-import akka.discovery.ServiceDiscovery
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.ServiceDiscovery.DiscoveryTimeoutException
-import akka.io.dns.{ AAAARecord, ARecord, DnsProtocol, SRVRecord }
-import akka.io.dns.CachePolicy.Ttl
-import akka.testkit.AkkaSpec
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ExtendedActorSystem
+import pekko.discovery
+import pekko.discovery.ServiceDiscovery
+import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import pekko.discovery.ServiceDiscovery.DiscoveryTimeoutException
+import pekko.io.dns.{ AAAARecord, ARecord, DnsProtocol, SRVRecord }
+import pekko.io.dns.CachePolicy.Ttl
+import pekko.testkit.AkkaSpec
+import pekko.testkit.TestProbe
 
 class DnsServiceDiscoverySpec extends AkkaSpec with AnyWordSpecLike with Matchers with ScalaFutures {
 
diff --git a/akka-distributed-data/src/main/java/akka/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java b/akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
similarity index 53%
rename from akka-distributed-data/src/main/java/akka/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
rename to akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
index a73533a12e..7264ea5b1d 100644
--- a/akka-distributed-data/src/main/java/akka/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
+++ b/akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
@@ -5,24 +5,24 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ReplicatedDataMessages.proto
 
-package akka.cluster.ddata.protobuf.msg;
+package org.apache.pekko.cluster.ddata.protobuf.msg;
 
 public final class ReplicatedDataMessages {
   private ReplicatedDataMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   /**
-   * Protobuf enum {@code akka.cluster.ddata.ORSetDeltaOp}
+   * Protobuf enum {@code org.apache.pekko.cluster.ddata.ORSetDeltaOp}
    */
   public enum ORSetDeltaOp
-      implements akka.protobufv3.internal.ProtocolMessageEnum {
+      implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
     /**
      * Add = 0;
      */
@@ -78,35 +78,35 @@ public final class ReplicatedDataMessages {
       }
     }
 
-    public static akka.protobufv3.internal.Internal.EnumLiteMap
+    public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalGetValueMap() {
       return internalValueMap;
     }
-    private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+    private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
         ORSetDeltaOp> internalValueMap =
-          new akka.protobufv3.internal.Internal.EnumLiteMap() {
+          new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
             public ORSetDeltaOp findValueByNumber(int number) {
               return ORSetDeltaOp.forNumber(number);
             }
           };
 
-    public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.getDescriptor().getEnumTypes().get(0);
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final ORSetDeltaOp[] VALUES = values();
 
     public static ORSetDeltaOp valueOf(
-        akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+        org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
         throw new java.lang.IllegalArgumentException(
           "EnumValueDescriptor is not for this type.");
@@ -120,14 +120,14 @@ public final class ReplicatedDataMessages {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:akka.cluster.ddata.ORSetDeltaOp)
+    // @@protoc_insertion_point(enum_scope:org.apache.pekko.cluster.ddata.ORSetDeltaOp)
   }
 
   /**
-   * Protobuf enum {@code akka.cluster.ddata.ORMapDeltaOp}
+   * Protobuf enum {@code org.apache.pekko.cluster.ddata.ORMapDeltaOp}
    */
   public enum ORMapDeltaOp
-      implements akka.protobufv3.internal.ProtocolMessageEnum {
+      implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
     /**
      * ORMapPut = 0;
      */
@@ -192,35 +192,35 @@ public final class ReplicatedDataMessages {
       }
     }
 
-    public static akka.protobufv3.internal.Internal.EnumLiteMap
+    public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalGetValueMap() {
       return internalValueMap;
     }
-    private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+    private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
         ORMapDeltaOp> internalValueMap =
-          new akka.protobufv3.internal.Internal.EnumLiteMap() {
+          new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
             public ORMapDeltaOp findValueByNumber(int number) {
               return ORMapDeltaOp.forNumber(number);
             }
           };
 
-    public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.getDescriptor().getEnumTypes().get(1);
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.getDescriptor().getEnumTypes().get(1);
     }
 
     private static final ORMapDeltaOp[] VALUES = values();
 
     public static ORMapDeltaOp valueOf(
-        akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+        org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
         throw new java.lang.IllegalArgumentException(
           "EnumValueDescriptor is not for this type.");
@@ -234,12 +234,12 @@ public final class ReplicatedDataMessages {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:akka.cluster.ddata.ORMapDeltaOp)
+    // @@protoc_insertion_point(enum_scope:org.apache.pekko.cluster.ddata.ORMapDeltaOp)
   }
 
   public interface GSetOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.GSet)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.GSet)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated string stringElements = 1;
@@ -263,7 +263,7 @@ public final class ReplicatedDataMessages {
      * @param index The index of the value to return.
      * @return The bytes of the stringElements at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getStringElementsBytes(int index);
 
     /**
@@ -301,32 +301,32 @@ public final class ReplicatedDataMessages {
     long getLongElements(int index);
 
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
-    java.util.List 
+    java.util.List 
         getOtherElementsList();
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index);
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
     int getOtherElementsCount();
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
-    java.util.List 
+    java.util.List 
         getOtherElementsOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
         int index);
 
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 5;
@@ -336,7 +336,7 @@ public final class ReplicatedDataMessages {
         getActorRefElementsList();
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 5;
@@ -345,7 +345,7 @@ public final class ReplicatedDataMessages {
     int getActorRefElementsCount();
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 5;
@@ -355,59 +355,59 @@ public final class ReplicatedDataMessages {
     java.lang.String getActorRefElements(int index);
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 5;
      * @param index The index of the value to return.
      * @return The bytes of the actorRefElements at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getActorRefElementsBytes(int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.GSet}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.GSet}
    */
   public  static final class GSet extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.GSet)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GSet)
       GSetOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use GSet.newBuilder() to construct.
-    private GSet(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private GSet(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private GSet() {
-      stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       intElements_ = emptyIntList();
       longElements_ = emptyLongList();
       otherElements_ = java.util.Collections.emptyList();
-      actorRefElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new GSet();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private GSet(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -417,9 +417,9 @@ public final class ReplicatedDataMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                stringElements_ = new akka.protobufv3.internal.LazyStringArrayList();
+                stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               stringElements_.add(bs);
@@ -469,17 +469,17 @@ public final class ReplicatedDataMessages {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                otherElements_ = new java.util.ArrayList();
+                otherElements_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
               otherElements_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry));
               break;
             }
             case 42: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                actorRefElements_ = new akka.protobufv3.internal.LazyStringArrayList();
+                actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
               actorRefElements_.add(bs);
@@ -494,10 +494,10 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -519,26 +519,26 @@ public final class ReplicatedDataMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.Builder.class);
     }
 
     public static final int STRINGELEMENTS_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.LazyStringList stringElements_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_;
     /**
      * repeated string stringElements = 1;
      * @return A list containing the stringElements.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getStringElementsList() {
       return stringElements_;
     }
@@ -562,13 +562,13 @@ public final class ReplicatedDataMessages {
      * @param index The index of the value to return.
      * @return The bytes of the stringElements at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getStringElementsBytes(int index) {
       return stringElements_.getByteString(index);
     }
 
     public static final int INTELEMENTS_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.Internal.IntList intElements_;
+    private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_;
     /**
      * repeated sint32 intElements = 2 [packed = true];
      * @return A list containing the intElements.
@@ -595,7 +595,7 @@ public final class ReplicatedDataMessages {
     private int intElementsMemoizedSerializedSize = -1;
 
     public static final int LONGELEMENTS_FIELD_NUMBER = 3;
-    private akka.protobufv3.internal.Internal.LongList longElements_;
+    private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_;
     /**
      * repeated sint64 longElements = 3 [packed = true];
      * @return A list containing the longElements.
@@ -622,57 +622,57 @@ public final class ReplicatedDataMessages {
     private int longElementsMemoizedSerializedSize = -1;
 
     public static final int OTHERELEMENTS_FIELD_NUMBER = 4;
-    private java.util.List otherElements_;
+    private java.util.List otherElements_;
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
-    public java.util.List getOtherElementsList() {
+    public java.util.List getOtherElementsList() {
       return otherElements_;
     }
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getOtherElementsOrBuilderList() {
       return otherElements_;
     }
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
     public int getOtherElementsCount() {
       return otherElements_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
       return otherElements_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
         int index) {
       return otherElements_.get(index);
     }
 
     public static final int ACTORREFELEMENTS_FIELD_NUMBER = 5;
-    private akka.protobufv3.internal.LazyStringList actorRefElements_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_;
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 5;
      * @return A list containing the actorRefElements.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getActorRefElementsList() {
       return actorRefElements_;
     }
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 5;
@@ -683,7 +683,7 @@ public final class ReplicatedDataMessages {
     }
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 5;
@@ -695,14 +695,14 @@ public final class ReplicatedDataMessages {
     }
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 5;
      * @param index The index of the value to return.
      * @return The bytes of the actorRefElements at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getActorRefElementsBytes(int index) {
       return actorRefElements_.getByteString(index);
     }
@@ -725,11 +725,11 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       for (int i = 0; i < stringElements_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringElements_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringElements_.getRaw(i));
       }
       if (getIntElementsList().size() > 0) {
         output.writeUInt32NoTag(18);
@@ -749,7 +749,7 @@ public final class ReplicatedDataMessages {
         output.writeMessage(4, otherElements_.get(i));
       }
       for (int i = 0; i < actorRefElements_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 5, actorRefElements_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 5, actorRefElements_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -771,13 +771,13 @@ public final class ReplicatedDataMessages {
       {
         int dataSize = 0;
         for (int i = 0; i < intElements_.size(); i++) {
-          dataSize += akka.protobufv3.internal.CodedOutputStream
+          dataSize += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt32SizeNoTag(intElements_.getInt(i));
         }
         size += dataSize;
         if (!getIntElementsList().isEmpty()) {
           size += 1;
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
         intElementsMemoizedSerializedSize = dataSize;
@@ -785,19 +785,19 @@ public final class ReplicatedDataMessages {
       {
         int dataSize = 0;
         for (int i = 0; i < longElements_.size(); i++) {
-          dataSize += akka.protobufv3.internal.CodedOutputStream
+          dataSize += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt64SizeNoTag(longElements_.getLong(i));
         }
         size += dataSize;
         if (!getLongElementsList().isEmpty()) {
           size += 1;
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
         longElementsMemoizedSerializedSize = dataSize;
       }
       for (int i = 0; i < otherElements_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, otherElements_.get(i));
       }
       {
@@ -818,10 +818,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet) obj;
 
       if (!getStringElementsList()
           .equals(other.getStringElementsList())) return false;
@@ -869,73 +869,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -944,7 +944,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -955,42 +955,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.GSet}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.GSet}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.GSet)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSetOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.GSet)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSetOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getOtherElementsFieldBuilder();
         }
@@ -998,7 +998,7 @@ public final class ReplicatedDataMessages {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         intElements_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -1010,25 +1010,25 @@ public final class ReplicatedDataMessages {
         } else {
           otherElementsBuilder_.clear();
         }
-        actorRefElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GSet_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1036,8 +1036,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
           stringElements_ = stringElements_.getUnmodifiableView();
@@ -1078,44 +1078,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet.getDefaultInstance()) return this;
         if (!other.stringElements_.isEmpty()) {
           if (stringElements_.isEmpty()) {
             stringElements_ = other.stringElements_;
@@ -1165,7 +1165,7 @@ public final class ReplicatedDataMessages {
               otherElements_ = other.otherElements_;
               bitField0_ = (bitField0_ & ~0x00000008);
               otherElementsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getOtherElementsFieldBuilder() : null;
             } else {
               otherElementsBuilder_.addAllMessages(other.otherElements_);
@@ -1199,14 +1199,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1217,10 +1217,10 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.LazyStringList stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureStringElementsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          stringElements_ = new akka.protobufv3.internal.LazyStringArrayList(stringElements_);
+          stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(stringElements_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -1228,7 +1228,7 @@ public final class ReplicatedDataMessages {
        * repeated string stringElements = 1;
        * @return A list containing the stringElements.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getStringElementsList() {
         return stringElements_.getUnmodifiableView();
       }
@@ -1252,7 +1252,7 @@ public final class ReplicatedDataMessages {
        * @param index The index of the value to return.
        * @return The bytes of the stringElements at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getStringElementsBytes(int index) {
         return stringElements_.getByteString(index);
       }
@@ -1295,7 +1295,7 @@ public final class ReplicatedDataMessages {
       public Builder addAllStringElements(
           java.lang.Iterable values) {
         ensureStringElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, stringElements_);
         onChanged();
         return this;
@@ -1305,7 +1305,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder clearStringElements() {
-        stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -1316,7 +1316,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder addStringElementsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1326,7 +1326,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
+      private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
       private void ensureIntElementsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
           intElements_ = mutableCopy(intElements_);
@@ -1389,7 +1389,7 @@ public final class ReplicatedDataMessages {
       public Builder addAllIntElements(
           java.lang.Iterable values) {
         ensureIntElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, intElements_);
         onChanged();
         return this;
@@ -1405,7 +1405,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.Internal.LongList longElements_ = emptyLongList();
+      private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_ = emptyLongList();
       private void ensureLongElementsIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
           longElements_ = mutableCopy(longElements_);
@@ -1468,7 +1468,7 @@ public final class ReplicatedDataMessages {
       public Builder addAllLongElements(
           java.lang.Iterable values) {
         ensureLongElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, longElements_);
         onChanged();
         return this;
@@ -1484,22 +1484,22 @@ public final class ReplicatedDataMessages {
         return this;
       }
 
-      private java.util.List otherElements_ =
+      private java.util.List otherElements_ =
         java.util.Collections.emptyList();
       private void ensureOtherElementsIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          otherElements_ = new java.util.ArrayList(otherElements_);
+          otherElements_ = new java.util.ArrayList(otherElements_);
           bitField0_ |= 0x00000008;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherElementsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherElementsBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
-      public java.util.List getOtherElementsList() {
+      public java.util.List getOtherElementsList() {
         if (otherElementsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(otherElements_);
         } else {
@@ -1507,7 +1507,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
       public int getOtherElementsCount() {
         if (otherElementsBuilder_ == null) {
@@ -1517,9 +1517,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
         if (otherElementsBuilder_ == null) {
           return otherElements_.get(index);
         } else {
@@ -1527,10 +1527,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
       public Builder setOtherElements(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (otherElementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1544,10 +1544,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
       public Builder setOtherElements(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
           otherElements_.set(index, builderForValue.build());
@@ -1558,9 +1558,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
-      public Builder addOtherElements(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder addOtherElements(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (otherElementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1574,10 +1574,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
       public Builder addOtherElements(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (otherElementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1591,10 +1591,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
       public Builder addOtherElements(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
           otherElements_.add(builderForValue.build());
@@ -1605,10 +1605,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
       public Builder addOtherElements(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
           otherElements_.add(index, builderForValue.build());
@@ -1619,13 +1619,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
       public Builder addAllOtherElements(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, otherElements_);
           onChanged();
         } else {
@@ -1634,7 +1634,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
       public Builder clearOtherElements() {
         if (otherElementsBuilder_ == null) {
@@ -1647,7 +1647,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
       public Builder removeOtherElements(int index) {
         if (otherElementsBuilder_ == null) {
@@ -1660,16 +1660,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherElementsBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherElementsBuilder(
           int index) {
         return getOtherElementsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
           int index) {
         if (otherElementsBuilder_ == null) {
           return otherElements_.get(index);  } else {
@@ -1677,9 +1677,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getOtherElementsOrBuilderList() {
         if (otherElementsBuilder_ != null) {
           return otherElementsBuilder_.getMessageOrBuilderList();
@@ -1688,33 +1688,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder addOtherElementsBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder addOtherElementsBuilder() {
         return getOtherElementsFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder addOtherElementsBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder addOtherElementsBuilder(
           int index) {
         return getOtherElementsFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 4;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getOtherElementsBuilderList() {
         return getOtherElementsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getOtherElementsFieldBuilder() {
         if (otherElementsBuilder_ == null) {
-          otherElementsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          otherElementsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   otherElements_,
                   ((bitField0_ & 0x00000008) != 0),
                   getParentForChildren(),
@@ -1724,28 +1724,28 @@ public final class ReplicatedDataMessages {
         return otherElementsBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList actorRefElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureActorRefElementsIsMutable() {
         if (!((bitField0_ & 0x00000010) != 0)) {
-          actorRefElements_ = new akka.protobufv3.internal.LazyStringArrayList(actorRefElements_);
+          actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(actorRefElements_);
           bitField0_ |= 0x00000010;
          }
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 5;
        * @return A list containing the actorRefElements.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getActorRefElementsList() {
         return actorRefElements_.getUnmodifiableView();
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 5;
@@ -1756,7 +1756,7 @@ public final class ReplicatedDataMessages {
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 5;
@@ -1768,20 +1768,20 @@ public final class ReplicatedDataMessages {
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 5;
        * @param index The index of the value to return.
        * @return The bytes of the actorRefElements at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getActorRefElementsBytes(int index) {
         return actorRefElements_.getByteString(index);
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 5;
@@ -1801,7 +1801,7 @@ public final class ReplicatedDataMessages {
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 5;
@@ -1820,7 +1820,7 @@ public final class ReplicatedDataMessages {
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 5;
@@ -1830,28 +1830,28 @@ public final class ReplicatedDataMessages {
       public Builder addAllActorRefElements(
           java.lang.Iterable values) {
         ensureActorRefElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, actorRefElements_);
         onChanged();
         return this;
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 5;
        * @return This builder for chaining.
        */
       public Builder clearActorRefElements() {
-        actorRefElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 5;
@@ -1859,7 +1859,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder addActorRefElementsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1870,98 +1870,98 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.GSet)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.GSet)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.GSet)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.GSet)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public GSet parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new GSet(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GSet getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ORSetOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORSet)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORSet)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.VersionVector vvector = 1;
+     * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
      * @return Whether the vvector field is set.
      */
     boolean hasVvector();
     /**
-     * required .akka.cluster.ddata.VersionVector vvector = 1;
+     * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
      * @return The vvector.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getVvector();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getVvector();
     /**
-     * required .akka.cluster.ddata.VersionVector vvector = 1;
+     * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getVvectorOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getVvectorOrBuilder();
 
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
-    java.util.List 
+    java.util.List 
         getDotsList();
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDots(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDots(int index);
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
     int getDotsCount();
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
-    java.util.List 
+    java.util.List 
         getDotsOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDotsOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDotsOrBuilder(
         int index);
 
     /**
@@ -1986,7 +1986,7 @@ public final class ReplicatedDataMessages {
      * @param index The index of the value to return.
      * @return The bytes of the stringElements at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getStringElementsBytes(int index);
 
     /**
@@ -2024,32 +2024,32 @@ public final class ReplicatedDataMessages {
     long getLongElements(int index);
 
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
-    java.util.List 
+    java.util.List 
         getOtherElementsList();
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index);
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
     int getOtherElementsCount();
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
-    java.util.List 
+    java.util.List 
         getOtherElementsOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
         int index);
 
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 7;
@@ -2059,7 +2059,7 @@ public final class ReplicatedDataMessages {
         getActorRefElementsList();
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 7;
@@ -2068,7 +2068,7 @@ public final class ReplicatedDataMessages {
     int getActorRefElementsCount();
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 7;
@@ -2078,60 +2078,60 @@ public final class ReplicatedDataMessages {
     java.lang.String getActorRefElements(int index);
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 7;
      * @param index The index of the value to return.
      * @return The bytes of the actorRefElements at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getActorRefElementsBytes(int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.ORSet}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.ORSet}
    */
   public  static final class ORSet extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORSet)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORSet)
       ORSetOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ORSet.newBuilder() to construct.
-    private ORSet(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ORSet(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ORSet() {
       dots_ = java.util.Collections.emptyList();
-      stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       intElements_ = emptyIntList();
       longElements_ = emptyLongList();
       otherElements_ = java.util.Collections.emptyList();
-      actorRefElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ORSet();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ORSet(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2141,11 +2141,11 @@ public final class ReplicatedDataMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = vvector_.toBuilder();
               }
-              vvector_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER, extensionRegistry);
+              vvector_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(vvector_);
                 vvector_ = subBuilder.buildPartial();
@@ -2155,17 +2155,17 @@ public final class ReplicatedDataMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                dots_ = new java.util.ArrayList();
+                dots_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               dots_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER, extensionRegistry));
               break;
             }
             case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                stringElements_ = new akka.protobufv3.internal.LazyStringArrayList();
+                stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               stringElements_.add(bs);
@@ -2215,17 +2215,17 @@ public final class ReplicatedDataMessages {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                otherElements_ = new java.util.ArrayList();
+                otherElements_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
               otherElements_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry));
               break;
             }
             case 58: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                actorRefElements_ = new akka.protobufv3.internal.LazyStringArrayList();
+                actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000040;
               }
               actorRefElements_.add(bs);
@@ -2240,10 +2240,10 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -2268,85 +2268,85 @@ public final class ReplicatedDataMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder.class);
     }
 
     private int bitField0_;
     public static final int VVECTOR_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector vvector_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector vvector_;
     /**
-     * required .akka.cluster.ddata.VersionVector vvector = 1;
+     * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
      * @return Whether the vvector field is set.
      */
     public boolean hasVvector() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.VersionVector vvector = 1;
+     * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
      * @return The vvector.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getVvector() {
-      return vvector_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getVvector() {
+      return vvector_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
     }
     /**
-     * required .akka.cluster.ddata.VersionVector vvector = 1;
+     * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getVvectorOrBuilder() {
-      return vvector_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getVvectorOrBuilder() {
+      return vvector_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
     }
 
     public static final int DOTS_FIELD_NUMBER = 2;
-    private java.util.List dots_;
+    private java.util.List dots_;
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
-    public java.util.List getDotsList() {
+    public java.util.List getDotsList() {
       return dots_;
     }
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getDotsOrBuilderList() {
       return dots_;
     }
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
     public int getDotsCount() {
       return dots_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDots(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDots(int index) {
       return dots_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.VersionVector dots = 2;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDotsOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDotsOrBuilder(
         int index) {
       return dots_.get(index);
     }
 
     public static final int STRINGELEMENTS_FIELD_NUMBER = 3;
-    private akka.protobufv3.internal.LazyStringList stringElements_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_;
     /**
      * repeated string stringElements = 3;
      * @return A list containing the stringElements.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getStringElementsList() {
       return stringElements_;
     }
@@ -2370,13 +2370,13 @@ public final class ReplicatedDataMessages {
      * @param index The index of the value to return.
      * @return The bytes of the stringElements at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getStringElementsBytes(int index) {
       return stringElements_.getByteString(index);
     }
 
     public static final int INTELEMENTS_FIELD_NUMBER = 4;
-    private akka.protobufv3.internal.Internal.IntList intElements_;
+    private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_;
     /**
      * repeated sint32 intElements = 4 [packed = true];
      * @return A list containing the intElements.
@@ -2403,7 +2403,7 @@ public final class ReplicatedDataMessages {
     private int intElementsMemoizedSerializedSize = -1;
 
     public static final int LONGELEMENTS_FIELD_NUMBER = 5;
-    private akka.protobufv3.internal.Internal.LongList longElements_;
+    private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_;
     /**
      * repeated sint64 longElements = 5 [packed = true];
      * @return A list containing the longElements.
@@ -2430,57 +2430,57 @@ public final class ReplicatedDataMessages {
     private int longElementsMemoizedSerializedSize = -1;
 
     public static final int OTHERELEMENTS_FIELD_NUMBER = 6;
-    private java.util.List otherElements_;
+    private java.util.List otherElements_;
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
-    public java.util.List getOtherElementsList() {
+    public java.util.List getOtherElementsList() {
       return otherElements_;
     }
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getOtherElementsOrBuilderList() {
       return otherElements_;
     }
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
     public int getOtherElementsCount() {
       return otherElements_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
       return otherElements_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+     * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
         int index) {
       return otherElements_.get(index);
     }
 
     public static final int ACTORREFELEMENTS_FIELD_NUMBER = 7;
-    private akka.protobufv3.internal.LazyStringList actorRefElements_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_;
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 7;
      * @return A list containing the actorRefElements.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getActorRefElementsList() {
       return actorRefElements_;
     }
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 7;
@@ -2491,7 +2491,7 @@ public final class ReplicatedDataMessages {
     }
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 7;
@@ -2503,14 +2503,14 @@ public final class ReplicatedDataMessages {
     }
     /**
      * 
    -     * added in Akka 2.5.14
+     * added in org.apache.pekko 2.5.14
      * 
    
      *
      * repeated string actorRefElements = 7;
      * @param index The index of the value to return.
      * @return The bytes of the actorRefElements at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getActorRefElementsBytes(int index) {
       return actorRefElements_.getByteString(index);
     }
@@ -2547,7 +2547,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) != 0)) {
@@ -2557,7 +2557,7 @@ public final class ReplicatedDataMessages {
         output.writeMessage(2, dots_.get(i));
       }
       for (int i = 0; i < stringElements_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, stringElements_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, stringElements_.getRaw(i));
       }
       if (getIntElementsList().size() > 0) {
         output.writeUInt32NoTag(34);
@@ -2577,7 +2577,7 @@ public final class ReplicatedDataMessages {
         output.writeMessage(6, otherElements_.get(i));
       }
       for (int i = 0; i < actorRefElements_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 7, actorRefElements_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 7, actorRefElements_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -2589,11 +2589,11 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getVvector());
       }
       for (int i = 0; i < dots_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, dots_.get(i));
       }
       {
@@ -2607,13 +2607,13 @@ public final class ReplicatedDataMessages {
       {
         int dataSize = 0;
         for (int i = 0; i < intElements_.size(); i++) {
-          dataSize += akka.protobufv3.internal.CodedOutputStream
+          dataSize += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt32SizeNoTag(intElements_.getInt(i));
         }
         size += dataSize;
         if (!getIntElementsList().isEmpty()) {
           size += 1;
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
         intElementsMemoizedSerializedSize = dataSize;
@@ -2621,19 +2621,19 @@ public final class ReplicatedDataMessages {
       {
         int dataSize = 0;
         for (int i = 0; i < longElements_.size(); i++) {
-          dataSize += akka.protobufv3.internal.CodedOutputStream
+          dataSize += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt64SizeNoTag(longElements_.getLong(i));
         }
         size += dataSize;
         if (!getLongElementsList().isEmpty()) {
           size += 1;
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
         longElementsMemoizedSerializedSize = dataSize;
       }
       for (int i = 0; i < otherElements_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(6, otherElements_.get(i));
       }
       {
@@ -2654,10 +2654,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet) obj;
 
       if (hasVvector() != other.hasVvector()) return false;
       if (hasVvector()) {
@@ -2720,73 +2720,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -2795,7 +2795,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2806,42 +2806,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORSet}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORSet}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORSet)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORSet)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getVvectorFieldBuilder();
           getDotsFieldBuilder();
@@ -2863,7 +2863,7 @@ public final class ReplicatedDataMessages {
         } else {
           dotsBuilder_.clear();
         }
-        stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         intElements_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -2875,25 +2875,25 @@ public final class ReplicatedDataMessages {
         } else {
           otherElementsBuilder_.clear();
         }
-        actorRefElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSet_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2901,8 +2901,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2962,44 +2962,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) return this;
         if (other.hasVvector()) {
           mergeVvector(other.getVvector());
         }
@@ -3022,7 +3022,7 @@ public final class ReplicatedDataMessages {
               dots_ = other.dots_;
               bitField0_ = (bitField0_ & ~0x00000002);
               dotsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getDotsFieldBuilder() : null;
             } else {
               dotsBuilder_.addAllMessages(other.dots_);
@@ -3078,7 +3078,7 @@ public final class ReplicatedDataMessages {
               otherElements_ = other.otherElements_;
               bitField0_ = (bitField0_ & ~0x00000020);
               otherElementsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getOtherElementsFieldBuilder() : null;
             } else {
               otherElementsBuilder_.addAllMessages(other.otherElements_);
@@ -3123,14 +3123,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3141,31 +3141,31 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector vvector_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> vvectorBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector vvector_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> vvectorBuilder_;
       /**
-       * required .akka.cluster.ddata.VersionVector vvector = 1;
+       * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        * @return Whether the vvector field is set.
        */
       public boolean hasVvector() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.VersionVector vvector = 1;
+       * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        * @return The vvector.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getVvector() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getVvector() {
         if (vvectorBuilder_ == null) {
-          return vvector_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
+          return vvector_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
         } else {
           return vvectorBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.VersionVector vvector = 1;
+       * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        */
-      public Builder setVvector(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
+      public Builder setVvector(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
         if (vvectorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3179,10 +3179,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.VersionVector vvector = 1;
+       * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        */
       public Builder setVvector(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
         if (vvectorBuilder_ == null) {
           vvector_ = builderForValue.build();
           onChanged();
@@ -3193,15 +3193,15 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.VersionVector vvector = 1;
+       * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        */
-      public Builder mergeVvector(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
+      public Builder mergeVvector(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
         if (vvectorBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               vvector_ != null &&
-              vvector_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) {
+              vvector_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) {
             vvector_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.newBuilder(vvector_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.newBuilder(vvector_).mergeFrom(value).buildPartial();
           } else {
             vvector_ = value;
           }
@@ -3213,7 +3213,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.VersionVector vvector = 1;
+       * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        */
       public Builder clearVvector() {
         if (vvectorBuilder_ == null) {
@@ -3226,33 +3226,33 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.VersionVector vvector = 1;
+       * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder getVvectorBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder getVvectorBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getVvectorFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.VersionVector vvector = 1;
+       * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getVvectorOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getVvectorOrBuilder() {
         if (vvectorBuilder_ != null) {
           return vvectorBuilder_.getMessageOrBuilder();
         } else {
           return vvector_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : vvector_;
         }
       }
       /**
-       * required .akka.cluster.ddata.VersionVector vvector = 1;
+       * required .org.apache.pekko.cluster.ddata.VersionVector vvector = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> 
           getVvectorFieldBuilder() {
         if (vvectorBuilder_ == null) {
-          vvectorBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder>(
+          vvectorBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder>(
                   getVvector(),
                   getParentForChildren(),
                   isClean());
@@ -3261,22 +3261,22 @@ public final class ReplicatedDataMessages {
         return vvectorBuilder_;
       }
 
-      private java.util.List dots_ =
+      private java.util.List dots_ =
         java.util.Collections.emptyList();
       private void ensureDotsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          dots_ = new java.util.ArrayList(dots_);
+          dots_ = new java.util.ArrayList(dots_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> dotsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> dotsBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
-      public java.util.List getDotsList() {
+      public java.util.List getDotsList() {
         if (dotsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(dots_);
         } else {
@@ -3284,7 +3284,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
       public int getDotsCount() {
         if (dotsBuilder_ == null) {
@@ -3294,9 +3294,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDots(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDots(int index) {
         if (dotsBuilder_ == null) {
           return dots_.get(index);
         } else {
@@ -3304,10 +3304,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
       public Builder setDots(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
         if (dotsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3321,10 +3321,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
       public Builder setDots(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
         if (dotsBuilder_ == null) {
           ensureDotsIsMutable();
           dots_.set(index, builderForValue.build());
@@ -3335,9 +3335,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
-      public Builder addDots(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
+      public Builder addDots(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
         if (dotsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3351,10 +3351,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
       public Builder addDots(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
         if (dotsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3368,10 +3368,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
       public Builder addDots(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
         if (dotsBuilder_ == null) {
           ensureDotsIsMutable();
           dots_.add(builderForValue.build());
@@ -3382,10 +3382,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
       public Builder addDots(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
         if (dotsBuilder_ == null) {
           ensureDotsIsMutable();
           dots_.add(index, builderForValue.build());
@@ -3396,13 +3396,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
       public Builder addAllDots(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (dotsBuilder_ == null) {
           ensureDotsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, dots_);
           onChanged();
         } else {
@@ -3411,7 +3411,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
       public Builder clearDots() {
         if (dotsBuilder_ == null) {
@@ -3424,7 +3424,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
       public Builder removeDots(int index) {
         if (dotsBuilder_ == null) {
@@ -3437,16 +3437,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder getDotsBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder getDotsBuilder(
           int index) {
         return getDotsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDotsOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDotsOrBuilder(
           int index) {
         if (dotsBuilder_ == null) {
           return dots_.get(index);  } else {
@@ -3454,9 +3454,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getDotsOrBuilderList() {
         if (dotsBuilder_ != null) {
           return dotsBuilder_.getMessageOrBuilderList();
@@ -3465,33 +3465,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder addDotsBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder addDotsBuilder() {
         return getDotsFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder addDotsBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder addDotsBuilder(
           int index) {
         return getDotsFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector dots = 2;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector dots = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getDotsBuilderList() {
         return getDotsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> 
           getDotsFieldBuilder() {
         if (dotsBuilder_ == null) {
-          dotsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder>(
+          dotsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder>(
                   dots_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -3501,10 +3501,10 @@ public final class ReplicatedDataMessages {
         return dotsBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureStringElementsIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          stringElements_ = new akka.protobufv3.internal.LazyStringArrayList(stringElements_);
+          stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(stringElements_);
           bitField0_ |= 0x00000004;
          }
       }
@@ -3512,7 +3512,7 @@ public final class ReplicatedDataMessages {
        * repeated string stringElements = 3;
        * @return A list containing the stringElements.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getStringElementsList() {
         return stringElements_.getUnmodifiableView();
       }
@@ -3536,7 +3536,7 @@ public final class ReplicatedDataMessages {
        * @param index The index of the value to return.
        * @return The bytes of the stringElements at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getStringElementsBytes(int index) {
         return stringElements_.getByteString(index);
       }
@@ -3579,7 +3579,7 @@ public final class ReplicatedDataMessages {
       public Builder addAllStringElements(
           java.lang.Iterable values) {
         ensureStringElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, stringElements_);
         onChanged();
         return this;
@@ -3589,7 +3589,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder clearStringElements() {
-        stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -3600,7 +3600,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder addStringElementsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -3610,7 +3610,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
+      private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
       private void ensureIntElementsIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
           intElements_ = mutableCopy(intElements_);
@@ -3673,7 +3673,7 @@ public final class ReplicatedDataMessages {
       public Builder addAllIntElements(
           java.lang.Iterable values) {
         ensureIntElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, intElements_);
         onChanged();
         return this;
@@ -3689,7 +3689,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.Internal.LongList longElements_ = emptyLongList();
+      private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_ = emptyLongList();
       private void ensureLongElementsIsMutable() {
         if (!((bitField0_ & 0x00000010) != 0)) {
           longElements_ = mutableCopy(longElements_);
@@ -3752,7 +3752,7 @@ public final class ReplicatedDataMessages {
       public Builder addAllLongElements(
           java.lang.Iterable values) {
         ensureLongElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, longElements_);
         onChanged();
         return this;
@@ -3768,22 +3768,22 @@ public final class ReplicatedDataMessages {
         return this;
       }
 
-      private java.util.List otherElements_ =
+      private java.util.List otherElements_ =
         java.util.Collections.emptyList();
       private void ensureOtherElementsIsMutable() {
         if (!((bitField0_ & 0x00000020) != 0)) {
-          otherElements_ = new java.util.ArrayList(otherElements_);
+          otherElements_ = new java.util.ArrayList(otherElements_);
           bitField0_ |= 0x00000020;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherElementsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherElementsBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
-      public java.util.List getOtherElementsList() {
+      public java.util.List getOtherElementsList() {
         if (otherElementsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(otherElements_);
         } else {
@@ -3791,7 +3791,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
       public int getOtherElementsCount() {
         if (otherElementsBuilder_ == null) {
@@ -3801,9 +3801,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherElements(int index) {
         if (otherElementsBuilder_ == null) {
           return otherElements_.get(index);
         } else {
@@ -3811,10 +3811,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
       public Builder setOtherElements(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (otherElementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3828,10 +3828,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
       public Builder setOtherElements(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
           otherElements_.set(index, builderForValue.build());
@@ -3842,9 +3842,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
-      public Builder addOtherElements(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder addOtherElements(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (otherElementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3858,10 +3858,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
       public Builder addOtherElements(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (otherElementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3875,10 +3875,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
       public Builder addOtherElements(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
           otherElements_.add(builderForValue.build());
@@ -3889,10 +3889,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
       public Builder addOtherElements(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
           otherElements_.add(index, builderForValue.build());
@@ -3903,13 +3903,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
       public Builder addAllOtherElements(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, otherElements_);
           onChanged();
         } else {
@@ -3918,7 +3918,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
       public Builder clearOtherElements() {
         if (otherElementsBuilder_ == null) {
@@ -3931,7 +3931,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
       public Builder removeOtherElements(int index) {
         if (otherElementsBuilder_ == null) {
@@ -3944,16 +3944,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherElementsBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherElementsBuilder(
           int index) {
         return getOtherElementsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherElementsOrBuilder(
           int index) {
         if (otherElementsBuilder_ == null) {
           return otherElements_.get(index);  } else {
@@ -3961,9 +3961,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getOtherElementsOrBuilderList() {
         if (otherElementsBuilder_ != null) {
           return otherElementsBuilder_.getMessageOrBuilderList();
@@ -3972,33 +3972,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder addOtherElementsBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder addOtherElementsBuilder() {
         return getOtherElementsFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder addOtherElementsBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder addOtherElementsBuilder(
           int index) {
         return getOtherElementsFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.OtherMessage otherElements = 6;
+       * repeated .org.apache.pekko.cluster.ddata.OtherMessage otherElements = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getOtherElementsBuilderList() {
         return getOtherElementsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getOtherElementsFieldBuilder() {
         if (otherElementsBuilder_ == null) {
-          otherElementsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          otherElementsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   otherElements_,
                   ((bitField0_ & 0x00000020) != 0),
                   getParentForChildren(),
@@ -4008,28 +4008,28 @@ public final class ReplicatedDataMessages {
         return otherElementsBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList actorRefElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureActorRefElementsIsMutable() {
         if (!((bitField0_ & 0x00000040) != 0)) {
-          actorRefElements_ = new akka.protobufv3.internal.LazyStringArrayList(actorRefElements_);
+          actorRefElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(actorRefElements_);
           bitField0_ |= 0x00000040;
          }
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 7;
        * @return A list containing the actorRefElements.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getActorRefElementsList() {
         return actorRefElements_.getUnmodifiableView();
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 7;
@@ -4040,7 +4040,7 @@ public final class ReplicatedDataMessages {
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 7;
@@ -4052,20 +4052,20 @@ public final class ReplicatedDataMessages {
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 7;
        * @param index The index of the value to return.
        * @return The bytes of the actorRefElements at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getActorRefElementsBytes(int index) {
         return actorRefElements_.getByteString(index);
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 7;
@@ -4085,7 +4085,7 @@ public final class ReplicatedDataMessages {
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 7;
@@ -4104,7 +4104,7 @@ public final class ReplicatedDataMessages {
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 7;
@@ -4114,28 +4114,28 @@ public final class ReplicatedDataMessages {
       public Builder addAllActorRefElements(
           java.lang.Iterable values) {
         ensureActorRefElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, actorRefElements_);
         onChanged();
         return this;
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 7;
        * @return This builder for chaining.
        */
       public Builder clearActorRefElements() {
-        actorRefElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        actorRefElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
       /**
        * 
    -       * added in Akka 2.5.14
+       * added in org.apache.pekko 2.5.14
        * 
    
        *
        * repeated string actorRefElements = 7;
@@ -4143,7 +4143,7 @@ public final class ReplicatedDataMessages {
        * @return This builder for chaining.
        */
       public Builder addActorRefElementsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -4154,95 +4154,95 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORSet)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORSet)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORSet)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORSet)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ORSet parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ORSet(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ORSetDeltaGroupOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORSetDeltaGroup)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORSetDeltaGroup)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.ORSetDeltaGroup}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.ORSetDeltaGroup}
    */
   public  static final class ORSetDeltaGroup extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORSetDeltaGroup)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORSetDeltaGroup)
       ORSetDeltaGroupOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ORSetDeltaGroup.newBuilder() to construct.
-    private ORSetDeltaGroup(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ORSetDeltaGroup(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ORSetDeltaGroup() {
@@ -4252,26 +4252,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ORSetDeltaGroup();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ORSetDeltaGroup(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4282,11 +4282,11 @@ public final class ReplicatedDataMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -4298,10 +4298,10 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -4311,59 +4311,59 @@ public final class ReplicatedDataMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORSetDeltaGroup.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
-       * required .akka.cluster.ddata.ORSetDeltaOp operation = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
        * @return Whether the operation field is set.
        */
       boolean hasOperation();
       /**
-       * required .akka.cluster.ddata.ORSetDeltaOp operation = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
        * @return The operation.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp getOperation();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp getOperation();
 
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return Whether the underlying field is set.
        */
       boolean hasUnderlying();
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return The underlying.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying();
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORSetDeltaGroup.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORSetDeltaGroup.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -4373,26 +4373,26 @@ public final class ReplicatedDataMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -4404,7 +4404,7 @@ public final class ReplicatedDataMessages {
               case 8: {
                 int rawValue = input.readEnum();
                   @SuppressWarnings("deprecation")
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp value = akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.valueOf(rawValue);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp value = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.valueOf(rawValue);
                 if (value == null) {
                   unknownFields.mergeVarintField(1, rawValue);
                 } else {
@@ -4414,11 +4414,11 @@ public final class ReplicatedDataMessages {
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = underlying_.toBuilder();
                 }
-                underlying_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
+                underlying_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(underlying_);
                   underlying_ = subBuilder.buildPartial();
@@ -4435,70 +4435,70 @@ public final class ReplicatedDataMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder.class);
       }
 
       private int bitField0_;
       public static final int OPERATION_FIELD_NUMBER = 1;
       private int operation_;
       /**
-       * required .akka.cluster.ddata.ORSetDeltaOp operation = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
        * @return Whether the operation field is set.
        */
       public boolean hasOperation() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.ORSetDeltaOp operation = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
        * @return The operation.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp getOperation() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp getOperation() {
         @SuppressWarnings("deprecation")
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp result = akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.valueOf(operation_);
-        return result == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.Add : result;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.valueOf(operation_);
+        return result == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.Add : result;
       }
 
       public static final int UNDERLYING_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet underlying_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet underlying_;
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return Whether the underlying field is set.
        */
       public boolean hasUnderlying() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return The underlying.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
-        return underlying_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
+        return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
       }
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
-        return underlying_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
+        return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -4525,7 +4525,7 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeEnum(1, operation_);
@@ -4543,11 +4543,11 @@ public final class ReplicatedDataMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeEnumSize(1, operation_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getUnderlying());
         }
         size += unknownFields.getSerializedSize();
@@ -4560,10 +4560,10 @@ public final class ReplicatedDataMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry) obj;
 
         if (hasOperation() != other.hasOperation()) return false;
         if (hasOperation()) {
@@ -4598,73 +4598,73 @@ public final class ReplicatedDataMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -4673,7 +4673,7 @@ public final class ReplicatedDataMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -4684,42 +4684,42 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.ORSetDeltaGroup.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORSetDeltaGroup.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getUnderlyingFieldBuilder();
           }
@@ -4739,19 +4739,19 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -4759,8 +4759,8 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4786,44 +4786,44 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.getDefaultInstance()) return this;
           if (other.hasOperation()) {
             setOperation(other.getOperation());
           }
@@ -4851,14 +4851,14 @@ public final class ReplicatedDataMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -4871,27 +4871,27 @@ public final class ReplicatedDataMessages {
 
         private int operation_ = 0;
         /**
-         * required .akka.cluster.ddata.ORSetDeltaOp operation = 1;
+         * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
          * @return Whether the operation field is set.
          */
         public boolean hasOperation() {
           return ((bitField0_ & 0x00000001) != 0);
         }
         /**
-         * required .akka.cluster.ddata.ORSetDeltaOp operation = 1;
+         * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
          * @return The operation.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp getOperation() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp getOperation() {
           @SuppressWarnings("deprecation")
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp result = akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.valueOf(operation_);
-          return result == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.Add : result;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.valueOf(operation_);
+          return result == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp.Add : result;
         }
         /**
-         * required .akka.cluster.ddata.ORSetDeltaOp operation = 1;
+         * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
          * @param value The operation to set.
          * @return This builder for chaining.
          */
-        public Builder setOperation(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp value) {
+        public Builder setOperation(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaOp value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -4901,7 +4901,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSetDeltaOp operation = 1;
+         * required .org.apache.pekko.cluster.ddata.ORSetDeltaOp operation = 1;
          * @return This builder for chaining.
          */
         public Builder clearOperation() {
@@ -4911,31 +4911,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet underlying_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> underlyingBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet underlying_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> underlyingBuilder_;
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          * @return Whether the underlying field is set.
          */
         public boolean hasUnderlying() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          * @return The underlying.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
           if (underlyingBuilder_ == null) {
-            return underlying_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
+            return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
           } else {
             return underlyingBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        public Builder setUnderlying(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+        public Builder setUnderlying(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
           if (underlyingBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4949,10 +4949,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
         public Builder setUnderlying(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
           if (underlyingBuilder_ == null) {
             underlying_ = builderForValue.build();
             onChanged();
@@ -4963,15 +4963,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        public Builder mergeUnderlying(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+        public Builder mergeUnderlying(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
           if (underlyingBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 underlying_ != null &&
-                underlying_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+                underlying_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
               underlying_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(underlying_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(underlying_).mergeFrom(value).buildPartial();
             } else {
               underlying_ = value;
             }
@@ -4983,7 +4983,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
         public Builder clearUnderlying() {
           if (underlyingBuilder_ == null) {
@@ -4996,33 +4996,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getUnderlyingBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getUnderlyingBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getUnderlyingFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
           if (underlyingBuilder_ != null) {
             return underlyingBuilder_.getMessageOrBuilder();
           } else {
             return underlying_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
           }
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
             getUnderlyingFieldBuilder() {
           if (underlyingBuilder_ == null) {
-            underlyingBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
+            underlyingBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
                     getUnderlying(),
                     getParentForChildren(),
                     isClean());
@@ -5032,88 +5032,88 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORSetDeltaGroup.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORSetDeltaGroup.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -5136,7 +5136,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
@@ -5151,7 +5151,7 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, entries_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -5164,10 +5164,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup) obj;
 
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
@@ -5191,73 +5191,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5266,7 +5266,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5277,42 +5277,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORSetDeltaGroup}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORSetDeltaGroup}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORSetDeltaGroup)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroupOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORSetDeltaGroup)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroupOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getEntriesFieldBuilder();
         }
@@ -5330,19 +5330,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5350,8 +5350,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup(this);
         int from_bitField0_ = bitField0_;
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -5372,44 +5372,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.getDefaultInstance()) return this;
         if (entriesBuilder_ == null) {
           if (!other.entries_.isEmpty()) {
             if (entries_.isEmpty()) {
@@ -5429,7 +5429,7 @@ public final class ReplicatedDataMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000001);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -5453,14 +5453,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5471,22 +5471,22 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -5494,7 +5494,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -5504,9 +5504,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -5514,10 +5514,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5531,10 +5531,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -5545,9 +5545,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5561,10 +5561,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5578,10 +5578,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -5592,10 +5592,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -5606,13 +5606,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -5621,7 +5621,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -5634,7 +5634,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -5647,16 +5647,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -5664,9 +5664,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -5675,33 +5675,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORSetDeltaGroup.Entry entries = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -5712,60 +5712,60 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORSetDeltaGroup)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORSetDeltaGroup)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORSetDeltaGroup)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORSetDeltaGroup)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ORSetDeltaGroup parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ORSetDeltaGroup(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetDeltaGroup getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface FlagOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Flag)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Flag)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required bool enabled = 1;
@@ -5779,15 +5779,15 @@ public final class ReplicatedDataMessages {
     boolean getEnabled();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Flag}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Flag}
    */
   public  static final class Flag extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Flag)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Flag)
       FlagOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Flag.newBuilder() to construct.
-    private Flag(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Flag(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Flag() {
@@ -5796,26 +5796,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Flag();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Flag(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5838,27 +5838,27 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.Builder.class);
     }
 
     private int bitField0_;
@@ -5895,7 +5895,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBool(1, enabled_);
@@ -5910,7 +5910,7 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(1, enabled_);
       }
       size += unknownFields.getSerializedSize();
@@ -5923,10 +5923,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag) obj;
 
       if (hasEnabled() != other.hasEnabled()) return false;
       if (hasEnabled()) {
@@ -5946,7 +5946,7 @@ public final class ReplicatedDataMessages {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasEnabled()) {
         hash = (37 * hash) + ENABLED_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getEnabled());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -5954,73 +5954,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -6029,7 +6029,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6040,42 +6040,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Flag}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Flag}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Flag)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.FlagOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Flag)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.FlagOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -6088,19 +6088,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_Flag_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6108,8 +6108,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6127,44 +6127,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag.getDefaultInstance()) return this;
         if (other.hasEnabled()) {
           setEnabled(other.getEnabled());
         }
@@ -6183,14 +6183,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6239,60 +6239,60 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Flag)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Flag)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Flag)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Flag)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Flag parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Flag(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.Flag getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface LWWRegisterOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.LWWRegister)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.LWWRegister)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required sint64 timestamp = 1;
@@ -6306,45 +6306,45 @@ public final class ReplicatedDataMessages {
     long getTimestamp();
 
     /**
-     * required .akka.cluster.ddata.UniqueAddress node = 2;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
      * @return Whether the node field is set.
      */
     boolean hasNode();
     /**
-     * required .akka.cluster.ddata.UniqueAddress node = 2;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
      * @return The node.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode();
     /**
-     * required .akka.cluster.ddata.UniqueAddress node = 2;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder();
 
     /**
-     * required .akka.cluster.ddata.OtherMessage state = 3;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
      * @return Whether the state field is set.
      */
     boolean hasState();
     /**
-     * required .akka.cluster.ddata.OtherMessage state = 3;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
      * @return The state.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getState();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getState();
     /**
-     * required .akka.cluster.ddata.OtherMessage state = 3;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getStateOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getStateOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.LWWRegister}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.LWWRegister}
    */
   public  static final class LWWRegister extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.LWWRegister)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.LWWRegister)
       LWWRegisterOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use LWWRegister.newBuilder() to construct.
-    private LWWRegister(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private LWWRegister(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private LWWRegister() {
@@ -6353,26 +6353,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new LWWRegister();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private LWWRegister(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6387,11 +6387,11 @@ public final class ReplicatedDataMessages {
               break;
             }
             case 18: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = node_.toBuilder();
               }
-              node_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
+              node_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(node_);
                 node_ = subBuilder.buildPartial();
@@ -6400,11 +6400,11 @@ public final class ReplicatedDataMessages {
               break;
             }
             case 26: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) != 0)) {
                 subBuilder = state_.toBuilder();
               }
-              state_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              state_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(state_);
                 state_ = subBuilder.buildPartial();
@@ -6421,27 +6421,27 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder.class);
     }
 
     private int bitField0_;
@@ -6463,49 +6463,49 @@ public final class ReplicatedDataMessages {
     }
 
     public static final int NODE_FIELD_NUMBER = 2;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
     /**
-     * required .akka.cluster.ddata.UniqueAddress node = 2;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
      * @return Whether the node field is set.
      */
     public boolean hasNode() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
-     * required .akka.cluster.ddata.UniqueAddress node = 2;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
      * @return The node.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
-      return node_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
+      return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
     }
     /**
-     * required .akka.cluster.ddata.UniqueAddress node = 2;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
-      return node_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
+      return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
     }
 
     public static final int STATE_FIELD_NUMBER = 3;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage state_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage state_;
     /**
-     * required .akka.cluster.ddata.OtherMessage state = 3;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
      * @return Whether the state field is set.
      */
     public boolean hasState() {
       return ((bitField0_ & 0x00000004) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage state = 3;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
      * @return The state.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getState() {
-      return state_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getState() {
+      return state_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage state = 3;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getStateOrBuilder() {
-      return state_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getStateOrBuilder() {
+      return state_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -6540,7 +6540,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeSInt64(1, timestamp_);
@@ -6561,15 +6561,15 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSInt64Size(1, timestamp_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getNode());
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getState());
       }
       size += unknownFields.getSerializedSize();
@@ -6582,10 +6582,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister) obj;
 
       if (hasTimestamp() != other.hasTimestamp()) return false;
       if (hasTimestamp()) {
@@ -6615,7 +6615,7 @@ public final class ReplicatedDataMessages {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasTimestamp()) {
         hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimestamp());
       }
       if (hasNode()) {
@@ -6631,73 +6631,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -6706,7 +6706,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6717,42 +6717,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.LWWRegister}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.LWWRegister}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.LWWRegister)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.LWWRegister)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getNodeFieldBuilder();
           getStateFieldBuilder();
@@ -6779,19 +6779,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWRegister_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6799,8 +6799,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6834,44 +6834,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance()) return this;
         if (other.hasTimestamp()) {
           setTimestamp(other.getTimestamp());
         }
@@ -6908,14 +6908,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6963,31 +6963,31 @@ public final class ReplicatedDataMessages {
         return this;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> nodeBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> nodeBuilder_;
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        * @return Whether the node field is set.
        */
       public boolean hasNode() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        * @return The node.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
         if (nodeBuilder_ == null) {
-          return node_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+          return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
         } else {
           return nodeBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        */
-      public Builder setNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+      public Builder setNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (nodeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7001,10 +7001,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        */
       public Builder setNode(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
         if (nodeBuilder_ == null) {
           node_ = builderForValue.build();
           onChanged();
@@ -7015,15 +7015,15 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        */
-      public Builder mergeNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+      public Builder mergeNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (nodeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               node_ != null &&
-              node_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+              node_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
             node_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
           } else {
             node_ = value;
           }
@@ -7035,7 +7035,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        */
       public Builder clearNode() {
         if (nodeBuilder_ == null) {
@@ -7048,33 +7048,33 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getNodeBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getNodeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getNodeFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
         if (nodeBuilder_ != null) {
           return nodeBuilder_.getMessageOrBuilder();
         } else {
           return node_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
         }
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
           getNodeFieldBuilder() {
         if (nodeBuilder_ == null) {
-          nodeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
+          nodeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
                   getNode(),
                   getParentForChildren(),
                   isClean());
@@ -7083,31 +7083,31 @@ public final class ReplicatedDataMessages {
         return nodeBuilder_;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage state_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> stateBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage state_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> stateBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage state = 3;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        * @return Whether the state field is set.
        */
       public boolean hasState() {
         return ((bitField0_ & 0x00000004) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage state = 3;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        * @return The state.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getState() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getState() {
         if (stateBuilder_ == null) {
-          return state_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
+          return state_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
         } else {
           return stateBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage state = 3;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        */
-      public Builder setState(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setState(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (stateBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7121,10 +7121,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage state = 3;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        */
       public Builder setState(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (stateBuilder_ == null) {
           state_ = builderForValue.build();
           onChanged();
@@ -7135,15 +7135,15 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage state = 3;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        */
-      public Builder mergeState(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeState(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (stateBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
               state_ != null &&
-              state_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              state_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             state_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(state_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(state_).mergeFrom(value).buildPartial();
           } else {
             state_ = value;
           }
@@ -7155,7 +7155,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage state = 3;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        */
       public Builder clearState() {
         if (stateBuilder_ == null) {
@@ -7168,33 +7168,33 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage state = 3;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getStateBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getStateBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getStateFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage state = 3;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getStateOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getStateOrBuilder() {
         if (stateBuilder_ != null) {
           return stateBuilder_.getMessageOrBuilder();
         } else {
           return state_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : state_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage state = 3;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage state = 3;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getStateFieldBuilder() {
         if (stateBuilder_ == null) {
-          stateBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          stateBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getState(),
                   getParentForChildren(),
                   isClean());
@@ -7204,95 +7204,95 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.LWWRegister)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.LWWRegister)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.LWWRegister)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.LWWRegister)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public LWWRegister parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new LWWRegister(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface GCounterOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.GCounter)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.GCounter)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder getEntriesOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.GCounter}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.GCounter}
    */
   public  static final class GCounter extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.GCounter)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GCounter)
       GCounterOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use GCounter.newBuilder() to construct.
-    private GCounter(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private GCounter(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private GCounter() {
@@ -7302,26 +7302,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new GCounter();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private GCounter(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7332,11 +7332,11 @@ public final class ReplicatedDataMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -7348,10 +7348,10 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -7361,37 +7361,37 @@ public final class ReplicatedDataMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.GCounter.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.GCounter.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return Whether the node field is set.
        */
       boolean hasNode();
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return The node.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode();
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder();
 
       /**
        * required bytes value = 2;
@@ -7402,47 +7402,47 @@ public final class ReplicatedDataMessages {
        * required bytes value = 2;
        * @return The value.
        */
-      akka.protobufv3.internal.ByteString getValue();
+      org.apache.pekko.protobufv3.internal.ByteString getValue();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.GCounter.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.GCounter.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.GCounter.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GCounter.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
-        value_ = akka.protobufv3.internal.ByteString.EMPTY;
+        value_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       }
 
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -7452,11 +7452,11 @@ public final class ReplicatedDataMessages {
                 done = true;
                 break;
               case 10: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000001) != 0)) {
                   subBuilder = node_.toBuilder();
                 }
-                node_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
+                node_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(node_);
                   node_ = subBuilder.buildPartial();
@@ -7478,55 +7478,55 @@ public final class ReplicatedDataMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder.class);
       }
 
       private int bitField0_;
       public static final int NODE_FIELD_NUMBER = 1;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return Whether the node field is set.
        */
       public boolean hasNode() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return The node.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
-        return node_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
+        return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
-        return node_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
+        return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private akka.protobufv3.internal.ByteString value_;
+      private org.apache.pekko.protobufv3.internal.ByteString value_;
       /**
        * required bytes value = 2;
        * @return Whether the value field is set.
@@ -7538,7 +7538,7 @@ public final class ReplicatedDataMessages {
        * required bytes value = 2;
        * @return The value.
        */
-      public akka.protobufv3.internal.ByteString getValue() {
+      public org.apache.pekko.protobufv3.internal.ByteString getValue() {
         return value_;
       }
 
@@ -7566,7 +7566,7 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeMessage(1, getNode());
@@ -7584,11 +7584,11 @@ public final class ReplicatedDataMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(1, getNode());
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeBytesSize(2, value_);
         }
         size += unknownFields.getSerializedSize();
@@ -7601,10 +7601,10 @@ public final class ReplicatedDataMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry) obj;
 
         if (hasNode() != other.hasNode()) return false;
         if (hasNode()) {
@@ -7640,73 +7640,73 @@ public final class ReplicatedDataMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -7715,7 +7715,7 @@ public final class ReplicatedDataMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -7726,42 +7726,42 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.GCounter.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.GCounter.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.GCounter.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.GCounter.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getNodeFieldBuilder();
           }
@@ -7775,25 +7775,25 @@ public final class ReplicatedDataMessages {
             nodeBuilder_.clear();
           }
           bitField0_ = (bitField0_ & ~0x00000001);
-          value_ = akka.protobufv3.internal.ByteString.EMPTY;
+          value_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -7801,8 +7801,8 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7828,44 +7828,44 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.getDefaultInstance()) return this;
           if (other.hasNode()) {
             mergeNode(other.getNode());
           }
@@ -7893,14 +7893,14 @@ public final class ReplicatedDataMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -7911,31 +7911,31 @@ public final class ReplicatedDataMessages {
         }
         private int bitField0_;
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> nodeBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> nodeBuilder_;
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          * @return Whether the node field is set.
          */
         public boolean hasNode() {
           return ((bitField0_ & 0x00000001) != 0);
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          * @return The node.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
           if (nodeBuilder_ == null) {
-            return node_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+            return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
           } else {
             return nodeBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        public Builder setNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+        public Builder setNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (nodeBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -7949,10 +7949,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
         public Builder setNode(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
           if (nodeBuilder_ == null) {
             node_ = builderForValue.build();
             onChanged();
@@ -7963,15 +7963,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        public Builder mergeNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+        public Builder mergeNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (nodeBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
                 node_ != null &&
-                node_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+                node_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
               node_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
             } else {
               node_ = value;
             }
@@ -7983,7 +7983,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
         public Builder clearNode() {
           if (nodeBuilder_ == null) {
@@ -7996,33 +7996,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getNodeBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getNodeBuilder() {
           bitField0_ |= 0x00000001;
           onChanged();
           return getNodeFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
           if (nodeBuilder_ != null) {
             return nodeBuilder_.getMessageOrBuilder();
           } else {
             return node_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
           }
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
             getNodeFieldBuilder() {
           if (nodeBuilder_ == null) {
-            nodeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
+            nodeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
                     getNode(),
                     getParentForChildren(),
                     isClean());
@@ -8031,7 +8031,7 @@ public final class ReplicatedDataMessages {
           return nodeBuilder_;
         }
 
-        private akka.protobufv3.internal.ByteString value_ = akka.protobufv3.internal.ByteString.EMPTY;
+        private org.apache.pekko.protobufv3.internal.ByteString value_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         /**
          * required bytes value = 2;
          * @return Whether the value field is set.
@@ -8043,7 +8043,7 @@ public final class ReplicatedDataMessages {
          * required bytes value = 2;
          * @return The value.
          */
-        public akka.protobufv3.internal.ByteString getValue() {
+        public org.apache.pekko.protobufv3.internal.ByteString getValue() {
           return value_;
         }
         /**
@@ -8051,7 +8051,7 @@ public final class ReplicatedDataMessages {
          * @param value The value to set.
          * @return This builder for chaining.
          */
-        public Builder setValue(akka.protobufv3.internal.ByteString value) {
+        public Builder setValue(org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -8072,88 +8072,88 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.GCounter.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.GCounter.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.GCounter.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.GCounter.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -8176,7 +8176,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
@@ -8191,7 +8191,7 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, entries_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -8204,10 +8204,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter) obj;
 
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
@@ -8231,73 +8231,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -8306,7 +8306,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8317,42 +8317,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.GCounter}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.GCounter}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.GCounter)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.GCounter)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getEntriesFieldBuilder();
         }
@@ -8370,19 +8370,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_GCounter_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8390,8 +8390,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter(this);
         int from_bitField0_ = bitField0_;
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -8412,44 +8412,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) return this;
         if (entriesBuilder_ == null) {
           if (!other.entries_.isEmpty()) {
             if (entries_.isEmpty()) {
@@ -8469,7 +8469,7 @@ public final class ReplicatedDataMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000001);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -8493,14 +8493,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -8511,22 +8511,22 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -8534,7 +8534,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -8544,9 +8544,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -8554,10 +8554,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8571,10 +8571,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -8585,9 +8585,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8601,10 +8601,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8618,10 +8618,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -8632,10 +8632,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -8646,13 +8646,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -8661,7 +8661,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -8674,7 +8674,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -8687,16 +8687,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -8704,9 +8704,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -8715,33 +8715,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.GCounter.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.GCounter.Entry entries = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -8752,101 +8752,101 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.GCounter)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.GCounter)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.GCounter)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.GCounter)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public GCounter parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new GCounter(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface PNCounterOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.PNCounter)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.PNCounter)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.GCounter increments = 1;
+     * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
      * @return Whether the increments field is set.
      */
     boolean hasIncrements();
     /**
-     * required .akka.cluster.ddata.GCounter increments = 1;
+     * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
      * @return The increments.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getIncrements();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getIncrements();
     /**
-     * required .akka.cluster.ddata.GCounter increments = 1;
+     * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getIncrementsOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getIncrementsOrBuilder();
 
     /**
-     * required .akka.cluster.ddata.GCounter decrements = 2;
+     * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
      * @return Whether the decrements field is set.
      */
     boolean hasDecrements();
     /**
-     * required .akka.cluster.ddata.GCounter decrements = 2;
+     * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
      * @return The decrements.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDecrements();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDecrements();
     /**
-     * required .akka.cluster.ddata.GCounter decrements = 2;
+     * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getDecrementsOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getDecrementsOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.PNCounter}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounter}
    */
   public  static final class PNCounter extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.PNCounter)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.PNCounter)
       PNCounterOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use PNCounter.newBuilder() to construct.
-    private PNCounter(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private PNCounter(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private PNCounter() {
@@ -8855,26 +8855,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new PNCounter();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private PNCounter(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8884,11 +8884,11 @@ public final class ReplicatedDataMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = increments_.toBuilder();
               }
-              increments_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.PARSER, extensionRegistry);
+              increments_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(increments_);
                 increments_ = subBuilder.buildPartial();
@@ -8897,11 +8897,11 @@ public final class ReplicatedDataMessages {
               break;
             }
             case 18: {
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = decrements_.toBuilder();
               }
-              decrements_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.PARSER, extensionRegistry);
+              decrements_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(decrements_);
                 decrements_ = subBuilder.buildPartial();
@@ -8918,74 +8918,74 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder.class);
     }
 
     private int bitField0_;
     public static final int INCREMENTS_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter increments_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter increments_;
     /**
-     * required .akka.cluster.ddata.GCounter increments = 1;
+     * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
      * @return Whether the increments field is set.
      */
     public boolean hasIncrements() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.GCounter increments = 1;
+     * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
      * @return The increments.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getIncrements() {
-      return increments_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getIncrements() {
+      return increments_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
     }
     /**
-     * required .akka.cluster.ddata.GCounter increments = 1;
+     * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getIncrementsOrBuilder() {
-      return increments_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getIncrementsOrBuilder() {
+      return increments_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
     }
 
     public static final int DECREMENTS_FIELD_NUMBER = 2;
-    private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter decrements_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter decrements_;
     /**
-     * required .akka.cluster.ddata.GCounter decrements = 2;
+     * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
      * @return Whether the decrements field is set.
      */
     public boolean hasDecrements() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
-     * required .akka.cluster.ddata.GCounter decrements = 2;
+     * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
      * @return The decrements.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDecrements() {
-      return decrements_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDecrements() {
+      return decrements_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
     }
     /**
-     * required .akka.cluster.ddata.GCounter decrements = 2;
+     * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getDecrementsOrBuilder() {
-      return decrements_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getDecrementsOrBuilder() {
+      return decrements_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -9016,7 +9016,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getIncrements());
@@ -9034,11 +9034,11 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getIncrements());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getDecrements());
       }
       size += unknownFields.getSerializedSize();
@@ -9051,10 +9051,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter) obj;
 
       if (hasIncrements() != other.hasIncrements()) return false;
       if (hasIncrements()) {
@@ -9090,73 +9090,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -9165,7 +9165,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -9176,42 +9176,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.PNCounter}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounter}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.PNCounter)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.PNCounter)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getIncrementsFieldBuilder();
           getDecrementsFieldBuilder();
@@ -9236,19 +9236,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounter_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9256,8 +9256,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -9287,44 +9287,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance()) return this;
         if (other.hasIncrements()) {
           mergeIncrements(other.getIncrements());
         }
@@ -9355,14 +9355,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -9373,31 +9373,31 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter increments_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder> incrementsBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter increments_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder> incrementsBuilder_;
       /**
-       * required .akka.cluster.ddata.GCounter increments = 1;
+       * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        * @return Whether the increments field is set.
        */
       public boolean hasIncrements() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.GCounter increments = 1;
+       * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        * @return The increments.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getIncrements() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getIncrements() {
         if (incrementsBuilder_ == null) {
-          return increments_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
+          return increments_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
         } else {
           return incrementsBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.GCounter increments = 1;
+       * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        */
-      public Builder setIncrements(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
+      public Builder setIncrements(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
         if (incrementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9411,10 +9411,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.GCounter increments = 1;
+       * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        */
       public Builder setIncrements(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder builderForValue) {
         if (incrementsBuilder_ == null) {
           increments_ = builderForValue.build();
           onChanged();
@@ -9425,15 +9425,15 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.GCounter increments = 1;
+       * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        */
-      public Builder mergeIncrements(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
+      public Builder mergeIncrements(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
         if (incrementsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               increments_ != null &&
-              increments_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) {
+              increments_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) {
             increments_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.newBuilder(increments_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.newBuilder(increments_).mergeFrom(value).buildPartial();
           } else {
             increments_ = value;
           }
@@ -9445,7 +9445,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.GCounter increments = 1;
+       * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        */
       public Builder clearIncrements() {
         if (incrementsBuilder_ == null) {
@@ -9458,33 +9458,33 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.GCounter increments = 1;
+       * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder getIncrementsBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder getIncrementsBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getIncrementsFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.GCounter increments = 1;
+       * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getIncrementsOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getIncrementsOrBuilder() {
         if (incrementsBuilder_ != null) {
           return incrementsBuilder_.getMessageOrBuilder();
         } else {
           return increments_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : increments_;
         }
       }
       /**
-       * required .akka.cluster.ddata.GCounter increments = 1;
+       * required .org.apache.pekko.cluster.ddata.GCounter increments = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder> 
           getIncrementsFieldBuilder() {
         if (incrementsBuilder_ == null) {
-          incrementsBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder>(
+          incrementsBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder>(
                   getIncrements(),
                   getParentForChildren(),
                   isClean());
@@ -9493,31 +9493,31 @@ public final class ReplicatedDataMessages {
         return incrementsBuilder_;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter decrements_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder> decrementsBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter decrements_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder> decrementsBuilder_;
       /**
-       * required .akka.cluster.ddata.GCounter decrements = 2;
+       * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        * @return Whether the decrements field is set.
        */
       public boolean hasDecrements() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.GCounter decrements = 2;
+       * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        * @return The decrements.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDecrements() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter getDecrements() {
         if (decrementsBuilder_ == null) {
-          return decrements_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
+          return decrements_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
         } else {
           return decrementsBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.GCounter decrements = 2;
+       * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        */
-      public Builder setDecrements(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
+      public Builder setDecrements(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
         if (decrementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9531,10 +9531,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.GCounter decrements = 2;
+       * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        */
       public Builder setDecrements(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder builderForValue) {
         if (decrementsBuilder_ == null) {
           decrements_ = builderForValue.build();
           onChanged();
@@ -9545,15 +9545,15 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.GCounter decrements = 2;
+       * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        */
-      public Builder mergeDecrements(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
+      public Builder mergeDecrements(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter value) {
         if (decrementsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               decrements_ != null &&
-              decrements_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) {
+              decrements_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance()) {
             decrements_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.newBuilder(decrements_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.newBuilder(decrements_).mergeFrom(value).buildPartial();
           } else {
             decrements_ = value;
           }
@@ -9565,7 +9565,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.GCounter decrements = 2;
+       * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        */
       public Builder clearDecrements() {
         if (decrementsBuilder_ == null) {
@@ -9578,33 +9578,33 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.GCounter decrements = 2;
+       * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder getDecrementsBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder getDecrementsBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getDecrementsFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.GCounter decrements = 2;
+       * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getDecrementsOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder getDecrementsOrBuilder() {
         if (decrementsBuilder_ != null) {
           return decrementsBuilder_.getMessageOrBuilder();
         } else {
           return decrements_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.getDefaultInstance() : decrements_;
         }
       }
       /**
-       * required .akka.cluster.ddata.GCounter decrements = 2;
+       * required .org.apache.pekko.cluster.ddata.GCounter decrements = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder> 
           getDecrementsFieldBuilder() {
         if (decrementsBuilder_ == null) {
-          decrementsBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder>(
+          decrementsBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounter.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.GCounterOrBuilder>(
                   getDecrements(),
                   getParentForChildren(),
                   isClean());
@@ -9614,110 +9614,110 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.PNCounter)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.PNCounter)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.PNCounter)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.PNCounter)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public PNCounter parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new PNCounter(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ORMapOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORMap)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORMap)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
     boolean hasKeys();
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys();
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder();
 
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder getEntriesOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.ORMap}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMap}
    */
   public  static final class ORMap extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORMap)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMap)
       ORMapOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ORMap.newBuilder() to construct.
-    private ORMap(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ORMap(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ORMap() {
@@ -9727,26 +9727,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ORMap();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ORMap(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9756,11 +9756,11 @@ public final class ReplicatedDataMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = keys_.toBuilder();
               }
-              keys_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
+              keys_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(keys_);
                 keys_ = subBuilder.buildPartial();
@@ -9770,11 +9770,11 @@ public final class ReplicatedDataMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -9786,10 +9786,10 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -9799,22 +9799,22 @@ public final class ReplicatedDataMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORMap.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORMap.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * optional string stringKey = 1;
@@ -9830,23 +9830,23 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes();
 
       /**
-       * required .akka.cluster.ddata.OtherMessage value = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return Whether the value field is set.
        */
       boolean hasValue();
       /**
-       * required .akka.cluster.ddata.OtherMessage value = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return The value.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue();
       /**
-       * required .akka.cluster.ddata.OtherMessage value = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder();
 
       /**
        * optional sint32 intKey = 3;
@@ -9871,30 +9871,30 @@ public final class ReplicatedDataMessages {
       long getLongKey();
 
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       boolean hasOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORMap.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMap.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORMap.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMap.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -9904,26 +9904,26 @@ public final class ReplicatedDataMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -9933,17 +9933,17 @@ public final class ReplicatedDataMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 stringKey_ = bs;
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = value_.toBuilder();
                 }
-                value_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(value_);
                   value_ = subBuilder.buildPartial();
@@ -9962,11 +9962,11 @@ public final class ReplicatedDataMessages {
                 break;
               }
               case 42: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000010) != 0)) {
                   subBuilder = otherKey_.toBuilder();
                 }
-                otherKey_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(otherKey_);
                   otherKey_ = subBuilder.buildPartial();
@@ -9983,27 +9983,27 @@ public final class ReplicatedDataMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -10025,8 +10025,8 @@ public final class ReplicatedDataMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             stringKey_ = s;
@@ -10038,41 +10038,41 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           stringKey_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value_;
       /**
-       * required .akka.cluster.ddata.OtherMessage value = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return Whether the value field is set.
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage value = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return The value.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage value = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
@@ -10110,26 +10110,26 @@ public final class ReplicatedDataMessages {
       }
 
       public static final int OTHERKEY_FIELD_NUMBER = 5;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -10158,10 +10158,10 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getValue());
@@ -10185,22 +10185,22 @@ public final class ReplicatedDataMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getValue());
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt32Size(3, intKey_);
         }
         if (((bitField0_ & 0x00000008) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt64Size(4, longKey_);
         }
         if (((bitField0_ & 0x00000010) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
         size += unknownFields.getSerializedSize();
@@ -10213,10 +10213,10 @@ public final class ReplicatedDataMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry) obj;
 
         if (hasStringKey() != other.hasStringKey()) return false;
         if (hasStringKey()) {
@@ -10268,7 +10268,7 @@ public final class ReplicatedDataMessages {
         }
         if (hasLongKey()) {
           hash = (37 * hash) + LONGKEY_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getLongKey());
         }
         if (hasOtherKey()) {
@@ -10280,73 +10280,73 @@ public final class ReplicatedDataMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -10355,7 +10355,7 @@ public final class ReplicatedDataMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -10366,42 +10366,42 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.ORMap.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMap.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORMap.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORMap.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getValueFieldBuilder();
             getOtherKeyFieldBuilder();
@@ -10432,19 +10432,19 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -10452,8 +10452,8 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -10495,44 +10495,44 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
             bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
@@ -10573,14 +10573,14 @@ public final class ReplicatedDataMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -10606,8 +10606,8 @@ public final class ReplicatedDataMessages {
         public java.lang.String getStringKey() {
           java.lang.Object ref = stringKey_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               stringKey_ = s;
@@ -10621,17 +10621,17 @@ public final class ReplicatedDataMessages {
          * optional string stringKey = 1;
          * @return The bytes for stringKey.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getStringKeyBytes() {
           java.lang.Object ref = stringKey_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             stringKey_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -10665,7 +10665,7 @@ public final class ReplicatedDataMessages {
          * @return This builder for chaining.
          */
         public Builder setStringKeyBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -10675,31 +10675,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> valueBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> valueBuilder_;
         /**
-         * required .akka.cluster.ddata.OtherMessage value = 2;
+         * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          * @return Whether the value field is set.
          */
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * required .akka.cluster.ddata.OtherMessage value = 2;
+         * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          * @return The value.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
           if (valueBuilder_ == null) {
-            return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
+            return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
           } else {
             return valueBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.OtherMessage value = 2;
+         * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        public Builder setValue(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (valueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -10713,10 +10713,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.OtherMessage value = 2;
+         * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
         public Builder setValue(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
             onChanged();
@@ -10727,15 +10727,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.OtherMessage value = 2;
+         * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        public Builder mergeValue(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 value_ != null &&
-                value_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
               value_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(value_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(value_).mergeFrom(value).buildPartial();
             } else {
               value_ = value;
             }
@@ -10747,7 +10747,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.OtherMessage value = 2;
+         * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
         public Builder clearValue() {
           if (valueBuilder_ == null) {
@@ -10760,33 +10760,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.OtherMessage value = 2;
+         * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getValueBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getValueBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getValueFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.OtherMessage value = 2;
+         * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
           if (valueBuilder_ != null) {
             return valueBuilder_.getMessageOrBuilder();
           } else {
             return value_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
           }
         }
         /**
-         * required .akka.cluster.ddata.OtherMessage value = 2;
+         * required .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
             getValueFieldBuilder() {
           if (valueBuilder_ == null) {
-            valueBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+            valueBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                     getValue(),
                     getParentForChildren(),
                     isClean());
@@ -10869,31 +10869,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return Whether the otherKey field is set.
          */
         public boolean hasOtherKey() {
           return ((bitField0_ & 0x00000010) != 0);
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return The otherKey.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
           if (otherKeyBuilder_ == null) {
-            return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+            return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           } else {
             return otherKeyBuilder_.getMessage();
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder setOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -10907,10 +10907,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder setOtherKey(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
             onChanged();
@@ -10921,15 +10921,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder mergeOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
                 otherKey_ != null &&
-                otherKey_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
               otherKey_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
             } else {
               otherKey_ = value;
             }
@@ -10941,7 +10941,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
           if (otherKeyBuilder_ == null) {
@@ -10954,33 +10954,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
           bitField0_ |= 0x00000010;
           onChanged();
           return getOtherKeyFieldBuilder().getBuilder();
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
           if (otherKeyBuilder_ != null) {
             return otherKeyBuilder_.getMessageOrBuilder();
           } else {
             return otherKey_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
             getOtherKeyFieldBuilder() {
           if (otherKeyBuilder_ == null) {
-            otherKeyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+            otherKeyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                     getOtherKey(),
                     getParentForChildren(),
                     isClean());
@@ -10990,52 +10990,52 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORMap.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORMap.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORMap.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORMap.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -11043,59 +11043,59 @@ public final class ReplicatedDataMessages {
 
     private int bitField0_;
     public static final int KEYS_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
     public boolean hasKeys() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
-      return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
+      return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
-      return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
+      return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -11126,7 +11126,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKeys());
@@ -11144,11 +11144,11 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKeys());
       }
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, entries_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -11161,10 +11161,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap) obj;
 
       if (hasKeys() != other.hasKeys()) return false;
       if (hasKeys()) {
@@ -11197,73 +11197,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -11272,7 +11272,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -11283,42 +11283,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORMap}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMap}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORMap)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORMap)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeysFieldBuilder();
           getEntriesFieldBuilder();
@@ -11343,19 +11343,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMap_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11363,8 +11363,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -11395,44 +11395,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.getDefaultInstance()) return this;
         if (other.hasKeys()) {
           mergeKeys(other.getKeys());
         }
@@ -11455,7 +11455,7 @@ public final class ReplicatedDataMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000002);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -11485,14 +11485,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -11503,31 +11503,31 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> keysBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> keysBuilder_;
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        * @return Whether the keys field is set.
        */
       public boolean hasKeys() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        * @return The keys.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
         if (keysBuilder_ == null) {
-          return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+          return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
         } else {
           return keysBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public Builder setKeys(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+      public Builder setKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11541,10 +11541,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder setKeys(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
         if (keysBuilder_ == null) {
           keys_ = builderForValue.build();
           onChanged();
@@ -11555,15 +11555,15 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public Builder mergeKeys(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+      public Builder mergeKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               keys_ != null &&
-              keys_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+              keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
             keys_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
           } else {
             keys_ = value;
           }
@@ -11575,7 +11575,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder clearKeys() {
         if (keysBuilder_ == null) {
@@ -11588,33 +11588,33 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getKeysBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getKeysBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeysFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
         if (keysBuilder_ != null) {
           return keysBuilder_.getMessageOrBuilder();
         } else {
           return keys_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
         }
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
           getKeysFieldBuilder() {
         if (keysBuilder_ == null) {
-          keysBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
+          keysBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
                   getKeys(),
                   getParentForChildren(),
                   isClean());
@@ -11623,22 +11623,22 @@ public final class ReplicatedDataMessages {
         return keysBuilder_;
       }
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -11646,7 +11646,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -11656,9 +11656,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -11666,10 +11666,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11683,10 +11683,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -11697,9 +11697,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11713,10 +11713,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11730,10 +11730,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -11744,10 +11744,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -11758,13 +11758,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -11773,7 +11773,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -11786,7 +11786,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -11799,16 +11799,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -11816,9 +11816,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -11827,33 +11827,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.ORMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMap.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -11864,95 +11864,95 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORMap)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORMap)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORMap)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORMap)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ORMap parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ORMap(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMap getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ORMapDeltaGroupOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORMapDeltaGroup)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORMapDeltaGroup)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.ORMapDeltaGroup}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMapDeltaGroup}
    */
   public  static final class ORMapDeltaGroup extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORMapDeltaGroup)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMapDeltaGroup)
       ORMapDeltaGroupOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ORMapDeltaGroup.newBuilder() to construct.
-    private ORMapDeltaGroup(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ORMapDeltaGroup(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ORMapDeltaGroup() {
@@ -11962,26 +11962,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ORMapDeltaGroup();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ORMapDeltaGroup(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -11992,11 +11992,11 @@ public final class ReplicatedDataMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -12008,10 +12008,10 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -12021,22 +12021,22 @@ public final class ReplicatedDataMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Builder.class);
     }
 
     public interface MapEntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORMapDeltaGroup.MapEntry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * optional string stringKey = 1;
@@ -12052,23 +12052,23 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes();
 
       /**
-       * optional .akka.cluster.ddata.OtherMessage value = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return Whether the value field is set.
        */
       boolean hasValue();
       /**
-       * optional .akka.cluster.ddata.OtherMessage value = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return The value.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue();
       /**
-       * optional .akka.cluster.ddata.OtherMessage value = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder();
 
       /**
        * optional sint32 intKey = 3;
@@ -12093,30 +12093,30 @@ public final class ReplicatedDataMessages {
       long getLongKey();
 
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       boolean hasOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORMapDeltaGroup.MapEntry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry}
      */
     public  static final class MapEntry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORMapDeltaGroup.MapEntry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry)
         MapEntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use MapEntry.newBuilder() to construct.
-      private MapEntry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private MapEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private MapEntry() {
@@ -12126,26 +12126,26 @@ public final class ReplicatedDataMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new MapEntry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private MapEntry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -12155,17 +12155,17 @@ public final class ReplicatedDataMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 stringKey_ = bs;
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = value_.toBuilder();
                 }
-                value_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(value_);
                   value_ = subBuilder.buildPartial();
@@ -12184,11 +12184,11 @@ public final class ReplicatedDataMessages {
                 break;
               }
               case 42: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000010) != 0)) {
                   subBuilder = otherKey_.toBuilder();
                 }
-                otherKey_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(otherKey_);
                   otherKey_ = subBuilder.buildPartial();
@@ -12205,27 +12205,27 @@ public final class ReplicatedDataMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder.class);
       }
 
       private int bitField0_;
@@ -12247,8 +12247,8 @@ public final class ReplicatedDataMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             stringKey_ = s;
@@ -12260,41 +12260,41 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           stringKey_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage value = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return Whether the value field is set.
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage value = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        * @return The value.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage value = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
@@ -12332,26 +12332,26 @@ public final class ReplicatedDataMessages {
       }
 
       public static final int OTHERKEY_FIELD_NUMBER = 5;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -12378,10 +12378,10 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getValue());
@@ -12405,22 +12405,22 @@ public final class ReplicatedDataMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getValue());
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt32Size(3, intKey_);
         }
         if (((bitField0_ & 0x00000008) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt64Size(4, longKey_);
         }
         if (((bitField0_ & 0x00000010) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
         size += unknownFields.getSerializedSize();
@@ -12433,10 +12433,10 @@ public final class ReplicatedDataMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry) obj;
 
         if (hasStringKey() != other.hasStringKey()) return false;
         if (hasStringKey()) {
@@ -12488,7 +12488,7 @@ public final class ReplicatedDataMessages {
         }
         if (hasLongKey()) {
           hash = (37 * hash) + LONGKEY_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getLongKey());
         }
         if (hasOtherKey()) {
@@ -12500,73 +12500,73 @@ public final class ReplicatedDataMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -12575,7 +12575,7 @@ public final class ReplicatedDataMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -12586,42 +12586,42 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.ORMapDeltaGroup.MapEntry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORMapDeltaGroup.MapEntry)
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getValueFieldBuilder();
             getOtherKeyFieldBuilder();
@@ -12652,19 +12652,19 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -12672,8 +12672,8 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -12715,44 +12715,44 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
             bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
@@ -12792,14 +12792,14 @@ public final class ReplicatedDataMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -12825,8 +12825,8 @@ public final class ReplicatedDataMessages {
         public java.lang.String getStringKey() {
           java.lang.Object ref = stringKey_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               stringKey_ = s;
@@ -12840,17 +12840,17 @@ public final class ReplicatedDataMessages {
          * optional string stringKey = 1;
          * @return The bytes for stringKey.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getStringKeyBytes() {
           java.lang.Object ref = stringKey_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             stringKey_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -12884,7 +12884,7 @@ public final class ReplicatedDataMessages {
          * @return This builder for chaining.
          */
         public Builder setStringKeyBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -12894,31 +12894,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> valueBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> valueBuilder_;
         /**
-         * optional .akka.cluster.ddata.OtherMessage value = 2;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          * @return Whether the value field is set.
          */
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage value = 2;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          * @return The value.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getValue() {
           if (valueBuilder_ == null) {
-            return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
+            return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
           } else {
             return valueBuilder_.getMessage();
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage value = 2;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        public Builder setValue(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (valueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -12932,10 +12932,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage value = 2;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
         public Builder setValue(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
             onChanged();
@@ -12946,15 +12946,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage value = 2;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        public Builder mergeValue(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 value_ != null &&
-                value_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
               value_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(value_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(value_).mergeFrom(value).buildPartial();
             } else {
               value_ = value;
             }
@@ -12966,7 +12966,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage value = 2;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
         public Builder clearValue() {
           if (valueBuilder_ == null) {
@@ -12979,33 +12979,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage value = 2;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getValueBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getValueBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getValueFieldBuilder().getBuilder();
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage value = 2;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getValueOrBuilder() {
           if (valueBuilder_ != null) {
             return valueBuilder_.getMessageOrBuilder();
           } else {
             return value_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : value_;
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage value = 2;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage value = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
             getValueFieldBuilder() {
           if (valueBuilder_ == null) {
-            valueBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+            valueBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                     getValue(),
                     getParentForChildren(),
                     isClean());
@@ -13088,31 +13088,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return Whether the otherKey field is set.
          */
         public boolean hasOtherKey() {
           return ((bitField0_ & 0x00000010) != 0);
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return The otherKey.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
           if (otherKeyBuilder_ == null) {
-            return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+            return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           } else {
             return otherKeyBuilder_.getMessage();
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder setOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -13126,10 +13126,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder setOtherKey(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
             onChanged();
@@ -13140,15 +13140,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder mergeOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
                 otherKey_ != null &&
-                otherKey_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
               otherKey_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
             } else {
               otherKey_ = value;
             }
@@ -13160,7 +13160,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
           if (otherKeyBuilder_ == null) {
@@ -13173,33 +13173,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
           bitField0_ |= 0x00000010;
           onChanged();
           return getOtherKeyFieldBuilder().getBuilder();
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
           if (otherKeyBuilder_ != null) {
             return otherKeyBuilder_.getMessageOrBuilder();
           } else {
             return otherKey_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
             getOtherKeyFieldBuilder() {
           if (otherKeyBuilder_ == null) {
-            otherKeyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+            otherKeyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                     getOtherKey(),
                     getParentForChildren(),
                     isClean());
@@ -13209,86 +13209,86 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORMapDeltaGroup.MapEntry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORMapDeltaGroup.MapEntry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public MapEntry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new MapEntry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORMapDeltaGroup.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
-       * required .akka.cluster.ddata.ORMapDeltaOp operation = 1;
+       * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
        * @return Whether the operation field is set.
        */
       boolean hasOperation();
       /**
-       * required .akka.cluster.ddata.ORMapDeltaOp operation = 1;
+       * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
        * @return The operation.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp getOperation();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp getOperation();
 
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return Whether the underlying field is set.
        */
       boolean hasUnderlying();
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return The underlying.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying();
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder();
 
       /**
        * required sint32 zeroTag = 3;
@@ -13302,39 +13302,39 @@ public final class ReplicatedDataMessages {
       int getZeroTag();
 
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
-      java.util.List 
+      java.util.List 
           getEntryDataList();
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getEntryData(int index);
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getEntryData(int index);
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
       int getEntryDataCount();
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
-      java.util.List 
+      java.util.List 
           getEntryDataOrBuilderList();
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder getEntryDataOrBuilder(
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder getEntryDataOrBuilder(
           int index);
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORMapDeltaGroup.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORMapDeltaGroup.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -13345,26 +13345,26 @@ public final class ReplicatedDataMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -13376,7 +13376,7 @@ public final class ReplicatedDataMessages {
               case 8: {
                 int rawValue = input.readEnum();
                   @SuppressWarnings("deprecation")
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp value = akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.valueOf(rawValue);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp value = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.valueOf(rawValue);
                 if (value == null) {
                   unknownFields.mergeVarintField(1, rawValue);
                 } else {
@@ -13386,11 +13386,11 @@ public final class ReplicatedDataMessages {
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = underlying_.toBuilder();
                 }
-                underlying_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
+                underlying_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(underlying_);
                   underlying_ = subBuilder.buildPartial();
@@ -13405,11 +13405,11 @@ public final class ReplicatedDataMessages {
               }
               case 34: {
                 if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                  entryData_ = new java.util.ArrayList();
+                  entryData_ = new java.util.ArrayList();
                   mutable_bitField0_ |= 0x00000008;
                 }
                 entryData_.add(
-                    input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.PARSER, extensionRegistry));
+                    input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.PARSER, extensionRegistry));
                 break;
               }
               default: {
@@ -13421,10 +13421,10 @@ public final class ReplicatedDataMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           if (((mutable_bitField0_ & 0x00000008) != 0)) {
@@ -13434,60 +13434,60 @@ public final class ReplicatedDataMessages {
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder.class);
       }
 
       private int bitField0_;
       public static final int OPERATION_FIELD_NUMBER = 1;
       private int operation_;
       /**
-       * required .akka.cluster.ddata.ORMapDeltaOp operation = 1;
+       * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
        * @return Whether the operation field is set.
        */
       public boolean hasOperation() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.ORMapDeltaOp operation = 1;
+       * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
        * @return The operation.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp getOperation() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp getOperation() {
         @SuppressWarnings("deprecation")
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp result = akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.valueOf(operation_);
-        return result == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.ORMapPut : result;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.valueOf(operation_);
+        return result == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.ORMapPut : result;
       }
 
       public static final int UNDERLYING_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet underlying_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet underlying_;
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return Whether the underlying field is set.
        */
       public boolean hasUnderlying() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        * @return The underlying.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
-        return underlying_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
+        return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
       }
       /**
-       * required .akka.cluster.ddata.ORSet underlying = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
-        return underlying_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
+        return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
       }
 
       public static final int ZEROTAG_FIELD_NUMBER = 3;
@@ -13508,36 +13508,36 @@ public final class ReplicatedDataMessages {
       }
 
       public static final int ENTRYDATA_FIELD_NUMBER = 4;
-      private java.util.List entryData_;
+      private java.util.List entryData_;
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
-      public java.util.List getEntryDataList() {
+      public java.util.List getEntryDataList() {
         return entryData_;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
-      public java.util.List 
+      public java.util.List 
           getEntryDataOrBuilderList() {
         return entryData_;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
       public int getEntryDataCount() {
         return entryData_.size();
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getEntryData(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getEntryData(int index) {
         return entryData_.get(index);
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder getEntryDataOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder getEntryDataOrBuilder(
           int index) {
         return entryData_.get(index);
       }
@@ -13576,7 +13576,7 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeEnum(1, operation_);
@@ -13600,19 +13600,19 @@ public final class ReplicatedDataMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeEnumSize(1, operation_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getUnderlying());
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt32Size(3, zeroTag_);
         }
         for (int i = 0; i < entryData_.size(); i++) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(4, entryData_.get(i));
         }
         size += unknownFields.getSerializedSize();
@@ -13625,10 +13625,10 @@ public final class ReplicatedDataMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry) obj;
 
         if (hasOperation() != other.hasOperation()) return false;
         if (hasOperation()) {
@@ -13678,73 +13678,73 @@ public final class ReplicatedDataMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -13753,7 +13753,7 @@ public final class ReplicatedDataMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -13764,42 +13764,42 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.ORMapDeltaGroup.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORMapDeltaGroup.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getUnderlyingFieldBuilder();
             getEntryDataFieldBuilder();
@@ -13828,19 +13828,19 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -13848,8 +13848,8 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -13888,44 +13888,44 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.getDefaultInstance()) return this;
           if (other.hasOperation()) {
             setOperation(other.getOperation());
           }
@@ -13954,7 +13954,7 @@ public final class ReplicatedDataMessages {
                 entryData_ = other.entryData_;
                 bitField0_ = (bitField0_ & ~0x00000008);
                 entryDataBuilder_ = 
-                  akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                      getEntryDataFieldBuilder() : null;
               } else {
                 entryDataBuilder_.addAllMessages(other.entryData_);
@@ -13990,14 +13990,14 @@ public final class ReplicatedDataMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -14010,27 +14010,27 @@ public final class ReplicatedDataMessages {
 
         private int operation_ = 0;
         /**
-         * required .akka.cluster.ddata.ORMapDeltaOp operation = 1;
+         * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
          * @return Whether the operation field is set.
          */
         public boolean hasOperation() {
           return ((bitField0_ & 0x00000001) != 0);
         }
         /**
-         * required .akka.cluster.ddata.ORMapDeltaOp operation = 1;
+         * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
          * @return The operation.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp getOperation() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp getOperation() {
           @SuppressWarnings("deprecation")
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp result = akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.valueOf(operation_);
-          return result == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.ORMapPut : result;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp result = org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.valueOf(operation_);
+          return result == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp.ORMapPut : result;
         }
         /**
-         * required .akka.cluster.ddata.ORMapDeltaOp operation = 1;
+         * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
          * @param value The operation to set.
          * @return This builder for chaining.
          */
-        public Builder setOperation(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp value) {
+        public Builder setOperation(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaOp value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -14040,7 +14040,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORMapDeltaOp operation = 1;
+         * required .org.apache.pekko.cluster.ddata.ORMapDeltaOp operation = 1;
          * @return This builder for chaining.
          */
         public Builder clearOperation() {
@@ -14050,31 +14050,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet underlying_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> underlyingBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet underlying_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> underlyingBuilder_;
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          * @return Whether the underlying field is set.
          */
         public boolean hasUnderlying() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          * @return The underlying.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getUnderlying() {
           if (underlyingBuilder_ == null) {
-            return underlying_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
+            return underlying_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
           } else {
             return underlyingBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        public Builder setUnderlying(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+        public Builder setUnderlying(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
           if (underlyingBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -14088,10 +14088,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
         public Builder setUnderlying(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
           if (underlyingBuilder_ == null) {
             underlying_ = builderForValue.build();
             onChanged();
@@ -14102,15 +14102,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        public Builder mergeUnderlying(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+        public Builder mergeUnderlying(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
           if (underlyingBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 underlying_ != null &&
-                underlying_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+                underlying_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
               underlying_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(underlying_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(underlying_).mergeFrom(value).buildPartial();
             } else {
               underlying_ = value;
             }
@@ -14122,7 +14122,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
         public Builder clearUnderlying() {
           if (underlyingBuilder_ == null) {
@@ -14135,33 +14135,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getUnderlyingBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getUnderlyingBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getUnderlyingFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getUnderlyingOrBuilder() {
           if (underlyingBuilder_ != null) {
             return underlyingBuilder_.getMessageOrBuilder();
           } else {
             return underlying_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : underlying_;
           }
         }
         /**
-         * required .akka.cluster.ddata.ORSet underlying = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet underlying = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
             getUnderlyingFieldBuilder() {
           if (underlyingBuilder_ == null) {
-            underlyingBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
+            underlyingBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
                     getUnderlying(),
                     getParentForChildren(),
                     isClean());
@@ -14207,22 +14207,22 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private java.util.List entryData_ =
+        private java.util.List entryData_ =
           java.util.Collections.emptyList();
         private void ensureEntryDataIsMutable() {
           if (!((bitField0_ & 0x00000008) != 0)) {
-            entryData_ = new java.util.ArrayList(entryData_);
+            entryData_ = new java.util.ArrayList(entryData_);
             bitField0_ |= 0x00000008;
            }
         }
 
-        private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder> entryDataBuilder_;
+        private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder> entryDataBuilder_;
 
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
-        public java.util.List getEntryDataList() {
+        public java.util.List getEntryDataList() {
           if (entryDataBuilder_ == null) {
             return java.util.Collections.unmodifiableList(entryData_);
           } else {
@@ -14230,7 +14230,7 @@ public final class ReplicatedDataMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
         public int getEntryDataCount() {
           if (entryDataBuilder_ == null) {
@@ -14240,9 +14240,9 @@ public final class ReplicatedDataMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getEntryData(int index) {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry getEntryData(int index) {
           if (entryDataBuilder_ == null) {
             return entryData_.get(index);
           } else {
@@ -14250,10 +14250,10 @@ public final class ReplicatedDataMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
         public Builder setEntryData(
-            int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry value) {
+            int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry value) {
           if (entryDataBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -14267,10 +14267,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
         public Builder setEntryData(
-            int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder builderForValue) {
+            int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder builderForValue) {
           if (entryDataBuilder_ == null) {
             ensureEntryDataIsMutable();
             entryData_.set(index, builderForValue.build());
@@ -14281,9 +14281,9 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
-        public Builder addEntryData(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry value) {
+        public Builder addEntryData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry value) {
           if (entryDataBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -14297,10 +14297,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
         public Builder addEntryData(
-            int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry value) {
+            int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry value) {
           if (entryDataBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -14314,10 +14314,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
         public Builder addEntryData(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder builderForValue) {
           if (entryDataBuilder_ == null) {
             ensureEntryDataIsMutable();
             entryData_.add(builderForValue.build());
@@ -14328,10 +14328,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
         public Builder addEntryData(
-            int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder builderForValue) {
+            int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder builderForValue) {
           if (entryDataBuilder_ == null) {
             ensureEntryDataIsMutable();
             entryData_.add(index, builderForValue.build());
@@ -14342,13 +14342,13 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
         public Builder addAllEntryData(
-            java.lang.Iterable values) {
+            java.lang.Iterable values) {
           if (entryDataBuilder_ == null) {
             ensureEntryDataIsMutable();
-            akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+            org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
                 values, entryData_);
             onChanged();
           } else {
@@ -14357,7 +14357,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
         public Builder clearEntryData() {
           if (entryDataBuilder_ == null) {
@@ -14370,7 +14370,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
         public Builder removeEntryData(int index) {
           if (entryDataBuilder_ == null) {
@@ -14383,16 +14383,16 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder getEntryDataBuilder(
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder getEntryDataBuilder(
             int index) {
           return getEntryDataFieldBuilder().getBuilder(index);
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder getEntryDataOrBuilder(
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder getEntryDataOrBuilder(
             int index) {
           if (entryDataBuilder_ == null) {
             return entryData_.get(index);  } else {
@@ -14400,9 +14400,9 @@ public final class ReplicatedDataMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
-        public java.util.List 
+        public java.util.List 
              getEntryDataOrBuilderList() {
           if (entryDataBuilder_ != null) {
             return entryDataBuilder_.getMessageOrBuilderList();
@@ -14411,33 +14411,33 @@ public final class ReplicatedDataMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder addEntryDataBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder addEntryDataBuilder() {
           return getEntryDataFieldBuilder().addBuilder(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.getDefaultInstance());
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.getDefaultInstance());
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder addEntryDataBuilder(
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder addEntryDataBuilder(
             int index) {
           return getEntryDataFieldBuilder().addBuilder(
-              index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.getDefaultInstance());
+              index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.getDefaultInstance());
         }
         /**
-         * repeated .akka.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
+         * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.MapEntry entryData = 4;
          */
-        public java.util.List 
+        public java.util.List 
              getEntryDataBuilderList() {
           return getEntryDataFieldBuilder().getBuilderList();
         }
-        private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder> 
             getEntryDataFieldBuilder() {
           if (entryDataBuilder_ == null) {
-            entryDataBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder>(
+            entryDataBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.MapEntryOrBuilder>(
                     entryData_,
                     ((bitField0_ & 0x00000008) != 0),
                     getParentForChildren(),
@@ -14448,88 +14448,88 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORMapDeltaGroup.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORMapDeltaGroup.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -14552,7 +14552,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
@@ -14567,7 +14567,7 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, entries_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -14580,10 +14580,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup) obj;
 
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
@@ -14607,73 +14607,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -14682,7 +14682,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -14693,42 +14693,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORMapDeltaGroup}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMapDeltaGroup}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORMapDeltaGroup)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroupOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORMapDeltaGroup)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroupOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getEntriesFieldBuilder();
         }
@@ -14746,19 +14746,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -14766,8 +14766,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup(this);
         int from_bitField0_ = bitField0_;
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -14788,44 +14788,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.getDefaultInstance()) return this;
         if (entriesBuilder_ == null) {
           if (!other.entries_.isEmpty()) {
             if (entries_.isEmpty()) {
@@ -14845,7 +14845,7 @@ public final class ReplicatedDataMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000001);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -14869,14 +14869,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -14887,22 +14887,22 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -14910,7 +14910,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -14920,9 +14920,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -14930,10 +14930,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14947,10 +14947,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -14961,9 +14961,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14977,10 +14977,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14994,10 +14994,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -15008,10 +15008,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -15022,13 +15022,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -15037,7 +15037,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -15050,7 +15050,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -15063,16 +15063,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -15080,9 +15080,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -15091,33 +15091,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.ORMapDeltaGroup.Entry entries = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -15128,110 +15128,110 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORMapDeltaGroup)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORMapDeltaGroup)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORMapDeltaGroup)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORMapDeltaGroup)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ORMapDeltaGroup parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ORMapDeltaGroup(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMapDeltaGroup getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface LWWMapOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.LWWMap)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.LWWMap)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
     boolean hasKeys();
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys();
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder();
 
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder getEntriesOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.LWWMap}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.LWWMap}
    */
   public  static final class LWWMap extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.LWWMap)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.LWWMap)
       LWWMapOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use LWWMap.newBuilder() to construct.
-    private LWWMap(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private LWWMap(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private LWWMap() {
@@ -15241,26 +15241,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new LWWMap();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private LWWMap(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -15270,11 +15270,11 @@ public final class ReplicatedDataMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = keys_.toBuilder();
               }
-              keys_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
+              keys_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(keys_);
                 keys_ = subBuilder.buildPartial();
@@ -15284,11 +15284,11 @@ public final class ReplicatedDataMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -15300,10 +15300,10 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -15313,22 +15313,22 @@ public final class ReplicatedDataMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.LWWMap.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.LWWMap.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * optional string stringKey = 1;
@@ -15344,23 +15344,23 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes();
 
       /**
-       * required .akka.cluster.ddata.LWWRegister value = 2;
+       * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
        * @return Whether the value field is set.
        */
       boolean hasValue();
       /**
-       * required .akka.cluster.ddata.LWWRegister value = 2;
+       * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
        * @return The value.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getValue();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getValue();
       /**
-       * required .akka.cluster.ddata.LWWRegister value = 2;
+       * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder getValueOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder getValueOrBuilder();
 
       /**
        * optional sint32 intKey = 3;
@@ -15385,30 +15385,30 @@ public final class ReplicatedDataMessages {
       long getLongKey();
 
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       boolean hasOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.LWWMap.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.LWWMap.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.LWWMap.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.LWWMap.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -15418,26 +15418,26 @@ public final class ReplicatedDataMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -15447,17 +15447,17 @@ public final class ReplicatedDataMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 stringKey_ = bs;
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = value_.toBuilder();
                 }
-                value_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.PARSER, extensionRegistry);
+                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(value_);
                   value_ = subBuilder.buildPartial();
@@ -15476,11 +15476,11 @@ public final class ReplicatedDataMessages {
                 break;
               }
               case 42: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000010) != 0)) {
                   subBuilder = otherKey_.toBuilder();
                 }
-                otherKey_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(otherKey_);
                   otherKey_ = subBuilder.buildPartial();
@@ -15497,27 +15497,27 @@ public final class ReplicatedDataMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -15539,8 +15539,8 @@ public final class ReplicatedDataMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             stringKey_ = s;
@@ -15552,41 +15552,41 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           stringKey_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister value_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister value_;
       /**
-       * required .akka.cluster.ddata.LWWRegister value = 2;
+       * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
        * @return Whether the value field is set.
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.LWWRegister value = 2;
+       * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
        * @return The value.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getValue() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getValue() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
       }
       /**
-       * required .akka.cluster.ddata.LWWRegister value = 2;
+       * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder getValueOrBuilder() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder getValueOrBuilder() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
@@ -15624,26 +15624,26 @@ public final class ReplicatedDataMessages {
       }
 
       public static final int OTHERKEY_FIELD_NUMBER = 5;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -15672,10 +15672,10 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getValue());
@@ -15699,22 +15699,22 @@ public final class ReplicatedDataMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getValue());
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt32Size(3, intKey_);
         }
         if (((bitField0_ & 0x00000008) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt64Size(4, longKey_);
         }
         if (((bitField0_ & 0x00000010) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
         size += unknownFields.getSerializedSize();
@@ -15727,10 +15727,10 @@ public final class ReplicatedDataMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry) obj;
 
         if (hasStringKey() != other.hasStringKey()) return false;
         if (hasStringKey()) {
@@ -15782,7 +15782,7 @@ public final class ReplicatedDataMessages {
         }
         if (hasLongKey()) {
           hash = (37 * hash) + LONGKEY_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getLongKey());
         }
         if (hasOtherKey()) {
@@ -15794,73 +15794,73 @@ public final class ReplicatedDataMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -15869,7 +15869,7 @@ public final class ReplicatedDataMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -15880,42 +15880,42 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.LWWMap.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.LWWMap.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.LWWMap.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.LWWMap.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getValueFieldBuilder();
             getOtherKeyFieldBuilder();
@@ -15946,19 +15946,19 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -15966,8 +15966,8 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -16009,44 +16009,44 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
             bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
@@ -16087,14 +16087,14 @@ public final class ReplicatedDataMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -16120,8 +16120,8 @@ public final class ReplicatedDataMessages {
         public java.lang.String getStringKey() {
           java.lang.Object ref = stringKey_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               stringKey_ = s;
@@ -16135,17 +16135,17 @@ public final class ReplicatedDataMessages {
          * optional string stringKey = 1;
          * @return The bytes for stringKey.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getStringKeyBytes() {
           java.lang.Object ref = stringKey_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             stringKey_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -16179,7 +16179,7 @@ public final class ReplicatedDataMessages {
          * @return This builder for chaining.
          */
         public Builder setStringKeyBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -16189,31 +16189,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister value_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder> valueBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister value_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder> valueBuilder_;
         /**
-         * required .akka.cluster.ddata.LWWRegister value = 2;
+         * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          * @return Whether the value field is set.
          */
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * required .akka.cluster.ddata.LWWRegister value = 2;
+         * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          * @return The value.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getValue() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister getValue() {
           if (valueBuilder_ == null) {
-            return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
+            return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
           } else {
             return valueBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.LWWRegister value = 2;
+         * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          */
-        public Builder setValue(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister value) {
+        public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister value) {
           if (valueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -16227,10 +16227,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.LWWRegister value = 2;
+         * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          */
         public Builder setValue(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
             onChanged();
@@ -16241,15 +16241,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.LWWRegister value = 2;
+         * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          */
-        public Builder mergeValue(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister value) {
+        public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 value_ != null &&
-                value_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance()) {
+                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance()) {
               value_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.newBuilder(value_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.newBuilder(value_).mergeFrom(value).buildPartial();
             } else {
               value_ = value;
             }
@@ -16261,7 +16261,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.LWWRegister value = 2;
+         * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          */
         public Builder clearValue() {
           if (valueBuilder_ == null) {
@@ -16274,33 +16274,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.LWWRegister value = 2;
+         * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder getValueBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder getValueBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getValueFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.LWWRegister value = 2;
+         * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder getValueOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder getValueOrBuilder() {
           if (valueBuilder_ != null) {
             return valueBuilder_.getMessageOrBuilder();
           } else {
             return value_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.getDefaultInstance() : value_;
           }
         }
         /**
-         * required .akka.cluster.ddata.LWWRegister value = 2;
+         * required .org.apache.pekko.cluster.ddata.LWWRegister value = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder> 
             getValueFieldBuilder() {
           if (valueBuilder_ == null) {
-            valueBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder>(
+            valueBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegister.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWRegisterOrBuilder>(
                     getValue(),
                     getParentForChildren(),
                     isClean());
@@ -16383,31 +16383,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return Whether the otherKey field is set.
          */
         public boolean hasOtherKey() {
           return ((bitField0_ & 0x00000010) != 0);
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return The otherKey.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
           if (otherKeyBuilder_ == null) {
-            return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+            return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           } else {
             return otherKeyBuilder_.getMessage();
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder setOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -16421,10 +16421,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder setOtherKey(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
             onChanged();
@@ -16435,15 +16435,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder mergeOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
                 otherKey_ != null &&
-                otherKey_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
               otherKey_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
             } else {
               otherKey_ = value;
             }
@@ -16455,7 +16455,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
           if (otherKeyBuilder_ == null) {
@@ -16468,33 +16468,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
           bitField0_ |= 0x00000010;
           onChanged();
           return getOtherKeyFieldBuilder().getBuilder();
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
           if (otherKeyBuilder_ != null) {
             return otherKeyBuilder_.getMessageOrBuilder();
           } else {
             return otherKey_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
             getOtherKeyFieldBuilder() {
           if (otherKeyBuilder_ == null) {
-            otherKeyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+            otherKeyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                     getOtherKey(),
                     getParentForChildren(),
                     isClean());
@@ -16504,52 +16504,52 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.LWWMap.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.LWWMap.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.LWWMap.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.LWWMap.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -16557,59 +16557,59 @@ public final class ReplicatedDataMessages {
 
     private int bitField0_;
     public static final int KEYS_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
     public boolean hasKeys() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
-      return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
+      return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
-      return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
+      return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -16640,7 +16640,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKeys());
@@ -16658,11 +16658,11 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKeys());
       }
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, entries_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -16675,10 +16675,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap) obj;
 
       if (hasKeys() != other.hasKeys()) return false;
       if (hasKeys()) {
@@ -16711,73 +16711,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -16786,7 +16786,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -16797,42 +16797,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.LWWMap}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.LWWMap}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.LWWMap)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMapOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.LWWMap)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMapOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeysFieldBuilder();
           getEntriesFieldBuilder();
@@ -16857,19 +16857,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_LWWMap_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -16877,8 +16877,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -16909,44 +16909,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.getDefaultInstance()) return this;
         if (other.hasKeys()) {
           mergeKeys(other.getKeys());
         }
@@ -16969,7 +16969,7 @@ public final class ReplicatedDataMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000002);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -16999,14 +16999,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -17017,31 +17017,31 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> keysBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> keysBuilder_;
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        * @return Whether the keys field is set.
        */
       public boolean hasKeys() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        * @return The keys.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
         if (keysBuilder_ == null) {
-          return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+          return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
         } else {
           return keysBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public Builder setKeys(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+      public Builder setKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17055,10 +17055,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder setKeys(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
         if (keysBuilder_ == null) {
           keys_ = builderForValue.build();
           onChanged();
@@ -17069,15 +17069,15 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public Builder mergeKeys(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+      public Builder mergeKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               keys_ != null &&
-              keys_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+              keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
             keys_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
           } else {
             keys_ = value;
           }
@@ -17089,7 +17089,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder clearKeys() {
         if (keysBuilder_ == null) {
@@ -17102,33 +17102,33 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getKeysBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getKeysBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeysFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
         if (keysBuilder_ != null) {
           return keysBuilder_.getMessageOrBuilder();
         } else {
           return keys_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
         }
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
           getKeysFieldBuilder() {
         if (keysBuilder_ == null) {
-          keysBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
+          keysBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
                   getKeys(),
                   getParentForChildren(),
                   isClean());
@@ -17137,22 +17137,22 @@ public final class ReplicatedDataMessages {
         return keysBuilder_;
       }
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -17160,7 +17160,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -17170,9 +17170,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -17180,10 +17180,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17197,10 +17197,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -17211,9 +17211,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17227,10 +17227,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17244,10 +17244,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -17258,10 +17258,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -17272,13 +17272,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -17287,7 +17287,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -17300,7 +17300,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -17313,16 +17313,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -17330,9 +17330,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -17341,33 +17341,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.LWWMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.LWWMap.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -17378,110 +17378,110 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.LWWMap)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.LWWMap)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.LWWMap)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.LWWMap)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public LWWMap parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new LWWMap(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.LWWMap getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface PNCounterMapOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.PNCounterMap)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.PNCounterMap)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
     boolean hasKeys();
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys();
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder();
 
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder getEntriesOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.PNCounterMap}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounterMap}
    */
   public  static final class PNCounterMap extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.PNCounterMap)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.PNCounterMap)
       PNCounterMapOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use PNCounterMap.newBuilder() to construct.
-    private PNCounterMap(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private PNCounterMap(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private PNCounterMap() {
@@ -17491,26 +17491,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new PNCounterMap();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private PNCounterMap(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -17520,11 +17520,11 @@ public final class ReplicatedDataMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = keys_.toBuilder();
               }
-              keys_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
+              keys_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(keys_);
                 keys_ = subBuilder.buildPartial();
@@ -17534,11 +17534,11 @@ public final class ReplicatedDataMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -17550,10 +17550,10 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -17563,22 +17563,22 @@ public final class ReplicatedDataMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.PNCounterMap.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.PNCounterMap.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * optional string stringKey = 1;
@@ -17594,23 +17594,23 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes();
 
       /**
-       * required .akka.cluster.ddata.PNCounter value = 2;
+       * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
        * @return Whether the value field is set.
        */
       boolean hasValue();
       /**
-       * required .akka.cluster.ddata.PNCounter value = 2;
+       * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
        * @return The value.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getValue();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getValue();
       /**
-       * required .akka.cluster.ddata.PNCounter value = 2;
+       * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder getValueOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder getValueOrBuilder();
 
       /**
        * optional sint32 intKey = 3;
@@ -17635,30 +17635,30 @@ public final class ReplicatedDataMessages {
       long getLongKey();
 
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       boolean hasOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.PNCounterMap.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounterMap.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.PNCounterMap.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.PNCounterMap.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -17668,26 +17668,26 @@ public final class ReplicatedDataMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -17697,17 +17697,17 @@ public final class ReplicatedDataMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 stringKey_ = bs;
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = value_.toBuilder();
                 }
-                value_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.PARSER, extensionRegistry);
+                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(value_);
                   value_ = subBuilder.buildPartial();
@@ -17726,11 +17726,11 @@ public final class ReplicatedDataMessages {
                 break;
               }
               case 42: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000010) != 0)) {
                   subBuilder = otherKey_.toBuilder();
                 }
-                otherKey_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(otherKey_);
                   otherKey_ = subBuilder.buildPartial();
@@ -17747,27 +17747,27 @@ public final class ReplicatedDataMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -17789,8 +17789,8 @@ public final class ReplicatedDataMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             stringKey_ = s;
@@ -17802,41 +17802,41 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           stringKey_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter value_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter value_;
       /**
-       * required .akka.cluster.ddata.PNCounter value = 2;
+       * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
        * @return Whether the value field is set.
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.PNCounter value = 2;
+       * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
        * @return The value.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getValue() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getValue() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
       }
       /**
-       * required .akka.cluster.ddata.PNCounter value = 2;
+       * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder getValueOrBuilder() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder getValueOrBuilder() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
@@ -17874,26 +17874,26 @@ public final class ReplicatedDataMessages {
       }
 
       public static final int OTHERKEY_FIELD_NUMBER = 5;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -17922,10 +17922,10 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getValue());
@@ -17949,22 +17949,22 @@ public final class ReplicatedDataMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getValue());
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt32Size(3, intKey_);
         }
         if (((bitField0_ & 0x00000008) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt64Size(4, longKey_);
         }
         if (((bitField0_ & 0x00000010) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
         size += unknownFields.getSerializedSize();
@@ -17977,10 +17977,10 @@ public final class ReplicatedDataMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry) obj;
 
         if (hasStringKey() != other.hasStringKey()) return false;
         if (hasStringKey()) {
@@ -18032,7 +18032,7 @@ public final class ReplicatedDataMessages {
         }
         if (hasLongKey()) {
           hash = (37 * hash) + LONGKEY_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getLongKey());
         }
         if (hasOtherKey()) {
@@ -18044,73 +18044,73 @@ public final class ReplicatedDataMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -18119,7 +18119,7 @@ public final class ReplicatedDataMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -18130,42 +18130,42 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.PNCounterMap.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounterMap.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.PNCounterMap.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.PNCounterMap.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getValueFieldBuilder();
             getOtherKeyFieldBuilder();
@@ -18196,19 +18196,19 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -18216,8 +18216,8 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -18259,44 +18259,44 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
             bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
@@ -18337,14 +18337,14 @@ public final class ReplicatedDataMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -18370,8 +18370,8 @@ public final class ReplicatedDataMessages {
         public java.lang.String getStringKey() {
           java.lang.Object ref = stringKey_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               stringKey_ = s;
@@ -18385,17 +18385,17 @@ public final class ReplicatedDataMessages {
          * optional string stringKey = 1;
          * @return The bytes for stringKey.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getStringKeyBytes() {
           java.lang.Object ref = stringKey_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             stringKey_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -18429,7 +18429,7 @@ public final class ReplicatedDataMessages {
          * @return This builder for chaining.
          */
         public Builder setStringKeyBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -18439,31 +18439,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter value_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder> valueBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter value_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder> valueBuilder_;
         /**
-         * required .akka.cluster.ddata.PNCounter value = 2;
+         * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          * @return Whether the value field is set.
          */
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * required .akka.cluster.ddata.PNCounter value = 2;
+         * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          * @return The value.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getValue() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter getValue() {
           if (valueBuilder_ == null) {
-            return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
+            return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
           } else {
             return valueBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.PNCounter value = 2;
+         * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          */
-        public Builder setValue(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter value) {
+        public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter value) {
           if (valueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -18477,10 +18477,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.PNCounter value = 2;
+         * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          */
         public Builder setValue(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
             onChanged();
@@ -18491,15 +18491,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.PNCounter value = 2;
+         * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          */
-        public Builder mergeValue(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter value) {
+        public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 value_ != null &&
-                value_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance()) {
+                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance()) {
               value_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.newBuilder(value_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.newBuilder(value_).mergeFrom(value).buildPartial();
             } else {
               value_ = value;
             }
@@ -18511,7 +18511,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.PNCounter value = 2;
+         * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          */
         public Builder clearValue() {
           if (valueBuilder_ == null) {
@@ -18524,33 +18524,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.PNCounter value = 2;
+         * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder getValueBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder getValueBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getValueFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.PNCounter value = 2;
+         * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder getValueOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder getValueOrBuilder() {
           if (valueBuilder_ != null) {
             return valueBuilder_.getMessageOrBuilder();
           } else {
             return value_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.getDefaultInstance() : value_;
           }
         }
         /**
-         * required .akka.cluster.ddata.PNCounter value = 2;
+         * required .org.apache.pekko.cluster.ddata.PNCounter value = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder> 
             getValueFieldBuilder() {
           if (valueBuilder_ == null) {
-            valueBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder>(
+            valueBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounter.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterOrBuilder>(
                     getValue(),
                     getParentForChildren(),
                     isClean());
@@ -18633,31 +18633,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return Whether the otherKey field is set.
          */
         public boolean hasOtherKey() {
           return ((bitField0_ & 0x00000010) != 0);
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return The otherKey.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
           if (otherKeyBuilder_ == null) {
-            return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+            return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           } else {
             return otherKeyBuilder_.getMessage();
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder setOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -18671,10 +18671,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder setOtherKey(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
             onChanged();
@@ -18685,15 +18685,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder mergeOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
                 otherKey_ != null &&
-                otherKey_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
               otherKey_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
             } else {
               otherKey_ = value;
             }
@@ -18705,7 +18705,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
           if (otherKeyBuilder_ == null) {
@@ -18718,33 +18718,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
           bitField0_ |= 0x00000010;
           onChanged();
           return getOtherKeyFieldBuilder().getBuilder();
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
           if (otherKeyBuilder_ != null) {
             return otherKeyBuilder_.getMessageOrBuilder();
           } else {
             return otherKey_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
             getOtherKeyFieldBuilder() {
           if (otherKeyBuilder_ == null) {
-            otherKeyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+            otherKeyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                     getOtherKey(),
                     getParentForChildren(),
                     isClean());
@@ -18754,52 +18754,52 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.PNCounterMap.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.PNCounterMap.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.PNCounterMap.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.PNCounterMap.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -18807,59 +18807,59 @@ public final class ReplicatedDataMessages {
 
     private int bitField0_;
     public static final int KEYS_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
     public boolean hasKeys() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
-      return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
+      return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
-      return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
+      return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -18890,7 +18890,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKeys());
@@ -18908,11 +18908,11 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKeys());
       }
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, entries_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -18925,10 +18925,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap) obj;
 
       if (hasKeys() != other.hasKeys()) return false;
       if (hasKeys()) {
@@ -18961,73 +18961,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -19036,7 +19036,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -19047,42 +19047,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.PNCounterMap}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.PNCounterMap}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.PNCounterMap)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMapOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.PNCounterMap)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMapOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeysFieldBuilder();
           getEntriesFieldBuilder();
@@ -19107,19 +19107,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_PNCounterMap_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -19127,8 +19127,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -19159,44 +19159,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.getDefaultInstance()) return this;
         if (other.hasKeys()) {
           mergeKeys(other.getKeys());
         }
@@ -19219,7 +19219,7 @@ public final class ReplicatedDataMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000002);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -19249,14 +19249,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -19267,31 +19267,31 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> keysBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> keysBuilder_;
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        * @return Whether the keys field is set.
        */
       public boolean hasKeys() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        * @return The keys.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
         if (keysBuilder_ == null) {
-          return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+          return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
         } else {
           return keysBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public Builder setKeys(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+      public Builder setKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19305,10 +19305,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder setKeys(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
         if (keysBuilder_ == null) {
           keys_ = builderForValue.build();
           onChanged();
@@ -19319,15 +19319,15 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public Builder mergeKeys(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+      public Builder mergeKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               keys_ != null &&
-              keys_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+              keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
             keys_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
           } else {
             keys_ = value;
           }
@@ -19339,7 +19339,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder clearKeys() {
         if (keysBuilder_ == null) {
@@ -19352,33 +19352,33 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getKeysBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getKeysBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeysFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
         if (keysBuilder_ != null) {
           return keysBuilder_.getMessageOrBuilder();
         } else {
           return keys_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
         }
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
           getKeysFieldBuilder() {
         if (keysBuilder_ == null) {
-          keysBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
+          keysBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
                   getKeys(),
                   getParentForChildren(),
                   isClean());
@@ -19387,22 +19387,22 @@ public final class ReplicatedDataMessages {
         return keysBuilder_;
       }
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -19410,7 +19410,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -19420,9 +19420,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -19430,10 +19430,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19447,10 +19447,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -19461,9 +19461,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19477,10 +19477,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19494,10 +19494,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -19508,10 +19508,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -19522,13 +19522,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -19537,7 +19537,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -19550,7 +19550,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -19563,16 +19563,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -19580,9 +19580,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -19591,33 +19591,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.PNCounterMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.PNCounterMap.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -19628,98 +19628,98 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.PNCounterMap)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.PNCounterMap)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.PNCounterMap)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.PNCounterMap)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public PNCounterMap parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new PNCounterMap(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.PNCounterMap getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ORMultiMapOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORMultiMap)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORMultiMap)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
     boolean hasKeys();
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys();
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder();
 
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder getEntriesOrBuilder(
         int index);
 
     /**
@@ -19734,15 +19734,15 @@ public final class ReplicatedDataMessages {
     boolean getWithValueDeltas();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.ORMultiMap}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMultiMap}
    */
   public  static final class ORMultiMap extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORMultiMap)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMultiMap)
       ORMultiMapOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ORMultiMap.newBuilder() to construct.
-    private ORMultiMap(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ORMultiMap(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ORMultiMap() {
@@ -19752,26 +19752,26 @@ public final class ReplicatedDataMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ORMultiMap();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ORMultiMap(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -19781,11 +19781,11 @@ public final class ReplicatedDataMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = keys_.toBuilder();
               }
-              keys_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
+              keys_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(keys_);
                 keys_ = subBuilder.buildPartial();
@@ -19795,11 +19795,11 @@ public final class ReplicatedDataMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.PARSER, extensionRegistry));
               break;
             }
             case 24: {
@@ -19816,10 +19816,10 @@ public final class ReplicatedDataMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -19829,22 +19829,22 @@ public final class ReplicatedDataMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ORMultiMap.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ORMultiMap.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * optional string stringKey = 1;
@@ -19860,23 +19860,23 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes();
 
       /**
-       * required .akka.cluster.ddata.ORSet value = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
        * @return Whether the value field is set.
        */
       boolean hasValue();
       /**
-       * required .akka.cluster.ddata.ORSet value = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
        * @return The value.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getValue();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getValue();
       /**
-       * required .akka.cluster.ddata.ORSet value = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getValueOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getValueOrBuilder();
 
       /**
        * optional sint32 intKey = 3;
@@ -19901,30 +19901,30 @@ public final class ReplicatedDataMessages {
       long getLongKey();
 
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       boolean hasOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey();
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORMultiMap.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMultiMap.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ORMultiMap.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ORMultiMap.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -19934,26 +19934,26 @@ public final class ReplicatedDataMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -19963,17 +19963,17 @@ public final class ReplicatedDataMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 stringKey_ = bs;
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = value_.toBuilder();
                 }
-                value_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
+                value_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(value_);
                   value_ = subBuilder.buildPartial();
@@ -19992,11 +19992,11 @@ public final class ReplicatedDataMessages {
                 break;
               }
               case 42: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000010) != 0)) {
                   subBuilder = otherKey_.toBuilder();
                 }
-                otherKey_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+                otherKey_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(otherKey_);
                   otherKey_ = subBuilder.buildPartial();
@@ -20013,27 +20013,27 @@ public final class ReplicatedDataMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -20055,8 +20055,8 @@ public final class ReplicatedDataMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             stringKey_ = s;
@@ -20068,41 +20068,41 @@ public final class ReplicatedDataMessages {
        * optional string stringKey = 1;
        * @return The bytes for stringKey.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getStringKeyBytes() {
         java.lang.Object ref = stringKey_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           stringKey_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value_;
       /**
-       * required .akka.cluster.ddata.ORSet value = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
        * @return Whether the value field is set.
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.ORSet value = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
        * @return The value.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getValue() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getValue() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
       }
       /**
-       * required .akka.cluster.ddata.ORSet value = 2;
+       * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getValueOrBuilder() {
-        return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getValueOrBuilder() {
+        return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
       }
 
       public static final int INTKEY_FIELD_NUMBER = 3;
@@ -20140,26 +20140,26 @@ public final class ReplicatedDataMessages {
       }
 
       public static final int OTHERKEY_FIELD_NUMBER = 5;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return Whether the otherKey field is set.
        */
       public boolean hasOtherKey() {
         return ((bitField0_ & 0x00000010) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        * @return The otherKey.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
-        return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -20188,10 +20188,10 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getValue());
@@ -20215,22 +20215,22 @@ public final class ReplicatedDataMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stringKey_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getValue());
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt32Size(3, intKey_);
         }
         if (((bitField0_ & 0x00000008) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt64Size(4, longKey_);
         }
         if (((bitField0_ & 0x00000010) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(5, getOtherKey());
         }
         size += unknownFields.getSerializedSize();
@@ -20243,10 +20243,10 @@ public final class ReplicatedDataMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry) obj;
 
         if (hasStringKey() != other.hasStringKey()) return false;
         if (hasStringKey()) {
@@ -20298,7 +20298,7 @@ public final class ReplicatedDataMessages {
         }
         if (hasLongKey()) {
           hash = (37 * hash) + LONGKEY_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getLongKey());
         }
         if (hasOtherKey()) {
@@ -20310,73 +20310,73 @@ public final class ReplicatedDataMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -20385,7 +20385,7 @@ public final class ReplicatedDataMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -20396,42 +20396,42 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.ORMultiMap.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMultiMap.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORMultiMap.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORMultiMap.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getValueFieldBuilder();
             getOtherKeyFieldBuilder();
@@ -20462,19 +20462,19 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -20482,8 +20482,8 @@ public final class ReplicatedDataMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -20525,44 +20525,44 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.getDefaultInstance()) return this;
           if (other.hasStringKey()) {
             bitField0_ |= 0x00000001;
             stringKey_ = other.stringKey_;
@@ -20603,14 +20603,14 @@ public final class ReplicatedDataMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -20636,8 +20636,8 @@ public final class ReplicatedDataMessages {
         public java.lang.String getStringKey() {
           java.lang.Object ref = stringKey_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               stringKey_ = s;
@@ -20651,17 +20651,17 @@ public final class ReplicatedDataMessages {
          * optional string stringKey = 1;
          * @return The bytes for stringKey.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getStringKeyBytes() {
           java.lang.Object ref = stringKey_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             stringKey_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -20695,7 +20695,7 @@ public final class ReplicatedDataMessages {
          * @return This builder for chaining.
          */
         public Builder setStringKeyBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -20705,31 +20705,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> valueBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> valueBuilder_;
         /**
-         * required .akka.cluster.ddata.ORSet value = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          * @return Whether the value field is set.
          */
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * required .akka.cluster.ddata.ORSet value = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          * @return The value.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getValue() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getValue() {
           if (valueBuilder_ == null) {
-            return value_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
+            return value_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
           } else {
             return valueBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.ORSet value = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          */
-        public Builder setValue(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+        public Builder setValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
           if (valueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -20743,10 +20743,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet value = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          */
         public Builder setValue(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
             onChanged();
@@ -20757,15 +20757,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet value = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          */
-        public Builder mergeValue(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+        public Builder mergeValue(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 value_ != null &&
-                value_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+                value_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
               value_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(value_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(value_).mergeFrom(value).buildPartial();
             } else {
               value_ = value;
             }
@@ -20777,7 +20777,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet value = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          */
         public Builder clearValue() {
           if (valueBuilder_ == null) {
@@ -20790,33 +20790,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.ORSet value = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getValueBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getValueBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getValueFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.ORSet value = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getValueOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getValueOrBuilder() {
           if (valueBuilder_ != null) {
             return valueBuilder_.getMessageOrBuilder();
           } else {
             return value_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : value_;
           }
         }
         /**
-         * required .akka.cluster.ddata.ORSet value = 2;
+         * required .org.apache.pekko.cluster.ddata.ORSet value = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
             getValueFieldBuilder() {
           if (valueBuilder_ == null) {
-            valueBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
+            valueBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
                     getValue(),
                     getParentForChildren(),
                     isClean());
@@ -20899,31 +20899,31 @@ public final class ReplicatedDataMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage otherKey_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> otherKeyBuilder_;
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return Whether the otherKey field is set.
          */
         public boolean hasOtherKey() {
           return ((bitField0_ & 0x00000010) != 0);
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          * @return The otherKey.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getOtherKey() {
           if (otherKeyBuilder_ == null) {
-            return otherKey_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+            return otherKey_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           } else {
             return otherKeyBuilder_.getMessage();
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder setOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder setOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -20937,10 +20937,10 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder setOtherKey(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
           if (otherKeyBuilder_ == null) {
             otherKey_ = builderForValue.build();
             onChanged();
@@ -20951,15 +20951,15 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public Builder mergeOtherKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+        public Builder mergeOtherKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
           if (otherKeyBuilder_ == null) {
             if (((bitField0_ & 0x00000010) != 0) &&
                 otherKey_ != null &&
-                otherKey_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+                otherKey_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
               otherKey_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(otherKey_).mergeFrom(value).buildPartial();
             } else {
               otherKey_ = value;
             }
@@ -20971,7 +20971,7 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
         public Builder clearOtherKey() {
           if (otherKeyBuilder_ == null) {
@@ -20984,33 +20984,33 @@ public final class ReplicatedDataMessages {
           return this;
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getOtherKeyBuilder() {
           bitField0_ |= 0x00000010;
           onChanged();
           return getOtherKeyFieldBuilder().getBuilder();
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getOtherKeyOrBuilder() {
           if (otherKeyBuilder_ != null) {
             return otherKeyBuilder_.getMessageOrBuilder();
           } else {
             return otherKey_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : otherKey_;
           }
         }
         /**
-         * optional .akka.cluster.ddata.OtherMessage otherKey = 5;
+         * optional .org.apache.pekko.cluster.ddata.OtherMessage otherKey = 5;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
             getOtherKeyFieldBuilder() {
           if (otherKeyBuilder_ == null) {
-            otherKeyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+            otherKeyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                     getOtherKey(),
                     getParentForChildren(),
                     isClean());
@@ -21020,52 +21020,52 @@ public final class ReplicatedDataMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORMultiMap.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORMultiMap.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORMultiMap.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORMultiMap.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -21073,59 +21073,59 @@ public final class ReplicatedDataMessages {
 
     private int bitField0_;
     public static final int KEYS_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return Whether the keys field is set.
      */
     public boolean hasKeys() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      * @return The keys.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
-      return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
+      return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
     /**
-     * required .akka.cluster.ddata.ORSet keys = 1;
+     * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
-      return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
+      return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -21173,7 +21173,7 @@ public final class ReplicatedDataMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKeys());
@@ -21194,15 +21194,15 @@ public final class ReplicatedDataMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKeys());
       }
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, entries_.get(i));
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, withValueDeltas_);
       }
       size += unknownFields.getSerializedSize();
@@ -21215,10 +21215,10 @@ public final class ReplicatedDataMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap other = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap) obj;
 
       if (hasKeys() != other.hasKeys()) return false;
       if (hasKeys()) {
@@ -21253,7 +21253,7 @@ public final class ReplicatedDataMessages {
       }
       if (hasWithValueDeltas()) {
         hash = (37 * hash) + WITHVALUEDELTAS_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getWithValueDeltas());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -21261,73 +21261,73 @@ public final class ReplicatedDataMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -21336,7 +21336,7 @@ public final class ReplicatedDataMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -21347,42 +21347,42 @@ public final class ReplicatedDataMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ORMultiMap}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ORMultiMap}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ORMultiMap)
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMapOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ORMultiMap)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMapOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.class, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeysFieldBuilder();
           getEntriesFieldBuilder();
@@ -21409,19 +21409,19 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.internal_static_akka_cluster_ddata_ORMultiMap_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -21429,8 +21429,8 @@ public final class ReplicatedDataMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap result = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -21465,44 +21465,44 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.getDefaultInstance()) return this;
         if (other.hasKeys()) {
           mergeKeys(other.getKeys());
         }
@@ -21525,7 +21525,7 @@ public final class ReplicatedDataMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000002);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -21558,14 +21558,14 @@ public final class ReplicatedDataMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -21576,31 +21576,31 @@ public final class ReplicatedDataMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> keysBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet keys_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> keysBuilder_;
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        * @return Whether the keys field is set.
        */
       public boolean hasKeys() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        * @return The keys.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet getKeys() {
         if (keysBuilder_ == null) {
-          return keys_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+          return keys_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
         } else {
           return keysBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public Builder setKeys(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+      public Builder setKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21614,10 +21614,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder setKeys(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder builderForValue) {
         if (keysBuilder_ == null) {
           keys_ = builderForValue.build();
           onChanged();
@@ -21628,15 +21628,15 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public Builder mergeKeys(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
+      public Builder mergeKeys(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet value) {
         if (keysBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               keys_ != null &&
-              keys_ != akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
+              keys_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance()) {
             keys_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.newBuilder(keys_).mergeFrom(value).buildPartial();
           } else {
             keys_ = value;
           }
@@ -21648,7 +21648,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
       public Builder clearKeys() {
         if (keysBuilder_ == null) {
@@ -21661,33 +21661,33 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getKeysBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder getKeysBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeysFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder getKeysOrBuilder() {
         if (keysBuilder_ != null) {
           return keysBuilder_.getMessageOrBuilder();
         } else {
           return keys_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.getDefaultInstance() : keys_;
         }
       }
       /**
-       * required .akka.cluster.ddata.ORSet keys = 1;
+       * required .org.apache.pekko.cluster.ddata.ORSet keys = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder> 
           getKeysFieldBuilder() {
         if (keysBuilder_ == null) {
-          keysBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
+          keysBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSet.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORSetOrBuilder>(
                   getKeys(),
                   getParentForChildren(),
                   isClean());
@@ -21696,22 +21696,22 @@ public final class ReplicatedDataMessages {
         return keysBuilder_;
       }
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -21719,7 +21719,7 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -21729,9 +21729,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -21739,10 +21739,10 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21756,10 +21756,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -21770,9 +21770,9 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21786,10 +21786,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21803,10 +21803,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -21817,10 +21817,10 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -21831,13 +21831,13 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -21846,7 +21846,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -21859,7 +21859,7 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -21872,16 +21872,16 @@ public final class ReplicatedDataMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -21889,9 +21889,9 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -21900,33 +21900,33 @@ public final class ReplicatedDataMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.ORMultiMap.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.ORMultiMap.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -21974,364 +21974,364 @@ public final class ReplicatedDataMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ORMultiMap)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ORMultiMap)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ORMultiMap)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ORMultiMap)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ORMultiMap parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ORMultiMap(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatedDataMessages.ORMultiMap getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor 
     internal_static_akka_cluster_ddata_GSet_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_GSet_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORSet_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORSet_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORSetDeltaGroup_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Flag_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Flag_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_LWWRegister_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_LWWRegister_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_GCounter_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_GCounter_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_GCounter_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_GCounter_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_PNCounter_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_PNCounter_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORMap_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORMap_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORMap_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORMap_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORMapDeltaGroup_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_LWWMap_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_LWWMap_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_LWWMap_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_LWWMap_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_PNCounterMap_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_PNCounterMap_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_PNCounterMap_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_PNCounterMap_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORMultiMap_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORMultiMap_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ORMultiMap_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ORMultiMap_Entry_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034ReplicatedDataMessages.proto\022\022akka.clu" +
+      "\n\034ReplicatedDataMessages.proto\022\022org.apache.pekko.clu" +
       "ster.ddata\032\030ReplicatorMessages.proto\"\244\001\n" +
       "\004GSet\022\026\n\016stringElements\030\001 \003(\t\022\027\n\013intElem" +
       "ents\030\002 \003(\021B\002\020\001\022\030\n\014longElements\030\003 \003(\022B\002\020\001" +
-      "\0227\n\rotherElements\030\004 \003(\0132 .akka.cluster.d" +
+      "\0227\n\rotherElements\030\004 \003(\0132 .org.apache.pekko.cluster.d" +
       "data.OtherMessage\022\030\n\020actorRefElements\030\005 " +
-      "\003(\t\"\212\002\n\005ORSet\0222\n\007vvector\030\001 \002(\0132!.akka.cl" +
+      "\003(\t\"\212\002\n\005ORSet\0222\n\007vvector\030\001 \002(\0132!.org.apache.pekko.cl" +
       "uster.ddata.VersionVector\022/\n\004dots\030\002 \003(\0132" +
-      "!.akka.cluster.ddata.VersionVector\022\026\n\016st" +
+      "!.org.apache.pekko.cluster.ddata.VersionVector\022\026\n\016st" +
       "ringElements\030\003 \003(\t\022\027\n\013intElements\030\004 \003(\021B" +
       "\002\020\001\022\030\n\014longElements\030\005 \003(\022B\002\020\001\0227\n\rotherEl" +
-      "ements\030\006 \003(\0132 .akka.cluster.ddata.OtherM" +
+      "ements\030\006 \003(\0132 .org.apache.pekko.cluster.ddata.OtherM" +
       "essage\022\030\n\020actorRefElements\030\007 \003(\t\"\272\001\n\017ORS" +
-      "etDeltaGroup\022:\n\007entries\030\001 \003(\0132).akka.clu" +
+      "etDeltaGroup\022:\n\007entries\030\001 \003(\0132).org.apache.pekko.clu" +
       "ster.ddata.ORSetDeltaGroup.Entry\032k\n\005Entr" +
-      "y\0223\n\toperation\030\001 \002(\0162 .akka.cluster.ddat" +
+      "y\0223\n\toperation\030\001 \002(\0162 .org.apache.pekko.cluster.ddat" +
       "a.ORSetDeltaOp\022-\n\nunderlying\030\002 \002(\0132\031.akk" +
       "a.cluster.ddata.ORSet\"\027\n\004Flag\022\017\n\007enabled" +
       "\030\001 \002(\010\"\202\001\n\013LWWRegister\022\021\n\ttimestamp\030\001 \002(" +
-      "\022\022/\n\004node\030\002 \002(\0132!.akka.cluster.ddata.Uni" +
-      "queAddress\022/\n\005state\030\003 \002(\0132 .akka.cluster" +
+      "\022\022/\n\004node\030\002 \002(\0132!.org.apache.pekko.cluster.ddata.Uni" +
+      "queAddress\022/\n\005state\030\003 \002(\0132 .org.apache.pekko.cluster" +
       ".ddata.OtherMessage\"\210\001\n\010GCounter\0223\n\007entr" +
-      "ies\030\001 \003(\0132\".akka.cluster.ddata.GCounter." +
-      "Entry\032G\n\005Entry\022/\n\004node\030\001 \002(\0132!.akka.clus" +
+      "ies\030\001 \003(\0132\".org.apache.pekko.cluster.ddata.GCounter." +
+      "Entry\032G\n\005Entry\022/\n\004node\030\001 \002(\0132!.org.apache.pekko.clus" +
       "ter.ddata.UniqueAddress\022\r\n\005value\030\002 \002(\014\"o" +
-      "\n\tPNCounter\0220\n\nincrements\030\001 \002(\0132\034.akka.c" +
+      "\n\tPNCounter\0220\n\nincrements\030\001 \002(\0132\034.org.apache.pekko.c" +
       "luster.ddata.GCounter\0220\n\ndecrements\030\002 \002(" +
-      "\0132\034.akka.cluster.ddata.GCounter\"\205\002\n\005ORMa" +
-      "p\022\'\n\004keys\030\001 \002(\0132\031.akka.cluster.ddata.ORS" +
-      "et\0220\n\007entries\030\002 \003(\0132\037.akka.cluster.ddata" +
+      "\0132\034.org.apache.pekko.cluster.ddata.GCounter\"\205\002\n\005ORMa" +
+      "p\022\'\n\004keys\030\001 \002(\0132\031.org.apache.pekko.cluster.ddata.ORS" +
+      "et\0220\n\007entries\030\002 \003(\0132\037.org.apache.pekko.cluster.ddata" +
       ".ORMap.Entry\032\240\001\n\005Entry\022\021\n\tstringKey\030\001 \001(" +
-      "\t\022/\n\005value\030\002 \002(\0132 .akka.cluster.ddata.Ot" +
+      "\t\022/\n\005value\030\002 \002(\0132 .org.apache.pekko.cluster.ddata.Ot" +
       "herMessage\022\016\n\006intKey\030\003 \001(\021\022\017\n\007longKey\030\004 " +
-      "\001(\022\0222\n\010otherKey\030\005 \001(\0132 .akka.cluster.dda" +
+      "\001(\022\0222\n\010otherKey\030\005 \001(\0132 .org.apache.pekko.cluster.dda" +
       "ta.OtherMessage\"\263\003\n\017ORMapDeltaGroup\022:\n\007e" +
-      "ntries\030\001 \003(\0132).akka.cluster.ddata.ORMapD" +
+      "ntries\030\001 \003(\0132).org.apache.pekko.cluster.ddata.ORMapD" +
       "eltaGroup.Entry\032\243\001\n\010MapEntry\022\021\n\tstringKe" +
-      "y\030\001 \001(\t\022/\n\005value\030\002 \001(\0132 .akka.cluster.dd" +
+      "y\030\001 \001(\t\022/\n\005value\030\002 \001(\0132 .org.apache.pekko.cluster.dd" +
       "ata.OtherMessage\022\016\n\006intKey\030\003 \001(\021\022\017\n\007long" +
-      "Key\030\004 \001(\022\0222\n\010otherKey\030\005 \001(\0132 .akka.clust" +
+      "Key\030\004 \001(\022\0222\n\010otherKey\030\005 \001(\0132 .org.apache.pekko.clust" +
       "er.ddata.OtherMessage\032\275\001\n\005Entry\0223\n\topera" +
-      "tion\030\001 \002(\0162 .akka.cluster.ddata.ORMapDel" +
-      "taOp\022-\n\nunderlying\030\002 \002(\0132\031.akka.cluster." +
+      "tion\030\001 \002(\0162 .org.apache.pekko.cluster.ddata.ORMapDel" +
+      "taOp\022-\n\nunderlying\030\002 \002(\0132\031.org.apache.pekko.cluster." +
       "ddata.ORSet\022\017\n\007zeroTag\030\003 \002(\021\022?\n\tentryDat" +
-      "a\030\004 \003(\0132,.akka.cluster.ddata.ORMapDeltaG" +
+      "a\030\004 \003(\0132,.org.apache.pekko.cluster.ddata.ORMapDeltaG" +
       "roup.MapEntry\"\206\002\n\006LWWMap\022\'\n\004keys\030\001 \002(\0132\031" +
-      ".akka.cluster.ddata.ORSet\0221\n\007entries\030\002 \003" +
-      "(\0132 .akka.cluster.ddata.LWWMap.Entry\032\237\001\n" +
+      ".org.apache.pekko.cluster.ddata.ORSet\0221\n\007entries\030\002 \003" +
+      "(\0132 .org.apache.pekko.cluster.ddata.LWWMap.Entry\032\237\001\n" +
       "\005Entry\022\021\n\tstringKey\030\001 \001(\t\022.\n\005value\030\002 \002(\013" +
-      "2\037.akka.cluster.ddata.LWWRegister\022\016\n\006int" +
+      "2\037.org.apache.pekko.cluster.ddata.LWWRegister\022\016\n\006int" +
       "Key\030\003 \001(\021\022\017\n\007longKey\030\004 \001(\022\0222\n\010otherKey\030\005" +
-      " \001(\0132 .akka.cluster.ddata.OtherMessage\"\220" +
-      "\002\n\014PNCounterMap\022\'\n\004keys\030\001 \002(\0132\031.akka.clu" +
-      "ster.ddata.ORSet\0227\n\007entries\030\002 \003(\0132&.akka" +
+      " \001(\0132 .org.apache.pekko.cluster.ddata.OtherMessage\"\220" +
+      "\002\n\014PNCounterMap\022\'\n\004keys\030\001 \002(\0132\031.org.apache.pekko.clu" +
+      "ster.ddata.ORSet\0227\n\007entries\030\002 \003(\0132&.org.apache.pekko" +
       ".cluster.ddata.PNCounterMap.Entry\032\235\001\n\005En" +
       "try\022\021\n\tstringKey\030\001 \001(\t\022,\n\005value\030\002 \002(\0132\035." +
-      "akka.cluster.ddata.PNCounter\022\016\n\006intKey\030\003" +
+      "org.apache.pekko.cluster.ddata.PNCounter\022\016\n\006intKey\030\003" +
       " \001(\021\022\017\n\007longKey\030\004 \001(\022\0222\n\010otherKey\030\005 \001(\0132" +
-      " .akka.cluster.ddata.OtherMessage\"\241\002\n\nOR" +
-      "MultiMap\022\'\n\004keys\030\001 \002(\0132\031.akka.cluster.dd" +
-      "ata.ORSet\0225\n\007entries\030\002 \003(\0132$.akka.cluste" +
+      " .org.apache.pekko.cluster.ddata.OtherMessage\"\241\002\n\nOR" +
+      "MultiMap\022\'\n\004keys\030\001 \002(\0132\031.org.apache.pekko.cluster.dd" +
+      "ata.ORSet\0225\n\007entries\030\002 \003(\0132$.org.apache.pekko.cluste" +
       "r.ddata.ORMultiMap.Entry\022\027\n\017withValueDel" +
       "tas\030\003 \001(\010\032\231\001\n\005Entry\022\021\n\tstringKey\030\001 \001(\t\022(" +
-      "\n\005value\030\002 \002(\0132\031.akka.cluster.ddata.ORSet" +
+      "\n\005value\030\002 \002(\0132\031.org.apache.pekko.cluster.ddata.ORSet" +
       "\022\016\n\006intKey\030\003 \001(\021\022\017\n\007longKey\030\004 \001(\022\0222\n\010oth" +
-      "erKey\030\005 \001(\0132 .akka.cluster.ddata.OtherMe" +
+      "erKey\030\005 \001(\0132 .org.apache.pekko.cluster.ddata.OtherMe" +
       "ssage*-\n\014ORSetDeltaOp\022\007\n\003Add\020\000\022\n\n\006Remove" +
       "\020\001\022\010\n\004Full\020\002*R\n\014ORMapDeltaOp\022\014\n\010ORMapPut" +
       "\020\000\022\017\n\013ORMapRemove\020\001\022\022\n\016ORMapRemoveKey\020\002\022" +
-      "\017\n\013ORMapUpdate\020\003B#\n\037akka.cluster.ddata.p" +
+      "\017\n\013ORMapUpdate\020\003B#\n\037org.apache.pekko.cluster.ddata.p" +
       "rotobuf.msgH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.getDescriptor(),
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.getDescriptor(),
         });
     internal_static_akka_cluster_ddata_GSet_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_akka_cluster_ddata_GSet_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_ddata_GSet_descriptor,
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_akka_cluster_ddata_GSet_descriptor,
         new java.lang.String[] { "StringElements", "IntElements", "LongElements", "OtherElements", "ActorRefElements", });
     internal_static_akka_cluster_ddata_ORSet_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_akka_cluster_ddata_ORSet_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORSet_descriptor,
         new java.lang.String[] { "Vvector", "Dots", "StringElements", "IntElements", "LongElements", "OtherElements", "ActorRefElements", });
     internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_akka_cluster_ddata_ORSetDeltaGroup_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor,
         new java.lang.String[] { "Entries", });
     internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_descriptor =
       internal_static_akka_cluster_ddata_ORSetDeltaGroup_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORSetDeltaGroup_Entry_descriptor,
         new java.lang.String[] { "Operation", "Underlying", });
     internal_static_akka_cluster_ddata_Flag_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_akka_cluster_ddata_Flag_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Flag_descriptor,
         new java.lang.String[] { "Enabled", });
     internal_static_akka_cluster_ddata_LWWRegister_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_akka_cluster_ddata_LWWRegister_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_LWWRegister_descriptor,
         new java.lang.String[] { "Timestamp", "Node", "State", });
     internal_static_akka_cluster_ddata_GCounter_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_akka_cluster_ddata_GCounter_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_GCounter_descriptor,
         new java.lang.String[] { "Entries", });
     internal_static_akka_cluster_ddata_GCounter_Entry_descriptor =
       internal_static_akka_cluster_ddata_GCounter_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_GCounter_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_GCounter_Entry_descriptor,
         new java.lang.String[] { "Node", "Value", });
     internal_static_akka_cluster_ddata_PNCounter_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_akka_cluster_ddata_PNCounter_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_PNCounter_descriptor,
         new java.lang.String[] { "Increments", "Decrements", });
     internal_static_akka_cluster_ddata_ORMap_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_akka_cluster_ddata_ORMap_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORMap_descriptor,
         new java.lang.String[] { "Keys", "Entries", });
     internal_static_akka_cluster_ddata_ORMap_Entry_descriptor =
       internal_static_akka_cluster_ddata_ORMap_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_ORMap_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORMap_Entry_descriptor,
         new java.lang.String[] { "StringKey", "Value", "IntKey", "LongKey", "OtherKey", });
     internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor =
       getDescriptor().getMessageTypes().get(8);
     internal_static_akka_cluster_ddata_ORMapDeltaGroup_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor,
         new java.lang.String[] { "Entries", });
     internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor =
       internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORMapDeltaGroup_MapEntry_descriptor,
         new java.lang.String[] { "StringKey", "Value", "IntKey", "LongKey", "OtherKey", });
     internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_descriptor =
       internal_static_akka_cluster_ddata_ORMapDeltaGroup_descriptor.getNestedTypes().get(1);
     internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORMapDeltaGroup_Entry_descriptor,
         new java.lang.String[] { "Operation", "Underlying", "ZeroTag", "EntryData", });
     internal_static_akka_cluster_ddata_LWWMap_descriptor =
       getDescriptor().getMessageTypes().get(9);
     internal_static_akka_cluster_ddata_LWWMap_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_LWWMap_descriptor,
         new java.lang.String[] { "Keys", "Entries", });
     internal_static_akka_cluster_ddata_LWWMap_Entry_descriptor =
       internal_static_akka_cluster_ddata_LWWMap_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_LWWMap_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_LWWMap_Entry_descriptor,
         new java.lang.String[] { "StringKey", "Value", "IntKey", "LongKey", "OtherKey", });
     internal_static_akka_cluster_ddata_PNCounterMap_descriptor =
       getDescriptor().getMessageTypes().get(10);
     internal_static_akka_cluster_ddata_PNCounterMap_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_PNCounterMap_descriptor,
         new java.lang.String[] { "Keys", "Entries", });
     internal_static_akka_cluster_ddata_PNCounterMap_Entry_descriptor =
       internal_static_akka_cluster_ddata_PNCounterMap_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_PNCounterMap_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_PNCounterMap_Entry_descriptor,
         new java.lang.String[] { "StringKey", "Value", "IntKey", "LongKey", "OtherKey", });
     internal_static_akka_cluster_ddata_ORMultiMap_descriptor =
       getDescriptor().getMessageTypes().get(11);
     internal_static_akka_cluster_ddata_ORMultiMap_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORMultiMap_descriptor,
         new java.lang.String[] { "Keys", "Entries", "WithValueDeltas", });
     internal_static_akka_cluster_ddata_ORMultiMap_Entry_descriptor =
       internal_static_akka_cluster_ddata_ORMultiMap_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_ORMultiMap_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ORMultiMap_Entry_descriptor,
         new java.lang.String[] { "StringKey", "Value", "IntKey", "LongKey", "OtherKey", });
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.getDescriptor();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/akka-distributed-data/src/main/java/akka/cluster/ddata/protobuf/msg/ReplicatorMessages.java b/akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java
similarity index 51%
rename from akka-distributed-data/src/main/java/akka/cluster/ddata/protobuf/msg/ReplicatorMessages.java
rename to akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java
index c594507231..c117c1662d 100644
--- a/akka-distributed-data/src/main/java/akka/cluster/ddata/protobuf/msg/ReplicatorMessages.java
+++ b/akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java
@@ -5,37 +5,37 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ReplicatorMessages.proto
 
-package akka.cluster.ddata.protobuf.msg;
+package org.apache.pekko.cluster.ddata.protobuf.msg;
 
 public final class ReplicatorMessages {
   private ReplicatorMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface GetOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Get)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Get)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     boolean hasKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
 
     /**
      * required sint32 consistency = 2;
@@ -60,19 +60,19 @@ public final class ReplicatorMessages {
     int getTimeout();
 
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return Whether the request field is set.
      */
     boolean hasRequest();
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return The request.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest();
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder();
 
     /**
      * optional int32 consistencyMinCap = 5;
@@ -97,15 +97,15 @@ public final class ReplicatorMessages {
     int getConsistencyAdditional();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Get}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Get}
    */
   public  static final class Get extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Get)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Get)
       GetOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Get.newBuilder() to construct.
-    private Get(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Get(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Get() {
@@ -114,26 +114,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Get();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Get(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -143,11 +143,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = key_.toBuilder();
               }
-              key_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(key_);
                 key_ = subBuilder.buildPartial();
@@ -166,11 +166,11 @@ public final class ReplicatorMessages {
               break;
             }
             case 34: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) != 0)) {
                 subBuilder = request_.toBuilder();
               }
-              request_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              request_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(request_);
                 request_ = subBuilder.buildPartial();
@@ -197,51 +197,51 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.Builder.class);
     }
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int CONSISTENCY_FIELD_NUMBER = 2;
@@ -279,26 +279,26 @@ public final class ReplicatorMessages {
     }
 
     public static final int REQUEST_FIELD_NUMBER = 4;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
       return ((bitField0_ & 0x00000008) != 0);
     }
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return The request.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
-      return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
+      return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
-      return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
+      return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
 
     public static final int CONSISTENCYMINCAP_FIELD_NUMBER = 5;
@@ -369,7 +369,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKey());
@@ -399,27 +399,27 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKey());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSInt32Size(2, consistency_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(3, timeout_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, getRequest());
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(5, consistencyMinCap_);
       }
       if (((bitField0_ & 0x00000020) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(6, consistencyAdditional_);
       }
       size += unknownFields.getSerializedSize();
@@ -432,10 +432,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -507,73 +507,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -582,7 +582,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -593,42 +593,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Get}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Get}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Get)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Get)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeyFieldBuilder();
           getRequestFieldBuilder();
@@ -661,19 +661,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Get_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -681,8 +681,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -728,44 +728,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get.getDefaultInstance()) return this;
         if (other.hasKey()) {
           mergeKey(other.getKey());
         }
@@ -813,14 +813,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -831,31 +831,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return Whether the key field is set.
        */
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return The key.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
         if (keyBuilder_ == null) {
-          return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+          return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         } else {
           return keyBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder setKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -869,10 +869,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder setKey(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
           onChanged();
@@ -883,15 +883,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder mergeKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               key_ != null &&
-              key_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             key_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
           } else {
             key_ = value;
           }
@@ -903,7 +903,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
         if (keyBuilder_ == null) {
@@ -916,33 +916,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeyFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
         if (keyBuilder_ != null) {
           return keyBuilder_.getMessageOrBuilder();
         } else {
           return key_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getKeyFieldBuilder() {
         if (keyBuilder_ == null) {
-          keyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          keyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getKey(),
                   getParentForChildren(),
                   isClean());
@@ -1025,31 +1025,31 @@ public final class ReplicatorMessages {
         return this;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> requestBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> requestBuilder_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        * @return Whether the request field is set.
        */
       public boolean hasRequest() {
         return ((bitField0_ & 0x00000008) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        * @return The request.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
         if (requestBuilder_ == null) {
-          return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+          return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
         } else {
           return requestBuilder_.getMessage();
         }
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      public Builder setRequest(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1063,10 +1063,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
       public Builder setRequest(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
           onChanged();
@@ -1077,15 +1077,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      public Builder mergeRequest(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0) &&
               request_ != null &&
-              request_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             request_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
           } else {
             request_ = value;
           }
@@ -1097,7 +1097,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
       public Builder clearRequest() {
         if (requestBuilder_ == null) {
@@ -1110,33 +1110,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getRequestBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getRequestBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getRequestFieldBuilder().getBuilder();
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
         if (requestBuilder_ != null) {
           return requestBuilder_.getMessageOrBuilder();
         } else {
           return request_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
         }
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getRequestFieldBuilder() {
         if (requestBuilder_ == null) {
-          requestBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          requestBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getRequest(),
                   getParentForChildren(),
                   isClean());
@@ -1220,116 +1220,116 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Get)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Get)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Get)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Get)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Get parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Get(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Get getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Get getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface GetSuccessOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.GetSuccess)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.GetSuccess)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     boolean hasKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
 
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return Whether the data field is set.
      */
     boolean hasData();
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return The data.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData();
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder();
 
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return Whether the request field is set.
      */
     boolean hasRequest();
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return The request.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest();
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.GetSuccess}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.GetSuccess}
    */
   public  static final class GetSuccess extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.GetSuccess)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GetSuccess)
       GetSuccessOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use GetSuccess.newBuilder() to construct.
-    private GetSuccess(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private GetSuccess(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private GetSuccess() {
@@ -1338,26 +1338,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new GetSuccess();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private GetSuccess(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1367,11 +1367,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = key_.toBuilder();
               }
-              key_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(key_);
                 key_ = subBuilder.buildPartial();
@@ -1380,11 +1380,11 @@ public final class ReplicatorMessages {
               break;
             }
             case 18: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = data_.toBuilder();
               }
-              data_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              data_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(data_);
                 data_ = subBuilder.buildPartial();
@@ -1393,11 +1393,11 @@ public final class ReplicatorMessages {
               break;
             }
             case 34: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) != 0)) {
                 subBuilder = request_.toBuilder();
               }
-              request_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              request_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(request_);
                 request_ = subBuilder.buildPartial();
@@ -1414,97 +1414,97 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.Builder.class);
     }
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int DATA_FIELD_NUMBER = 2;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return Whether the data field is set.
      */
     public boolean hasData() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return The data.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
-      return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
+      return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
-      return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
+      return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
 
     public static final int REQUEST_FIELD_NUMBER = 4;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
       return ((bitField0_ & 0x00000004) != 0);
     }
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      * @return The request.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
-      return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
+      return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 4;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
-      return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
+      return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1541,7 +1541,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKey());
@@ -1562,15 +1562,15 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKey());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getData());
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(4, getRequest());
       }
       size += unknownFields.getSerializedSize();
@@ -1583,10 +1583,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -1631,73 +1631,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1706,7 +1706,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1717,42 +1717,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.GetSuccess}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.GetSuccess}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.GetSuccess)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccessOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.GetSuccess)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccessOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeyFieldBuilder();
           getDataFieldBuilder();
@@ -1784,19 +1784,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetSuccess_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1804,8 +1804,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1843,44 +1843,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess.getDefaultInstance()) return this;
         if (other.hasKey()) {
           mergeKey(other.getKey());
         }
@@ -1919,14 +1919,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1937,31 +1937,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return Whether the key field is set.
        */
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return The key.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
         if (keyBuilder_ == null) {
-          return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+          return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         } else {
           return keyBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder setKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1975,10 +1975,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder setKey(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
           onChanged();
@@ -1989,15 +1989,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder mergeKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               key_ != null &&
-              key_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             key_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
           } else {
             key_ = value;
           }
@@ -2009,7 +2009,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
         if (keyBuilder_ == null) {
@@ -2022,33 +2022,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeyFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
         if (keyBuilder_ != null) {
           return keyBuilder_.getMessageOrBuilder();
         } else {
           return key_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getKeyFieldBuilder() {
         if (keyBuilder_ == null) {
-          keyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          keyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getKey(),
                   getParentForChildren(),
                   isClean());
@@ -2057,31 +2057,31 @@ public final class ReplicatorMessages {
         return keyBuilder_;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> dataBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> dataBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        * @return Whether the data field is set.
        */
       public boolean hasData() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        * @return The data.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
         if (dataBuilder_ == null) {
-          return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+          return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
         } else {
           return dataBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      public Builder setData(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2095,10 +2095,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
       public Builder setData(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (dataBuilder_ == null) {
           data_ = builderForValue.build();
           onChanged();
@@ -2109,15 +2109,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      public Builder mergeData(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               data_ != null &&
-              data_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             data_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
           } else {
             data_ = value;
           }
@@ -2129,7 +2129,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
       public Builder clearData() {
         if (dataBuilder_ == null) {
@@ -2142,33 +2142,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getDataBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getDataBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getDataFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
         if (dataBuilder_ != null) {
           return dataBuilder_.getMessageOrBuilder();
         } else {
           return data_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getDataFieldBuilder() {
         if (dataBuilder_ == null) {
-          dataBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          dataBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getData(),
                   getParentForChildren(),
                   isClean());
@@ -2177,31 +2177,31 @@ public final class ReplicatorMessages {
         return dataBuilder_;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> requestBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> requestBuilder_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        * @return Whether the request field is set.
        */
       public boolean hasRequest() {
         return ((bitField0_ & 0x00000004) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        * @return The request.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
         if (requestBuilder_ == null) {
-          return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+          return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
         } else {
           return requestBuilder_.getMessage();
         }
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      public Builder setRequest(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2215,10 +2215,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
       public Builder setRequest(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
           onChanged();
@@ -2229,15 +2229,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      public Builder mergeRequest(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
               request_ != null &&
-              request_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             request_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
           } else {
             request_ = value;
           }
@@ -2249,7 +2249,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
       public Builder clearRequest() {
         if (requestBuilder_ == null) {
@@ -2262,33 +2262,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getRequestBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getRequestBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getRequestFieldBuilder().getBuilder();
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
         if (requestBuilder_ != null) {
           return requestBuilder_.getMessageOrBuilder();
         } else {
           return request_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
         }
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 4;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 4;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getRequestFieldBuilder() {
         if (requestBuilder_ == null) {
-          requestBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          requestBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getRequest(),
                   getParentForChildren(),
                   isClean());
@@ -2298,101 +2298,101 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.GetSuccess)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.GetSuccess)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.GetSuccess)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.GetSuccess)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public GetSuccess parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new GetSuccess(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetSuccess getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface NotFoundOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.NotFound)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.NotFound)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     boolean hasKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
 
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return Whether the request field is set.
      */
     boolean hasRequest();
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return The request.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest();
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.NotFound}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.NotFound}
    */
   public  static final class NotFound extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.NotFound)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.NotFound)
       NotFoundOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use NotFound.newBuilder() to construct.
-    private NotFound(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private NotFound(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private NotFound() {
@@ -2401,26 +2401,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new NotFound();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private NotFound(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2430,11 +2430,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = key_.toBuilder();
               }
-              key_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(key_);
                 key_ = subBuilder.buildPartial();
@@ -2443,11 +2443,11 @@ public final class ReplicatorMessages {
               break;
             }
             case 18: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = request_.toBuilder();
               }
-              request_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              request_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(request_);
                 request_ = subBuilder.buildPartial();
@@ -2464,74 +2464,74 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.Builder.class);
     }
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int REQUEST_FIELD_NUMBER = 2;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return The request.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
-      return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
+      return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
-      return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
+      return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -2560,7 +2560,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKey());
@@ -2578,11 +2578,11 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKey());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getRequest());
       }
       size += unknownFields.getSerializedSize();
@@ -2595,10 +2595,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -2634,73 +2634,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -2709,7 +2709,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2720,42 +2720,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.NotFound}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.NotFound}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.NotFound)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFoundOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.NotFound)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFoundOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeyFieldBuilder();
           getRequestFieldBuilder();
@@ -2780,19 +2780,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_NotFound_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2800,8 +2800,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2831,44 +2831,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound.getDefaultInstance()) return this;
         if (other.hasKey()) {
           mergeKey(other.getKey());
         }
@@ -2898,14 +2898,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2916,31 +2916,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return Whether the key field is set.
        */
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return The key.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
         if (keyBuilder_ == null) {
-          return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+          return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         } else {
           return keyBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder setKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2954,10 +2954,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder setKey(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
           onChanged();
@@ -2968,15 +2968,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder mergeKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               key_ != null &&
-              key_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             key_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
           } else {
             key_ = value;
           }
@@ -2988,7 +2988,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
         if (keyBuilder_ == null) {
@@ -3001,33 +3001,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeyFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
         if (keyBuilder_ != null) {
           return keyBuilder_.getMessageOrBuilder();
         } else {
           return key_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getKeyFieldBuilder() {
         if (keyBuilder_ == null) {
-          keyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          keyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getKey(),
                   getParentForChildren(),
                   isClean());
@@ -3036,31 +3036,31 @@ public final class ReplicatorMessages {
         return keyBuilder_;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> requestBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> requestBuilder_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        * @return Whether the request field is set.
        */
       public boolean hasRequest() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        * @return The request.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
         if (requestBuilder_ == null) {
-          return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+          return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
         } else {
           return requestBuilder_.getMessage();
         }
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      public Builder setRequest(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3074,10 +3074,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
       public Builder setRequest(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
           onChanged();
@@ -3088,15 +3088,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      public Builder mergeRequest(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               request_ != null &&
-              request_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             request_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
           } else {
             request_ = value;
           }
@@ -3108,7 +3108,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
       public Builder clearRequest() {
         if (requestBuilder_ == null) {
@@ -3121,33 +3121,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getRequestBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getRequestBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getRequestFieldBuilder().getBuilder();
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
         if (requestBuilder_ != null) {
           return requestBuilder_.getMessageOrBuilder();
         } else {
           return request_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
         }
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getRequestFieldBuilder() {
         if (requestBuilder_ == null) {
-          requestBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          requestBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getRequest(),
                   getParentForChildren(),
                   isClean());
@@ -3157,101 +3157,101 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.NotFound)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.NotFound)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.NotFound)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.NotFound)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public NotFound parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new NotFound(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.NotFound getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface GetFailureOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.GetFailure)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.GetFailure)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     boolean hasKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
 
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return Whether the request field is set.
      */
     boolean hasRequest();
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return The request.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest();
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.GetFailure}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.GetFailure}
    */
   public  static final class GetFailure extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.GetFailure)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.GetFailure)
       GetFailureOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use GetFailure.newBuilder() to construct.
-    private GetFailure(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private GetFailure(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private GetFailure() {
@@ -3260,26 +3260,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new GetFailure();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private GetFailure(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3289,11 +3289,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = key_.toBuilder();
               }
-              key_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(key_);
                 key_ = subBuilder.buildPartial();
@@ -3302,11 +3302,11 @@ public final class ReplicatorMessages {
               break;
             }
             case 18: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = request_.toBuilder();
               }
-              request_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              request_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(request_);
                 request_ = subBuilder.buildPartial();
@@ -3323,74 +3323,74 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.Builder.class);
     }
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int REQUEST_FIELD_NUMBER = 2;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return Whether the request field is set.
      */
     public boolean hasRequest() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      * @return The request.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
-      return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
+      return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
     /**
-     * optional .akka.cluster.ddata.OtherMessage request = 2;
+     * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
-      return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
+      return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -3419,7 +3419,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKey());
@@ -3437,11 +3437,11 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKey());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getRequest());
       }
       size += unknownFields.getSerializedSize();
@@ -3454,10 +3454,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -3493,73 +3493,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3568,7 +3568,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3579,42 +3579,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.GetFailure}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.GetFailure}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.GetFailure)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailureOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.GetFailure)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailureOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeyFieldBuilder();
           getRequestFieldBuilder();
@@ -3639,19 +3639,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_GetFailure_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3659,8 +3659,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3690,44 +3690,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure.getDefaultInstance()) return this;
         if (other.hasKey()) {
           mergeKey(other.getKey());
         }
@@ -3757,14 +3757,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3775,31 +3775,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return Whether the key field is set.
        */
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return The key.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
         if (keyBuilder_ == null) {
-          return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+          return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         } else {
           return keyBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder setKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3813,10 +3813,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder setKey(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
           onChanged();
@@ -3827,15 +3827,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder mergeKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               key_ != null &&
-              key_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             key_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
           } else {
             key_ = value;
           }
@@ -3847,7 +3847,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
         if (keyBuilder_ == null) {
@@ -3860,33 +3860,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeyFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
         if (keyBuilder_ != null) {
           return keyBuilder_.getMessageOrBuilder();
         } else {
           return key_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getKeyFieldBuilder() {
         if (keyBuilder_ == null) {
-          keyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          keyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getKey(),
                   getParentForChildren(),
                   isClean());
@@ -3895,31 +3895,31 @@ public final class ReplicatorMessages {
         return keyBuilder_;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> requestBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage request_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> requestBuilder_;
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        * @return Whether the request field is set.
        */
       public boolean hasRequest() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        * @return The request.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getRequest() {
         if (requestBuilder_ == null) {
-          return request_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+          return request_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
         } else {
           return requestBuilder_.getMessage();
         }
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      public Builder setRequest(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3933,10 +3933,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
       public Builder setRequest(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (requestBuilder_ == null) {
           request_ = builderForValue.build();
           onChanged();
@@ -3947,15 +3947,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      public Builder mergeRequest(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeRequest(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (requestBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               request_ != null &&
-              request_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              request_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             request_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(request_).mergeFrom(value).buildPartial();
           } else {
             request_ = value;
           }
@@ -3967,7 +3967,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
       public Builder clearRequest() {
         if (requestBuilder_ == null) {
@@ -3980,33 +3980,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getRequestBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getRequestBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getRequestFieldBuilder().getBuilder();
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getRequestOrBuilder() {
         if (requestBuilder_ != null) {
           return requestBuilder_.getMessageOrBuilder();
         } else {
           return request_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : request_;
         }
       }
       /**
-       * optional .akka.cluster.ddata.OtherMessage request = 2;
+       * optional .org.apache.pekko.cluster.ddata.OtherMessage request = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getRequestFieldBuilder() {
         if (requestBuilder_ == null) {
-          requestBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          requestBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getRequest(),
                   getParentForChildren(),
                   isClean());
@@ -4016,75 +4016,75 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.GetFailure)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.GetFailure)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.GetFailure)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.GetFailure)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public GetFailure parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new GetFailure(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GetFailure getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface SubscribeOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Subscribe)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Subscribe)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     boolean hasKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
 
     /**
      * required string ref = 2;
@@ -4100,19 +4100,19 @@ public final class ReplicatorMessages {
      * required string ref = 2;
      * @return The bytes for ref.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRefBytes();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Subscribe}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Subscribe}
    */
   public  static final class Subscribe extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Subscribe)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Subscribe)
       SubscribeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Subscribe.newBuilder() to construct.
-    private Subscribe(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Subscribe(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Subscribe() {
@@ -4122,26 +4122,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Subscribe();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Subscribe(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4151,11 +4151,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = key_.toBuilder();
               }
-              key_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(key_);
                 key_ = subBuilder.buildPartial();
@@ -4164,7 +4164,7 @@ public final class ReplicatorMessages {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               ref_ = bs;
               break;
@@ -4178,51 +4178,51 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.Builder.class);
     }
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int REF_FIELD_NUMBER = 2;
@@ -4243,8 +4243,8 @@ public final class ReplicatorMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           ref_ = s;
@@ -4256,17 +4256,17 @@ public final class ReplicatorMessages {
      * required string ref = 2;
      * @return The bytes for ref.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRefBytes() {
       java.lang.Object ref = ref_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         ref_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4294,13 +4294,13 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKey());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, ref_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, ref_);
       }
       unknownFields.writeTo(output);
     }
@@ -4312,11 +4312,11 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKey());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, ref_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, ref_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -4328,10 +4328,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -4367,73 +4367,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -4442,7 +4442,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4453,42 +4453,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Subscribe}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Subscribe}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Subscribe)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.SubscribeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Subscribe)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.SubscribeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeyFieldBuilder();
         }
@@ -4508,19 +4508,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Subscribe_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4528,8 +4528,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4555,44 +4555,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe.getDefaultInstance()) return this;
         if (other.hasKey()) {
           mergeKey(other.getKey());
         }
@@ -4622,14 +4622,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4640,31 +4640,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return Whether the key field is set.
        */
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return The key.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
         if (keyBuilder_ == null) {
-          return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+          return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         } else {
           return keyBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder setKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4678,10 +4678,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder setKey(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
           onChanged();
@@ -4692,15 +4692,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder mergeKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               key_ != null &&
-              key_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             key_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
           } else {
             key_ = value;
           }
@@ -4712,7 +4712,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
         if (keyBuilder_ == null) {
@@ -4725,33 +4725,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeyFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
         if (keyBuilder_ != null) {
           return keyBuilder_.getMessageOrBuilder();
         } else {
           return key_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getKeyFieldBuilder() {
         if (keyBuilder_ == null) {
-          keyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          keyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getKey(),
                   getParentForChildren(),
                   isClean());
@@ -4775,8 +4775,8 @@ public final class ReplicatorMessages {
       public java.lang.String getRef() {
         java.lang.Object ref = ref_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             ref_ = s;
@@ -4790,17 +4790,17 @@ public final class ReplicatorMessages {
        * required string ref = 2;
        * @return The bytes for ref.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRefBytes() {
         java.lang.Object ref = ref_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           ref_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -4834,7 +4834,7 @@ public final class ReplicatorMessages {
        * @return This builder for chaining.
        */
       public Builder setRefBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -4845,75 +4845,75 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Subscribe)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Subscribe)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Subscribe)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Subscribe)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Subscribe parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Subscribe(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Subscribe getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface UnsubscribeOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Unsubscribe)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Unsubscribe)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     boolean hasKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
 
     /**
      * required string ref = 2;
@@ -4929,19 +4929,19 @@ public final class ReplicatorMessages {
      * required string ref = 2;
      * @return The bytes for ref.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRefBytes();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Unsubscribe}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Unsubscribe}
    */
   public  static final class Unsubscribe extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Unsubscribe)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Unsubscribe)
       UnsubscribeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Unsubscribe.newBuilder() to construct.
-    private Unsubscribe(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Unsubscribe(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Unsubscribe() {
@@ -4951,26 +4951,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Unsubscribe();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Unsubscribe(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4980,11 +4980,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = key_.toBuilder();
               }
-              key_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(key_);
                 key_ = subBuilder.buildPartial();
@@ -4993,7 +4993,7 @@ public final class ReplicatorMessages {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               ref_ = bs;
               break;
@@ -5007,51 +5007,51 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.Builder.class);
     }
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int REF_FIELD_NUMBER = 2;
@@ -5072,8 +5072,8 @@ public final class ReplicatorMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           ref_ = s;
@@ -5085,17 +5085,17 @@ public final class ReplicatorMessages {
      * required string ref = 2;
      * @return The bytes for ref.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRefBytes() {
       java.lang.Object ref = ref_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         ref_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -5123,13 +5123,13 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKey());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, ref_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, ref_);
       }
       unknownFields.writeTo(output);
     }
@@ -5141,11 +5141,11 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKey());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, ref_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, ref_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -5157,10 +5157,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -5196,73 +5196,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5271,7 +5271,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5282,42 +5282,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Unsubscribe}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Unsubscribe}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Unsubscribe)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UnsubscribeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Unsubscribe)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UnsubscribeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeyFieldBuilder();
         }
@@ -5337,19 +5337,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Unsubscribe_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5357,8 +5357,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5384,44 +5384,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe.getDefaultInstance()) return this;
         if (other.hasKey()) {
           mergeKey(other.getKey());
         }
@@ -5451,14 +5451,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5469,31 +5469,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return Whether the key field is set.
        */
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return The key.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
         if (keyBuilder_ == null) {
-          return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+          return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         } else {
           return keyBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder setKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5507,10 +5507,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder setKey(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
           onChanged();
@@ -5521,15 +5521,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder mergeKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               key_ != null &&
-              key_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             key_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
           } else {
             key_ = value;
           }
@@ -5541,7 +5541,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
         if (keyBuilder_ == null) {
@@ -5554,33 +5554,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeyFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
         if (keyBuilder_ != null) {
           return keyBuilder_.getMessageOrBuilder();
         } else {
           return key_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getKeyFieldBuilder() {
         if (keyBuilder_ == null) {
-          keyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          keyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getKey(),
                   getParentForChildren(),
                   isClean());
@@ -5604,8 +5604,8 @@ public final class ReplicatorMessages {
       public java.lang.String getRef() {
         java.lang.Object ref = ref_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             ref_ = s;
@@ -5619,17 +5619,17 @@ public final class ReplicatorMessages {
        * required string ref = 2;
        * @return The bytes for ref.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRefBytes() {
         java.lang.Object ref = ref_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           ref_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -5663,7 +5663,7 @@ public final class ReplicatorMessages {
        * @return This builder for chaining.
        */
       public Builder setRefBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5674,101 +5674,101 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Unsubscribe)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Unsubscribe)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Unsubscribe)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Unsubscribe)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Unsubscribe parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Unsubscribe(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Unsubscribe getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ChangedOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Changed)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Changed)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     boolean hasKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey();
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder();
 
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return Whether the data field is set.
      */
     boolean hasData();
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return The data.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData();
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Changed}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Changed}
    */
   public  static final class Changed extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Changed)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Changed)
       ChangedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Changed.newBuilder() to construct.
-    private Changed(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Changed(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Changed() {
@@ -5777,26 +5777,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Changed();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Changed(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5806,11 +5806,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = key_.toBuilder();
               }
-              key_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              key_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(key_);
                 key_ = subBuilder.buildPartial();
@@ -5819,11 +5819,11 @@ public final class ReplicatorMessages {
               break;
             }
             case 18: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = data_.toBuilder();
               }
-              data_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              data_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(data_);
                 data_ = subBuilder.buildPartial();
@@ -5840,74 +5840,74 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.Builder.class);
     }
 
     private int bitField0_;
     public static final int KEY_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      * @return The key.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage key = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
-      return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
     }
 
     public static final int DATA_FIELD_NUMBER = 2;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return Whether the data field is set.
      */
     public boolean hasData() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      * @return The data.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
-      return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
+      return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 2;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
-      return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
+      return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -5938,7 +5938,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getKey());
@@ -5956,11 +5956,11 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getKey());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getData());
       }
       size += unknownFields.getSerializedSize();
@@ -5973,10 +5973,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -6012,73 +6012,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -6087,7 +6087,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6098,42 +6098,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Changed}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Changed}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Changed)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ChangedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Changed)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ChangedOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getKeyFieldBuilder();
           getDataFieldBuilder();
@@ -6158,19 +6158,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Changed_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6178,8 +6178,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6209,44 +6209,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed.getDefaultInstance()) return this;
         if (other.hasKey()) {
           mergeKey(other.getKey());
         }
@@ -6277,14 +6277,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6295,31 +6295,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage key_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> keyBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return Whether the key field is set.
        */
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        * @return The key.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getKey() {
         if (keyBuilder_ == null) {
-          return key_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+          return key_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         } else {
           return keyBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder setKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6333,10 +6333,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder setKey(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (keyBuilder_ == null) {
           key_ = builderForValue.build();
           onChanged();
@@ -6347,15 +6347,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public Builder mergeKey(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeKey(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (keyBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               key_ != null &&
-              key_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              key_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             key_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(key_).mergeFrom(value).buildPartial();
           } else {
             key_ = value;
           }
@@ -6367,7 +6367,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
       public Builder clearKey() {
         if (keyBuilder_ == null) {
@@ -6380,33 +6380,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getKeyBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getKeyFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getKeyOrBuilder() {
         if (keyBuilder_ != null) {
           return keyBuilder_.getMessageOrBuilder();
         } else {
           return key_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : key_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage key = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage key = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getKeyFieldBuilder() {
         if (keyBuilder_ == null) {
-          keyBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          keyBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getKey(),
                   getParentForChildren(),
                   isClean());
@@ -6415,31 +6415,31 @@ public final class ReplicatorMessages {
         return keyBuilder_;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> dataBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> dataBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        * @return Whether the data field is set.
        */
       public boolean hasData() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        * @return The data.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
         if (dataBuilder_ == null) {
-          return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+          return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
         } else {
           return dataBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      public Builder setData(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6453,10 +6453,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
       public Builder setData(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (dataBuilder_ == null) {
           data_ = builderForValue.build();
           onChanged();
@@ -6467,15 +6467,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      public Builder mergeData(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               data_ != null &&
-              data_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             data_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
           } else {
             data_ = value;
           }
@@ -6487,7 +6487,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
       public Builder clearData() {
         if (dataBuilder_ == null) {
@@ -6500,33 +6500,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getDataBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getDataBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getDataFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
         if (dataBuilder_ != null) {
           return dataBuilder_.getMessageOrBuilder();
         } else {
           return data_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 2;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getDataFieldBuilder() {
         if (dataBuilder_ == null) {
-          dataBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          dataBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getData(),
                   getParentForChildren(),
                   isClean());
@@ -6536,60 +6536,60 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Changed)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Changed)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Changed)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Changed)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Changed parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Changed(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Changed getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface WriteOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Write)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Write)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string key = 1;
@@ -6605,49 +6605,49 @@ public final class ReplicatorMessages {
      * required string key = 1;
      * @return The bytes for key.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getKeyBytes();
 
     /**
-     * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+     * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
      * @return Whether the envelope field is set.
      */
     boolean hasEnvelope();
     /**
-     * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+     * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
      * @return The envelope.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope();
     /**
-     * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+     * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder();
 
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
      * @return Whether the fromNode field is set.
      */
     boolean hasFromNode();
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
      * @return The fromNode.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode();
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Write}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Write}
    */
   public  static final class Write extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Write)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Write)
       WriteOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Write.newBuilder() to construct.
-    private Write(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Write(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Write() {
@@ -6657,26 +6657,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Write();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Write(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6686,17 +6686,17 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               key_ = bs;
               break;
             }
             case 18: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = envelope_.toBuilder();
               }
-              envelope_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
+              envelope_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(envelope_);
                 envelope_ = subBuilder.buildPartial();
@@ -6705,11 +6705,11 @@ public final class ReplicatorMessages {
               break;
             }
             case 26: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) != 0)) {
                 subBuilder = fromNode_.toBuilder();
               }
-              fromNode_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
+              fromNode_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(fromNode_);
                 fromNode_ = subBuilder.buildPartial();
@@ -6726,27 +6726,27 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.Builder.class);
     }
 
     private int bitField0_;
@@ -6768,8 +6768,8 @@ public final class ReplicatorMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           key_ = s;
@@ -6781,64 +6781,64 @@ public final class ReplicatorMessages {
      * required string key = 1;
      * @return The bytes for key.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getKeyBytes() {
       java.lang.Object ref = key_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         key_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int ENVELOPE_FIELD_NUMBER = 2;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
     /**
-     * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+     * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
      * @return Whether the envelope field is set.
      */
     public boolean hasEnvelope() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
-     * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+     * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
      * @return The envelope.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
-      return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
+      return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
     }
     /**
-     * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+     * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
-      return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
+      return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
     }
 
     public static final int FROMNODE_FIELD_NUMBER = 3;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
      * @return Whether the fromNode field is set.
      */
     public boolean hasFromNode() {
       return ((bitField0_ & 0x00000004) != 0);
     }
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
      * @return The fromNode.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
-      return fromNode_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
+      return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
-      return fromNode_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
+      return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -6871,10 +6871,10 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getEnvelope());
@@ -6892,14 +6892,14 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getEnvelope());
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getFromNode());
       }
       size += unknownFields.getSerializedSize();
@@ -6912,10 +6912,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -6960,73 +6960,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -7035,7 +7035,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7046,42 +7046,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Write}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Write}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Write)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.WriteOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Write)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.WriteOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getEnvelopeFieldBuilder();
           getFromNodeFieldBuilder();
@@ -7108,19 +7108,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Write_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7128,8 +7128,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7163,44 +7163,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write.getDefaultInstance()) return this;
         if (other.hasKey()) {
           bitField0_ |= 0x00000001;
           key_ = other.key_;
@@ -7238,14 +7238,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7271,8 +7271,8 @@ public final class ReplicatorMessages {
       public java.lang.String getKey() {
         java.lang.Object ref = key_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             key_ = s;
@@ -7286,17 +7286,17 @@ public final class ReplicatorMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           key_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -7330,7 +7330,7 @@ public final class ReplicatorMessages {
        * @return This builder for chaining.
        */
       public Builder setKeyBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7340,31 +7340,31 @@ public final class ReplicatorMessages {
         return this;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> envelopeBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> envelopeBuilder_;
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return Whether the envelope field is set.
        */
       public boolean hasEnvelope() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return The envelope.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
         if (envelopeBuilder_ == null) {
-          return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+          return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
         } else {
           return envelopeBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
-      public Builder setEnvelope(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
+      public Builder setEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
         if (envelopeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7378,10 +7378,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
       public Builder setEnvelope(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
         if (envelopeBuilder_ == null) {
           envelope_ = builderForValue.build();
           onChanged();
@@ -7392,15 +7392,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
-      public Builder mergeEnvelope(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
+      public Builder mergeEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
         if (envelopeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               envelope_ != null &&
-              envelope_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
+              envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
             envelope_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
           } else {
             envelope_ = value;
           }
@@ -7412,7 +7412,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
       public Builder clearEnvelope() {
         if (envelopeBuilder_ == null) {
@@ -7425,33 +7425,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder getEnvelopeBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder getEnvelopeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getEnvelopeFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
         if (envelopeBuilder_ != null) {
           return envelopeBuilder_.getMessageOrBuilder();
         } else {
           return envelope_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
         }
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> 
           getEnvelopeFieldBuilder() {
         if (envelopeBuilder_ == null) {
-          envelopeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder>(
+          envelopeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder>(
                   getEnvelope(),
                   getParentForChildren(),
                   isClean());
@@ -7460,31 +7460,31 @@ public final class ReplicatorMessages {
         return envelopeBuilder_;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> fromNodeBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> fromNodeBuilder_;
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        * @return Whether the fromNode field is set.
        */
       public boolean hasFromNode() {
         return ((bitField0_ & 0x00000004) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        * @return The fromNode.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
         if (fromNodeBuilder_ == null) {
-          return fromNode_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+          return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
         } else {
           return fromNodeBuilder_.getMessage();
         }
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        */
-      public Builder setFromNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+      public Builder setFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (fromNodeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7498,10 +7498,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        */
       public Builder setFromNode(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
         if (fromNodeBuilder_ == null) {
           fromNode_ = builderForValue.build();
           onChanged();
@@ -7512,15 +7512,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        */
-      public Builder mergeFromNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+      public Builder mergeFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (fromNodeBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
               fromNode_ != null &&
-              fromNode_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+              fromNode_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
             fromNode_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(fromNode_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(fromNode_).mergeFrom(value).buildPartial();
           } else {
             fromNode_ = value;
           }
@@ -7532,7 +7532,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        */
       public Builder clearFromNode() {
         if (fromNodeBuilder_ == null) {
@@ -7545,33 +7545,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getFromNodeBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getFromNodeBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getFromNodeFieldBuilder().getBuilder();
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
         if (fromNodeBuilder_ != null) {
           return fromNodeBuilder_.getMessageOrBuilder();
         } else {
           return fromNode_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
         }
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 3;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 3;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
           getFromNodeFieldBuilder() {
         if (fromNodeBuilder_ == null) {
-          fromNodeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
+          fromNodeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
                   getFromNode(),
                   getParentForChildren(),
                   isClean());
@@ -7581,71 +7581,71 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Write)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Write)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Write)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Write)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Write parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Write(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Write getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Write getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface EmptyOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Empty)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Empty)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Empty}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Empty}
    */
   public  static final class Empty extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Empty)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Empty)
       EmptyOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Empty.newBuilder() to construct.
-    private Empty(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Empty(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Empty() {
@@ -7654,25 +7654,25 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Empty();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Empty(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7690,27 +7690,27 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -7725,7 +7725,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       unknownFields.writeTo(output);
     }
@@ -7746,10 +7746,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -7767,73 +7767,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -7842,7 +7842,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7853,42 +7853,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Empty}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Empty}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Empty)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.EmptyOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Empty)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.EmptyOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -7899,19 +7899,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Empty_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7919,8 +7919,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty(this);
         onBuilt();
         return result;
       }
@@ -7931,44 +7931,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -7981,14 +7981,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7999,60 +7999,60 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Empty)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Empty)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Empty)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Empty)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Empty parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Empty(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Empty getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ReadOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Read)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Read)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string key = 1;
@@ -8068,34 +8068,34 @@ public final class ReplicatorMessages {
      * required string key = 1;
      * @return The bytes for key.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getKeyBytes();
 
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
      * @return Whether the fromNode field is set.
      */
     boolean hasFromNode();
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
      * @return The fromNode.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode();
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Read}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Read}
    */
   public  static final class Read extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Read)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Read)
       ReadOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Read.newBuilder() to construct.
-    private Read(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Read(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Read() {
@@ -8105,26 +8105,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Read();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Read(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8134,17 +8134,17 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               key_ = bs;
               break;
             }
             case 18: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = fromNode_.toBuilder();
               }
-              fromNode_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
+              fromNode_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(fromNode_);
                 fromNode_ = subBuilder.buildPartial();
@@ -8161,27 +8161,27 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.Builder.class);
     }
 
     private int bitField0_;
@@ -8203,8 +8203,8 @@ public final class ReplicatorMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           key_ = s;
@@ -8216,41 +8216,41 @@ public final class ReplicatorMessages {
      * required string key = 1;
      * @return The bytes for key.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getKeyBytes() {
       java.lang.Object ref = key_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         key_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int FROMNODE_FIELD_NUMBER = 2;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
      * @return Whether the fromNode field is set.
      */
     public boolean hasFromNode() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
      * @return The fromNode.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
-      return fromNode_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
+      return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
     /**
-     * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+     * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
-      return fromNode_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
+      return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -8275,10 +8275,10 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getFromNode());
@@ -8293,10 +8293,10 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getFromNode());
       }
       size += unknownFields.getSerializedSize();
@@ -8309,10 +8309,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read) obj;
 
       if (hasKey() != other.hasKey()) return false;
       if (hasKey()) {
@@ -8348,73 +8348,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -8423,7 +8423,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8434,42 +8434,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Read}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Read}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Read)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Read)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromNodeFieldBuilder();
         }
@@ -8489,19 +8489,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Read_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8509,8 +8509,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -8536,44 +8536,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read.getDefaultInstance()) return this;
         if (other.hasKey()) {
           bitField0_ |= 0x00000001;
           key_ = other.key_;
@@ -8602,14 +8602,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -8635,8 +8635,8 @@ public final class ReplicatorMessages {
       public java.lang.String getKey() {
         java.lang.Object ref = key_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             key_ = s;
@@ -8650,17 +8650,17 @@ public final class ReplicatorMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           key_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -8694,7 +8694,7 @@ public final class ReplicatorMessages {
        * @return This builder for chaining.
        */
       public Builder setKeyBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -8704,31 +8704,31 @@ public final class ReplicatorMessages {
         return this;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> fromNodeBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> fromNodeBuilder_;
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        * @return Whether the fromNode field is set.
        */
       public boolean hasFromNode() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        * @return The fromNode.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
         if (fromNodeBuilder_ == null) {
-          return fromNode_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+          return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
         } else {
           return fromNodeBuilder_.getMessage();
         }
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        */
-      public Builder setFromNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+      public Builder setFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (fromNodeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8742,10 +8742,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        */
       public Builder setFromNode(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
         if (fromNodeBuilder_ == null) {
           fromNode_ = builderForValue.build();
           onChanged();
@@ -8756,15 +8756,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        */
-      public Builder mergeFromNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+      public Builder mergeFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (fromNodeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               fromNode_ != null &&
-              fromNode_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+              fromNode_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
             fromNode_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(fromNode_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(fromNode_).mergeFrom(value).buildPartial();
           } else {
             fromNode_ = value;
           }
@@ -8776,7 +8776,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        */
       public Builder clearFromNode() {
         if (fromNodeBuilder_ == null) {
@@ -8789,33 +8789,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getFromNodeBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getFromNodeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getFromNodeFieldBuilder().getBuilder();
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
         if (fromNodeBuilder_ != null) {
           return fromNodeBuilder_.getMessageOrBuilder();
         } else {
           return fromNode_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
         }
       }
       /**
-       * optional .akka.cluster.ddata.UniqueAddress fromNode = 2;
+       * optional .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
           getFromNodeFieldBuilder() {
         if (fromNodeBuilder_ == null) {
-          fromNodeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
+          fromNodeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
                   getFromNode(),
                   getParentForChildren(),
                   isClean());
@@ -8825,86 +8825,86 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Read)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Read)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Read)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Read)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Read parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Read(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Read getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Read getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface ReadResultOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.ReadResult)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.ReadResult)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+     * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
      * @return Whether the envelope field is set.
      */
     boolean hasEnvelope();
     /**
-     * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+     * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
      * @return The envelope.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope();
     /**
-     * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+     * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.ReadResult}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.ReadResult}
    */
   public  static final class ReadResult extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.ReadResult)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.ReadResult)
       ReadResultOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ReadResult.newBuilder() to construct.
-    private ReadResult(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ReadResult(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ReadResult() {
@@ -8913,26 +8913,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ReadResult();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ReadResult(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8942,11 +8942,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = envelope_.toBuilder();
               }
-              envelope_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
+              envelope_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(envelope_);
                 envelope_ = subBuilder.buildPartial();
@@ -8963,51 +8963,51 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.Builder.class);
     }
 
     private int bitField0_;
     public static final int ENVELOPE_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
     /**
-     * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+     * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
      * @return Whether the envelope field is set.
      */
     public boolean hasEnvelope() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+     * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
      * @return The envelope.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
-      return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
+      return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
     }
     /**
-     * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+     * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
-      return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
+      return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -9028,7 +9028,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getEnvelope());
@@ -9043,7 +9043,7 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getEnvelope());
       }
       size += unknownFields.getSerializedSize();
@@ -9056,10 +9056,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult) obj;
 
       if (hasEnvelope() != other.hasEnvelope()) return false;
       if (hasEnvelope()) {
@@ -9086,73 +9086,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -9161,7 +9161,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -9172,42 +9172,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.ReadResult}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.ReadResult}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.ReadResult)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResultOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.ReadResult)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResultOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getEnvelopeFieldBuilder();
         }
@@ -9225,19 +9225,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_ReadResult_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9245,8 +9245,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -9268,44 +9268,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult.getDefaultInstance()) return this;
         if (other.hasEnvelope()) {
           mergeEnvelope(other.getEnvelope());
         }
@@ -9326,14 +9326,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -9344,31 +9344,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> envelopeBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> envelopeBuilder_;
       /**
-       * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+       * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        * @return Whether the envelope field is set.
        */
       public boolean hasEnvelope() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+       * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        * @return The envelope.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
         if (envelopeBuilder_ == null) {
-          return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+          return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
         } else {
           return envelopeBuilder_.getMessage();
         }
       }
       /**
-       * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+       * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        */
-      public Builder setEnvelope(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
+      public Builder setEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
         if (envelopeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9382,10 +9382,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+       * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        */
       public Builder setEnvelope(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
         if (envelopeBuilder_ == null) {
           envelope_ = builderForValue.build();
           onChanged();
@@ -9396,15 +9396,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+       * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        */
-      public Builder mergeEnvelope(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
+      public Builder mergeEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
         if (envelopeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               envelope_ != null &&
-              envelope_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
+              envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
             envelope_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
           } else {
             envelope_ = value;
           }
@@ -9416,7 +9416,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+       * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        */
       public Builder clearEnvelope() {
         if (envelopeBuilder_ == null) {
@@ -9429,33 +9429,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+       * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder getEnvelopeBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder getEnvelopeBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getEnvelopeFieldBuilder().getBuilder();
       }
       /**
-       * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+       * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
         if (envelopeBuilder_ != null) {
           return envelopeBuilder_.getMessageOrBuilder();
         } else {
           return envelope_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
         }
       }
       /**
-       * optional .akka.cluster.ddata.DataEnvelope envelope = 1;
+       * optional .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> 
           getEnvelopeFieldBuilder() {
         if (envelopeBuilder_ == null) {
-          envelopeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder>(
+          envelopeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder>(
                   getEnvelope(),
                   getParentForChildren(),
                   isClean());
@@ -9465,125 +9465,125 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.ReadResult)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.ReadResult)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.ReadResult)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.ReadResult)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ReadResult parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ReadResult(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.ReadResult getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface DataEnvelopeOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.DataEnvelope)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.DataEnvelope)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return Whether the data field is set.
      */
     boolean hasData();
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return The data.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData();
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder();
 
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    java.util.List 
+    java.util.List 
         getPruningList();
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index);
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
     int getPruningCount();
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    java.util.List 
+    java.util.List 
         getPruningOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
         int index);
 
     /**
-     * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+     * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
      * @return Whether the deltaVersions field is set.
      */
     boolean hasDeltaVersions();
     /**
-     * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+     * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
      * @return The deltaVersions.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDeltaVersions();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDeltaVersions();
     /**
-     * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+     * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDeltaVersionsOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDeltaVersionsOrBuilder();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.DataEnvelope}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.DataEnvelope}
    */
   public  static final class DataEnvelope extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.DataEnvelope)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DataEnvelope)
       DataEnvelopeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use DataEnvelope.newBuilder() to construct.
-    private DataEnvelope(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private DataEnvelope(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private DataEnvelope() {
@@ -9593,26 +9593,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new DataEnvelope();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private DataEnvelope(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -9622,11 +9622,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = data_.toBuilder();
               }
-              data_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              data_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(data_);
                 data_ = subBuilder.buildPartial();
@@ -9636,19 +9636,19 @@ public final class ReplicatorMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                pruning_ = new java.util.ArrayList();
+                pruning_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               pruning_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.PARSER, extensionRegistry));
               break;
             }
             case 26: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = deltaVersions_.toBuilder();
               }
-              deltaVersions_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER, extensionRegistry);
+              deltaVersions_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(deltaVersions_);
                 deltaVersions_ = subBuilder.buildPartial();
@@ -9665,10 +9665,10 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -9678,52 +9678,52 @@ public final class ReplicatorMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder.class);
     }
 
     public interface PruningEntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.DataEnvelope.PruningEntry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
-       * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
        * @return Whether the removedAddress field is set.
        */
       boolean hasRemovedAddress();
       /**
-       * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
        * @return The removedAddress.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getRemovedAddress();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getRemovedAddress();
       /**
-       * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getRemovedAddressOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getRemovedAddressOrBuilder();
 
       /**
-       * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
        * @return Whether the ownerAddress field is set.
        */
       boolean hasOwnerAddress();
       /**
-       * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
        * @return The ownerAddress.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getOwnerAddress();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getOwnerAddress();
       /**
-       * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getOwnerAddressOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getOwnerAddressOrBuilder();
 
       /**
        * required bool performed = 3;
@@ -9737,27 +9737,27 @@ public final class ReplicatorMessages {
       boolean getPerformed();
 
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
-      java.util.List 
+      java.util.List 
           getSeenList();
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getSeen(int index);
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getSeen(int index);
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
       int getSeenCount();
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
-      java.util.List 
+      java.util.List 
           getSeenOrBuilderList();
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getSeenOrBuilder(
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getSeenOrBuilder(
           int index);
 
       /**
@@ -9772,15 +9772,15 @@ public final class ReplicatorMessages {
       long getObsoleteTime();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.DataEnvelope.PruningEntry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry}
      */
     public  static final class PruningEntry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.DataEnvelope.PruningEntry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry)
         PruningEntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use PruningEntry.newBuilder() to construct.
-      private PruningEntry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private PruningEntry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private PruningEntry() {
@@ -9790,26 +9790,26 @@ public final class ReplicatorMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new PruningEntry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private PruningEntry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -9819,11 +9819,11 @@ public final class ReplicatorMessages {
                 done = true;
                 break;
               case 10: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000001) != 0)) {
                   subBuilder = removedAddress_.toBuilder();
                 }
-                removedAddress_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
+                removedAddress_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(removedAddress_);
                   removedAddress_ = subBuilder.buildPartial();
@@ -9832,11 +9832,11 @@ public final class ReplicatorMessages {
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = ownerAddress_.toBuilder();
                 }
-                ownerAddress_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
+                ownerAddress_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(ownerAddress_);
                   ownerAddress_ = subBuilder.buildPartial();
@@ -9851,11 +9851,11 @@ public final class ReplicatorMessages {
               }
               case 34: {
                 if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                  seen_ = new java.util.ArrayList();
+                  seen_ = new java.util.ArrayList();
                   mutable_bitField0_ |= 0x00000008;
                 }
                 seen_.add(
-                    input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.PARSER, extensionRegistry));
+                    input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.PARSER, extensionRegistry));
                 break;
               }
               case 40: {
@@ -9872,10 +9872,10 @@ public final class ReplicatorMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           if (((mutable_bitField0_ & 0x00000008) != 0)) {
@@ -9885,64 +9885,64 @@ public final class ReplicatorMessages {
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder.class);
       }
 
       private int bitField0_;
       public static final int REMOVEDADDRESS_FIELD_NUMBER = 1;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress removedAddress_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress removedAddress_;
       /**
-       * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
        * @return Whether the removedAddress field is set.
        */
       public boolean hasRemovedAddress() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
        * @return The removedAddress.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getRemovedAddress() {
-        return removedAddress_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getRemovedAddress() {
+        return removedAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getRemovedAddressOrBuilder() {
-        return removedAddress_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getRemovedAddressOrBuilder() {
+        return removedAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
       }
 
       public static final int OWNERADDRESS_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress ownerAddress_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress ownerAddress_;
       /**
-       * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
        * @return Whether the ownerAddress field is set.
        */
       public boolean hasOwnerAddress() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
        * @return The ownerAddress.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getOwnerAddress() {
-        return ownerAddress_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getOwnerAddress() {
+        return ownerAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getOwnerAddressOrBuilder() {
-        return ownerAddress_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getOwnerAddressOrBuilder() {
+        return ownerAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
       }
 
       public static final int PERFORMED_FIELD_NUMBER = 3;
@@ -9963,36 +9963,36 @@ public final class ReplicatorMessages {
       }
 
       public static final int SEEN_FIELD_NUMBER = 4;
-      private java.util.List seen_;
+      private java.util.List seen_;
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
-      public java.util.List getSeenList() {
+      public java.util.List getSeenList() {
         return seen_;
       }
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
-      public java.util.List 
+      public java.util.List 
           getSeenOrBuilderList() {
         return seen_;
       }
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
       public int getSeenCount() {
         return seen_.size();
       }
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getSeen(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getSeen(int index) {
         return seen_.get(index);
       }
       /**
-       * repeated .akka.cluster.ddata.Address seen = 4;
+       * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getSeenOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getSeenOrBuilder(
           int index) {
         return seen_.get(index);
       }
@@ -10052,7 +10052,7 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeMessage(1, getRemovedAddress());
@@ -10079,23 +10079,23 @@ public final class ReplicatorMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(1, getRemovedAddress());
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getOwnerAddress());
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeBoolSize(3, performed_);
         }
         for (int i = 0; i < seen_.size(); i++) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(4, seen_.get(i));
         }
         if (((bitField0_ & 0x00000008) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeSInt64Size(5, obsoleteTime_);
         }
         size += unknownFields.getSerializedSize();
@@ -10108,10 +10108,10 @@ public final class ReplicatorMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry) obj;
 
         if (hasRemovedAddress() != other.hasRemovedAddress()) return false;
         if (hasRemovedAddress()) {
@@ -10156,7 +10156,7 @@ public final class ReplicatorMessages {
         }
         if (hasPerformed()) {
           hash = (37 * hash) + PERFORMED_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
               getPerformed());
         }
         if (getSeenCount() > 0) {
@@ -10165,7 +10165,7 @@ public final class ReplicatorMessages {
         }
         if (hasObsoleteTime()) {
           hash = (37 * hash) + OBSOLETETIME_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getObsoleteTime());
         }
         hash = (29 * hash) + unknownFields.hashCode();
@@ -10173,73 +10173,73 @@ public final class ReplicatorMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -10248,7 +10248,7 @@ public final class ReplicatorMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -10259,42 +10259,42 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.DataEnvelope.PruningEntry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.DataEnvelope.PruningEntry)
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getRemovedAddressFieldBuilder();
             getOwnerAddressFieldBuilder();
@@ -10330,19 +10330,19 @@ public final class ReplicatorMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -10350,8 +10350,8 @@ public final class ReplicatorMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -10398,44 +10398,44 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance()) return this;
           if (other.hasRemovedAddress()) {
             mergeRemovedAddress(other.getRemovedAddress());
           }
@@ -10464,7 +10464,7 @@ public final class ReplicatorMessages {
                 seen_ = other.seen_;
                 bitField0_ = (bitField0_ & ~0x00000008);
                 seenBuilder_ = 
-                  akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                      getSeenFieldBuilder() : null;
               } else {
                 seenBuilder_.addAllMessages(other.seen_);
@@ -10506,14 +10506,14 @@ public final class ReplicatorMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -10524,31 +10524,31 @@ public final class ReplicatorMessages {
         }
         private int bitField0_;
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress removedAddress_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> removedAddressBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress removedAddress_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> removedAddressBuilder_;
         /**
-         * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          * @return Whether the removedAddress field is set.
          */
         public boolean hasRemovedAddress() {
           return ((bitField0_ & 0x00000001) != 0);
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          * @return The removedAddress.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getRemovedAddress() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getRemovedAddress() {
           if (removedAddressBuilder_ == null) {
-            return removedAddress_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
+            return removedAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
           } else {
             return removedAddressBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          */
-        public Builder setRemovedAddress(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+        public Builder setRemovedAddress(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (removedAddressBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -10562,10 +10562,10 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          */
         public Builder setRemovedAddress(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
           if (removedAddressBuilder_ == null) {
             removedAddress_ = builderForValue.build();
             onChanged();
@@ -10576,15 +10576,15 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          */
-        public Builder mergeRemovedAddress(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+        public Builder mergeRemovedAddress(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (removedAddressBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
                 removedAddress_ != null &&
-                removedAddress_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+                removedAddress_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
               removedAddress_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(removedAddress_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(removedAddress_).mergeFrom(value).buildPartial();
             } else {
               removedAddress_ = value;
             }
@@ -10596,7 +10596,7 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          */
         public Builder clearRemovedAddress() {
           if (removedAddressBuilder_ == null) {
@@ -10609,33 +10609,33 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getRemovedAddressBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getRemovedAddressBuilder() {
           bitField0_ |= 0x00000001;
           onChanged();
           return getRemovedAddressFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getRemovedAddressOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getRemovedAddressOrBuilder() {
           if (removedAddressBuilder_ != null) {
             return removedAddressBuilder_.getMessageOrBuilder();
           } else {
             return removedAddress_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : removedAddress_;
           }
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress removedAddress = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress removedAddress = 1;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
             getRemovedAddressFieldBuilder() {
           if (removedAddressBuilder_ == null) {
-            removedAddressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
+            removedAddressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
                     getRemovedAddress(),
                     getParentForChildren(),
                     isClean());
@@ -10644,31 +10644,31 @@ public final class ReplicatorMessages {
           return removedAddressBuilder_;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress ownerAddress_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> ownerAddressBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress ownerAddress_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> ownerAddressBuilder_;
         /**
-         * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          * @return Whether the ownerAddress field is set.
          */
         public boolean hasOwnerAddress() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          * @return The ownerAddress.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getOwnerAddress() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getOwnerAddress() {
           if (ownerAddressBuilder_ == null) {
-            return ownerAddress_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
+            return ownerAddress_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
           } else {
             return ownerAddressBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          */
-        public Builder setOwnerAddress(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+        public Builder setOwnerAddress(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (ownerAddressBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -10682,10 +10682,10 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          */
         public Builder setOwnerAddress(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
           if (ownerAddressBuilder_ == null) {
             ownerAddress_ = builderForValue.build();
             onChanged();
@@ -10696,15 +10696,15 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          */
-        public Builder mergeOwnerAddress(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+        public Builder mergeOwnerAddress(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (ownerAddressBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 ownerAddress_ != null &&
-                ownerAddress_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+                ownerAddress_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
               ownerAddress_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(ownerAddress_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(ownerAddress_).mergeFrom(value).buildPartial();
             } else {
               ownerAddress_ = value;
             }
@@ -10716,7 +10716,7 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          */
         public Builder clearOwnerAddress() {
           if (ownerAddressBuilder_ == null) {
@@ -10729,33 +10729,33 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getOwnerAddressBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getOwnerAddressBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getOwnerAddressFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getOwnerAddressOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getOwnerAddressOrBuilder() {
           if (ownerAddressBuilder_ != null) {
             return ownerAddressBuilder_.getMessageOrBuilder();
           } else {
             return ownerAddress_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : ownerAddress_;
           }
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress ownerAddress = 2;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress ownerAddress = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
             getOwnerAddressFieldBuilder() {
           if (ownerAddressBuilder_ == null) {
-            ownerAddressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
+            ownerAddressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
                     getOwnerAddress(),
                     getParentForChildren(),
                     isClean());
@@ -10801,22 +10801,22 @@ public final class ReplicatorMessages {
           return this;
         }
 
-        private java.util.List seen_ =
+        private java.util.List seen_ =
           java.util.Collections.emptyList();
         private void ensureSeenIsMutable() {
           if (!((bitField0_ & 0x00000008) != 0)) {
-            seen_ = new java.util.ArrayList(seen_);
+            seen_ = new java.util.ArrayList(seen_);
             bitField0_ |= 0x00000008;
            }
         }
 
-        private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder> seenBuilder_;
+        private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder> seenBuilder_;
 
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
-        public java.util.List getSeenList() {
+        public java.util.List getSeenList() {
           if (seenBuilder_ == null) {
             return java.util.Collections.unmodifiableList(seen_);
           } else {
@@ -10824,7 +10824,7 @@ public final class ReplicatorMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
         public int getSeenCount() {
           if (seenBuilder_ == null) {
@@ -10834,9 +10834,9 @@ public final class ReplicatorMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getSeen(int index) {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getSeen(int index) {
           if (seenBuilder_ == null) {
             return seen_.get(index);
           } else {
@@ -10844,10 +10844,10 @@ public final class ReplicatorMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
         public Builder setSeen(
-            int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
+            int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
           if (seenBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -10861,10 +10861,10 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
         public Builder setSeen(
-            int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder builderForValue) {
+            int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder builderForValue) {
           if (seenBuilder_ == null) {
             ensureSeenIsMutable();
             seen_.set(index, builderForValue.build());
@@ -10875,9 +10875,9 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
-        public Builder addSeen(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
+        public Builder addSeen(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
           if (seenBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -10891,10 +10891,10 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
         public Builder addSeen(
-            int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
+            int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
           if (seenBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -10908,10 +10908,10 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
         public Builder addSeen(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder builderForValue) {
           if (seenBuilder_ == null) {
             ensureSeenIsMutable();
             seen_.add(builderForValue.build());
@@ -10922,10 +10922,10 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
         public Builder addSeen(
-            int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder builderForValue) {
+            int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder builderForValue) {
           if (seenBuilder_ == null) {
             ensureSeenIsMutable();
             seen_.add(index, builderForValue.build());
@@ -10936,13 +10936,13 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
         public Builder addAllSeen(
-            java.lang.Iterable values) {
+            java.lang.Iterable values) {
           if (seenBuilder_ == null) {
             ensureSeenIsMutable();
-            akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+            org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
                 values, seen_);
             onChanged();
           } else {
@@ -10951,7 +10951,7 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
         public Builder clearSeen() {
           if (seenBuilder_ == null) {
@@ -10964,7 +10964,7 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
         public Builder removeSeen(int index) {
           if (seenBuilder_ == null) {
@@ -10977,16 +10977,16 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder getSeenBuilder(
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder getSeenBuilder(
             int index) {
           return getSeenFieldBuilder().getBuilder(index);
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getSeenOrBuilder(
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getSeenOrBuilder(
             int index) {
           if (seenBuilder_ == null) {
             return seen_.get(index);  } else {
@@ -10994,9 +10994,9 @@ public final class ReplicatorMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
-        public java.util.List 
+        public java.util.List 
              getSeenOrBuilderList() {
           if (seenBuilder_ != null) {
             return seenBuilder_.getMessageOrBuilderList();
@@ -11005,33 +11005,33 @@ public final class ReplicatorMessages {
           }
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder addSeenBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder addSeenBuilder() {
           return getSeenFieldBuilder().addBuilder(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance());
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance());
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder addSeenBuilder(
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder addSeenBuilder(
             int index) {
           return getSeenFieldBuilder().addBuilder(
-              index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance());
+              index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance());
         }
         /**
-         * repeated .akka.cluster.ddata.Address seen = 4;
+         * repeated .org.apache.pekko.cluster.ddata.Address seen = 4;
          */
-        public java.util.List 
+        public java.util.List 
              getSeenBuilderList() {
           return getSeenFieldBuilder().getBuilderList();
         }
-        private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder> 
             getSeenFieldBuilder() {
           if (seenBuilder_ == null) {
-            seenBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder>(
+            seenBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder>(
                     seen_,
                     ((bitField0_ & 0x00000008) != 0),
                     getParentForChildren(),
@@ -11079,52 +11079,52 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.DataEnvelope.PruningEntry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.DataEnvelope.PruningEntry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public PruningEntry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new PruningEntry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -11132,84 +11132,84 @@ public final class ReplicatorMessages {
 
     private int bitField0_;
     public static final int DATA_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return Whether the data field is set.
      */
     public boolean hasData() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return The data.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
-      return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
+      return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
-      return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
+      return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
 
     public static final int PRUNING_FIELD_NUMBER = 2;
-    private java.util.List pruning_;
+    private java.util.List pruning_;
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    public java.util.List getPruningList() {
+    public java.util.List getPruningList() {
       return pruning_;
     }
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getPruningOrBuilderList() {
       return pruning_;
     }
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
     public int getPruningCount() {
       return pruning_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
       return pruning_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
         int index) {
       return pruning_.get(index);
     }
 
     public static final int DELTAVERSIONS_FIELD_NUMBER = 3;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector deltaVersions_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector deltaVersions_;
     /**
-     * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+     * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
      * @return Whether the deltaVersions field is set.
      */
     public boolean hasDeltaVersions() {
       return ((bitField0_ & 0x00000002) != 0);
     }
     /**
-     * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+     * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
      * @return The deltaVersions.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDeltaVersions() {
-      return deltaVersions_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDeltaVersions() {
+      return deltaVersions_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
     }
     /**
-     * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+     * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDeltaVersionsOrBuilder() {
-      return deltaVersions_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDeltaVersionsOrBuilder() {
+      return deltaVersions_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -11244,7 +11244,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getData());
@@ -11265,15 +11265,15 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getData());
       }
       for (int i = 0; i < pruning_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, pruning_.get(i));
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getDeltaVersions());
       }
       size += unknownFields.getSerializedSize();
@@ -11286,10 +11286,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope) obj;
 
       if (hasData() != other.hasData()) return false;
       if (hasData()) {
@@ -11331,73 +11331,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -11406,7 +11406,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -11417,42 +11417,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.DataEnvelope}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.DataEnvelope}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.DataEnvelope)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.DataEnvelope)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getDataFieldBuilder();
           getPruningFieldBuilder();
@@ -11484,19 +11484,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DataEnvelope_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11504,8 +11504,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -11544,44 +11544,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) return this;
         if (other.hasData()) {
           mergeData(other.getData());
         }
@@ -11604,7 +11604,7 @@ public final class ReplicatorMessages {
               pruning_ = other.pruning_;
               bitField0_ = (bitField0_ & ~0x00000002);
               pruningBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getPruningFieldBuilder() : null;
             } else {
               pruningBuilder_.addAllMessages(other.pruning_);
@@ -11642,14 +11642,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -11660,31 +11660,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> dataBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> dataBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        * @return Whether the data field is set.
        */
       public boolean hasData() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        * @return The data.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
         if (dataBuilder_ == null) {
-          return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+          return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
         } else {
           return dataBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      public Builder setData(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11698,10 +11698,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
       public Builder setData(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (dataBuilder_ == null) {
           data_ = builderForValue.build();
           onChanged();
@@ -11712,15 +11712,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      public Builder mergeData(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               data_ != null &&
-              data_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             data_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
           } else {
             data_ = value;
           }
@@ -11732,7 +11732,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
       public Builder clearData() {
         if (dataBuilder_ == null) {
@@ -11745,33 +11745,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getDataBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getDataBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getDataFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
         if (dataBuilder_ != null) {
           return dataBuilder_.getMessageOrBuilder();
         } else {
           return data_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getDataFieldBuilder() {
         if (dataBuilder_ == null) {
-          dataBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          dataBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getData(),
                   getParentForChildren(),
                   isClean());
@@ -11780,22 +11780,22 @@ public final class ReplicatorMessages {
         return dataBuilder_;
       }
 
-      private java.util.List pruning_ =
+      private java.util.List pruning_ =
         java.util.Collections.emptyList();
       private void ensurePruningIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          pruning_ = new java.util.ArrayList(pruning_);
+          pruning_ = new java.util.ArrayList(pruning_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder> pruningBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder> pruningBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public java.util.List getPruningList() {
+      public java.util.List getPruningList() {
         if (pruningBuilder_ == null) {
           return java.util.Collections.unmodifiableList(pruning_);
         } else {
@@ -11803,7 +11803,7 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public int getPruningCount() {
         if (pruningBuilder_ == null) {
@@ -11813,9 +11813,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
         if (pruningBuilder_ == null) {
           return pruning_.get(index);
         } else {
@@ -11823,10 +11823,10 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder setPruning(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
         if (pruningBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11840,10 +11840,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder setPruning(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
         if (pruningBuilder_ == null) {
           ensurePruningIsMutable();
           pruning_.set(index, builderForValue.build());
@@ -11854,9 +11854,9 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public Builder addPruning(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
+      public Builder addPruning(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
         if (pruningBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11870,10 +11870,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder addPruning(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
         if (pruningBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11887,10 +11887,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder addPruning(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
         if (pruningBuilder_ == null) {
           ensurePruningIsMutable();
           pruning_.add(builderForValue.build());
@@ -11901,10 +11901,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder addPruning(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
         if (pruningBuilder_ == null) {
           ensurePruningIsMutable();
           pruning_.add(index, builderForValue.build());
@@ -11915,13 +11915,13 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder addAllPruning(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (pruningBuilder_ == null) {
           ensurePruningIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, pruning_);
           onChanged();
         } else {
@@ -11930,7 +11930,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder clearPruning() {
         if (pruningBuilder_ == null) {
@@ -11943,7 +11943,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder removePruning(int index) {
         if (pruningBuilder_ == null) {
@@ -11956,16 +11956,16 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder getPruningBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder getPruningBuilder(
           int index) {
         return getPruningFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
           int index) {
         if (pruningBuilder_ == null) {
           return pruning_.get(index);  } else {
@@ -11973,9 +11973,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getPruningOrBuilderList() {
         if (pruningBuilder_ != null) {
           return pruningBuilder_.getMessageOrBuilderList();
@@ -11984,33 +11984,33 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder addPruningBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder addPruningBuilder() {
         return getPruningFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder addPruningBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder addPruningBuilder(
           int index) {
         return getPruningFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getPruningBuilderList() {
         return getPruningFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder> 
           getPruningFieldBuilder() {
         if (pruningBuilder_ == null) {
-          pruningBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder>(
+          pruningBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder>(
                   pruning_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -12020,31 +12020,31 @@ public final class ReplicatorMessages {
         return pruningBuilder_;
       }
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector deltaVersions_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> deltaVersionsBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector deltaVersions_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> deltaVersionsBuilder_;
       /**
-       * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+       * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        * @return Whether the deltaVersions field is set.
        */
       public boolean hasDeltaVersions() {
         return ((bitField0_ & 0x00000004) != 0);
       }
       /**
-       * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+       * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        * @return The deltaVersions.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDeltaVersions() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDeltaVersions() {
         if (deltaVersionsBuilder_ == null) {
-          return deltaVersions_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
+          return deltaVersions_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
         } else {
           return deltaVersionsBuilder_.getMessage();
         }
       }
       /**
-       * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+       * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        */
-      public Builder setDeltaVersions(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
+      public Builder setDeltaVersions(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
         if (deltaVersionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12058,10 +12058,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+       * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        */
       public Builder setDeltaVersions(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder builderForValue) {
         if (deltaVersionsBuilder_ == null) {
           deltaVersions_ = builderForValue.build();
           onChanged();
@@ -12072,15 +12072,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+       * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        */
-      public Builder mergeDeltaVersions(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
+      public Builder mergeDeltaVersions(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector value) {
         if (deltaVersionsBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
               deltaVersions_ != null &&
-              deltaVersions_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) {
+              deltaVersions_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) {
             deltaVersions_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.newBuilder(deltaVersions_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.newBuilder(deltaVersions_).mergeFrom(value).buildPartial();
           } else {
             deltaVersions_ = value;
           }
@@ -12092,7 +12092,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+       * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        */
       public Builder clearDeltaVersions() {
         if (deltaVersionsBuilder_ == null) {
@@ -12105,33 +12105,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+       * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder getDeltaVersionsBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder getDeltaVersionsBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getDeltaVersionsFieldBuilder().getBuilder();
       }
       /**
-       * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+       * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDeltaVersionsOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder getDeltaVersionsOrBuilder() {
         if (deltaVersionsBuilder_ != null) {
           return deltaVersionsBuilder_.getMessageOrBuilder();
         } else {
           return deltaVersions_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance() : deltaVersions_;
         }
       }
       /**
-       * optional .akka.cluster.ddata.VersionVector deltaVersions = 3;
+       * optional .org.apache.pekko.cluster.ddata.VersionVector deltaVersions = 3;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder> 
           getDeltaVersionsFieldBuilder() {
         if (deltaVersionsBuilder_ == null) {
-          deltaVersionsBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder>(
+          deltaVersionsBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder>(
                   getDeltaVersions(),
                   getParentForChildren(),
                   isClean());
@@ -12141,60 +12141,60 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.DataEnvelope)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.DataEnvelope)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.DataEnvelope)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.DataEnvelope)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public DataEnvelope parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new DataEnvelope(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface StatusOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Status)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Status)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required uint32 chunk = 1;
@@ -12219,27 +12219,27 @@ public final class ReplicatorMessages {
     int getTotChunks();
 
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder getEntriesOrBuilder(
         int index);
 
     /**
@@ -12265,15 +12265,15 @@ public final class ReplicatorMessages {
     long getFromSystemUid();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Status}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Status}
    */
   public  static final class Status extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Status)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Status)
       StatusOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Status.newBuilder() to construct.
-    private Status(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Status(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Status() {
@@ -12283,26 +12283,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Status();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Status(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -12323,11 +12323,11 @@ public final class ReplicatorMessages {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.PARSER, extensionRegistry));
               break;
             }
             case 33: {
@@ -12349,10 +12349,10 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
@@ -12362,22 +12362,22 @@ public final class ReplicatorMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Status.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Status.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required string key = 1;
@@ -12393,7 +12393,7 @@ public final class ReplicatorMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes();
 
       /**
@@ -12405,48 +12405,48 @@ public final class ReplicatorMessages {
        * required bytes digest = 2;
        * @return The digest.
        */
-      akka.protobufv3.internal.ByteString getDigest();
+      org.apache.pekko.protobufv3.internal.ByteString getDigest();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Status.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Status.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Status.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Status.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
         key_ = "";
-        digest_ = akka.protobufv3.internal.ByteString.EMPTY;
+        digest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       }
 
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -12456,7 +12456,7 @@ public final class ReplicatorMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 key_ = bs;
                 break;
@@ -12475,27 +12475,27 @@ public final class ReplicatorMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -12517,8 +12517,8 @@ public final class ReplicatorMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             key_ = s;
@@ -12530,22 +12530,22 @@ public final class ReplicatorMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           key_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
       public static final int DIGEST_FIELD_NUMBER = 2;
-      private akka.protobufv3.internal.ByteString digest_;
+      private org.apache.pekko.protobufv3.internal.ByteString digest_;
       /**
        * required bytes digest = 2;
        * @return Whether the digest field is set.
@@ -12557,7 +12557,7 @@ public final class ReplicatorMessages {
        * required bytes digest = 2;
        * @return The digest.
        */
-      public akka.protobufv3.internal.ByteString getDigest() {
+      public org.apache.pekko.protobufv3.internal.ByteString getDigest() {
         return digest_;
       }
 
@@ -12581,10 +12581,10 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeBytes(2, digest_);
@@ -12599,10 +12599,10 @@ public final class ReplicatorMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeBytesSize(2, digest_);
         }
         size += unknownFields.getSerializedSize();
@@ -12615,10 +12615,10 @@ public final class ReplicatorMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry) obj;
 
         if (hasKey() != other.hasKey()) return false;
         if (hasKey()) {
@@ -12654,73 +12654,73 @@ public final class ReplicatorMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -12729,7 +12729,7 @@ public final class ReplicatorMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -12740,42 +12740,42 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.Status.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.Status.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Status.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Status.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
           }
         }
@@ -12784,25 +12784,25 @@ public final class ReplicatorMessages {
           super.clear();
           key_ = "";
           bitField0_ = (bitField0_ & ~0x00000001);
-          digest_ = akka.protobufv3.internal.ByteString.EMPTY;
+          digest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -12810,8 +12810,8 @@ public final class ReplicatorMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -12833,44 +12833,44 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
             bitField0_ |= 0x00000001;
             key_ = other.key_;
@@ -12897,14 +12897,14 @@ public final class ReplicatorMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -12930,8 +12930,8 @@ public final class ReplicatorMessages {
         public java.lang.String getKey() {
           java.lang.Object ref = key_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               key_ = s;
@@ -12945,17 +12945,17 @@ public final class ReplicatorMessages {
          * required string key = 1;
          * @return The bytes for key.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getKeyBytes() {
           java.lang.Object ref = key_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             key_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -12989,7 +12989,7 @@ public final class ReplicatorMessages {
          * @return This builder for chaining.
          */
         public Builder setKeyBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -12999,7 +12999,7 @@ public final class ReplicatorMessages {
           return this;
         }
 
-        private akka.protobufv3.internal.ByteString digest_ = akka.protobufv3.internal.ByteString.EMPTY;
+        private org.apache.pekko.protobufv3.internal.ByteString digest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         /**
          * required bytes digest = 2;
          * @return Whether the digest field is set.
@@ -13011,7 +13011,7 @@ public final class ReplicatorMessages {
          * required bytes digest = 2;
          * @return The digest.
          */
-        public akka.protobufv3.internal.ByteString getDigest() {
+        public org.apache.pekko.protobufv3.internal.ByteString getDigest() {
           return digest_;
         }
         /**
@@ -13019,7 +13019,7 @@ public final class ReplicatorMessages {
          * @param value The digest to set.
          * @return This builder for chaining.
          */
-        public Builder setDigest(akka.protobufv3.internal.ByteString value) {
+        public Builder setDigest(org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -13040,52 +13040,52 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Status.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Status.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Status.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Status.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -13127,36 +13127,36 @@ public final class ReplicatorMessages {
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 3;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+     * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -13221,7 +13221,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt32(1, chunk_);
@@ -13248,23 +13248,23 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(1, chunk_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(2, totChunks_);
       }
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, entries_.get(i));
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSFixed64Size(4, toSystemUid_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSFixed64Size(5, fromSystemUid_);
       }
       size += unknownFields.getSerializedSize();
@@ -13277,10 +13277,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status) obj;
 
       if (hasChunk() != other.hasChunk()) return false;
       if (hasChunk()) {
@@ -13329,12 +13329,12 @@ public final class ReplicatorMessages {
       }
       if (hasToSystemUid()) {
         hash = (37 * hash) + TOSYSTEMUID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getToSystemUid());
       }
       if (hasFromSystemUid()) {
         hash = (37 * hash) + FROMSYSTEMUID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getFromSystemUid());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -13342,73 +13342,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -13417,7 +13417,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -13428,42 +13428,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Status}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Status}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Status)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StatusOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Status)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StatusOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getEntriesFieldBuilder();
         }
@@ -13489,19 +13489,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Status_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -13509,8 +13509,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -13549,44 +13549,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.getDefaultInstance()) return this;
         if (other.hasChunk()) {
           setChunk(other.getChunk());
         }
@@ -13612,7 +13612,7 @@ public final class ReplicatorMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000004);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -13648,14 +13648,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -13740,22 +13740,22 @@ public final class ReplicatorMessages {
         return this;
       }
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000004;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -13763,7 +13763,7 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -13773,9 +13773,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -13783,10 +13783,10 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13800,10 +13800,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -13814,9 +13814,9 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13830,10 +13830,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13847,10 +13847,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -13861,10 +13861,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -13875,13 +13875,13 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -13890,7 +13890,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -13903,7 +13903,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -13916,16 +13916,16 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -13933,9 +13933,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -13944,33 +13944,33 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.Status.Entry entries = 3;
+       * repeated .org.apache.pekko.cluster.ddata.Status.Entry entries = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
@@ -14055,60 +14055,60 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Status)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Status)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Status)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Status)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Status parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Status(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Status getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Status getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface GossipOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Gossip)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Gossip)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required bool sendBack = 1;
@@ -14122,27 +14122,27 @@ public final class ReplicatorMessages {
     boolean getSendBack();
 
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder getEntriesOrBuilder(
         int index);
 
     /**
@@ -14168,15 +14168,15 @@ public final class ReplicatorMessages {
     long getFromSystemUid();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Gossip}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Gossip}
    */
   public  static final class Gossip extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Gossip)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Gossip)
       GossipOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Gossip.newBuilder() to construct.
-    private Gossip(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Gossip(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Gossip() {
@@ -14186,26 +14186,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Gossip();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Gossip(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -14221,11 +14221,11 @@ public final class ReplicatorMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.PARSER, extensionRegistry));
               break;
             }
             case 25: {
@@ -14247,10 +14247,10 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -14260,22 +14260,22 @@ public final class ReplicatorMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Gossip.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Gossip.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required string key = 1;
@@ -14291,34 +14291,34 @@ public final class ReplicatorMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes();
 
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return Whether the envelope field is set.
        */
       boolean hasEnvelope();
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return The envelope.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope();
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Gossip.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Gossip.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Gossip.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Gossip.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -14328,26 +14328,26 @@ public final class ReplicatorMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -14357,17 +14357,17 @@ public final class ReplicatorMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 key_ = bs;
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = envelope_.toBuilder();
                 }
-                envelope_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
+                envelope_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(envelope_);
                   envelope_ = subBuilder.buildPartial();
@@ -14384,27 +14384,27 @@ public final class ReplicatorMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -14426,8 +14426,8 @@ public final class ReplicatorMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             key_ = s;
@@ -14439,41 +14439,41 @@ public final class ReplicatorMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           key_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
       public static final int ENVELOPE_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return Whether the envelope field is set.
        */
       public boolean hasEnvelope() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return The envelope.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
-        return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
+        return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
-        return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
+        return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
       }
 
       private byte memoizedIsInitialized = -1;
@@ -14500,10 +14500,10 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getEnvelope());
@@ -14518,10 +14518,10 @@ public final class ReplicatorMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getEnvelope());
         }
         size += unknownFields.getSerializedSize();
@@ -14534,10 +14534,10 @@ public final class ReplicatorMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry) obj;
 
         if (hasKey() != other.hasKey()) return false;
         if (hasKey()) {
@@ -14573,73 +14573,73 @@ public final class ReplicatorMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -14648,7 +14648,7 @@ public final class ReplicatorMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -14659,42 +14659,42 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.Gossip.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.Gossip.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Gossip.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Gossip.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getEnvelopeFieldBuilder();
           }
@@ -14714,19 +14714,19 @@ public final class ReplicatorMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -14734,8 +14734,8 @@ public final class ReplicatorMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -14761,44 +14761,44 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
             bitField0_ |= 0x00000001;
             key_ = other.key_;
@@ -14828,14 +14828,14 @@ public final class ReplicatorMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -14861,8 +14861,8 @@ public final class ReplicatorMessages {
         public java.lang.String getKey() {
           java.lang.Object ref = key_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               key_ = s;
@@ -14876,17 +14876,17 @@ public final class ReplicatorMessages {
          * required string key = 1;
          * @return The bytes for key.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getKeyBytes() {
           java.lang.Object ref = key_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             key_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -14920,7 +14920,7 @@ public final class ReplicatorMessages {
          * @return This builder for chaining.
          */
         public Builder setKeyBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -14930,31 +14930,31 @@ public final class ReplicatorMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> envelopeBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> envelopeBuilder_;
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          * @return Whether the envelope field is set.
          */
         public boolean hasEnvelope() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          * @return The envelope.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
           if (envelopeBuilder_ == null) {
-            return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+            return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
           } else {
             return envelopeBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        public Builder setEnvelope(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
+        public Builder setEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
           if (envelopeBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -14968,10 +14968,10 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
         public Builder setEnvelope(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
           if (envelopeBuilder_ == null) {
             envelope_ = builderForValue.build();
             onChanged();
@@ -14982,15 +14982,15 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        public Builder mergeEnvelope(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
+        public Builder mergeEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
           if (envelopeBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 envelope_ != null &&
-                envelope_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
+                envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
               envelope_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
             } else {
               envelope_ = value;
             }
@@ -15002,7 +15002,7 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
         public Builder clearEnvelope() {
           if (envelopeBuilder_ == null) {
@@ -15015,33 +15015,33 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder getEnvelopeBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder getEnvelopeBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getEnvelopeFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
           if (envelopeBuilder_ != null) {
             return envelopeBuilder_.getMessageOrBuilder();
           } else {
             return envelope_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
           }
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> 
             getEnvelopeFieldBuilder() {
           if (envelopeBuilder_ == null) {
-            envelopeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder>(
+            envelopeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder>(
                     getEnvelope(),
                     getParentForChildren(),
                     isClean());
@@ -15051,52 +15051,52 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Gossip.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Gossip.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Gossip.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Gossip.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -15121,36 +15121,36 @@ public final class ReplicatorMessages {
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -15211,7 +15211,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBool(1, sendBack_);
@@ -15235,19 +15235,19 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(1, sendBack_);
       }
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, entries_.get(i));
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSFixed64Size(3, toSystemUid_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSFixed64Size(4, fromSystemUid_);
       }
       size += unknownFields.getSerializedSize();
@@ -15260,10 +15260,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip) obj;
 
       if (hasSendBack() != other.hasSendBack()) return false;
       if (hasSendBack()) {
@@ -15295,7 +15295,7 @@ public final class ReplicatorMessages {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasSendBack()) {
         hash = (37 * hash) + SENDBACK_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getSendBack());
       }
       if (getEntriesCount() > 0) {
@@ -15304,12 +15304,12 @@ public final class ReplicatorMessages {
       }
       if (hasToSystemUid()) {
         hash = (37 * hash) + TOSYSTEMUID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getToSystemUid());
       }
       if (hasFromSystemUid()) {
         hash = (37 * hash) + FROMSYSTEMUID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getFromSystemUid());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -15317,73 +15317,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -15392,7 +15392,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -15403,42 +15403,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Gossip}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Gossip}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Gossip)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.GossipOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Gossip)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.GossipOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getEntriesFieldBuilder();
         }
@@ -15462,19 +15462,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Gossip_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -15482,8 +15482,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -15518,44 +15518,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.getDefaultInstance()) return this;
         if (other.hasSendBack()) {
           setSendBack(other.getSendBack());
         }
@@ -15578,7 +15578,7 @@ public final class ReplicatorMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000002);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -15611,14 +15611,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -15666,22 +15666,22 @@ public final class ReplicatorMessages {
         return this;
       }
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -15689,7 +15689,7 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -15699,9 +15699,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -15709,10 +15709,10 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15726,10 +15726,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -15740,9 +15740,9 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15756,10 +15756,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15773,10 +15773,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -15787,10 +15787,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -15801,13 +15801,13 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -15816,7 +15816,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -15829,7 +15829,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -15842,16 +15842,16 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -15859,9 +15859,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -15870,33 +15870,33 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.Gossip.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.Gossip.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -15981,98 +15981,98 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Gossip)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Gossip)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Gossip)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Gossip)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Gossip parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Gossip(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Gossip getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface DeltaPropagationOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.DeltaPropagation)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.DeltaPropagation)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
      * @return Whether the fromNode field is set.
      */
     boolean hasFromNode();
     /**
-     * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
      * @return The fromNode.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode();
     /**
-     * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder();
 
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder getEntriesOrBuilder(
         int index);
 
     /**
@@ -16095,15 +16095,15 @@ public final class ReplicatorMessages {
     boolean getReply();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.DeltaPropagation}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.DeltaPropagation}
    */
   public  static final class DeltaPropagation extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.DeltaPropagation)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DeltaPropagation)
       DeltaPropagationOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use DeltaPropagation.newBuilder() to construct.
-    private DeltaPropagation(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private DeltaPropagation(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private DeltaPropagation() {
@@ -16113,26 +16113,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new DeltaPropagation();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private DeltaPropagation(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -16142,11 +16142,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = fromNode_.toBuilder();
               }
-              fromNode_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
+              fromNode_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(fromNode_);
                 fromNode_ = subBuilder.buildPartial();
@@ -16156,11 +16156,11 @@ public final class ReplicatorMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.PARSER, extensionRegistry));
               break;
             }
             case 24: {
@@ -16177,10 +16177,10 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -16190,22 +16190,22 @@ public final class ReplicatorMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.DeltaPropagation.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.DeltaPropagation.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required string key = 1;
@@ -16221,23 +16221,23 @@ public final class ReplicatorMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      akka.protobufv3.internal.ByteString
+      org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes();
 
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return Whether the envelope field is set.
        */
       boolean hasEnvelope();
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return The envelope.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope();
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder();
 
       /**
        * required int64 fromSeqNr = 3;
@@ -16270,15 +16270,15 @@ public final class ReplicatorMessages {
       long getToSeqNr();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.DeltaPropagation.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.DeltaPropagation.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.DeltaPropagation.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DeltaPropagation.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -16288,26 +16288,26 @@ public final class ReplicatorMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -16317,17 +16317,17 @@ public final class ReplicatorMessages {
                 done = true;
                 break;
               case 10: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 key_ = bs;
                 break;
               }
               case 18: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = envelope_.toBuilder();
                 }
-                envelope_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
+                envelope_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(envelope_);
                   envelope_ = subBuilder.buildPartial();
@@ -16354,27 +16354,27 @@ public final class ReplicatorMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -16396,8 +16396,8 @@ public final class ReplicatorMessages {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs = 
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             key_ = s;
@@ -16409,41 +16409,41 @@ public final class ReplicatorMessages {
        * required string key = 1;
        * @return The bytes for key.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getKeyBytes() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           key_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
       public static final int ENVELOPE_FIELD_NUMBER = 2;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return Whether the envelope field is set.
        */
       public boolean hasEnvelope() {
         return ((bitField0_ & 0x00000002) != 0);
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        * @return The envelope.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
-        return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
+        return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
       }
       /**
-       * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+       * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
-        return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
+        return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
       }
 
       public static final int FROMSEQNR_FIELD_NUMBER = 3;
@@ -16516,10 +16516,10 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeMessage(2, getEnvelope());
@@ -16540,18 +16540,18 @@ public final class ReplicatorMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
+          size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(2, getEnvelope());
         }
         if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(3, fromSeqNr_);
         }
         if (((bitField0_ & 0x00000008) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(4, toSeqNr_);
         }
         size += unknownFields.getSerializedSize();
@@ -16564,10 +16564,10 @@ public final class ReplicatorMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry) obj;
 
         if (hasKey() != other.hasKey()) return false;
         if (hasKey()) {
@@ -16610,12 +16610,12 @@ public final class ReplicatorMessages {
         }
         if (hasFromSeqNr()) {
           hash = (37 * hash) + FROMSEQNR_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getFromSeqNr());
         }
         if (hasToSeqNr()) {
           hash = (37 * hash) + TOSEQNR_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getToSeqNr());
         }
         hash = (29 * hash) + unknownFields.hashCode();
@@ -16623,73 +16623,73 @@ public final class ReplicatorMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -16698,7 +16698,7 @@ public final class ReplicatorMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -16709,42 +16709,42 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.DeltaPropagation.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.DeltaPropagation.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.DeltaPropagation.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.DeltaPropagation.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getEnvelopeFieldBuilder();
           }
@@ -16768,19 +16768,19 @@ public final class ReplicatorMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -16788,8 +16788,8 @@ public final class ReplicatorMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -16823,44 +16823,44 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
             bitField0_ |= 0x00000001;
             key_ = other.key_;
@@ -16899,14 +16899,14 @@ public final class ReplicatorMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -16932,8 +16932,8 @@ public final class ReplicatorMessages {
         public java.lang.String getKey() {
           java.lang.Object ref = key_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               key_ = s;
@@ -16947,17 +16947,17 @@ public final class ReplicatorMessages {
          * required string key = 1;
          * @return The bytes for key.
          */
-        public akka.protobufv3.internal.ByteString
+        public org.apache.pekko.protobufv3.internal.ByteString
             getKeyBytes() {
           java.lang.Object ref = key_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
+            org.apache.pekko.protobufv3.internal.ByteString b = 
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                     (java.lang.String) ref);
             key_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -16991,7 +16991,7 @@ public final class ReplicatorMessages {
          * @return This builder for chaining.
          */
         public Builder setKeyBytes(
-            akka.protobufv3.internal.ByteString value) {
+            org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
     throw new NullPointerException();
   }
@@ -17001,31 +17001,31 @@ public final class ReplicatorMessages {
           return this;
         }
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> envelopeBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope envelope_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> envelopeBuilder_;
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          * @return Whether the envelope field is set.
          */
         public boolean hasEnvelope() {
           return ((bitField0_ & 0x00000002) != 0);
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          * @return The envelope.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope getEnvelope() {
           if (envelopeBuilder_ == null) {
-            return envelope_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+            return envelope_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
           } else {
             return envelopeBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        public Builder setEnvelope(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
+        public Builder setEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
           if (envelopeBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -17039,10 +17039,10 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
         public Builder setEnvelope(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder builderForValue) {
           if (envelopeBuilder_ == null) {
             envelope_ = builderForValue.build();
             onChanged();
@@ -17053,15 +17053,15 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        public Builder mergeEnvelope(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
+        public Builder mergeEnvelope(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope value) {
           if (envelopeBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0) &&
                 envelope_ != null &&
-                envelope_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
+                envelope_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance()) {
               envelope_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
             } else {
               envelope_ = value;
             }
@@ -17073,7 +17073,7 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
         public Builder clearEnvelope() {
           if (envelopeBuilder_ == null) {
@@ -17086,33 +17086,33 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder getEnvelopeBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder getEnvelopeBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getEnvelopeFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder getEnvelopeOrBuilder() {
           if (envelopeBuilder_ != null) {
             return envelopeBuilder_.getMessageOrBuilder();
           } else {
             return envelope_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.getDefaultInstance() : envelope_;
           }
         }
         /**
-         * required .akka.cluster.ddata.DataEnvelope envelope = 2;
+         * required .org.apache.pekko.cluster.ddata.DataEnvelope envelope = 2;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder> 
             getEnvelopeFieldBuilder() {
           if (envelopeBuilder_ == null) {
-            envelopeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder>(
+            envelopeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelopeOrBuilder>(
                     getEnvelope(),
                     getParentForChildren(),
                     isClean());
@@ -17212,52 +17212,52 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.DeltaPropagation.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.DeltaPropagation.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.DeltaPropagation.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.DeltaPropagation.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -17265,59 +17265,59 @@ public final class ReplicatorMessages {
 
     private int bitField0_;
     public static final int FROMNODE_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
     /**
-     * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
      * @return Whether the fromNode field is set.
      */
     public boolean hasFromNode() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
      * @return The fromNode.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
-      return fromNode_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
+      return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
     /**
-     * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+     * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
-      return fromNode_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
+      return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 2;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -17373,7 +17373,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFromNode());
@@ -17394,15 +17394,15 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFromNode());
       }
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, entries_.get(i));
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, reply_);
       }
       size += unknownFields.getSerializedSize();
@@ -17415,10 +17415,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation) obj;
 
       if (hasFromNode() != other.hasFromNode()) return false;
       if (hasFromNode()) {
@@ -17453,7 +17453,7 @@ public final class ReplicatorMessages {
       }
       if (hasReply()) {
         hash = (37 * hash) + REPLY_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getReply());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -17461,73 +17461,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -17536,7 +17536,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -17547,42 +17547,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.DeltaPropagation}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.DeltaPropagation}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.DeltaPropagation)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagationOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.DeltaPropagation)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagationOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromNodeFieldBuilder();
           getEntriesFieldBuilder();
@@ -17609,19 +17609,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DeltaPropagation_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -17629,8 +17629,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -17665,44 +17665,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.getDefaultInstance()) return this;
         if (other.hasFromNode()) {
           mergeFromNode(other.getFromNode());
         }
@@ -17725,7 +17725,7 @@ public final class ReplicatorMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000002);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -17758,14 +17758,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -17776,31 +17776,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> fromNodeBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress fromNode_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> fromNodeBuilder_;
       /**
-       * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        * @return Whether the fromNode field is set.
        */
       public boolean hasFromNode() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        * @return The fromNode.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getFromNode() {
         if (fromNodeBuilder_ == null) {
-          return fromNode_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+          return fromNode_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
         } else {
           return fromNodeBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        */
-      public Builder setFromNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+      public Builder setFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (fromNodeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17814,10 +17814,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        */
       public Builder setFromNode(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
         if (fromNodeBuilder_ == null) {
           fromNode_ = builderForValue.build();
           onChanged();
@@ -17828,15 +17828,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        */
-      public Builder mergeFromNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+      public Builder mergeFromNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
         if (fromNodeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               fromNode_ != null &&
-              fromNode_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+              fromNode_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
             fromNode_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(fromNode_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(fromNode_).mergeFrom(value).buildPartial();
           } else {
             fromNode_ = value;
           }
@@ -17848,7 +17848,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        */
       public Builder clearFromNode() {
         if (fromNodeBuilder_ == null) {
@@ -17861,33 +17861,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getFromNodeBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getFromNodeBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromNodeFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getFromNodeOrBuilder() {
         if (fromNodeBuilder_ != null) {
           return fromNodeBuilder_.getMessageOrBuilder();
         } else {
           return fromNode_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : fromNode_;
         }
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress fromNode = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress fromNode = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
           getFromNodeFieldBuilder() {
         if (fromNodeBuilder_ == null) {
-          fromNodeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
+          fromNodeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
                   getFromNode(),
                   getParentForChildren(),
                   isClean());
@@ -17896,22 +17896,22 @@ public final class ReplicatorMessages {
         return fromNodeBuilder_;
       }
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -17919,7 +17919,7 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -17929,9 +17929,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -17939,10 +17939,10 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17956,10 +17956,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -17970,9 +17970,9 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17986,10 +17986,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -18003,10 +18003,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -18017,10 +18017,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -18031,13 +18031,13 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -18046,7 +18046,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -18059,7 +18059,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -18072,16 +18072,16 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -18089,9 +18089,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -18100,33 +18100,33 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.DeltaPropagation.Entry entries = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DeltaPropagation.Entry entries = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -18190,75 +18190,75 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.DeltaPropagation)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.DeltaPropagation)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.DeltaPropagation)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.DeltaPropagation)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public DeltaPropagation parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new DeltaPropagation(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DeltaPropagation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface UniqueAddressOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.UniqueAddress)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.UniqueAddress)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.Address address = 1;
+     * required .org.apache.pekko.cluster.ddata.Address address = 1;
      * @return Whether the address field is set.
      */
     boolean hasAddress();
     /**
-     * required .akka.cluster.ddata.Address address = 1;
+     * required .org.apache.pekko.cluster.ddata.Address address = 1;
      * @return The address.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getAddress();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getAddress();
     /**
-     * required .akka.cluster.ddata.Address address = 1;
+     * required .org.apache.pekko.cluster.ddata.Address address = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getAddressOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getAddressOrBuilder();
 
     /**
      * required sfixed32 uid = 2;
@@ -18291,15 +18291,15 @@ public final class ReplicatorMessages {
     int getUid2();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.UniqueAddress}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.UniqueAddress}
    */
   public  static final class UniqueAddress extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.UniqueAddress)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.UniqueAddress)
       UniqueAddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use UniqueAddress.newBuilder() to construct.
-    private UniqueAddress(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private UniqueAddress(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private UniqueAddress() {
@@ -18308,26 +18308,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new UniqueAddress();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private UniqueAddress(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -18337,11 +18337,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = address_.toBuilder();
               }
-              address_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.PARSER, extensionRegistry);
+              address_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(address_);
                 address_ = subBuilder.buildPartial();
@@ -18368,51 +18368,51 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder.class);
     }
 
     private int bitField0_;
     public static final int ADDRESS_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address address_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address address_;
     /**
-     * required .akka.cluster.ddata.Address address = 1;
+     * required .org.apache.pekko.cluster.ddata.Address address = 1;
      * @return Whether the address field is set.
      */
     public boolean hasAddress() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.Address address = 1;
+     * required .org.apache.pekko.cluster.ddata.Address address = 1;
      * @return The address.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getAddress() {
-      return address_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getAddress() {
+      return address_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
     }
     /**
-     * required .akka.cluster.ddata.Address address = 1;
+     * required .org.apache.pekko.cluster.ddata.Address address = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getAddressOrBuilder() {
-      return address_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getAddressOrBuilder() {
+      return address_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
     }
 
     public static final int UID_FIELD_NUMBER = 2;
@@ -18481,7 +18481,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getAddress());
@@ -18502,15 +18502,15 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getAddress());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSFixed32Size(2, uid_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeSFixed32Size(3, uid2_);
       }
       size += unknownFields.getSerializedSize();
@@ -18523,10 +18523,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress) obj;
 
       if (hasAddress() != other.hasAddress()) return false;
       if (hasAddress()) {
@@ -18571,73 +18571,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -18646,7 +18646,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -18657,42 +18657,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.UniqueAddress}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.UniqueAddress}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.UniqueAddress)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.UniqueAddress)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAddressFieldBuilder();
         }
@@ -18714,19 +18714,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_UniqueAddress_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -18734,8 +18734,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -18765,44 +18765,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) return this;
         if (other.hasAddress()) {
           mergeAddress(other.getAddress());
         }
@@ -18833,14 +18833,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -18851,31 +18851,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address address_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder> addressBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address address_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder> addressBuilder_;
       /**
-       * required .akka.cluster.ddata.Address address = 1;
+       * required .org.apache.pekko.cluster.ddata.Address address = 1;
        * @return Whether the address field is set.
        */
       public boolean hasAddress() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.Address address = 1;
+       * required .org.apache.pekko.cluster.ddata.Address address = 1;
        * @return The address.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getAddress() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getAddress() {
         if (addressBuilder_ == null) {
-          return address_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
+          return address_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
         } else {
           return addressBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.Address address = 1;
+       * required .org.apache.pekko.cluster.ddata.Address address = 1;
        */
-      public Builder setAddress(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
+      public Builder setAddress(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
         if (addressBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -18889,10 +18889,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.Address address = 1;
+       * required .org.apache.pekko.cluster.ddata.Address address = 1;
        */
       public Builder setAddress(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
           onChanged();
@@ -18903,15 +18903,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.Address address = 1;
+       * required .org.apache.pekko.cluster.ddata.Address address = 1;
        */
-      public Builder mergeAddress(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
+      public Builder mergeAddress(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               address_ != null &&
-              address_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance()) {
+              address_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance()) {
             address_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial();
           } else {
             address_ = value;
           }
@@ -18923,7 +18923,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.Address address = 1;
+       * required .org.apache.pekko.cluster.ddata.Address address = 1;
        */
       public Builder clearAddress() {
         if (addressBuilder_ == null) {
@@ -18936,33 +18936,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.Address address = 1;
+       * required .org.apache.pekko.cluster.ddata.Address address = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder getAddressBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder getAddressBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getAddressFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.Address address = 1;
+       * required .org.apache.pekko.cluster.ddata.Address address = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getAddressOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder getAddressOrBuilder() {
         if (addressBuilder_ != null) {
           return addressBuilder_.getMessageOrBuilder();
         } else {
           return address_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance() : address_;
         }
       }
       /**
-       * required .akka.cluster.ddata.Address address = 1;
+       * required .org.apache.pekko.cluster.ddata.Address address = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder> 
           getAddressFieldBuilder() {
         if (addressBuilder_ == null) {
-          addressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder>(
+          addressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder>(
                   getAddress(),
                   getParentForChildren(),
                   isClean());
@@ -19062,60 +19062,60 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.UniqueAddress)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.UniqueAddress)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.UniqueAddress)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.UniqueAddress)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public UniqueAddress parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new UniqueAddress(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface AddressOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.Address)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.Address)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string hostname = 1;
@@ -19131,7 +19131,7 @@ public final class ReplicatorMessages {
      * required string hostname = 1;
      * @return The bytes for hostname.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes();
 
     /**
@@ -19146,15 +19146,15 @@ public final class ReplicatorMessages {
     int getPort();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.Address}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.Address}
    */
   public  static final class Address extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.Address)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.Address)
       AddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Address.newBuilder() to construct.
-    private Address(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Address(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Address() {
@@ -19164,26 +19164,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Address();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Address(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -19193,7 +19193,7 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               hostname_ = bs;
               break;
@@ -19212,27 +19212,27 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder.class);
     }
 
     private int bitField0_;
@@ -19254,8 +19254,8 @@ public final class ReplicatorMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           hostname_ = s;
@@ -19267,17 +19267,17 @@ public final class ReplicatorMessages {
      * required string hostname = 1;
      * @return The bytes for hostname.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         hostname_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -19318,10 +19318,10 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, hostname_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, hostname_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeUInt32(2, port_);
@@ -19336,10 +19336,10 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, hostname_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, hostname_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(2, port_);
       }
       size += unknownFields.getSerializedSize();
@@ -19352,10 +19352,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address) obj;
 
       if (hasHostname() != other.hasHostname()) return false;
       if (hasHostname()) {
@@ -19391,73 +19391,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -19466,7 +19466,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -19477,42 +19477,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.Address}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.Address}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.Address)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.Address)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.AddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -19527,19 +19527,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_Address_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -19547,8 +19547,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -19570,44 +19570,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address.getDefaultInstance()) return this;
         if (other.hasHostname()) {
           bitField0_ |= 0x00000001;
           hostname_ = other.hostname_;
@@ -19634,14 +19634,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -19667,8 +19667,8 @@ public final class ReplicatorMessages {
       public java.lang.String getHostname() {
         java.lang.Object ref = hostname_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             hostname_ = s;
@@ -19682,17 +19682,17 @@ public final class ReplicatorMessages {
        * required string hostname = 1;
        * @return The bytes for hostname.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getHostnameBytes() {
         java.lang.Object ref = hostname_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           hostname_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -19726,7 +19726,7 @@ public final class ReplicatorMessages {
        * @return This builder for chaining.
        */
       public Builder setHostnameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -19774,95 +19774,95 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.Address)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.Address)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.Address)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.Address)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
    
-        PARSER = new akka.protobufv3.internal.AbstractParser
    () {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
    
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser
    () {
       @java.lang.Override
       public Address parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Address(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser
     parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser
     parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser
     getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser
     getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.Address getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface VersionVectorOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.VersionVector)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.VersionVector)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
-    java.util.List 
+    java.util.List 
         getEntriesList();
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getEntries(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getEntries(int index);
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
     int getEntriesCount();
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
-    java.util.List 
+    java.util.List 
         getEntriesOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder getEntriesOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder getEntriesOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.VersionVector}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.VersionVector}
    */
   public  static final class VersionVector extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.VersionVector)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.VersionVector)
       VersionVectorOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use VersionVector.newBuilder() to construct.
-    private VersionVector(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private VersionVector(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private VersionVector() {
@@ -19872,26 +19872,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new VersionVector();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private VersionVector(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -19902,11 +19902,11 @@ public final class ReplicatorMessages {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entries_ = new java.util.ArrayList();
+                entries_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               entries_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -19918,10 +19918,10 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -19931,37 +19931,37 @@ public final class ReplicatorMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder.class);
     }
 
     public interface EntryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.VersionVector.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.VersionVector.Entry)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return Whether the node field is set.
        */
       boolean hasNode();
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return The node.
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode();
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        */
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder();
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder();
 
       /**
        * required int64 version = 2;
@@ -19975,15 +19975,15 @@ public final class ReplicatorMessages {
       long getVersion();
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.VersionVector.Entry}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.VersionVector.Entry}
      */
     public  static final class Entry extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:akka.cluster.ddata.VersionVector.Entry)
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.VersionVector.Entry)
         EntryOrBuilder {
     private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
       private Entry() {
@@ -19992,26 +19992,26 @@ public final class ReplicatorMessages {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
       getUnknownFields() {
         return this.unknownFields;
       }
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -20021,11 +20021,11 @@ public final class ReplicatorMessages {
                 done = true;
                 break;
               case 10: {
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000001) != 0)) {
                   subBuilder = node_.toBuilder();
                 }
-                node_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
+                node_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(node_);
                   node_ = subBuilder.buildPartial();
@@ -20047,51 +20047,51 @@ public final class ReplicatorMessages {
               }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
               e).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder.class);
       }
 
       private int bitField0_;
       public static final int NODE_FIELD_NUMBER = 1;
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return Whether the node field is set.
        */
       public boolean hasNode() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        * @return The node.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
-        return node_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
+        return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
       }
       /**
-       * required .akka.cluster.ddata.UniqueAddress node = 1;
+       * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
-        return node_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
+        return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
       }
 
       public static final int VERSION_FIELD_NUMBER = 2;
@@ -20135,7 +20135,7 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeMessage(1, getNode());
@@ -20153,11 +20153,11 @@ public final class ReplicatorMessages {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeMessageSize(1, getNode());
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
+          size += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeInt64Size(2, version_);
         }
         size += unknownFields.getSerializedSize();
@@ -20170,10 +20170,10 @@ public final class ReplicatorMessages {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry)) {
+        if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry)) {
           return super.equals(obj);
         }
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry) obj;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry) obj;
 
         if (hasNode() != other.hasNode()) return false;
         if (hasNode()) {
@@ -20202,7 +20202,7 @@ public final class ReplicatorMessages {
         }
         if (hasVersion()) {
           hash = (37 * hash) + VERSION_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
               getVersion());
         }
         hash = (29 * hash) + unknownFields.hashCode();
@@ -20210,73 +20210,73 @@ public final class ReplicatorMessages {
         return hash;
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
           java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
           java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.ByteString data,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(byte[] data)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
           byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseDelimitedFrom(
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parseFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
@@ -20285,7 +20285,7 @@ public final class ReplicatorMessages {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry prototype) {
+      public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -20296,42 +20296,42 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /**
-       * Protobuf type {@code akka.cluster.ddata.VersionVector.Entry}
+       * Protobuf type {@code org.apache.pekko.cluster.ddata.VersionVector.Entry}
        */
       public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.VersionVector.Entry)
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.VersionVector.Entry)
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptor() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_fieldAccessorTable
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder.class);
+                  org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder.class);
         }
 
-        // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.newBuilder()
+        // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                   .alwaysUseFieldBuilders) {
             getNodeFieldBuilder();
           }
@@ -20351,19 +20351,19 @@ public final class ReplicatorMessages {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_descriptor;
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getDefaultInstanceForType() {
-          return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.getDefaultInstance();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getDefaultInstanceForType() {
+          return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry build() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry result = buildPartial();
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry build() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -20371,8 +20371,8 @@ public final class ReplicatorMessages {
         }
 
         @java.lang.Override
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry buildPartial() {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry(this);
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry buildPartial() {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -20398,44 +20398,44 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.setField(field, value);
         }
         @java.lang.Override
         public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
         @java.lang.Override
         public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
         }
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry) {
-            return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry)other);
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry) {
+            return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry other) {
-          if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry other) {
+          if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.getDefaultInstance()) return this;
           if (other.hasNode()) {
             mergeNode(other.getNode());
           }
@@ -20463,14 +20463,14 @@ public final class ReplicatorMessages {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parsedMessage = null;
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -20481,31 +20481,31 @@ public final class ReplicatorMessages {
         }
         private int bitField0_;
 
-        private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> nodeBuilder_;
+        private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress node_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> nodeBuilder_;
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          * @return Whether the node field is set.
          */
         public boolean hasNode() {
           return ((bitField0_ & 0x00000001) != 0);
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          * @return The node.
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress getNode() {
           if (nodeBuilder_ == null) {
-            return node_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+            return node_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
           } else {
             return nodeBuilder_.getMessage();
           }
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        public Builder setNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+        public Builder setNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (nodeBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -20519,10 +20519,10 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
         public Builder setNode(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder builderForValue) {
           if (nodeBuilder_ == null) {
             node_ = builderForValue.build();
             onChanged();
@@ -20533,15 +20533,15 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        public Builder mergeNode(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
+        public Builder mergeNode(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress value) {
           if (nodeBuilder_ == null) {
             if (((bitField0_ & 0x00000001) != 0) &&
                 node_ != null &&
-                node_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
+                node_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance()) {
               node_ =
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.newBuilder(node_).mergeFrom(value).buildPartial();
             } else {
               node_ = value;
             }
@@ -20553,7 +20553,7 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
         public Builder clearNode() {
           if (nodeBuilder_ == null) {
@@ -20566,33 +20566,33 @@ public final class ReplicatorMessages {
           return this;
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getNodeBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder getNodeBuilder() {
           bitField0_ |= 0x00000001;
           onChanged();
           return getNodeFieldBuilder().getBuilder();
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
+        public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder getNodeOrBuilder() {
           if (nodeBuilder_ != null) {
             return nodeBuilder_.getMessageOrBuilder();
           } else {
             return node_ == null ?
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.getDefaultInstance() : node_;
           }
         }
         /**
-         * required .akka.cluster.ddata.UniqueAddress node = 1;
+         * required .org.apache.pekko.cluster.ddata.UniqueAddress node = 1;
          */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder> 
             getNodeFieldBuilder() {
           if (nodeBuilder_ == null) {
-            nodeBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
+            nodeBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddress.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.UniqueAddressOrBuilder>(
                     getNode(),
                     getParentForChildren(),
                     isClean());
@@ -20639,88 +20639,88 @@ public final class ReplicatorMessages {
         }
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
 
-        // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.VersionVector.Entry)
+        // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.VersionVector.Entry)
       }
 
-      // @@protoc_insertion_point(class_scope:akka.cluster.ddata.VersionVector.Entry)
-      private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry DEFAULT_INSTANCE;
+      // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.VersionVector.Entry)
+      private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry();
+        DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry();
       }
 
-      public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getDefaultInstance() {
+      public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
+      @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+          PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
         @java.lang.Override
         public Entry parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
           return new Entry(input, extensionRegistry);
         }
       };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getDefaultInstanceForType() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
     }
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
-    private java.util.List entries_;
+    private java.util.List entries_;
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
-    public java.util.List getEntriesList() {
+    public java.util.List getEntriesList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getEntriesOrBuilderList() {
       return entries_;
     }
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
     public int getEntriesCount() {
       return entries_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getEntries(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getEntries(int index) {
       return entries_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+     * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder getEntriesOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder getEntriesOrBuilder(
         int index) {
       return entries_.get(index);
     }
@@ -20743,7 +20743,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
@@ -20758,7 +20758,7 @@ public final class ReplicatorMessages {
 
       size = 0;
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, entries_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -20771,10 +20771,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector) obj;
 
       if (!getEntriesList()
           .equals(other.getEntriesList())) return false;
@@ -20798,73 +20798,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -20873,7 +20873,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -20884,42 +20884,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.VersionVector}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.VersionVector}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.VersionVector)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.VersionVector)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVectorOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getEntriesFieldBuilder();
         }
@@ -20937,19 +20937,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_VersionVector_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -20957,8 +20957,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector(this);
         int from_bitField0_ = bitField0_;
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -20979,44 +20979,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.getDefaultInstance()) return this;
         if (entriesBuilder_ == null) {
           if (!other.entries_.isEmpty()) {
             if (entries_.isEmpty()) {
@@ -21036,7 +21036,7 @@ public final class ReplicatorMessages {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000001);
               entriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getEntriesFieldBuilder() : null;
             } else {
               entriesBuilder_.addAllMessages(other.entries_);
@@ -21060,14 +21060,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -21078,22 +21078,22 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private java.util.List entries_ =
+      private java.util.List entries_ =
         java.util.Collections.emptyList();
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          entries_ = new java.util.ArrayList(entries_);
+          entries_ = new java.util.ArrayList(entries_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder> entriesBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder> entriesBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
-      public java.util.List getEntriesList() {
+      public java.util.List getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
         } else {
@@ -21101,7 +21101,7 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
       public int getEntriesCount() {
         if (entriesBuilder_ == null) {
@@ -21111,9 +21111,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getEntries(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
         } else {
@@ -21121,10 +21121,10 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21138,10 +21138,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
       public Builder setEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.set(index, builderForValue.build());
@@ -21152,9 +21152,9 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
-      public Builder addEntries(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry value) {
+      public Builder addEntries(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21168,10 +21168,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21185,10 +21185,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
       public Builder addEntries(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(builderForValue.build());
@@ -21199,10 +21199,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
       public Builder addEntries(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
           entries_.add(index, builderForValue.build());
@@ -21213,13 +21213,13 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
       public Builder addAllEntries(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, entries_);
           onChanged();
         } else {
@@ -21228,7 +21228,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
       public Builder clearEntries() {
         if (entriesBuilder_ == null) {
@@ -21241,7 +21241,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
       public Builder removeEntries(int index) {
         if (entriesBuilder_ == null) {
@@ -21254,16 +21254,16 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder getEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder getEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder getEntriesOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder getEntriesOrBuilder(
           int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);  } else {
@@ -21271,9 +21271,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -21282,33 +21282,33 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder addEntriesBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder addEntriesBuilder() {
         return getEntriesFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder addEntriesBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder addEntriesBuilder(
           int index) {
         return getEntriesFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.VersionVector.Entry entries = 1;
+       * repeated .org.apache.pekko.cluster.ddata.VersionVector.Entry entries = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder> 
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
-          entriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder>(
+          entriesBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.Entry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector.EntryOrBuilder>(
                   entries_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -21319,60 +21319,60 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.VersionVector)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.VersionVector)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.VersionVector)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.VersionVector)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public VersionVector parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new VersionVector(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.VersionVector getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface OtherMessageOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.OtherMessage)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.OtherMessage)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required bytes enclosedMessage = 1;
@@ -21383,7 +21383,7 @@ public final class ReplicatorMessages {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
-    akka.protobufv3.internal.ByteString getEnclosedMessage();
+    org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage();
 
     /**
      * required int32 serializerId = 2;
@@ -21405,48 +21405,48 @@ public final class ReplicatorMessages {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
-    akka.protobufv3.internal.ByteString getMessageManifest();
+    org.apache.pekko.protobufv3.internal.ByteString getMessageManifest();
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.OtherMessage}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.OtherMessage}
    */
   public  static final class OtherMessage extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.OtherMessage)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.OtherMessage)
       OtherMessageOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use OtherMessage.newBuilder() to construct.
-    private OtherMessage(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private OtherMessage(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private OtherMessage() {
-      enclosedMessage_ = akka.protobufv3.internal.ByteString.EMPTY;
-      messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+      messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new OtherMessage();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private OtherMessage(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -21479,32 +21479,32 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder.class);
     }
 
     private int bitField0_;
     public static final int ENCLOSEDMESSAGE_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.ByteString enclosedMessage_;
+    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_;
     /**
      * required bytes enclosedMessage = 1;
      * @return Whether the enclosedMessage field is set.
@@ -21516,7 +21516,7 @@ public final class ReplicatorMessages {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
-    public akka.protobufv3.internal.ByteString getEnclosedMessage() {
+    public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
       return enclosedMessage_;
     }
 
@@ -21538,7 +21538,7 @@ public final class ReplicatorMessages {
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 4;
-    private akka.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
     /**
      * optional bytes messageManifest = 4;
      * @return Whether the messageManifest field is set.
@@ -21550,7 +21550,7 @@ public final class ReplicatorMessages {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
-    public akka.protobufv3.internal.ByteString getMessageManifest() {
+    public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
 
@@ -21574,7 +21574,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, enclosedMessage_);
@@ -21595,15 +21595,15 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(1, enclosedMessage_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(2, serializerId_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(4, messageManifest_);
       }
       size += unknownFields.getSerializedSize();
@@ -21616,10 +21616,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage) obj;
 
       if (hasEnclosedMessage() != other.hasEnclosedMessage()) return false;
       if (hasEnclosedMessage()) {
@@ -21664,73 +21664,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -21739,7 +21739,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -21750,71 +21750,71 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.OtherMessage}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.OtherMessage}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.OtherMessage)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.OtherMessage)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        enclosedMessage_ = akka.protobufv3.internal.ByteString.EMPTY;
+        enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+        messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_OtherMessage_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -21822,8 +21822,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -21849,44 +21849,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) return this;
         if (other.hasEnclosedMessage()) {
           setEnclosedMessage(other.getEnclosedMessage());
         }
@@ -21914,14 +21914,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -21932,7 +21932,7 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.ByteString enclosedMessage_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes enclosedMessage = 1;
        * @return Whether the enclosedMessage field is set.
@@ -21944,7 +21944,7 @@ public final class ReplicatorMessages {
        * required bytes enclosedMessage = 1;
        * @return The enclosedMessage.
        */
-      public akka.protobufv3.internal.ByteString getEnclosedMessage() {
+      public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
         return enclosedMessage_;
       }
       /**
@@ -21952,7 +21952,7 @@ public final class ReplicatorMessages {
        * @param value The enclosedMessage to set.
        * @return This builder for chaining.
        */
-      public Builder setEnclosedMessage(akka.protobufv3.internal.ByteString value) {
+      public Builder setEnclosedMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -22009,7 +22009,7 @@ public final class ReplicatorMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.ByteString messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * optional bytes messageManifest = 4;
        * @return Whether the messageManifest field is set.
@@ -22021,7 +22021,7 @@ public final class ReplicatorMessages {
        * optional bytes messageManifest = 4;
        * @return The messageManifest.
        */
-      public akka.protobufv3.internal.ByteString getMessageManifest() {
+      public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
       /**
@@ -22029,7 +22029,7 @@ public final class ReplicatorMessages {
        * @param value The messageManifest to set.
        * @return This builder for chaining.
        */
-      public Builder setMessageManifest(akka.protobufv3.internal.ByteString value) {
+      public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -22050,60 +22050,60 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.OtherMessage)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.OtherMessage)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.OtherMessage)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.OtherMessage)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public OtherMessage parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new OtherMessage(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface StringGSetOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.StringGSet)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.StringGSet)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated string elements = 1;
@@ -22127,48 +22127,48 @@ public final class ReplicatorMessages {
      * @param index The index of the value to return.
      * @return The bytes of the elements at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getElementsBytes(int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.StringGSet}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.StringGSet}
    */
   public  static final class StringGSet extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.StringGSet)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.StringGSet)
       StringGSetOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use StringGSet.newBuilder() to construct.
-    private StringGSet(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private StringGSet(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private StringGSet() {
-      elements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new StringGSet();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private StringGSet(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -22178,9 +22178,9 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                elements_ = new akka.protobufv3.internal.LazyStringArrayList();
+                elements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               elements_.add(bs);
@@ -22195,10 +22195,10 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -22208,26 +22208,26 @@ public final class ReplicatorMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.Builder.class);
     }
 
     public static final int ELEMENTS_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.LazyStringList elements_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList elements_;
     /**
      * repeated string elements = 1;
      * @return A list containing the elements.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getElementsList() {
       return elements_;
     }
@@ -22251,7 +22251,7 @@ public final class ReplicatorMessages {
      * @param index The index of the value to return.
      * @return The bytes of the elements at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getElementsBytes(int index) {
       return elements_.getByteString(index);
     }
@@ -22268,10 +22268,10 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < elements_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, elements_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, elements_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -22300,10 +22300,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet) obj;
 
       if (!getElementsList()
           .equals(other.getElementsList())) return false;
@@ -22327,73 +22327,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -22402,7 +22402,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -22413,67 +22413,67 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.StringGSet}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.StringGSet}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.StringGSet)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSetOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.StringGSet)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSetOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        elements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_StringGSet_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -22481,8 +22481,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
           elements_ = elements_.getUnmodifiableView();
@@ -22499,44 +22499,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet.getDefaultInstance()) return this;
         if (!other.elements_.isEmpty()) {
           if (elements_.isEmpty()) {
             elements_ = other.elements_;
@@ -22559,14 +22559,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -22577,10 +22577,10 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.LazyStringList elements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureElementsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          elements_ = new akka.protobufv3.internal.LazyStringArrayList(elements_);
+          elements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(elements_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -22588,7 +22588,7 @@ public final class ReplicatorMessages {
        * repeated string elements = 1;
        * @return A list containing the elements.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getElementsList() {
         return elements_.getUnmodifiableView();
       }
@@ -22612,7 +22612,7 @@ public final class ReplicatorMessages {
        * @param index The index of the value to return.
        * @return The bytes of the elements at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getElementsBytes(int index) {
         return elements_.getByteString(index);
       }
@@ -22655,7 +22655,7 @@ public final class ReplicatorMessages {
       public Builder addAllElements(
           java.lang.Iterable values) {
         ensureElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, elements_);
         onChanged();
         return this;
@@ -22665,7 +22665,7 @@ public final class ReplicatorMessages {
        * @return This builder for chaining.
        */
       public Builder clearElements() {
-        elements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        elements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -22676,7 +22676,7 @@ public final class ReplicatorMessages {
        * @return This builder for chaining.
        */
       public Builder addElementsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -22687,110 +22687,110 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.StringGSet)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.StringGSet)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.StringGSet)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.StringGSet)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public StringGSet parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new StringGSet(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.StringGSet getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
   public interface DurableDataEnvelopeOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:akka.cluster.ddata.DurableDataEnvelope)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.cluster.ddata.DurableDataEnvelope)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return Whether the data field is set.
      */
     boolean hasData();
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return The data.
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData();
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder();
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder();
 
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    java.util.List 
+    java.util.List 
         getPruningList();
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index);
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index);
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
     int getPruningCount();
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    java.util.List 
+    java.util.List 
         getPruningOrBuilderList();
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
+    org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code akka.cluster.ddata.DurableDataEnvelope}
+   * Protobuf type {@code org.apache.pekko.cluster.ddata.DurableDataEnvelope}
    */
   public  static final class DurableDataEnvelope extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:akka.cluster.ddata.DurableDataEnvelope)
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.ddata.DurableDataEnvelope)
       DurableDataEnvelopeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use DurableDataEnvelope.newBuilder() to construct.
-    private DurableDataEnvelope(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private DurableDataEnvelope(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private DurableDataEnvelope() {
@@ -22800,26 +22800,26 @@ public final class ReplicatorMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new DurableDataEnvelope();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private DurableDataEnvelope(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -22829,11 +22829,11 @@ public final class ReplicatorMessages {
               done = true;
               break;
             case 10: {
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = data_.toBuilder();
               }
-              data_ = input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
+              data_ = input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(data_);
                 data_ = subBuilder.buildPartial();
@@ -22843,11 +22843,11 @@ public final class ReplicatorMessages {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                pruning_ = new java.util.ArrayList();
+                pruning_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               pruning_.add(
-                  input.readMessage(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -22859,10 +22859,10 @@ public final class ReplicatorMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -22872,74 +22872,74 @@ public final class ReplicatorMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_descriptor;
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_fieldAccessorTable
+      return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.Builder.class);
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.Builder.class);
     }
 
     private int bitField0_;
     public static final int DATA_FIELD_NUMBER = 1;
-    private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
+    private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return Whether the data field is set.
      */
     public boolean hasData() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      * @return The data.
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
-      return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
+      return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
     /**
-     * required .akka.cluster.ddata.OtherMessage data = 1;
+     * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
-      return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
+      return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
     }
 
     public static final int PRUNING_FIELD_NUMBER = 2;
-    private java.util.List pruning_;
+    private java.util.List pruning_;
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    public java.util.List getPruningList() {
+    public java.util.List getPruningList() {
       return pruning_;
     }
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getPruningOrBuilderList() {
       return pruning_;
     }
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
     public int getPruningCount() {
       return pruning_.size();
     }
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
       return pruning_.get(index);
     }
     /**
-     * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+     * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
      */
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
         int index) {
       return pruning_.get(index);
     }
@@ -22970,7 +22970,7 @@ public final class ReplicatorMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getData());
@@ -22988,11 +22988,11 @@ public final class ReplicatorMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getData());
       }
       for (int i = 0; i < pruning_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, pruning_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -23005,10 +23005,10 @@ public final class ReplicatorMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope)) {
+      if (!(obj instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope)) {
         return super.equals(obj);
       }
-      akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope other = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope) obj;
+      org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope other = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope) obj;
 
       if (hasData() != other.hasData()) return false;
       if (hasData()) {
@@ -23041,73 +23041,73 @@ public final class ReplicatorMessages {
       return hash;
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseDelimitedFrom(
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -23116,7 +23116,7 @@ public final class ReplicatorMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope prototype) {
+    public static Builder newBuilder(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -23127,42 +23127,42 @@ public final class ReplicatorMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code akka.cluster.ddata.DurableDataEnvelope}
+     * Protobuf type {@code org.apache.pekko.cluster.ddata.DurableDataEnvelope}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:akka.cluster.ddata.DurableDataEnvelope)
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelopeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.ddata.DurableDataEnvelope)
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelopeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_fieldAccessorTable
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.class, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.Builder.class);
+                org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.class, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.Builder.class);
       }
 
-      // Construct using akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.newBuilder()
+      // Construct using org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getDataFieldBuilder();
           getPruningFieldBuilder();
@@ -23187,19 +23187,19 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_descriptor;
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.internal_static_akka_cluster_ddata_DurableDataEnvelope_descriptor;
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope getDefaultInstanceForType() {
-        return akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.getDefaultInstance();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope getDefaultInstanceForType() {
+        return org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope build() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope result = buildPartial();
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope build() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -23207,8 +23207,8 @@ public final class ReplicatorMessages {
       }
 
       @java.lang.Override
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope buildPartial() {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope result = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope(this);
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope buildPartial() {
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope result = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -23239,44 +23239,44 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope) {
-          return mergeFrom((akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope) {
+          return mergeFrom((org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope other) {
-        if (other == akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope other) {
+        if (other == org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope.getDefaultInstance()) return this;
         if (other.hasData()) {
           mergeData(other.getData());
         }
@@ -23299,7 +23299,7 @@ public final class ReplicatorMessages {
               pruning_ = other.pruning_;
               bitField0_ = (bitField0_ & ~0x00000002);
               pruningBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getPruningFieldBuilder() : null;
             } else {
               pruningBuilder_.addAllMessages(other.pruning_);
@@ -23329,14 +23329,14 @@ public final class ReplicatorMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parsedMessage = null;
+        org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -23347,31 +23347,31 @@ public final class ReplicatorMessages {
       }
       private int bitField0_;
 
-      private akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> dataBuilder_;
+      private org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage data_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> dataBuilder_;
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        * @return Whether the data field is set.
        */
       public boolean hasData() {
         return ((bitField0_ & 0x00000001) != 0);
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        * @return The data.
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage getData() {
         if (dataBuilder_ == null) {
-          return data_ == null ? akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+          return data_ == null ? org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
         } else {
           return dataBuilder_.getMessage();
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      public Builder setData(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder setData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23385,10 +23385,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
       public Builder setData(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder builderForValue) {
         if (dataBuilder_ == null) {
           data_ = builderForValue.build();
           onChanged();
@@ -23399,15 +23399,15 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      public Builder mergeData(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
+      public Builder mergeData(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage value) {
         if (dataBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               data_ != null &&
-              data_ != akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
+              data_ != org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance()) {
             data_ =
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.newBuilder(data_).mergeFrom(value).buildPartial();
           } else {
             data_ = value;
           }
@@ -23419,7 +23419,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
       public Builder clearData() {
         if (dataBuilder_ == null) {
@@ -23432,33 +23432,33 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getDataBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder getDataBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getDataFieldBuilder().getBuilder();
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder getDataOrBuilder() {
         if (dataBuilder_ != null) {
           return dataBuilder_.getMessageOrBuilder();
         } else {
           return data_ == null ?
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.getDefaultInstance() : data_;
         }
       }
       /**
-       * required .akka.cluster.ddata.OtherMessage data = 1;
+       * required .org.apache.pekko.cluster.ddata.OtherMessage data = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder> 
           getDataFieldBuilder() {
         if (dataBuilder_ == null) {
-          dataBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
+          dataBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessageOrBuilder>(
                   getData(),
                   getParentForChildren(),
                   isClean());
@@ -23467,22 +23467,22 @@ public final class ReplicatorMessages {
         return dataBuilder_;
       }
 
-      private java.util.List pruning_ =
+      private java.util.List pruning_ =
         java.util.Collections.emptyList();
       private void ensurePruningIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          pruning_ = new java.util.ArrayList(pruning_);
+          pruning_ = new java.util.ArrayList(pruning_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder> pruningBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder> pruningBuilder_;
 
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public java.util.List getPruningList() {
+      public java.util.List getPruningList() {
         if (pruningBuilder_ == null) {
           return java.util.Collections.unmodifiableList(pruning_);
         } else {
@@ -23490,7 +23490,7 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public int getPruningCount() {
         if (pruningBuilder_ == null) {
@@ -23500,9 +23500,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry getPruning(int index) {
         if (pruningBuilder_ == null) {
           return pruning_.get(index);
         } else {
@@ -23510,10 +23510,10 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder setPruning(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
         if (pruningBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23527,10 +23527,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder setPruning(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
         if (pruningBuilder_ == null) {
           ensurePruningIsMutable();
           pruning_.set(index, builderForValue.build());
@@ -23541,9 +23541,9 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public Builder addPruning(akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
+      public Builder addPruning(org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
         if (pruningBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23557,10 +23557,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder addPruning(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry value) {
         if (pruningBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23574,10 +23574,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder addPruning(
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
         if (pruningBuilder_ == null) {
           ensurePruningIsMutable();
           pruning_.add(builderForValue.build());
@@ -23588,10 +23588,10 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder addPruning(
-          int index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
+          int index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder builderForValue) {
         if (pruningBuilder_ == null) {
           ensurePruningIsMutable();
           pruning_.add(index, builderForValue.build());
@@ -23602,13 +23602,13 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder addAllPruning(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (pruningBuilder_ == null) {
           ensurePruningIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, pruning_);
           onChanged();
         } else {
@@ -23617,7 +23617,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder clearPruning() {
         if (pruningBuilder_ == null) {
@@ -23630,7 +23630,7 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
       public Builder removePruning(int index) {
         if (pruningBuilder_ == null) {
@@ -23643,16 +23643,16 @@ public final class ReplicatorMessages {
         return this;
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder getPruningBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder getPruningBuilder(
           int index) {
         return getPruningFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder getPruningOrBuilder(
           int index) {
         if (pruningBuilder_ == null) {
           return pruning_.get(index);  } else {
@@ -23660,9 +23660,9 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getPruningOrBuilderList() {
         if (pruningBuilder_ != null) {
           return pruningBuilder_.getMessageOrBuilderList();
@@ -23671,33 +23671,33 @@ public final class ReplicatorMessages {
         }
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder addPruningBuilder() {
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder addPruningBuilder() {
         return getPruningFieldBuilder().addBuilder(
-            akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance());
+            org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder addPruningBuilder(
+      public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder addPruningBuilder(
           int index) {
         return getPruningFieldBuilder().addBuilder(
-            index, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance());
+            index, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.getDefaultInstance());
       }
       /**
-       * repeated .akka.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
+       * repeated .org.apache.pekko.cluster.ddata.DataEnvelope.PruningEntry pruning = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getPruningBuilderList() {
         return getPruningFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder> 
           getPruningFieldBuilder() {
         if (pruningBuilder_ == null) {
-          pruningBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder>(
+          pruningBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntry.Builder, org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DataEnvelope.PruningEntryOrBuilder>(
                   pruning_,
                   ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
@@ -23708,197 +23708,197 @@ public final class ReplicatorMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
 
-      // @@protoc_insertion_point(builder_scope:akka.cluster.ddata.DurableDataEnvelope)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.ddata.DurableDataEnvelope)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.cluster.ddata.DurableDataEnvelope)
-    private static final akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope DEFAULT_INSTANCE;
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.cluster.ddata.DurableDataEnvelope)
+    private static final org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope();
+      DEFAULT_INSTANCE = new org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope();
     }
 
-    public static akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope getDefaultInstance() {
+    public static org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public DurableDataEnvelope parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new DurableDataEnvelope(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope getDefaultInstanceForType() {
+    public org.apache.pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.DurableDataEnvelope getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Get_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Get_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_GetSuccess_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_GetSuccess_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_NotFound_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_NotFound_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_GetFailure_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_GetFailure_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Subscribe_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Subscribe_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Unsubscribe_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Unsubscribe_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Changed_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Changed_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Write_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Write_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Empty_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Empty_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Read_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Read_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_ReadResult_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_ReadResult_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_DataEnvelope_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_DataEnvelope_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Status_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Status_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Status_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Status_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Gossip_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Gossip_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Gossip_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Gossip_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_DeltaPropagation_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_DeltaPropagation_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_DeltaPropagation_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_DeltaPropagation_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_UniqueAddress_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_UniqueAddress_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_Address_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_Address_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_VersionVector_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_VersionVector_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_VersionVector_Entry_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_VersionVector_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_OtherMessage_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_OtherMessage_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_StringGSet_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_StringGSet_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_akka_cluster_ddata_DurableDataEnvelope_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_cluster_ddata_DurableDataEnvelope_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030ReplicatorMessages.proto\022\022akka.cluster" +
+      "\n\030ReplicatorMessages.proto\022\022org.apache.pekko.cluster" +
       ".ddata\"\307\001\n\003Get\022-\n\003key\030\001 \002(\0132 .akka.clust" +
       "er.ddata.OtherMessage\022\023\n\013consistency\030\002 \002" +
       "(\021\022\017\n\007timeout\030\003 \002(\r\0221\n\007request\030\004 \001(\0132 .a" +
@@ -23906,35 +23906,35 @@ public final class ReplicatorMessages {
       "tencyMinCap\030\005 \001(\005\022\035\n\025consistencyAddition" +
       "al\030\006 \001(\005\"\236\001\n\nGetSuccess\022-\n\003key\030\001 \002(\0132 .a" +
       "kka.cluster.ddata.OtherMessage\022.\n\004data\030\002" +
-      " \002(\0132 .akka.cluster.ddata.OtherMessage\0221" +
-      "\n\007request\030\004 \001(\0132 .akka.cluster.ddata.Oth" +
+      " \002(\0132 .org.apache.pekko.cluster.ddata.OtherMessage\0221" +
+      "\n\007request\030\004 \001(\0132 .org.apache.pekko.cluster.ddata.Oth" +
       "erMessage\"l\n\010NotFound\022-\n\003key\030\001 \002(\0132 .akk" +
       "a.cluster.ddata.OtherMessage\0221\n\007request\030" +
-      "\002 \001(\0132 .akka.cluster.ddata.OtherMessage\"" +
+      "\002 \001(\0132 .org.apache.pekko.cluster.ddata.OtherMessage\"" +
       "n\n\nGetFailure\022-\n\003key\030\001 \002(\0132 .akka.cluste" +
       "r.ddata.OtherMessage\0221\n\007request\030\002 \001(\0132 ." +
-      "akka.cluster.ddata.OtherMessage\"G\n\tSubsc" +
-      "ribe\022-\n\003key\030\001 \002(\0132 .akka.cluster.ddata.O" +
+      "org.apache.pekko.cluster.ddata.OtherMessage\"G\n\tSubsc" +
+      "ribe\022-\n\003key\030\001 \002(\0132 .org.apache.pekko.cluster.ddata.O" +
       "therMessage\022\013\n\003ref\030\002 \002(\t\"I\n\013Unsubscribe\022" +
-      "-\n\003key\030\001 \002(\0132 .akka.cluster.ddata.OtherM" +
+      "-\n\003key\030\001 \002(\0132 .org.apache.pekko.cluster.ddata.OtherM" +
       "essage\022\013\n\003ref\030\002 \002(\t\"h\n\007Changed\022-\n\003key\030\001 " +
-      "\002(\0132 .akka.cluster.ddata.OtherMessage\022.\n" +
-      "\004data\030\002 \002(\0132 .akka.cluster.ddata.OtherMe" +
+      "\002(\0132 .org.apache.pekko.cluster.ddata.OtherMessage\022.\n" +
+      "\004data\030\002 \002(\0132 .org.apache.pekko.cluster.ddata.OtherMe" +
       "ssage\"}\n\005Write\022\013\n\003key\030\001 \002(\t\0222\n\010envelope\030" +
-      "\002 \002(\0132 .akka.cluster.ddata.DataEnvelope\022" +
-      "3\n\010fromNode\030\003 \001(\0132!.akka.cluster.ddata.U" +
+      "\002 \002(\0132 .org.apache.pekko.cluster.ddata.DataEnvelope\022" +
+      "3\n\010fromNode\030\003 \001(\0132!.org.apache.pekko.cluster.ddata.U" +
       "niqueAddress\"\007\n\005Empty\"H\n\004Read\022\013\n\003key\030\001 \002" +
-      "(\t\0223\n\010fromNode\030\002 \001(\0132!.akka.cluster.ddat" +
+      "(\t\0223\n\010fromNode\030\002 \001(\0132!.org.apache.pekko.cluster.ddat" +
       "a.UniqueAddress\"@\n\nReadResult\0222\n\010envelop" +
-      "e\030\001 \001(\0132 .akka.cluster.ddata.DataEnvelop" +
+      "e\030\001 \001(\0132 .org.apache.pekko.cluster.ddata.DataEnvelop" +
       "e\"\221\003\n\014DataEnvelope\022.\n\004data\030\001 \002(\0132 .akka." +
       "cluster.ddata.OtherMessage\022>\n\007pruning\030\002 " +
-      "\003(\0132-.akka.cluster.ddata.DataEnvelope.Pr" +
+      "\003(\0132-.org.apache.pekko.cluster.ddata.DataEnvelope.Pr" +
       "uningEntry\0228\n\rdeltaVersions\030\003 \001(\0132!.akka" +
       ".cluster.ddata.VersionVector\032\326\001\n\014Pruning" +
       "Entry\0229\n\016removedAddress\030\001 \002(\0132!.akka.clu" +
       "ster.ddata.UniqueAddress\0227\n\014ownerAddress" +
-      "\030\002 \002(\0132!.akka.cluster.ddata.UniqueAddres" +
+      "\030\002 \002(\0132!.org.apache.pekko.cluster.ddata.UniqueAddres" +
       "s\022\021\n\tperformed\030\003 \002(\010\022)\n\004seen\030\004 \003(\0132\033.akk" +
       "a.cluster.ddata.Address\022\024\n\014obsoleteTime\030" +
       "\005 \001(\022\"\257\001\n\006Status\022\r\n\005chunk\030\001 \002(\r\022\021\n\ttotCh" +
@@ -23947,186 +23947,186 @@ public final class ReplicatorMessages {
       " \001(\020\022\025\n\rfromSystemUid\030\004 \001(\020\032H\n\005Entry\022\013\n\003" +
       "key\030\001 \002(\t\0222\n\010envelope\030\002 \002(\0132 .akka.clust" +
       "er.ddata.DataEnvelope\"\201\002\n\020DeltaPropagati" +
-      "on\0223\n\010fromNode\030\001 \002(\0132!.akka.cluster.ddat" +
+      "on\0223\n\010fromNode\030\001 \002(\0132!.org.apache.pekko.cluster.ddat" +
       "a.UniqueAddress\022;\n\007entries\030\002 \003(\0132*.akka." +
       "cluster.ddata.DeltaPropagation.Entry\022\r\n\005" +
       "reply\030\003 \001(\010\032l\n\005Entry\022\013\n\003key\030\001 \002(\t\0222\n\010env" +
-      "elope\030\002 \002(\0132 .akka.cluster.ddata.DataEnv" +
+      "elope\030\002 \002(\0132 .org.apache.pekko.cluster.ddata.DataEnv" +
       "elope\022\021\n\tfromSeqNr\030\003 \002(\003\022\017\n\007toSeqNr\030\004 \001(" +
       "\003\"X\n\rUniqueAddress\022,\n\007address\030\001 \002(\0132\033.ak" +
       "ka.cluster.ddata.Address\022\013\n\003uid\030\002 \002(\017\022\014\n" +
       "\004uid2\030\003 \001(\017\")\n\007Address\022\020\n\010hostname\030\001 \002(\t" +
       "\022\014\n\004port\030\002 \002(\r\"\224\001\n\rVersionVector\0228\n\007entr" +
-      "ies\030\001 \003(\0132\'.akka.cluster.ddata.VersionVe" +
+      "ies\030\001 \003(\0132\'.org.apache.pekko.cluster.ddata.VersionVe" +
       "ctor.Entry\032I\n\005Entry\022/\n\004node\030\001 \002(\0132!.akka" +
       ".cluster.ddata.UniqueAddress\022\017\n\007version\030" +
       "\002 \002(\003\"V\n\014OtherMessage\022\027\n\017enclosedMessage" +
       "\030\001 \002(\014\022\024\n\014serializerId\030\002 \002(\005\022\027\n\017messageM" +
       "anifest\030\004 \001(\014\"\036\n\nStringGSet\022\020\n\010elements\030" +
       "\001 \003(\t\"\205\001\n\023DurableDataEnvelope\022.\n\004data\030\001 " +
-      "\002(\0132 .akka.cluster.ddata.OtherMessage\022>\n" +
-      "\007pruning\030\002 \003(\0132-.akka.cluster.ddata.Data" +
-      "Envelope.PruningEntryB#\n\037akka.cluster.dd" +
+      "\002(\0132 .org.apache.pekko.cluster.ddata.OtherMessage\022>\n" +
+      "\007pruning\030\002 \003(\0132-.org.apache.pekko.cluster.ddata.Data" +
+      "Envelope.PruningEntryB#\n\037org.apache.pekko.cluster.dd" +
       "ata.protobuf.msgH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_akka_cluster_ddata_Get_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_akka_cluster_ddata_Get_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Get_descriptor,
         new java.lang.String[] { "Key", "Consistency", "Timeout", "Request", "ConsistencyMinCap", "ConsistencyAdditional", });
     internal_static_akka_cluster_ddata_GetSuccess_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_akka_cluster_ddata_GetSuccess_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_GetSuccess_descriptor,
         new java.lang.String[] { "Key", "Data", "Request", });
     internal_static_akka_cluster_ddata_NotFound_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_akka_cluster_ddata_NotFound_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_NotFound_descriptor,
         new java.lang.String[] { "Key", "Request", });
     internal_static_akka_cluster_ddata_GetFailure_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_akka_cluster_ddata_GetFailure_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_GetFailure_descriptor,
         new java.lang.String[] { "Key", "Request", });
     internal_static_akka_cluster_ddata_Subscribe_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_akka_cluster_ddata_Subscribe_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Subscribe_descriptor,
         new java.lang.String[] { "Key", "Ref", });
     internal_static_akka_cluster_ddata_Unsubscribe_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_akka_cluster_ddata_Unsubscribe_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Unsubscribe_descriptor,
         new java.lang.String[] { "Key", "Ref", });
     internal_static_akka_cluster_ddata_Changed_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_akka_cluster_ddata_Changed_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Changed_descriptor,
         new java.lang.String[] { "Key", "Data", });
     internal_static_akka_cluster_ddata_Write_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_akka_cluster_ddata_Write_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Write_descriptor,
         new java.lang.String[] { "Key", "Envelope", "FromNode", });
     internal_static_akka_cluster_ddata_Empty_descriptor =
       getDescriptor().getMessageTypes().get(8);
     internal_static_akka_cluster_ddata_Empty_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Empty_descriptor,
         new java.lang.String[] { });
     internal_static_akka_cluster_ddata_Read_descriptor =
       getDescriptor().getMessageTypes().get(9);
     internal_static_akka_cluster_ddata_Read_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Read_descriptor,
         new java.lang.String[] { "Key", "FromNode", });
     internal_static_akka_cluster_ddata_ReadResult_descriptor =
       getDescriptor().getMessageTypes().get(10);
     internal_static_akka_cluster_ddata_ReadResult_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_ReadResult_descriptor,
         new java.lang.String[] { "Envelope", });
     internal_static_akka_cluster_ddata_DataEnvelope_descriptor =
       getDescriptor().getMessageTypes().get(11);
     internal_static_akka_cluster_ddata_DataEnvelope_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_DataEnvelope_descriptor,
         new java.lang.String[] { "Data", "Pruning", "DeltaVersions", });
     internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_descriptor =
       internal_static_akka_cluster_ddata_DataEnvelope_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_DataEnvelope_PruningEntry_descriptor,
         new java.lang.String[] { "RemovedAddress", "OwnerAddress", "Performed", "Seen", "ObsoleteTime", });
     internal_static_akka_cluster_ddata_Status_descriptor =
       getDescriptor().getMessageTypes().get(12);
     internal_static_akka_cluster_ddata_Status_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Status_descriptor,
         new java.lang.String[] { "Chunk", "TotChunks", "Entries", "ToSystemUid", "FromSystemUid", });
     internal_static_akka_cluster_ddata_Status_Entry_descriptor =
       internal_static_akka_cluster_ddata_Status_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_Status_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Status_Entry_descriptor,
         new java.lang.String[] { "Key", "Digest", });
     internal_static_akka_cluster_ddata_Gossip_descriptor =
       getDescriptor().getMessageTypes().get(13);
     internal_static_akka_cluster_ddata_Gossip_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Gossip_descriptor,
         new java.lang.String[] { "SendBack", "Entries", "ToSystemUid", "FromSystemUid", });
     internal_static_akka_cluster_ddata_Gossip_Entry_descriptor =
       internal_static_akka_cluster_ddata_Gossip_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_Gossip_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Gossip_Entry_descriptor,
         new java.lang.String[] { "Key", "Envelope", });
     internal_static_akka_cluster_ddata_DeltaPropagation_descriptor =
       getDescriptor().getMessageTypes().get(14);
     internal_static_akka_cluster_ddata_DeltaPropagation_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_DeltaPropagation_descriptor,
         new java.lang.String[] { "FromNode", "Entries", "Reply", });
     internal_static_akka_cluster_ddata_DeltaPropagation_Entry_descriptor =
       internal_static_akka_cluster_ddata_DeltaPropagation_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_DeltaPropagation_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_DeltaPropagation_Entry_descriptor,
         new java.lang.String[] { "Key", "Envelope", "FromSeqNr", "ToSeqNr", });
     internal_static_akka_cluster_ddata_UniqueAddress_descriptor =
       getDescriptor().getMessageTypes().get(15);
     internal_static_akka_cluster_ddata_UniqueAddress_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_UniqueAddress_descriptor,
         new java.lang.String[] { "Address", "Uid", "Uid2", });
     internal_static_akka_cluster_ddata_Address_descriptor =
       getDescriptor().getMessageTypes().get(16);
     internal_static_akka_cluster_ddata_Address_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_Address_descriptor,
         new java.lang.String[] { "Hostname", "Port", });
     internal_static_akka_cluster_ddata_VersionVector_descriptor =
       getDescriptor().getMessageTypes().get(17);
     internal_static_akka_cluster_ddata_VersionVector_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_VersionVector_descriptor,
         new java.lang.String[] { "Entries", });
     internal_static_akka_cluster_ddata_VersionVector_Entry_descriptor =
       internal_static_akka_cluster_ddata_VersionVector_descriptor.getNestedTypes().get(0);
     internal_static_akka_cluster_ddata_VersionVector_Entry_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_VersionVector_Entry_descriptor,
         new java.lang.String[] { "Node", "Version", });
     internal_static_akka_cluster_ddata_OtherMessage_descriptor =
       getDescriptor().getMessageTypes().get(18);
     internal_static_akka_cluster_ddata_OtherMessage_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_OtherMessage_descriptor,
         new java.lang.String[] { "EnclosedMessage", "SerializerId", "MessageManifest", });
     internal_static_akka_cluster_ddata_StringGSet_descriptor =
       getDescriptor().getMessageTypes().get(19);
     internal_static_akka_cluster_ddata_StringGSet_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_StringGSet_descriptor,
         new java.lang.String[] { "Elements", });
     internal_static_akka_cluster_ddata_DurableDataEnvelope_descriptor =
       getDescriptor().getMessageTypes().get(20);
     internal_static_akka_cluster_ddata_DurableDataEnvelope_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_akka_cluster_ddata_DurableDataEnvelope_descriptor,
         new java.lang.String[] { "Data", "Pruning", });
   }
diff --git a/akka-distributed-data/src/main/protobuf/ReplicatedDataMessages.proto b/akka-distributed-data/src/main/protobuf/ReplicatedDataMessages.proto
index f35cb732ce..0b72a0ca7c 100644
--- a/akka-distributed-data/src/main/protobuf/ReplicatedDataMessages.proto
+++ b/akka-distributed-data/src/main/protobuf/ReplicatedDataMessages.proto
@@ -4,9 +4,9 @@
 
 syntax = "proto2";
 
-package akka.cluster.ddata;
+package org.apache.pekko.cluster.ddata;
 
-option java_package = "akka.cluster.ddata.protobuf.msg";
+option java_package = "org.apache.pekko.cluster.ddata.protobuf.msg";
 option optimize_for = SPEED;
 import "ReplicatorMessages.proto";
 
diff --git a/akka-distributed-data/src/main/protobuf/ReplicatorMessages.proto b/akka-distributed-data/src/main/protobuf/ReplicatorMessages.proto
index 156186f20c..86fc143f65 100644
--- a/akka-distributed-data/src/main/protobuf/ReplicatorMessages.proto
+++ b/akka-distributed-data/src/main/protobuf/ReplicatorMessages.proto
@@ -4,9 +4,9 @@
 
 syntax = "proto2";
 
-package akka.cluster.ddata;
+package org.apache.pekko.cluster.ddata;
 
-option java_package = "akka.cluster.ddata.protobuf.msg";
+option java_package = "org.apache.pekko.cluster.ddata.protobuf.msg";
 option optimize_for = SPEED;
 
 message Get {
diff --git a/akka-distributed-data/src/main/resources/reference.conf b/akka-distributed-data/src/main/resources/reference.conf
index f716157bd5..e9983f034c 100644
--- a/akka-distributed-data/src/main/resources/reference.conf
+++ b/akka-distributed-data/src/main/resources/reference.conf
@@ -98,9 +98,9 @@ akka.cluster.distributed-data {
     
     # Fully qualified class name of the durable store actor. It must be a subclass
     # of akka.actor.Actor and handle the protocol defined in 
-    # akka.cluster.ddata.DurableStore. The class must have a constructor with 
+    # org.apache.pekko.cluster.ddata.DurableStore. The class must have a constructor with
     # com.typesafe.config.Config parameter.
-    store-actor-class = akka.cluster.ddata.LmdbDurableStore
+    store-actor-class = org.apache.pekko.cluster.ddata.LmdbDurableStore
     
     use-dispatcher = akka.cluster.distributed-data.durable.pinned-store
     
@@ -145,15 +145,15 @@ akka.cluster.distributed-data {
 # Protobuf serializer for cluster DistributedData messages
 akka.actor {
   serializers {
-    akka-data-replication = "akka.cluster.ddata.protobuf.ReplicatorMessageSerializer"
-    akka-replicated-data = "akka.cluster.ddata.protobuf.ReplicatedDataSerializer"
+    akka-data-replication = "org.apache.pekko.cluster.ddata.protobuf.ReplicatorMessageSerializer"
+    akka-replicated-data = "org.apache.pekko.cluster.ddata.protobuf.ReplicatedDataSerializer"
   }
   serialization-bindings {
-    "akka.cluster.ddata.Replicator$ReplicatorMessage" = akka-data-replication
-    "akka.cluster.ddata.ReplicatedDataSerialization" = akka-replicated-data
+    "org.apache.pekko.cluster.ddata.Replicator$ReplicatorMessage" = akka-data-replication
+    "org.apache.pekko.cluster.ddata.ReplicatedDataSerialization" = akka-replicated-data
   }
   serialization-identifiers {
-    "akka.cluster.ddata.protobuf.ReplicatedDataSerializer" = 11
-    "akka.cluster.ddata.protobuf.ReplicatorMessageSerializer" = 12
+    "org.apache.pekko.cluster.ddata.protobuf.ReplicatedDataSerializer" = 11
+    "org.apache.pekko.cluster.ddata.protobuf.ReplicatorMessageSerializer" = 12
   }
 }
diff --git a/akka-distributed-data/src/main/scala-2/akka/cluster/ddata/GSet.scala b/akka-distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala
similarity index 93%
rename from akka-distributed-data/src/main/scala-2/akka/cluster/ddata/GSet.scala
rename to akka-distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala
index b96c6b2f18..d6dd9f3b37 100644
--- a/akka-distributed-data/src/main/scala-2/akka/cluster/ddata/GSet.scala
+++ b/akka-distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 object GSet {
   private val _empty: GSet[Any] = new GSet(Set.empty)(None)
   def empty[A]: GSet[A] = _empty.asInstanceOf[GSet[A]]
   def apply(): GSet[Any] = _empty
-  private[akka] def apply[A](set: Set[A]): GSet[A] = new GSet(set)(None)
+  private[pekko] def apply[A](set: Set[A]): GSet[A] = new GSet(set)(None)
 
   /**
    * Java API
@@ -43,7 +43,7 @@ final case class GSet[A] private (elements: Set[A])(override val delta: Option[G
    * Java API
    */
   def getElements(): java.util.Set[A] = {
-    import akka.util.ccompat.JavaConverters._
+    import org.apache.pekko.util.ccompat.JavaConverters._
     elements.asJava
   }
 
diff --git a/akka-distributed-data/src/main/scala-3/akka/cluster/ddata/GSet.scala b/akka-distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala
similarity index 93%
rename from akka-distributed-data/src/main/scala-3/akka/cluster/ddata/GSet.scala
rename to akka-distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala
index 2198f9bfaf..1d73af844c 100644
--- a/akka-distributed-data/src/main/scala-3/akka/cluster/ddata/GSet.scala
+++ b/akka-distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 object GSet {
   private val _empty: GSet[Any] = new GSet(Set.empty)(None)
   def empty[A]: GSet[A] = _empty.asInstanceOf[GSet[A]]
   def apply(): GSet[Any] = _empty
-  private[akka] def apply[A](set: Set[A]): GSet[A] = new GSet(set)(None)
+  private[pekko] def apply[A](set: Set[A]): GSet[A] = new GSet(set)(None)
 
   /**
    * Java API
@@ -43,7 +43,7 @@ final case class GSet[A] private (elements: Set[A])(override val delta: Option[G
    * Java API
    */
   def getElements(): java.util.Set[A] = {
-    import akka.util.ccompat.JavaConverters._
+    import org.apache.pekko.util.ccompat.JavaConverters._
     elements.asJava
   }
 
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DeltaPropagationSelector.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala
similarity index 94%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/DeltaPropagationSelector.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala
index 8a5cb1a502..576cdca17f 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DeltaPropagationSelector.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.collection.immutable.TreeMap
 
-import akka.annotation.InternalApi
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Key.KeyId
-import akka.cluster.ddata.Replicator.Internal.DeltaPropagation
-import akka.cluster.ddata.Replicator.Internal.DeltaPropagation.NoDeltaPlaceholder
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Key.KeyId
+import pekko.cluster.ddata.Replicator.Internal.DeltaPropagation
+import pekko.cluster.ddata.Replicator.Internal.DeltaPropagation.NoDeltaPlaceholder
+import pekko.util.ccompat._
 
 /**
  * INTERNAL API: Used by the Replicator actor.
@@ -19,7 +20,7 @@ import akka.util.ccompat._
  */
 @ccompatUsedUntil213
 @InternalApi
-private[akka] trait DeltaPropagationSelector {
+private[pekko] trait DeltaPropagationSelector {
 
   private var _propagationCount = 0L
   def propagationCount: Long = _propagationCount
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DistributedData.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala
similarity index 80%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/DistributedData.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala
index ce19765e96..c94bebb2e0 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DistributedData.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.cluster.{ Cluster, UniqueAddress }
-import akka.event.Logging
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.cluster.{ Cluster, UniqueAddress }
+import pekko.event.Logging
 
 object DistributedData extends ExtensionId[DistributedData] with ExtensionIdProvider {
   override def get(system: ActorSystem): DistributedData = super.get(system)
@@ -64,7 +65,7 @@ class DistributedData(system: ExtendedActorSystem) extends Extension {
 }
 
 /**
- * Cluster non-specific (typed vs classic) wrapper for [[akka.cluster.UniqueAddress]].
+ * Cluster non-specific (typed vs classic) wrapper for [[pekko.cluster.UniqueAddress]].
  */
 @SerialVersionUID(1L)
 final case class SelfUniqueAddress(uniqueAddress: UniqueAddress)
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DurableStore.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala
similarity index 92%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/DurableStore.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala
index 19beab90f2..085db9b1e8 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DurableStore.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.io.File
 import java.nio.ByteBuffer
@@ -19,21 +19,22 @@ import org.lmdbjava.Env
 import org.lmdbjava.EnvFlags
 import org.lmdbjava.Txn
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.DeadLetterSuppression
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.ddata.Key.KeyId
-import akka.cluster.ddata.Replicator.Internal.DataEnvelope
-import akka.cluster.ddata.Replicator.ReplicatorMessage
-import akka.io.DirectByteBufferPool
-import akka.serialization.SerializationExtension
-import akka.serialization.SerializerWithStringManifest
-import akka.util.ByteString
-import akka.util.OptionVal
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.DeadLetterSuppression
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.ddata.Key.KeyId
+import pekko.cluster.ddata.Replicator.Internal.DataEnvelope
+import pekko.cluster.ddata.Replicator.ReplicatorMessage
+import pekko.io.DirectByteBufferPool
+import pekko.serialization.SerializationExtension
+import pekko.serialization.SerializerWithStringManifest
+import pekko.util.ByteString
+import pekko.util.OptionVal
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * An actor implementing the durable store for the Distributed Data `Replicator`
@@ -82,7 +83,7 @@ object DurableStore {
    * the wrapped `ReplicatedData` including its serializerId and
    * manifest.
    */
-  final class DurableDataEnvelope private[akka] (private[akka] val dataEnvelope: DataEnvelope)
+  final class DurableDataEnvelope private[pekko] (private[pekko] val dataEnvelope: DataEnvelope)
       extends ReplicatorMessage {
 
     def this(data: ReplicatedData) = this(DataEnvelope(data))
@@ -302,7 +303,7 @@ final class LmdbDurableStore(config: Config) extends Actor with ActorLogging {
             TimeUnit.NANOSECONDS.toMillis(System.nanoTime - t0))
       } catch {
         case NonFatal(e) =>
-          import akka.util.ccompat.JavaConverters._
+          import pekko.util.ccompat.JavaConverters._
           log.error(e, "failed to store [{}]", pending.keySet.asScala.mkString(","))
           tx.abort()
       } finally {
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/EstimatedSize.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/EstimatedSize.scala
similarity index 67%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/EstimatedSize.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/EstimatedSize.scala
index 118d416682..c7d7f4ccc7 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/EstimatedSize.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/EstimatedSize.scala
@@ -2,15 +2,15 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API: Rough estimate in bytes of some serialized data elements. Used
  * when creating gossip messages.
  */
-@InternalApi private[akka] object EstimatedSize {
+@InternalApi private[pekko] object EstimatedSize {
   val LongValue = 8
   val Address = 50
   val UniqueAddress = Address + LongValue
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/FastMerge.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/FastMerge.scala
similarity index 79%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/FastMerge.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/FastMerge.scala
index b5d8b4ee67..d1fbfdc169 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/FastMerge.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/FastMerge.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
@@ -22,23 +22,23 @@ import akka.annotation.InternalApi
  * i.e. if used outside the Replicator infrastructure, but the worst thing that can happen is that
  * a full merge is performed instead of the fast forward merge.
  */
-@InternalApi private[akka] trait FastMerge { self: ReplicatedData =>
+@InternalApi private[pekko] trait FastMerge { self: ReplicatedData =>
 
   private var ancestor: FastMerge = null
 
   /** INTERNAL API: should be called from "updating" methods, and `resetDelta` */
-  private[akka] def assignAncestor(newData: T with FastMerge): T = {
+  private[pekko] def assignAncestor(newData: T with FastMerge): T = {
     newData.ancestor = if (this.ancestor eq null) this else this.ancestor
     this.ancestor = null // only one level, for GC
     newData
   }
 
   /** INTERNAL API: should be used from merge */
-  private[akka] def isAncestorOf(that: T with FastMerge): Boolean =
+  private[pekko] def isAncestorOf(that: T with FastMerge): Boolean =
     that.ancestor eq this
 
   /** INTERNAL API: should be called from merge */
-  private[akka] def clearAncestor(): self.type = {
+  private[pekko] def clearAncestor(): self.type = {
     ancestor = null
     this
   }
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Flag.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Flag.scala
similarity index 96%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/Flag.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Flag.scala
index bba1d37094..fef19a7413 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Flag.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Flag.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 object Flag {
 
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/GCounter.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/GCounter.scala
similarity index 91%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/GCounter.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/GCounter.scala
index 5e4e9b33c4..f55b76f918 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/GCounter.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/GCounter.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.math.BigInteger
 
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
 
 object GCounter {
   val empty: GCounter = new GCounter
@@ -42,8 +43,8 @@ object GCounter {
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
 @SerialVersionUID(1L)
-final class GCounter private[akka] (
-    private[akka] val state: Map[UniqueAddress, BigInt] = Map.empty,
+final class GCounter private[pekko] (
+    private[pekko] val state: Map[UniqueAddress, BigInt] = Map.empty,
     override val delta: Option[GCounter] = None)
     extends DeltaReplicatedData
     with ReplicatedDelta
@@ -89,12 +90,12 @@ final class GCounter private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def increment(key: UniqueAddress): GCounter = increment(key, 1)
+  @InternalApi private[pekko] def increment(key: UniqueAddress): GCounter = increment(key, 1)
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def increment(key: UniqueAddress, n: BigInt): GCounter = {
+  @InternalApi private[pekko] def increment(key: UniqueAddress, n: BigInt): GCounter = {
     require(n >= 0, "Can't decrement a GCounter")
     if (n == 0) this
     else {
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Key.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Key.scala
similarity index 90%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/Key.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Key.scala
index 4ed1106cd9..fe2fc0f2ce 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Key.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Key.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 object Key {
 
@@ -11,7 +11,7 @@ object Key {
    */
   def unapply(k: Key[_]): Option[String] = Some(k.id)
 
-  private[akka] type KeyR = Key[ReplicatedData]
+  private[pekko] type KeyR = Key[ReplicatedData]
 
   type KeyId = String
 
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/LWWMap.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala
similarity index 92%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/LWWMap.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala
index d6bd6eceb5..b2d1304e60 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/LWWMap.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.ORMap.ZeroTag
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.ORMap.ZeroTag
 
 object LWWMap {
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] case object LWWMapTag extends ZeroTag {
+  @InternalApi private[pekko] case object LWWMapTag extends ZeroTag {
     override def zero: DeltaReplicatedData = LWWMap.empty
     override final val value: Int = 4
   }
@@ -57,7 +58,7 @@ object LWWMap {
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
 @SerialVersionUID(1L)
-final class LWWMap[A, B] private[akka] (private[akka] val underlying: ORMap[A, LWWRegister[B]])
+final class LWWMap[A, B] private[pekko] (private[pekko] val underlying: ORMap[A, LWWRegister[B]])
     extends DeltaReplicatedData
     with ReplicatedDataSerialization
     with RemovedNodePruning {
@@ -75,7 +76,7 @@ final class LWWMap[A, B] private[akka] (private[akka] val underlying: ORMap[A, L
    * Java API: All entries of the map.
    */
   def getEntries(): java.util.Map[A, B] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     entries.asJava
   }
 
@@ -141,7 +142,7 @@ final class LWWMap[A, B] private[akka] (private[akka] val underlying: ORMap[A, L
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def put(node: UniqueAddress, key: A, value: B, clock: Clock[B]): LWWMap[A, B] = {
+  @InternalApi private[pekko] def put(node: UniqueAddress, key: A, value: B, clock: Clock[B]): LWWMap[A, B] = {
     val newRegister = underlying.get(key) match {
       case Some(r) => r.withValue(node, value, clock)
       case None    => LWWRegister(node, value, clock)
@@ -172,7 +173,7 @@ final class LWWMap[A, B] private[akka] (private[akka] val underlying: ORMap[A, L
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def remove(node: UniqueAddress, key: A): LWWMap[A, B] =
+  @InternalApi private[pekko] def remove(node: UniqueAddress, key: A): LWWMap[A, B] =
     new LWWMap(underlying.remove(node, key))
 
   override def resetDelta: LWWMap[A, B] =
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/LWWRegister.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWRegister.scala
similarity index 93%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/LWWRegister.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWRegister.scala
index cbaf10dc41..e4dd305ab7 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/LWWRegister.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWRegister.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
-import akka.util.HashCode
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
+import pekko.util.HashCode
 
 object LWWRegister {
 
@@ -46,7 +47,7 @@ object LWWRegister {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def apply[A](node: UniqueAddress, initialValue: A, clock: Clock[A]): LWWRegister[A] =
+  @InternalApi private[pekko] def apply[A](node: UniqueAddress, initialValue: A, clock: Clock[A]): LWWRegister[A] =
     new LWWRegister(node, initialValue, clock(0L, initialValue))
 
   def apply[A](node: SelfUniqueAddress, initialValue: A): LWWRegister[A] =
@@ -129,7 +130,7 @@ object LWWRegister {
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
 @SerialVersionUID(1L)
-final class LWWRegister[A] private[akka] (private[akka] val node: UniqueAddress, val value: A, val timestamp: Long)
+final class LWWRegister[A] private[pekko] (private[pekko] val node: UniqueAddress, val value: A, val timestamp: Long)
     extends ReplicatedData
     with ReplicatedDataSerialization {
   import LWWRegister.{ defaultClock, Clock }
@@ -189,7 +190,7 @@ final class LWWRegister[A] private[akka] (private[akka] val node: UniqueAddress,
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def withValue(node: UniqueAddress, value: A, clock: Clock[A]): LWWRegister[A] =
+  @InternalApi private[pekko] def withValue(node: UniqueAddress, value: A, clock: Clock[A]): LWWRegister[A] =
     new LWWRegister(node, value, clock(timestamp, value))
 
   override def merge(that: LWWRegister[A]): LWWRegister[A] =
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala
similarity index 92%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala
index 16020e65ba..6fd1ff7ff4 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.collection.immutable
 
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.ORMap.ZeroTag
-import akka.util.HashCode
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.ORMap.ZeroTag
+import pekko.util.HashCode
 
 object ORMap {
   private val _empty: ORMap[Any, ReplicatedData] = new ORMap(ORSet.empty, Map.empty, VanillaORMapTag)
@@ -37,7 +38,7 @@ object ORMap {
    * Tags for ORMap.DeltaOp's, so that when the Replicator needs to re-create full value from delta,
    * the right map type will be used
    */
-  @InternalApi private[akka] trait ZeroTag {
+  @InternalApi private[pekko] trait ZeroTag {
     def zero: DeltaReplicatedData
     def value: Int
   }
@@ -45,7 +46,7 @@ object ORMap {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] case object VanillaORMapTag extends ZeroTag {
+  @InternalApi private[pekko] case object VanillaORMapTag extends ZeroTag {
     override def zero: DeltaReplicatedData = ORMap.empty
     override final val value: Int = 0
   }
@@ -53,7 +54,7 @@ object ORMap {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] sealed abstract class AtomicDeltaOp[A, B <: ReplicatedData]
+  @InternalApi private[pekko] sealed abstract class AtomicDeltaOp[A, B <: ReplicatedData]
       extends DeltaOp
       with ReplicatedDeltaSize {
     def underlying: ORSet.DeltaOp
@@ -68,7 +69,7 @@ object ORMap {
 
   // PutDeltaOp contains ORSet delta and full value
   /** INTERNAL API */
-  @InternalApi private[akka] final case class PutDeltaOp[A, B <: ReplicatedData](
+  @InternalApi private[pekko] final case class PutDeltaOp[A, B <: ReplicatedData](
       underlying: ORSet.DeltaOp,
       value: (A, B),
       zeroTag: ZeroTag)
@@ -95,7 +96,7 @@ object ORMap {
 
   // UpdateDeltaOp contains ORSet delta and either delta of value (in case where underlying type supports deltas) or full value
   /** INTERNAL API */
-  @InternalApi private[akka] final case class UpdateDeltaOp[A, B <: ReplicatedData](
+  @InternalApi private[pekko] final case class UpdateDeltaOp[A, B <: ReplicatedData](
       underlying: ORSet.DeltaOp,
       values: Map[A, B],
       zeroTag: ZeroTag)
@@ -123,14 +124,14 @@ object ORMap {
 
   // RemoveDeltaOp does not contain any value at all - the propagated 'value' map would be empty
   /** INTERNAL API */
-  @InternalApi private[akka] final case class RemoveDeltaOp[A, B <: ReplicatedData](
+  @InternalApi private[pekko] final case class RemoveDeltaOp[A, B <: ReplicatedData](
       underlying: ORSet.DeltaOp,
       zeroTag: ZeroTag)
       extends AtomicDeltaOp[A, B]
 
   // RemoveKeyDeltaOp contains a single value - to provide the recipient with the removed key for value map
   /** INTERNAL API */
-  @InternalApi private[akka] final case class RemoveKeyDeltaOp[A, B <: ReplicatedData](
+  @InternalApi private[pekko] final case class RemoveKeyDeltaOp[A, B <: ReplicatedData](
       underlying: ORSet.DeltaOp,
       removedKey: A,
       zeroTag: ZeroTag)
@@ -138,7 +139,7 @@ object ORMap {
 
   // DeltaGroup is effectively a causally ordered list of individual deltas
   /** INTERNAL API */
-  @InternalApi private[akka] final case class DeltaGroup[A, B <: ReplicatedData](ops: immutable.IndexedSeq[DeltaOp])
+  @InternalApi private[pekko] final case class DeltaGroup[A, B <: ReplicatedData](ops: immutable.IndexedSeq[DeltaOp])
       extends DeltaOp
       with ReplicatedDeltaSize {
     override def merge(that: DeltaOp): DeltaOp = that match {
@@ -177,10 +178,10 @@ object ORMap {
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
 @SerialVersionUID(1L)
-final class ORMap[A, B <: ReplicatedData] private[akka] (
-    private[akka] val keys: ORSet[A],
-    private[akka] val values: Map[A, B],
-    private[akka] val zeroTag: ZeroTag,
+final class ORMap[A, B <: ReplicatedData] private[pekko] (
+    private[pekko] val keys: ORSet[A],
+    private[pekko] val values: Map[A, B],
+    private[pekko] val zeroTag: ZeroTag,
     override val delta: Option[ORMap.DeltaOp] = None)
     extends DeltaReplicatedData
     with ReplicatedDataSerialization
@@ -200,7 +201,7 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
    * Java API: All entries of the map.
    */
   def getEntries(): java.util.Map[A, B] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     entries.asJava
   }
 
@@ -255,7 +256,7 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def put(node: UniqueAddress, key: A, value: B): ORMap[A, B] =
+  @InternalApi private[pekko] def put(node: UniqueAddress, key: A, value: B): ORMap[A, B] =
     if (value.isInstanceOf[ORSet[_]] && values.contains(key))
       throw new IllegalArgumentException(
         "`ORMap.put` must not be used to replace an existing `ORSet` " +
@@ -309,7 +310,7 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def updated(node: UniqueAddress, key: A, initial: B, valueDeltas: Boolean = false)(
+  @InternalApi private[pekko] def updated(node: UniqueAddress, key: A, initial: B, valueDeltas: Boolean = false)(
       modify: B => B): ORMap[A, B] = {
     val (oldValue, hasOldValue) = values.get(key) match {
       case Some(old) => (old, true)
@@ -362,7 +363,7 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def remove(node: UniqueAddress, key: A): ORMap[A, B] = {
+  @InternalApi private[pekko] def remove(node: UniqueAddress, key: A): ORMap[A, B] = {
     // for removals the delta values map emitted will be empty
     val newKeys = keys.resetDelta.remove(node, key)
     val removeDeltaOp = RemoveDeltaOp(newKeys.delta.get, zeroTag)
@@ -374,7 +375,7 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
    * This function is only to be used by derived maps that avoid remove anomalies
    * by keeping the vvector (in form of key -> value pair) for deleted keys
    */
-  @InternalApi private[akka] def removeKey(node: UniqueAddress, key: A): ORMap[A, B] = {
+  @InternalApi private[pekko] def removeKey(node: UniqueAddress, key: A): ORMap[A, B] = {
     val newKeys = keys.resetDelta.remove(node, key)
     val removeKeyDeltaOp = RemoveKeyDeltaOp(newKeys.delta.get, key, zeroTag)
     new ORMap(newKeys, values, zeroTag, Some(newDelta(removeKeyDeltaOp)))
@@ -417,7 +418,7 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
    * This function is only to be used by derived maps that avoid remove anomalies
    * by keeping the vvector (in form of key -> value pair) for deleted keys
    */
-  @InternalApi private[akka] def mergeRetainingDeletedValues(that: ORMap[A, B]): ORMap[A, B] = {
+  @InternalApi private[pekko] def mergeRetainingDeletedValues(that: ORMap[A, B]): ORMap[A, B] = {
     val mergedKeys = keys.merge(that.keys)
     dryMerge(that, mergedKeys, (this.values.keySet ++ that.values.keySet).iterator)
   }
@@ -515,7 +516,7 @@ final class ORMap[A, B <: ReplicatedData] private[akka] (
    * This function is only to be used by derived maps that avoid remove anomalies
    * by keeping the vvector (in form of key -> value pair) for deleted keys
    */
-  @InternalApi private[akka] def mergeDeltaRetainingDeletedValues(thatDelta: ORMap.DeltaOp): ORMap[A, B] = {
+  @InternalApi private[pekko] def mergeDeltaRetainingDeletedValues(thatDelta: ORMap.DeltaOp): ORMap[A, B] = {
     val thisWithDeltas = dryMergeDelta(thatDelta, true)
     this.mergeRetainingDeletedValues(thisWithDeltas)
   }
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMultiMap.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala
similarity index 92%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMultiMap.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala
index e016ccf28f..681e3895f2 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMultiMap.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
-import akka.annotation.InternalApi
-import akka.cluster.{ Cluster, UniqueAddress }
-import akka.cluster.ddata.ORMap._
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.{ Cluster, UniqueAddress }
+import pekko.cluster.ddata.ORMap._
 
 object ORMultiMap {
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] case object ORMultiMapTag extends ZeroTag {
+  @InternalApi private[pekko] case object ORMultiMapTag extends ZeroTag {
     override def zero: DeltaReplicatedData = ORMultiMap.empty
     override final val value: Int = 2
   }
@@ -21,7 +22,7 @@ object ORMultiMap {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] case object ORMultiMapWithValueDeltasTag extends ZeroTag {
+  @InternalApi private[pekko] case object ORMultiMapWithValueDeltasTag extends ZeroTag {
     override def zero: DeltaReplicatedData = ORMultiMap.emptyWithValueDeltas
     override final val value: Int = 3
   }
@@ -65,9 +66,9 @@ object ORMultiMap {
  * Note that on concurrent adds and removals for the same key (on the same set), removals can be lost.
  */
 @SerialVersionUID(1L)
-final class ORMultiMap[A, B] private[akka] (
-    private[akka] val underlying: ORMap[A, ORSet[B]],
-    private[akka] val withValueDeltas: Boolean)
+final class ORMultiMap[A, B] private[pekko] (
+    private[pekko] val underlying: ORMap[A, ORSet[B]],
+    private[pekko] val withValueDeltas: Boolean)
     extends DeltaReplicatedData
     with ReplicatedDataSerialization
     with RemovedNodePruning {
@@ -103,7 +104,7 @@ final class ORMultiMap[A, B] private[akka] (
    * Java API: All entries of a multimap where keys are strings and values are sets.
    */
   def getEntries(): java.util.Map[A, java.util.Set[B]] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     val result = new java.util.HashMap[A, java.util.Set[B]]
     if (withValueDeltas)
       underlying.entries.foreach {
@@ -167,21 +168,21 @@ final class ORMultiMap[A, B] private[akka] (
    * replicated data set.
    */
   def put(node: SelfUniqueAddress, key: A, value: java.util.Set[B]): ORMultiMap[A, B] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     put(node.uniqueAddress, key, value.asScala.toSet)
   }
 
   @Deprecated
   @deprecated("Use `put` that takes a `SelfUniqueAddress` parameter instead.", since = "2.5.20")
   def put(node: Cluster, key: A, value: java.util.Set[B]): ORMultiMap[A, B] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     put(node.selfUniqueAddress, key, value.asScala.toSet)
   }
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def put(node: UniqueAddress, key: A, value: Set[B]): ORMultiMap[A, B] = {
+  @InternalApi private[pekko] def put(node: UniqueAddress, key: A, value: Set[B]): ORMultiMap[A, B] = {
     val newUnderlying = underlying.updated(node, key, ORSet.empty[B], valueDeltas = withValueDeltas) { existing =>
       value.foldLeft(existing.clear()) { (s, element) =>
         s.add(node, element)
@@ -215,7 +216,7 @@ final class ORMultiMap[A, B] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def remove(node: UniqueAddress, key: A): ORMultiMap[A, B] = {
+  @InternalApi private[pekko] def remove(node: UniqueAddress, key: A): ORMultiMap[A, B] = {
     if (withValueDeltas) {
       val u = underlying.updated(node, key, ORSet.empty[B], valueDeltas = true) { existing =>
         existing.clear()
@@ -247,7 +248,7 @@ final class ORMultiMap[A, B] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def addBinding(node: UniqueAddress, key: A, element: B): ORMultiMap[A, B] = {
+  @InternalApi private[pekko] def addBinding(node: UniqueAddress, key: A, element: B): ORMultiMap[A, B] = {
     val newUnderlying =
       underlying.updated(node, key, ORSet.empty[B], valueDeltas = withValueDeltas)(_.add(node, element))
     new ORMultiMap(newUnderlying, withValueDeltas)
@@ -276,7 +277,7 @@ final class ORMultiMap[A, B] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def removeBinding(node: UniqueAddress, key: A, element: B): ORMultiMap[A, B] = {
+  @InternalApi private[pekko] def removeBinding(node: UniqueAddress, key: A, element: B): ORMultiMap[A, B] = {
     val newUnderlying = {
       val u = underlying.updated(node, key, ORSet.empty[B], valueDeltas = withValueDeltas)(_.remove(node, element))
       u.get(key) match {
@@ -309,7 +310,7 @@ final class ORMultiMap[A, B] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def replaceBinding(
+  @InternalApi private[pekko] def replaceBinding(
       node: UniqueAddress,
       key: A,
       oldElement: B,
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala
similarity index 93%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala
index d4fb75b620..51e7722267 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.annotation.tailrec
 import scala.collection.immutable
 
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
-import akka.util.{ unused, HashCode }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
+import pekko.util.{ unused, HashCode }
 
 object ORSet {
   private val _empty: ORSet[Any] = new ORSet(Map.empty, VersionVector.empty)
@@ -38,7 +39,7 @@ object ORSet {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] type Dot = VersionVector
+  @InternalApi private[pekko] type Dot = VersionVector
 
   sealed trait DeltaOp extends ReplicatedDelta with RequiresCausalDeliveryOfDeltas with ReplicatedDataSerialization {
     type T = DeltaOp
@@ -47,14 +48,14 @@ object ORSet {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] sealed abstract class AtomicDeltaOp[A] extends DeltaOp with ReplicatedDeltaSize {
+  @InternalApi private[pekko] sealed abstract class AtomicDeltaOp[A] extends DeltaOp with ReplicatedDeltaSize {
     def underlying: ORSet[A]
     override def zero: ORSet[A] = ORSet.empty
     override def deltaSize: Int = 1
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] final case class AddDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
+  @InternalApi private[pekko] final case class AddDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
 
     override def merge(that: DeltaOp): DeltaOp = that match {
       case AddDeltaOp(u) =>
@@ -75,7 +76,7 @@ object ORSet {
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] final case class RemoveDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
+  @InternalApi private[pekko] final case class RemoveDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
     if (underlying.size != 1)
       throw new IllegalArgumentException(s"RemoveDeltaOp should contain one removed element, but was $underlying")
 
@@ -86,7 +87,7 @@ object ORSet {
   }
 
   /** INTERNAL API: Used for `clear` but could be used for other cases also */
-  @InternalApi private[akka] final case class FullStateDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
+  @InternalApi private[pekko] final case class FullStateDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
     override def merge(that: DeltaOp): DeltaOp = that match {
       case _: AtomicDeltaOp[_] => DeltaGroup(Vector(this, that))
       case DeltaGroup(ops)     => DeltaGroup(this +: ops)
@@ -96,7 +97,7 @@ object ORSet {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] final case class DeltaGroup[A](ops: immutable.IndexedSeq[DeltaOp])
+  @InternalApi private[pekko] final case class DeltaGroup[A](ops: immutable.IndexedSeq[DeltaOp])
       extends DeltaOp
       with ReplicatedDeltaSize {
     override def merge(that: DeltaOp): DeltaOp = that match {
@@ -124,7 +125,7 @@ object ORSet {
    *         [{a, 4}, {b, 1}, {c, 1}, {d, 14}, {e, 5}, {f, 2}] =
    *         [{b, 2}, {g, 22}]
    */
-  @InternalApi private[akka] def subtractDots(dot: Dot, vvector: VersionVector): Dot = {
+  @InternalApi private[pekko] def subtractDots(dot: Dot, vvector: VersionVector): Dot = {
 
     @tailrec def dropDots(
         remaining: List[(UniqueAddress, Long)],
@@ -161,7 +162,7 @@ object ORSet {
    * INTERNAL API
    * @see [[ORSet#merge]]
    */
-  @InternalApi private[akka] def mergeCommonKeys[A](
+  @InternalApi private[pekko] def mergeCommonKeys[A](
       commonKeys: Set[A],
       lhs: ORSet[A],
       rhs: ORSet[A]): Map[A, ORSet.Dot] =
@@ -233,7 +234,7 @@ object ORSet {
    * INTERNAL API
    * @see [[ORSet#merge]]
    */
-  @InternalApi private[akka] def mergeDisjointKeys[A](
+  @InternalApi private[pekko] def mergeDisjointKeys[A](
       keys: Set[A],
       elementsMap: Map[A, ORSet.Dot],
       vvector: VersionVector,
@@ -289,9 +290,9 @@ object ORSet {
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
 @SerialVersionUID(1L)
-final class ORSet[A] private[akka] (
-    private[akka] val elementsMap: Map[A, ORSet.Dot],
-    private[akka] val vvector: VersionVector,
+final class ORSet[A] private[pekko] (
+    private[pekko] val elementsMap: Map[A, ORSet.Dot],
+    private[pekko] val vvector: VersionVector,
     override val delta: Option[ORSet.DeltaOp] = None)
     extends DeltaReplicatedData
     with ReplicatedDataSerialization
@@ -310,7 +311,7 @@ final class ORSet[A] private[akka] (
    * Java API
    */
   def getElements(): java.util.Set[A] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     elements.asJava
   }
 
@@ -336,7 +337,7 @@ final class ORSet[A] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def add(node: UniqueAddress, element: A): ORSet[A] = {
+  @InternalApi private[pekko] def add(node: UniqueAddress, element: A): ORSet[A] = {
     val newVvector = vvector + node
     val newDot = VersionVector(node, newVvector.versionAt(node))
     val newDelta = delta match {
@@ -377,7 +378,7 @@ final class ORSet[A] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def remove(node: UniqueAddress, element: A): ORSet[A] = {
+  @InternalApi private[pekko] def remove(node: UniqueAddress, element: A): ORSet[A] = {
     val deltaDot = VersionVector(node, vvector.versionAt(node))
     val rmOp = ORSet.RemoveDeltaOp(new ORSet(Map(element -> deltaDot), vvector))
     val newDelta = delta match {
@@ -401,7 +402,7 @@ final class ORSet[A] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def clear(): ORSet[A] = {
+  @InternalApi private[pekko] def clear(): ORSet[A] = {
     val newFullState = new ORSet[A](elementsMap = Map.empty, vvector)
     val clearOp = ORSet.FullStateDeltaOp(newFullState)
     val newDelta = delta match {
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounter.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounter.scala
similarity index 91%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounter.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounter.scala
index 3610b4f361..124456a0c5 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounter.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounter.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.math.BigInteger
 
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
-import akka.util.HashCode
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
+import pekko.util.HashCode
 
 object PNCounter {
   val empty: PNCounter = new PNCounter(GCounter.empty, GCounter.empty)
@@ -41,7 +42,7 @@ object PNCounter {
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
 @SerialVersionUID(1L)
-final class PNCounter private[akka] (private[akka] val increments: GCounter, private[akka] val decrements: GCounter)
+final class PNCounter private[pekko] (private[pekko] val increments: GCounter, private[pekko] val decrements: GCounter)
     extends DeltaReplicatedData
     with ReplicatedDelta
     with ReplicatedDataSerialization
@@ -158,19 +159,19 @@ final class PNCounter private[akka] (private[akka] val increments: GCounter, pri
   def decrement(node: Cluster, n: java.math.BigInteger): PNCounter = decrement(node.selfUniqueAddress, n)
 
   /** Internal API */
-  @InternalApi private[akka] def increment(key: UniqueAddress, n: BigInt): PNCounter = change(key, n)
+  @InternalApi private[pekko] def increment(key: UniqueAddress, n: BigInt): PNCounter = change(key, n)
 
   /** Internal API */
-  @InternalApi private[akka] def increment(key: UniqueAddress): PNCounter = increment(key, 1)
+  @InternalApi private[pekko] def increment(key: UniqueAddress): PNCounter = increment(key, 1)
 
   /** Internal API */
-  @InternalApi private[akka] def decrement(key: UniqueAddress, n: BigInt): PNCounter = change(key, -n)
+  @InternalApi private[pekko] def decrement(key: UniqueAddress, n: BigInt): PNCounter = change(key, -n)
 
   /** Internal API */
-  @InternalApi private[akka] def decrement(key: UniqueAddress): PNCounter = decrement(key, 1)
+  @InternalApi private[pekko] def decrement(key: UniqueAddress): PNCounter = decrement(key, 1)
 
   /** Internal API */
-  @InternalApi private[akka] def change(key: UniqueAddress, n: BigInt): PNCounter =
+  @InternalApi private[pekko] def change(key: UniqueAddress, n: BigInt): PNCounter =
     if (n > 0) copy(increments = increments.increment(key, n))
     else if (n < 0) copy(decrements = decrements.increment(key, -n))
     else this
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounterMap.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala
similarity index 89%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounterMap.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala
index 81fa1c7871..2028f5fa97 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounterMap.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.math.BigInteger
 
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.ORMap._
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.ORMap._
 
 object PNCounterMap {
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] case object PNCounterMapTag extends ZeroTag {
+  @InternalApi private[pekko] case object PNCounterMapTag extends ZeroTag {
     override def zero: DeltaReplicatedData = PNCounterMap.empty
     override final val value: Int = 1
   }
@@ -41,7 +42,7 @@ object PNCounterMap {
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
 @SerialVersionUID(1L)
-final class PNCounterMap[A] private[akka] (private[akka] val underlying: ORMap[A, PNCounter])
+final class PNCounterMap[A] private[pekko] (private[pekko] val underlying: ORMap[A, PNCounter])
     extends DeltaReplicatedData
     with ReplicatedDataSerialization
     with RemovedNodePruning {
@@ -54,7 +55,7 @@ final class PNCounterMap[A] private[akka] (private[akka] val underlying: ORMap[A
 
   /** Java API */
   def getEntries: java.util.Map[A, BigInteger] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     underlying.entries.map { case (k, c) => k -> c.value.bigInteger }.asJava
   }
 
@@ -102,7 +103,7 @@ final class PNCounterMap[A] private[akka] (private[akka] val underlying: ORMap[A
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def increment(node: UniqueAddress, key: A, delta: Long): PNCounterMap[A] =
+  @InternalApi private[pekko] def increment(node: UniqueAddress, key: A, delta: Long): PNCounterMap[A] =
     new PNCounterMap(underlying.updated(node, key, PNCounter())(_.increment(node, delta)))
 
   /**
@@ -136,7 +137,7 @@ final class PNCounterMap[A] private[akka] (private[akka] val underlying: ORMap[A
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def decrement(node: UniqueAddress, key: A, delta: Long): PNCounterMap[A] = {
+  @InternalApi private[pekko] def decrement(node: UniqueAddress, key: A, delta: Long): PNCounterMap[A] = {
     new PNCounterMap(underlying.updated(node, key, PNCounter())(_.decrement(node, delta)))
   }
 
@@ -158,7 +159,7 @@ final class PNCounterMap[A] private[akka] (private[akka] val underlying: ORMap[A
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def remove(node: UniqueAddress, key: A): PNCounterMap[A] =
+  @InternalApi private[pekko] def remove(node: UniqueAddress, key: A): PNCounterMap[A] =
     new PNCounterMap(underlying.remove(node, key))
 
   override def merge(that: PNCounterMap[A]): PNCounterMap[A] =
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PayloadSizeAggregator.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PayloadSizeAggregator.scala
similarity index 86%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/PayloadSizeAggregator.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PayloadSizeAggregator.scala
index 316605f81f..2a23001875 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PayloadSizeAggregator.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PayloadSizeAggregator.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
-import akka.annotation.InternalApi
-import akka.cluster.ddata.Key.KeyId
-import akka.event.LoggingAdapter
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.ddata.Key.KeyId
+import pekko.event.LoggingAdapter
 
 /**
  * INTERNAL API
  *
  * This class is not thread-safe. It is supposed to be used from an actor.
  */
-@InternalApi private[akka] class PayloadSizeAggregator(
+@InternalApi private[pekko] class PayloadSizeAggregator(
     log: LoggingAdapter,
     logSizeExceeding: Int,
     val maxFrameSize: Int) {
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PruningState.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala
similarity index 82%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/PruningState.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala
index 6a1eebd3e3..a9753df22c 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PruningState.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
-import akka.actor.Address
-import akka.annotation.InternalApi
-import akka.cluster.Member
-import akka.cluster.UniqueAddress
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.annotation.InternalApi
+import pekko.cluster.Member
+import pekko.cluster.UniqueAddress
+import pekko.util.unused
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object PruningState {
+@InternalApi private[pekko] object PruningState {
   final case class PruningInitialized(owner: UniqueAddress, seen: Set[Address]) extends PruningState {
     override def addSeen(node: Address): PruningState = {
       if (seen(node) || owner.address == node) this
@@ -31,7 +32,7 @@ import akka.util.unused
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] sealed trait PruningState {
+@InternalApi private[pekko] sealed trait PruningState {
   import PruningState._
 
   def merge(that: PruningState): PruningState =
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ReplicatedData.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ReplicatedData.scala
similarity index 97%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/ReplicatedData.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ReplicatedData.scala
index f4bdc595fd..320162b5db 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ReplicatedData.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ReplicatedData.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.util.Optional
 
 import scala.compat.java8.OptionConverters._
 
-import akka.cluster.UniqueAddress
+import org.apache.pekko
+import pekko.cluster.UniqueAddress
 
 /**
  * Interface for implementing a state based convergent
@@ -18,7 +19,7 @@ import akka.cluster.UniqueAddress
  * Serializer. It is highly recommended to implement a serializer with
  * Protobuf or similar. The built in data types are marked with
  * [[ReplicatedDataSerialization]] and serialized with
- * [[akka.cluster.ddata.protobuf.ReplicatedDataSerializer]].
+ * [[pekko.cluster.ddata.protobuf.ReplicatedDataSerializer]].
  *
  * Serialization of the data types are used in remote messages and also
  * for creating message digests (SHA-1) to detect changes. Therefore it is
@@ -241,6 +242,6 @@ trait RemovedNodePruning extends ReplicatedData {
 
 /**
  * Marker trait for `ReplicatedData` serialized by
- * [[akka.cluster.ddata.protobuf.ReplicatedDataSerializer]].
+ * [[pekko.cluster.ddata.protobuf.ReplicatedDataSerializer]].
  */
 trait ReplicatedDataSerialization extends Serializable
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
similarity index 97%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
index 5c6292cc17..14bc247b30 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.security.MessageDigest
 import java.util.Optional
@@ -25,41 +25,42 @@ import scala.util.control.NonFatal
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor.Actor
-import akka.actor.ActorInitializationException
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ActorSelection
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Cancellable
-import akka.actor.DeadLetterSuppression
-import akka.actor.Deploy
-import akka.actor.ExtendedActorSystem
-import akka.actor.NoSerializationVerificationNeeded
-import akka.actor.OneForOneStrategy
-import akka.actor.Props
-import akka.actor.ReceiveTimeout
-import akka.actor.SupervisorStrategy
-import akka.actor.Terminated
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
-import akka.cluster.ClusterEvent.InitialStateAsEvents
-import akka.cluster.Member
-import akka.cluster.MemberStatus
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.DurableStore._
-import akka.cluster.ddata.Key.KeyId
-import akka.cluster.ddata.Key.KeyR
-import akka.dispatch.Dispatchers
-import akka.event.Logging
-import akka.remote.RARP
-import akka.serialization.SerializationExtension
-import akka.util.ByteString
-import akka.util.Helpers.toRootLowerCase
-import akka.util.JavaDurationConverters._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorInitializationException
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ActorSelection
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Cancellable
+import pekko.actor.DeadLetterSuppression
+import pekko.actor.Deploy
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.NoSerializationVerificationNeeded
+import pekko.actor.OneForOneStrategy
+import pekko.actor.Props
+import pekko.actor.ReceiveTimeout
+import pekko.actor.SupervisorStrategy
+import pekko.actor.Terminated
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent._
+import pekko.cluster.ClusterEvent.InitialStateAsEvents
+import pekko.cluster.Member
+import pekko.cluster.MemberStatus
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.DurableStore._
+import pekko.cluster.ddata.Key.KeyId
+import pekko.cluster.ddata.Key.KeyR
+import pekko.dispatch.Dispatchers
+import pekko.event.Logging
+import pekko.remote.RARP
+import pekko.serialization.SerializationExtension
+import pekko.util.ByteString
+import pekko.util.Helpers.toRootLowerCase
+import pekko.util.JavaDurationConverters._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object ReplicatorSettings {
@@ -88,7 +89,7 @@ object ReplicatorSettings {
       else Some(config.getBytes("log-data-size-exceeding").toInt)
     }
 
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     new ReplicatorSettings(
       roles = roleOption(config.getString("role")).toSet,
       gossipInterval = config.getDuration("gossip-interval", MILLISECONDS).millis,
@@ -110,14 +111,14 @@ object ReplicatorSettings {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def roleOption(role: String): Option[String] =
+  @InternalApi private[pekko] def roleOption(role: String): Option[String] =
     if (role == "") None else Option(role)
 
   /**
    * INTERNAL API
    * The name of the actor used in DistributedData extensions.
    */
-  @InternalApi private[akka] def name(system: ActorSystem, modifier: Option[String]): String = {
+  @InternalApi private[pekko] def name(system: ActorSystem, modifier: Option[String]): String = {
     val name = system.settings.config.getString("akka.cluster.distributed-data.name")
     modifier.map(s => s + name.take(1).toUpperCase + name.drop(1)).getOrElse(name)
   }
@@ -357,7 +358,7 @@ final class ReplicatorSettings(
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def withRoles(roles: Set[String]): ReplicatorSettings = copy(roles = roles)
+  @InternalApi private[pekko] def withRoles(roles: Set[String]): ReplicatorSettings = copy(roles = roles)
 
   // for backwards compatibility
   def role: Option[String] = roles.headOption
@@ -402,7 +403,7 @@ final class ReplicatorSettings(
    * Java API
    */
   def withDurableKeys(durableKeys: java.util.Set[String]): ReplicatorSettings = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     withDurableKeys(durableKeys.asScala.toSet)
   }
 
@@ -455,7 +456,7 @@ final class ReplicatorSettings(
 object Replicator {
 
   /**
-   * Factory method for the [[akka.actor.Props]] of the [[Replicator]] actor.
+   * Factory method for the [[pekko.actor.Props]] of the [[Replicator]] actor.
    */
   def props(settings: ReplicatorSettings): Props = {
     require(
@@ -568,18 +569,18 @@ object Replicator {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] case object GetKeyIds
+  @InternalApi private[pekko] case object GetKeyIds
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] final case class GetKeyIdsResult(keyIds: Set[KeyId]) {
+  @InternalApi private[pekko] final case class GetKeyIdsResult(keyIds: Set[KeyId]) {
 
     /**
      * Java API
      */
     def getKeyIds: java.util.Set[String] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       keyIds.asJava
     }
   }
@@ -919,14 +920,14 @@ object Replicator {
 
   /**
    * Marker trait for remote messages serialized by
-   * [[akka.cluster.ddata.protobuf.ReplicatorMessageSerializer]].
+   * [[pekko.cluster.ddata.protobuf.ReplicatorMessageSerializer]].
    */
   trait ReplicatorMessage extends Serializable
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] object Internal {
+  @InternalApi private[pekko] object Internal {
 
     case object GossipTick
     case object DeltaPropagationTick
@@ -1517,7 +1518,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
     }
   }
 
-  override protected[akka] def aroundReceive(rcv: Actor.Receive, msg: Any): Unit = {
+  override protected[pekko] def aroundReceive(rcv: Actor.Receive, msg: Any): Unit = {
     replyTo = sender()
     try {
       super.aroundReceive(rcv, msg)
@@ -2498,7 +2499,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ReadWriteAggregator {
+@InternalApi private[pekko] object ReadWriteAggregator {
   case object SendToSecondary
   val MaxSecondaryNodes = 10
 
@@ -2511,7 +2512,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] abstract class ReadWriteAggregator extends Actor {
+@InternalApi private[pekko] abstract class ReadWriteAggregator extends Actor {
   import ReadWriteAggregator._
 
   def timeout: FiniteDuration
@@ -2560,7 +2561,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object WriteAggregator {
+@InternalApi private[pekko] object WriteAggregator {
   def props(
       key: KeyR,
       envelope: Replicator.Internal.DataEnvelope,
@@ -2591,7 +2592,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class WriteAggregator(
+@InternalApi private[pekko] class WriteAggregator(
     key: KeyR,
     envelope: Replicator.Internal.DataEnvelope,
     delta: Option[Replicator.Internal.Delta],
@@ -2718,7 +2719,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ReadAggregator {
+@InternalApi private[pekko] object ReadAggregator {
   def props(
       key: KeyR,
       consistency: Replicator.ReadConsistency,
@@ -2738,7 +2739,7 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class ReadAggregator(
+@InternalApi private[pekko] class ReadAggregator(
     key: KeyR,
     consistency: Replicator.ReadConsistency,
     req: Option[Any],
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/VersionVector.scala
similarity index 86%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/VersionVector.scala
index 39247d2d70..60f2c663b5 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/VersionVector.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.util.concurrent.atomic.AtomicLong
 
 import scala.annotation.tailrec
 import scala.collection.immutable.TreeMap
 
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
 
 /**
  * VersionVector module with helper classes and methods.
@@ -31,7 +32,7 @@ object VersionVector {
   def apply(node: UniqueAddress, version: Long): VersionVector = OneVersionVector(node, version)
 
   /** INTERNAL API */
-  @InternalApi private[akka] def apply(versions: List[(UniqueAddress, Long)]): VersionVector =
+  @InternalApi private[pekko] def apply(versions: List[(UniqueAddress, Long)]): VersionVector =
     if (versions.isEmpty) empty
     else if (versions.tail.isEmpty) apply(versions.head._1, versions.head._2)
     else apply(emptyVersions ++ versions)
@@ -73,7 +74,7 @@ object VersionVector {
   def ConcurrentInstance = Concurrent
 
   /** INTERNAL API */
-  @InternalApi private[akka] object Timestamp {
+  @InternalApi private[pekko] object Timestamp {
     final val Zero = 0L
     final val EndMarker = Long.MinValue
     val counter = new AtomicLong(1L)
@@ -94,7 +95,7 @@ object VersionVector {
  *    2) Friedemann Mattern (1988). "Virtual Time and Global States of Distributed Systems". Workshop on Parallel and Distributed Algorithms: pp. 215-226
  * }}}
  *
- * Based on code from `akka.cluster.VectorClock`.
+ * Based on code from `org.apache.pekko.cluster.VectorClock`.
  *
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
@@ -117,7 +118,7 @@ sealed abstract class VersionVector extends ReplicatedData with ReplicatedDataSe
    * INTERNAL API
    * Increment the version for the node passed as argument. Returns a new VersionVector.
    */
-  @InternalApi private[akka] def +(node: UniqueAddress): VersionVector = increment(node)
+  @InternalApi private[pekko] def +(node: UniqueAddress): VersionVector = increment(node)
 
   /**
    * Increment the version for the node passed as argument. Returns a new VersionVector.
@@ -132,23 +133,23 @@ sealed abstract class VersionVector extends ReplicatedData with ReplicatedDataSe
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def size: Int
+  @InternalApi private[pekko] def size: Int
 
   /**
    * INTERNAL API
    * Increment the version for the node passed as argument. Returns a new VersionVector.
    */
-  @InternalApi private[akka] def increment(node: UniqueAddress): VersionVector
+  @InternalApi private[pekko] def increment(node: UniqueAddress): VersionVector
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def versionAt(node: UniqueAddress): Long
+  @InternalApi private[pekko] def versionAt(node: UniqueAddress): Long
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def contains(node: UniqueAddress): Boolean
+  @InternalApi private[pekko] def contains(node: UniqueAddress): Boolean
 
   /**
    * Returns true if this and that are concurrent else false.
@@ -236,7 +237,7 @@ sealed abstract class VersionVector extends ReplicatedData with ReplicatedDataSe
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def versionsIterator: Iterator[(UniqueAddress, Long)]
+  @InternalApi private[pekko] def versionsIterator: Iterator[(UniqueAddress, Long)]
 
   /**
    * Compare two version vectors. The outcome will be one of the following:
@@ -264,36 +265,36 @@ sealed abstract class VersionVector extends ReplicatedData with ReplicatedDataSe
   override def pruningCleanup(removedNode: UniqueAddress): VersionVector
 
   /** INTERNAL API */
-  @InternalApi private[akka] def estimatedSize: Int
+  @InternalApi private[pekko] def estimatedSize: Int
 
 }
 
-final case class OneVersionVector private[akka] (node: UniqueAddress, version: Long) extends VersionVector {
+final case class OneVersionVector private[pekko] (node: UniqueAddress, version: Long) extends VersionVector {
   import VersionVector.Timestamp
 
   override def isEmpty: Boolean = false
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def size: Int = 1
+  @InternalApi private[pekko] override def size: Int = 1
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def increment(n: UniqueAddress): VersionVector = {
+  @InternalApi private[pekko] override def increment(n: UniqueAddress): VersionVector = {
     val v = Timestamp.counter.getAndIncrement()
     if (n == node) copy(version = v)
     else ManyVersionVector(TreeMap(node -> version, n -> v))
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def versionAt(n: UniqueAddress): Long =
+  @InternalApi private[pekko] override def versionAt(n: UniqueAddress): Long =
     if (n == node) version
     else Timestamp.Zero
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def contains(n: UniqueAddress): Boolean =
+  @InternalApi private[pekko] override def contains(n: UniqueAddress): Boolean =
     n == node
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def versionsIterator: Iterator[(UniqueAddress, Long)] =
+  @InternalApi private[pekko] override def versionsIterator: Iterator[(UniqueAddress, Long)] =
     Iterator.single((node, version))
 
   override def merge(that: VersionVector): VersionVector = {
@@ -326,7 +327,7 @@ final case class OneVersionVector private[akka] (node: UniqueAddress, version: L
     s"VersionVector($node -> $version)"
 
   /** INTERNAL API */
-  @InternalApi override private[akka] def estimatedSize: Int =
+  @InternalApi override private[pekko] def estimatedSize: Int =
     EstimatedSize.UniqueAddress + EstimatedSize.LongValue
 
 }
@@ -337,26 +338,26 @@ final case class ManyVersionVector(versions: TreeMap[UniqueAddress, Long]) exten
   override def isEmpty: Boolean = versions.isEmpty
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def size: Int = versions.size
+  @InternalApi private[pekko] override def size: Int = versions.size
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def increment(node: UniqueAddress): VersionVector = {
+  @InternalApi private[pekko] override def increment(node: UniqueAddress): VersionVector = {
     val v = Timestamp.counter.getAndIncrement()
     VersionVector(versions.updated(node, v))
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def versionAt(node: UniqueAddress): Long = versions.get(node) match {
+  @InternalApi private[pekko] override def versionAt(node: UniqueAddress): Long = versions.get(node) match {
     case Some(v) => v
     case None    => Timestamp.Zero
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def contains(node: UniqueAddress): Boolean =
+  @InternalApi private[pekko] override def contains(node: UniqueAddress): Boolean =
     versions.contains(node)
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def versionsIterator: Iterator[(UniqueAddress, Long)] =
+  @InternalApi private[pekko] override def versionsIterator: Iterator[(UniqueAddress, Long)] =
     versions.iterator
 
   override def merge(that: VersionVector): VersionVector = {
@@ -398,6 +399,6 @@ final case class ManyVersionVector(versions: TreeMap[UniqueAddress, Long]) exten
     versions.map { case ((n, v)) => n.toString + " -> " + v }.mkString("VersionVector(", ", ", ")")
 
   /** INTERNAL API */
-  @InternalApi override private[akka] def estimatedSize: Int =
+  @InternalApi override private[pekko] def estimatedSize: Int =
     versions.size * (EstimatedSize.UniqueAddress + EstimatedSize.LongValue)
 }
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
similarity index 98%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
index c5b5037631..a1d7663c33 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.protobuf
+package org.apache.pekko.cluster.ddata.protobuf
 
 import java.{ lang => jl }
 import java.io.NotSerializableException
@@ -13,21 +13,22 @@ import java.util.Comparator
 import scala.annotation.tailrec
 import scala.collection.immutable
 import scala.annotation.nowarn
-import akka.actor.ActorRef
-import akka.actor.ExtendedActorSystem
-import akka.cluster.ddata._
-import akka.cluster.ddata.Replicator.Internal._
-import akka.cluster.ddata.protobuf.msg.{ ReplicatedDataMessages => rd }
-import akka.cluster.ddata.protobuf.msg.{ ReplicatorMessages => dm }
-import akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage
-import akka.protobufv3.internal.GeneratedMessageV3
-import akka.remote.ByteStringUtils
-import akka.serialization.BaseSerializer
-import akka.serialization.Serialization
-import akka.serialization.SerializerWithStringManifest
-import akka.util.ByteString.UTF_8
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.ddata._
+import pekko.cluster.ddata.Replicator.Internal._
+import pekko.cluster.ddata.protobuf.msg.{ ReplicatedDataMessages => rd }
+import pekko.cluster.ddata.protobuf.msg.{ ReplicatorMessages => dm }
+import pekko.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage
+import pekko.protobufv3.internal.GeneratedMessageV3
+import pekko.remote.ByteStringUtils
+import pekko.serialization.BaseSerializer
+import pekko.serialization.Serialization
+import pekko.serialization.SerializerWithStringManifest
+import pekko.util.ByteString.UTF_8
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 @ccompatUsedUntil213
 private object ReplicatedDataSerializer {
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
similarity index 95%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
index 073c4cb0d3..9720aaccca 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.protobuf
+package org.apache.pekko.cluster.ddata.protobuf
 
 import java.io.NotSerializableException
 import java.util.concurrent.TimeUnit
@@ -12,34 +12,35 @@ import scala.collection.immutable
 import scala.concurrent.duration._
 import scala.concurrent.duration.Duration
 import scala.concurrent.duration.FiniteDuration
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.cluster.Member
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.DurableStore.DurableDataEnvelope
-import akka.cluster.ddata.Key.KeyR
-import akka.cluster.ddata.PruningState
-import akka.cluster.ddata.PruningState.PruningPerformed
-import akka.cluster.ddata.ReplicatedData
-import akka.cluster.ddata.Replicator._
-import akka.cluster.ddata.Replicator.Internal._
-import akka.cluster.ddata.VersionVector
-import akka.cluster.ddata.protobuf.msg.{ ReplicatorMessages => dm }
-import akka.remote.ByteStringUtils
-import akka.serialization.BaseSerializer
-import akka.serialization.Serialization
-import akka.serialization.SerializerWithStringManifest
-import akka.util.{ ByteString => AkkaByteString }
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.InternalApi
+import pekko.cluster.Member
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.DurableStore.DurableDataEnvelope
+import pekko.cluster.ddata.Key.KeyR
+import pekko.cluster.ddata.PruningState
+import pekko.cluster.ddata.PruningState.PruningPerformed
+import pekko.cluster.ddata.ReplicatedData
+import pekko.cluster.ddata.Replicator._
+import pekko.cluster.ddata.Replicator.Internal._
+import pekko.cluster.ddata.VersionVector
+import pekko.cluster.ddata.protobuf.msg.{ ReplicatorMessages => dm }
+import pekko.remote.ByteStringUtils
+import pekko.serialization.BaseSerializer
+import pekko.serialization.Serialization
+import pekko.serialization.SerializerWithStringManifest
+import pekko.util.{ ByteString => AkkaByteString }
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API
  */
 @ccompatUsedUntil213
 @InternalApi
-private[akka] object ReplicatorMessageSerializer {
+private[pekko] object ReplicatorMessageSerializer {
 
   /**
    * A cache that is designed for a small number (<= 32) of
diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/SerializationSupport.scala b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
similarity index 91%
rename from akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/SerializationSupport.scala
rename to akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
index cfbc2b6577..3c6213a65d 100644
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/SerializationSupport.scala
+++ b/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.protobuf
+package org.apache.pekko.cluster.ddata.protobuf
 
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
@@ -10,18 +10,19 @@ import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
 import scala.annotation.tailrec
 import scala.collection.immutable.TreeMap
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.VersionVector
-import akka.cluster.ddata.protobuf.msg.{ ReplicatorMessages => dm }
-import akka.protobufv3.internal.ByteString
-import akka.protobufv3.internal.MessageLite
-import akka.remote.ByteStringUtils
-import akka.serialization._
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.VersionVector
+import pekko.cluster.ddata.protobuf.msg.{ ReplicatorMessages => dm }
+import pekko.protobufv3.internal.ByteString
+import pekko.protobufv3.internal.MessageLite
+import pekko.remote.ByteStringUtils
+import pekko.serialization._
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Some useful serialization helper methods.
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurableDataSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurableDataSpec.scala
similarity index 96%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurableDataSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurableDataSpec.scala
index fea9d17eba..be9326c943 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurableDataSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurableDataSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -11,22 +11,23 @@ import scala.util.control.NoStackTrace
 import com.typesafe.config.ConfigFactory
 import org.scalatest.CancelAfterFailure
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit._
 
 final case class DurableDataSpecConfig(writeBehind: Boolean) extends MultiNodeConfig {
   val first = role("first")
   val second = role("second")
 
   commonConfig(ConfigFactory.parseString(s"""akka.loglevel = DEBUG
-    akka.actor.provider = "akka.cluster.ClusterActorRefProvider"
+    akka.actor.provider = "org.apache.pekko.cluster.ClusterActorRefProvider"
     akka.log-dead-letters-during-shutdown = off
     akka.cluster.distributed-data.durable.keys = ["durable*"]
     akka.cluster.distributed-data.durable.lmdb {
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurablePruningSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurablePruningSpec.scala
similarity index 94%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurablePruningSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurablePruningSpec.scala
index 4a88702f11..6e2561a554 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurablePruningSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurablePruningSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.cluster.Cluster
+import pekko.cluster.MemberStatus
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit._
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object DurablePruningSpec extends MultiNodeConfig {
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/JepsenInspiredInsertSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/JepsenInspiredInsertSpec.scala
similarity index 96%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/JepsenInspiredInsertSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/JepsenInspiredInsertSpec.scala
index afee11f760..c7ac99a5b8 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/JepsenInspiredInsertSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/JepsenInspiredInsertSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -10,12 +10,13 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 object JepsenInspiredInsertSpec extends MultiNodeConfig {
   val controller = role("controller")
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/PerformanceSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/PerformanceSpec.scala
similarity index 95%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/PerformanceSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/PerformanceSpec.scala
index 1ff49d232b..f63a7bf70a 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/PerformanceSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/PerformanceSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Deploy
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Deploy
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit._
 
 object PerformanceSpec extends MultiNodeConfig {
   val n1 = role("n1")
@@ -29,7 +30,7 @@ object PerformanceSpec extends MultiNodeConfig {
   commonConfig(ConfigFactory.parseString(s"""
     akka.loglevel = ERROR
     akka.stdout-loglevel = ERROR
-    akka.loggers = ["akka.event.Logging$$DefaultLogger"]
+    akka.loggers = ["org.apache.pekko.event.Logging$$DefaultLogger"]
     akka.actor.provider = "cluster"
     akka.log-dead-letters = off
     akka.log-dead-letters-during-shutdown = off
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorChaosSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorChaosSpec.scala
similarity index 95%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorChaosSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorChaosSpec.scala
index 73b2715e16..f62016506e 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorChaosSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorChaosSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 object ReplicatorChaosSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorDeltaSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala
similarity index 97%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorDeltaSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala
index c6a282350a..63d82871a1 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorDeltaSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -10,13 +10,14 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.cluster.ddata.Replicator._
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.cluster.ddata.Replicator._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
 
 object ReplicatorDeltaSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorGossipSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorGossipSpec.scala
similarity index 93%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorGossipSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorGossipSpec.scala
index 59766564a0..5c4b1a39e2 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorGossipSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorGossipSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.concurrent.duration._
 import scala.util.Random
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Dropped
-import akka.cluster.Cluster
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Dropped
+import pekko.cluster.Cluster
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit._
 
 object ReplicatorGossipSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorMapDeltaSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala
similarity index 98%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorMapDeltaSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala
index ad644bce64..f7d2660084 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorMapDeltaSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -10,13 +10,14 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.cluster.ddata.Replicator._
-import akka.event.Logging.Error
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.cluster.ddata.Replicator._
+import pekko.event.Logging.Error
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit._
 
 object ReplicatorMapDeltaSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorORSetDeltaSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorORSetDeltaSpec.scala
similarity index 93%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorORSetDeltaSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorORSetDeltaSpec.scala
index a9787b96db..3ad3d2ec25 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorORSetDeltaSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorORSetDeltaSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 object ReplicatorORSetDeltaSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorPruningSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorPruningSpec.scala
similarity index 96%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorPruningSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorPruningSpec.scala
index 9a18b76007..93651a781e 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorPruningSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorPruningSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.InitialStateAsEvents
-import akka.cluster.ClusterEvent.MemberUp
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent.InitialStateAsEvents
+import pekko.cluster.ClusterEvent.MemberUp
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit._
 
 object ReplicatorPruningSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorSpec.scala
similarity index 98%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorSpec.scala
index 25fddd9384..faf0b83729 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.pattern.ask
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.pattern.ask
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
+import pekko.util.Timeout
 
 object ReplicatorSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/STMultiNodeSpec.scala
similarity index 82%
rename from akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala
rename to akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/STMultiNodeSpec.scala
index fa0de35be2..2afcfd795e 100644
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/STMultiNodeSpec.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.remote.testkit.MultiNodeSpecCallbacks
+import org.apache.pekko.remote.testkit.MultiNodeSpecCallbacks
 
 /**
  * Hooks up MultiNodeSpec with ScalaTest
diff --git a/akka-distributed-data/src/test/java/akka/cluster/ddata/JavaImplOfDeltaReplicatedData.java b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData.java
similarity index 95%
rename from akka-distributed-data/src/test/java/akka/cluster/ddata/JavaImplOfDeltaReplicatedData.java
rename to akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData.java
index 5b2ed18cb4..7a28ca08d3 100644
--- a/akka-distributed-data/src/test/java/akka/cluster/ddata/JavaImplOfDeltaReplicatedData.java
+++ b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata;
+package org.apache.pekko.cluster.ddata;
 
 import java.util.Optional;
 
diff --git a/akka-distributed-data/src/test/java/akka/cluster/ddata/JavaImplOfDeltaReplicatedData2.java b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData2.java
similarity index 96%
rename from akka-distributed-data/src/test/java/akka/cluster/ddata/JavaImplOfDeltaReplicatedData2.java
rename to akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData2.java
index b8f6c1a868..6a76329877 100644
--- a/akka-distributed-data/src/test/java/akka/cluster/ddata/JavaImplOfDeltaReplicatedData2.java
+++ b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData2.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata;
+package org.apache.pekko.cluster.ddata;
 
 import java.util.Optional;
 
diff --git a/akka-distributed-data/src/test/java/akka/cluster/ddata/JavaImplOfReplicatedData.java b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfReplicatedData.java
similarity index 79%
rename from akka-distributed-data/src/test/java/akka/cluster/ddata/JavaImplOfReplicatedData.java
rename to akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfReplicatedData.java
index 0322633c89..ef3f00f94c 100644
--- a/akka-distributed-data/src/test/java/akka/cluster/ddata/JavaImplOfReplicatedData.java
+++ b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfReplicatedData.java
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata;
+package org.apache.pekko.cluster.ddata;
 
-import akka.cluster.UniqueAddress;
+import org.apache.pekko.cluster.UniqueAddress;
 
 public class JavaImplOfReplicatedData extends AbstractReplicatedData
     implements RemovedNodePruning {
@@ -16,7 +16,8 @@ public class JavaImplOfReplicatedData extends AbstractReplicatedData modifiedByNodes() {
-    return akka.japi.Util.immutableSeq(new java.util.ArrayList()).toSet();
+    return org.apache.pekko.japi.Util.immutableSeq(new java.util.ArrayList())
+        .toSet();
   }
 
   @Override
diff --git a/akka-distributed-data/src/test/java/akka/cluster/ddata/ORMapTest.java b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMapTest.java
similarity index 92%
rename from akka-distributed-data/src/test/java/akka/cluster/ddata/ORMapTest.java
rename to akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMapTest.java
index 6253cbf7d7..f92a4fda47 100644
--- a/akka-distributed-data/src/test/java/akka/cluster/ddata/ORMapTest.java
+++ b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMapTest.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata;
+package org.apache.pekko.cluster.ddata;
 
 public class ORMapTest {
 
diff --git a/akka-distributed-data/src/test/java/akka/cluster/ddata/ORMultiMapTest.java b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMultiMapTest.java
similarity index 91%
rename from akka-distributed-data/src/test/java/akka/cluster/ddata/ORMultiMapTest.java
rename to akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMultiMapTest.java
index 7d110033ae..182a3830fb 100644
--- a/akka-distributed-data/src/test/java/akka/cluster/ddata/ORMultiMapTest.java
+++ b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMultiMapTest.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata;
+package org.apache.pekko.cluster.ddata;
 
 public class ORMultiMapTest {
 
diff --git a/akka-distributed-data/src/test/java/akka/cluster/ddata/PNCounterTest.java b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/PNCounterTest.java
similarity index 93%
rename from akka-distributed-data/src/test/java/akka/cluster/ddata/PNCounterTest.java
rename to akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/PNCounterTest.java
index 5fbee2500e..4a4d118dd3 100644
--- a/akka-distributed-data/src/test/java/akka/cluster/ddata/PNCounterTest.java
+++ b/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/PNCounterTest.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata;
+package org.apache.pekko.cluster.ddata;
 
 import java.math.BigInteger;
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/DataEnvelopeSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DataEnvelopeSpec.scala
similarity index 93%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/DataEnvelopeSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DataEnvelopeSpec.scala
index 811cdc4be9..f39f322303 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/DataEnvelopeSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DataEnvelopeSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Replicator.Internal.DataEnvelope
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Replicator.Internal.DataEnvelope
 
 class DataEnvelopeSpec extends AnyWordSpec with Matchers {
   import PruningState._
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/DeltaPropagationSelectorSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelectorSpec.scala
similarity index 95%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/DeltaPropagationSelectorSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelectorSpec.scala
index 77f2f1a9fc..f222839bc7 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/DeltaPropagationSelectorSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelectorSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalactic.TypeCheckedTripleEquals
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Key.KeyId
-import akka.cluster.ddata.Replicator.Internal.DataEnvelope
-import akka.cluster.ddata.Replicator.Internal.Delta
-import akka.cluster.ddata.Replicator.Internal.DeltaPropagation
-import akka.cluster.ddata.Replicator.Internal.DeltaPropagation.NoDeltaPlaceholder
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Key.KeyId
+import pekko.cluster.ddata.Replicator.Internal.DataEnvelope
+import pekko.cluster.ddata.Replicator.Internal.Delta
+import pekko.cluster.ddata.Replicator.Internal.DeltaPropagation
+import pekko.cluster.ddata.Replicator.Internal.DeltaPropagation.NoDeltaPlaceholder
 
 object DeltaPropagationSelectorSpec {
   class TestSelector(val selfUniqueAddress: UniqueAddress, override val allNodes: Vector[UniqueAddress])
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/FlagSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/FlagSpec.scala
similarity index 92%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/FlagSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/FlagSpec.scala
index c494683a6b..472160094f 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/FlagSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/FlagSpec.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko.cluster.ddata.Replicator.Changed
 
 class FlagSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/GCounterSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GCounterSpec.scala
similarity index 97%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/GCounterSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GCounterSpec.scala
index 5b37a99c27..271297db2e 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/GCounterSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GCounterSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Replicator.Changed
 
 class GCounterSpec extends AnyWordSpec with Matchers {
   val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/GSetSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GSetSpec.scala
similarity index 97%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/GSetSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GSetSpec.scala
index 9d98546213..a912ad3490 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/GSetSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GSetSpec.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko.cluster.ddata.Replicator.Changed
 
 class GSetSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWMapSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWMapSpec.scala
similarity index 95%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWMapSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWMapSpec.scala
index fa37780419..c4d00f3dc9 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWMapSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWMapSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Replicator.Changed
 
 class LWWMapSpec extends AnyWordSpec with Matchers {
   import LWWRegister.defaultClock
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWRegisterSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWRegisterSpec.scala
similarity index 94%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWRegisterSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWRegisterSpec.scala
index dc0952937e..14510053d9 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWRegisterSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWRegisterSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Replicator.Changed
 
 class LWWRegisterSpec extends AnyWordSpec with Matchers {
   import LWWRegister.defaultClock
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LocalConcurrencySpec.scala
similarity index 90%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LocalConcurrencySpec.scala
index 9135a2c3d2..429fc2d9d7 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LocalConcurrencySpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.Actor
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.actor.Stash
-import akka.testkit.ImplicitSender
-import akka.testkit.TestKit
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorSystem
+import pekko.actor.Props
+import pekko.actor.Stash
+import pekko.testkit.ImplicitSender
+import pekko.testkit.TestKit
 
 object LocalConcurrencySpec {
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
similarity index 94%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
index e22eee783c..f575da43a2 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -10,10 +10,11 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorSystem
-import akka.actor.Props
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorSystem
+import pekko.actor.Props
 
 /**
  * This "sample" simulates lots of data entries, and can be used for
@@ -50,7 +51,7 @@ object LotsOfDataBot {
                 "akka://ClusterSystem@127.0.0.1:2551",
                 "akka://ClusterSystem@127.0.0.1:2552"]
 
-              downing-provider-class = akka.cluster.testkit.AutoDowning
+              downing-provider-class = org.apache.pekko.cluster.testkit.AutoDowning
               testkit.auto-down-unreachable-after = 10s
             }
             """)))
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMapSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMapSpec.scala
similarity index 99%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMapSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMapSpec.scala
index 2db0e68048..54bf8fb776 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMapSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMapSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.ORSet.AddDeltaOp
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.ORSet.AddDeltaOp
+import pekko.cluster.ddata.Replicator.Changed
 
 class ORMapSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMultiMapSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMultiMapSpec.scala
similarity index 99%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMultiMapSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMultiMapSpec.scala
index b36c6f5c42..a6ee63fc5d 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMultiMapSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMultiMapSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Replicator.Changed
 
 class ORMultiMapSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORSetSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORSetSpec.scala
similarity index 99%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/ORSetSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORSetSpec.scala
index 8f72ed7df2..40b2c3db0e 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORSetSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORSetSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.collection.immutable.TreeMap
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Replicator.Changed
 
 class ORSetSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterMapSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterMapSpec.scala
similarity index 95%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterMapSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterMapSpec.scala
index fa0080278c..2a687ac1c6 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterMapSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterMapSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Replicator.Changed
 
 class PNCounterMapSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterSpec.scala
similarity index 97%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterSpec.scala
index b641c25002..db5e33ada7 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Replicator.Changed
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Replicator.Changed
 
 class PNCounterSpec extends AnyWordSpec with Matchers {
   val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PruningStateSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PruningStateSpec.scala
similarity index 92%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/PruningStateSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PruningStateSpec.scala
index 98d654af2d..7f229ac7d9 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PruningStateSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PruningStateSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.Address
-import akka.cluster.UniqueAddress
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
 
 class PruningStateSpec extends AnyWordSpec with Matchers {
   import PruningState._
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ReplicatorSettingsSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ReplicatorSettingsSpec.scala
similarity index 91%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/ReplicatorSettingsSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ReplicatorSettingsSpec.scala
index da4b3ce808..7bd17b79e0 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ReplicatorSettingsSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ReplicatorSettingsSpec.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 
 object ReplicatorSettingsSpec {
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/VersionVectorSpec.scala
similarity index 97%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/VersionVectorSpec.scala
index 210057b19f..de4a74403f 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/VersionVectorSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.cluster.UniqueAddress
-import akka.testkit.TestKit
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.cluster.UniqueAddress
+import pekko.testkit.TestKit
 
 class VersionVectorSpec
     extends TestKit(ActorSystem("VersionVectorSpec"))
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/WriteAggregatorSpec.scala
similarity index 97%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/WriteAggregatorSpec.scala
index 4af49c599f..1875e0d370 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/WriteAggregatorSpec.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata
+package org.apache.pekko.cluster.ddata
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSelection
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.Replicator._
-import akka.cluster.ddata.Replicator.Internal._
-import akka.remote.RARP
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.ActorSelection
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.Props
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.Replicator._
+import pekko.cluster.ddata.Replicator.Internal._
+import pekko.remote.RARP
+import pekko.testkit._
 
 object WriteAggregatorSpec {
 
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
similarity index 96%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
index 7d6b1d47ca..d3f98c7f95 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
@@ -2,28 +2,29 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.protobuf
+package org.apache.pekko.cluster.ddata.protobuf
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.actor.Identify
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.cluster.Cluster
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata._
-import akka.cluster.ddata.Replicator.Internal._
-import akka.remote.RARP
-import akka.testkit.TestActors
-import akka.testkit.TestKit
+import org.apache.pekko
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.cluster.Cluster
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata._
+import pekko.cluster.ddata.Replicator.Internal._
+import pekko.remote.RARP
+import pekko.testkit.TestActors
+import pekko.testkit.TestKit
 
 class ReplicatedDataSerializerSpec
     extends TestKit(
diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
similarity index 92%
rename from akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
rename to akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
index 99b88e6d66..f27807a6d4 100644
--- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
+++ b/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.cluster.ddata.protobuf
+package org.apache.pekko.cluster.ddata.protobuf
 
 import scala.concurrent.duration._
 
@@ -11,25 +11,26 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.cluster.UniqueAddress
-import akka.cluster.ddata.DurableStore.DurableDataEnvelope
-import akka.cluster.ddata.GCounter
-import akka.cluster.ddata.GSet
-import akka.cluster.ddata.GSetKey
-import akka.cluster.ddata.ORMultiMap
-import akka.cluster.ddata.ORSet
-import akka.cluster.ddata.PruningState.PruningInitialized
-import akka.cluster.ddata.PruningState.PruningPerformed
-import akka.cluster.ddata.Replicator._
-import akka.cluster.ddata.Replicator.Internal._
-import akka.cluster.ddata.VersionVector
-import akka.remote.RARP
-import akka.testkit.TestKit
-import akka.util.{ unused, ByteString }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.Address
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.cluster.UniqueAddress
+import pekko.cluster.ddata.DurableStore.DurableDataEnvelope
+import pekko.cluster.ddata.GCounter
+import pekko.cluster.ddata.GSet
+import pekko.cluster.ddata.GSetKey
+import pekko.cluster.ddata.ORMultiMap
+import pekko.cluster.ddata.ORSet
+import pekko.cluster.ddata.PruningState.PruningInitialized
+import pekko.cluster.ddata.PruningState.PruningPerformed
+import pekko.cluster.ddata.Replicator._
+import pekko.cluster.ddata.Replicator.Internal._
+import pekko.cluster.ddata.VersionVector
+import pekko.remote.RARP
+import pekko.testkit.TestKit
+import pekko.util.{ unused, ByteString }
 
 class ReplicatorMessageSerializerSpec
     extends TestKit(
diff --git a/akka-docs/src/main/categories/sink-operators.md b/akka-docs/src/main/categories/sink-operators.md
index 756796870b..de92422ca6 100644
--- a/akka-docs/src/main/categories/sink-operators.md
+++ b/akka-docs/src/main/categories/sink-operators.md
@@ -1 +1 @@
-These built-in sinks are available from @scala[`akka.stream.scaladsl.Sink`] @java[`akka.stream.javadsl.Sink`]:
+These built-in sinks are available from @scala[`org.apache.pekko.stream.scaladsl.Sink`] @java[`org.apache.pekko.stream.javadsl.Sink`]:
diff --git a/akka-docs/src/main/categories/source-operators.md b/akka-docs/src/main/categories/source-operators.md
index 4643818531..e69d1d4b36 100644
--- a/akka-docs/src/main/categories/source-operators.md
+++ b/akka-docs/src/main/categories/source-operators.md
@@ -1 +1 @@
-These built-in sources are available from @scala[`akka.stream.scaladsl.Source`] @java[`akka.stream.javadsl.Source`]:
\ No newline at end of file
+These built-in sources are available from @scala[`org.apache.pekko.stream.scaladsl.Source`] @java[`org.apache.pekko.stream.javadsl.Source`]:
\ No newline at end of file
diff --git a/akka-docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java b/akka-docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java
index 57fc9f3399..5a965359d9 100644
--- a/akka-docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java
+++ b/akka-docs/src/main/java/docs/ddata/protobuf/msg/TwoPhaseSetMessages.java
@@ -10,17 +10,17 @@ package docs.ddata.protobuf.msg;
 public final class TwoPhaseSetMessages {
   private TwoPhaseSetMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface TwoPhaseSetOrBuilder extends
       // @@protoc_insertion_point(interface_extends:docs.ddata.TwoPhaseSet)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * repeated string adds = 1;
@@ -44,7 +44,7 @@ public final class TwoPhaseSetMessages {
      * @param index The index of the value to return.
      * @return The bytes of the adds at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getAddsBytes(int index);
 
     /**
@@ -69,49 +69,49 @@ public final class TwoPhaseSetMessages {
      * @param index The index of the value to return.
      * @return The bytes of the removals at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getRemovalsBytes(int index);
   }
   /**
    * Protobuf type {@code docs.ddata.TwoPhaseSet}
    */
   public  static final class TwoPhaseSet extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:docs.ddata.TwoPhaseSet)
       TwoPhaseSetOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use TwoPhaseSet.newBuilder() to construct.
-    private TwoPhaseSet(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private TwoPhaseSet(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private TwoPhaseSet() {
-      adds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
-      removals_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
+      removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new TwoPhaseSet();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private TwoPhaseSet(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -121,18 +121,18 @@ public final class TwoPhaseSetMessages {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                adds_ = new akka.protobufv3.internal.LazyStringArrayList();
+                adds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
               adds_.add(bs);
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                removals_ = new akka.protobufv3.internal.LazyStringArrayList();
+                removals_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
               removals_.add(bs);
@@ -147,10 +147,10 @@ public final class TwoPhaseSetMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -163,13 +163,13 @@ public final class TwoPhaseSetMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -177,12 +177,12 @@ public final class TwoPhaseSetMessages {
     }
 
     public static final int ADDS_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.LazyStringList adds_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList adds_;
     /**
      * repeated string adds = 1;
      * @return A list containing the adds.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getAddsList() {
       return adds_;
     }
@@ -206,18 +206,18 @@ public final class TwoPhaseSetMessages {
      * @param index The index of the value to return.
      * @return The bytes of the adds at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getAddsBytes(int index) {
       return adds_.getByteString(index);
     }
 
     public static final int REMOVALS_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.LazyStringList removals_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList removals_;
     /**
      * repeated string removals = 2;
      * @return A list containing the removals.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getRemovalsList() {
       return removals_;
     }
@@ -241,7 +241,7 @@ public final class TwoPhaseSetMessages {
      * @param index The index of the value to return.
      * @return The bytes of the removals at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getRemovalsBytes(int index) {
       return removals_.getByteString(index);
     }
@@ -258,13 +258,13 @@ public final class TwoPhaseSetMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < adds_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, adds_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, adds_.getRaw(i));
       }
       for (int i = 0; i < removals_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, removals_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, removals_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -336,71 +336,71 @@ public final class TwoPhaseSetMessages {
 
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -420,7 +420,7 @@ public final class TwoPhaseSetMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -428,16 +428,16 @@ public final class TwoPhaseSetMessages {
      * Protobuf type {@code docs.ddata.TwoPhaseSet}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:docs.ddata.TwoPhaseSet)
         docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSetOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -450,27 +450,27 @@ public final class TwoPhaseSetMessages {
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        adds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
-        removals_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
         return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet_descriptor;
       }
@@ -513,34 +513,34 @@ public final class TwoPhaseSetMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other instanceof docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet) {
           return mergeFrom((docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet)other);
         } else {
@@ -583,13 +583,13 @@ public final class TwoPhaseSetMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage = (docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -601,10 +601,10 @@ public final class TwoPhaseSetMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.LazyStringList adds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureAddsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          adds_ = new akka.protobufv3.internal.LazyStringArrayList(adds_);
+          adds_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(adds_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -612,7 +612,7 @@ public final class TwoPhaseSetMessages {
        * repeated string adds = 1;
        * @return A list containing the adds.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getAddsList() {
         return adds_.getUnmodifiableView();
       }
@@ -636,7 +636,7 @@ public final class TwoPhaseSetMessages {
        * @param index The index of the value to return.
        * @return The bytes of the adds at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getAddsBytes(int index) {
         return adds_.getByteString(index);
       }
@@ -679,7 +679,7 @@ public final class TwoPhaseSetMessages {
       public Builder addAllAdds(
           java.lang.Iterable values) {
         ensureAddsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, adds_);
         onChanged();
         return this;
@@ -689,7 +689,7 @@ public final class TwoPhaseSetMessages {
        * @return This builder for chaining.
        */
       public Builder clearAdds() {
-        adds_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        adds_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
@@ -700,7 +700,7 @@ public final class TwoPhaseSetMessages {
        * @return This builder for chaining.
        */
       public Builder addAddsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -710,10 +710,10 @@ public final class TwoPhaseSetMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.LazyStringList removals_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureRemovalsIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          removals_ = new akka.protobufv3.internal.LazyStringArrayList(removals_);
+          removals_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(removals_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -721,7 +721,7 @@ public final class TwoPhaseSetMessages {
        * repeated string removals = 2;
        * @return A list containing the removals.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getRemovalsList() {
         return removals_.getUnmodifiableView();
       }
@@ -745,7 +745,7 @@ public final class TwoPhaseSetMessages {
        * @param index The index of the value to return.
        * @return The bytes of the removals at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getRemovalsBytes(int index) {
         return removals_.getByteString(index);
       }
@@ -788,7 +788,7 @@ public final class TwoPhaseSetMessages {
       public Builder addAllRemovals(
           java.lang.Iterable values) {
         ensureRemovalsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, removals_);
         onChanged();
         return this;
@@ -798,7 +798,7 @@ public final class TwoPhaseSetMessages {
        * @return This builder for chaining.
        */
       public Builder clearRemovals() {
-        removals_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        removals_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -809,7 +809,7 @@ public final class TwoPhaseSetMessages {
        * @return This builder for chaining.
        */
       public Builder addRemovalsBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -820,13 +820,13 @@ public final class TwoPhaseSetMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -844,23 +844,23 @@ public final class TwoPhaseSetMessages {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public TwoPhaseSet parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new TwoPhaseSet(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
@@ -873,7 +873,7 @@ public final class TwoPhaseSetMessages {
 
   public interface TwoPhaseSet2OrBuilder extends
       // @@protoc_insertion_point(interface_extends:docs.ddata.TwoPhaseSet2)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * optional bytes adds = 1;
@@ -884,7 +884,7 @@ public final class TwoPhaseSetMessages {
      * optional bytes adds = 1;
      * @return The adds.
      */
-    akka.protobufv3.internal.ByteString getAdds();
+    org.apache.pekko.protobufv3.internal.ByteString getAdds();
 
     /**
      * optional bytes removals = 2;
@@ -895,7 +895,7 @@ public final class TwoPhaseSetMessages {
      * optional bytes removals = 2;
      * @return The removals.
      */
-    akka.protobufv3.internal.ByteString getRemovals();
+    org.apache.pekko.protobufv3.internal.ByteString getRemovals();
   }
   /**
    * 
    @@ -905,42 +905,42 @@ public final class TwoPhaseSetMessages {
    * Protobuf type {@code docs.ddata.TwoPhaseSet2}
    */
   public  static final class TwoPhaseSet2 extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:docs.ddata.TwoPhaseSet2)
       TwoPhaseSet2OrBuilder {
   private static final long serialVersionUID = 0L;
     // Use TwoPhaseSet2.newBuilder() to construct.
-    private TwoPhaseSet2(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private TwoPhaseSet2(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private TwoPhaseSet2() {
-      adds_ = akka.protobufv3.internal.ByteString.EMPTY;
-      removals_ = akka.protobufv3.internal.ByteString.EMPTY;
+      adds_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+      removals_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new TwoPhaseSet2();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private TwoPhaseSet2(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -968,23 +968,23 @@ public final class TwoPhaseSetMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet2_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet2_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -993,7 +993,7 @@ public final class TwoPhaseSetMessages {
 
     private int bitField0_;
     public static final int ADDS_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.ByteString adds_;
+    private org.apache.pekko.protobufv3.internal.ByteString adds_;
     /**
      * optional bytes adds = 1;
      * @return Whether the adds field is set.
@@ -1005,12 +1005,12 @@ public final class TwoPhaseSetMessages {
      * optional bytes adds = 1;
      * @return The adds.
      */
-    public akka.protobufv3.internal.ByteString getAdds() {
+    public org.apache.pekko.protobufv3.internal.ByteString getAdds() {
       return adds_;
     }
 
     public static final int REMOVALS_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.ByteString removals_;
+    private org.apache.pekko.protobufv3.internal.ByteString removals_;
     /**
      * optional bytes removals = 2;
      * @return Whether the removals field is set.
@@ -1022,7 +1022,7 @@ public final class TwoPhaseSetMessages {
      * optional bytes removals = 2;
      * @return The removals.
      */
-    public akka.protobufv3.internal.ByteString getRemovals() {
+    public org.apache.pekko.protobufv3.internal.ByteString getRemovals() {
       return removals_;
     }
 
@@ -1038,7 +1038,7 @@ public final class TwoPhaseSetMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, adds_);
@@ -1056,11 +1056,11 @@ public final class TwoPhaseSetMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(1, adds_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(2, removals_);
       }
       size += unknownFields.getSerializedSize();
@@ -1114,71 +1114,71 @@ public final class TwoPhaseSetMessages {
 
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
     public static docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1198,7 +1198,7 @@ public final class TwoPhaseSetMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1210,16 +1210,16 @@ public final class TwoPhaseSetMessages {
      * Protobuf type {@code docs.ddata.TwoPhaseSet2}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:docs.ddata.TwoPhaseSet2)
         docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2OrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet2_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet2_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1232,27 +1232,27 @@ public final class TwoPhaseSetMessages {
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        adds_ = akka.protobufv3.internal.ByteString.EMPTY;
+        adds_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
-        removals_ = akka.protobufv3.internal.ByteString.EMPTY;
+        removals_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
         return docs.ddata.protobuf.msg.TwoPhaseSetMessages.internal_static_docs_ddata_TwoPhaseSet2_descriptor;
       }
@@ -1295,34 +1295,34 @@ public final class TwoPhaseSetMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other instanceof docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2) {
           return mergeFrom((docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2)other);
         } else {
@@ -1351,13 +1351,13 @@ public final class TwoPhaseSetMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2 parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage = (docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -1369,7 +1369,7 @@ public final class TwoPhaseSetMessages {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.ByteString adds_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString adds_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * optional bytes adds = 1;
        * @return Whether the adds field is set.
@@ -1381,7 +1381,7 @@ public final class TwoPhaseSetMessages {
        * optional bytes adds = 1;
        * @return The adds.
        */
-      public akka.protobufv3.internal.ByteString getAdds() {
+      public org.apache.pekko.protobufv3.internal.ByteString getAdds() {
         return adds_;
       }
       /**
@@ -1389,7 +1389,7 @@ public final class TwoPhaseSetMessages {
        * @param value The adds to set.
        * @return This builder for chaining.
        */
-      public Builder setAdds(akka.protobufv3.internal.ByteString value) {
+      public Builder setAdds(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1409,7 +1409,7 @@ public final class TwoPhaseSetMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.ByteString removals_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString removals_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * optional bytes removals = 2;
        * @return Whether the removals field is set.
@@ -1421,7 +1421,7 @@ public final class TwoPhaseSetMessages {
        * optional bytes removals = 2;
        * @return The removals.
        */
-      public akka.protobufv3.internal.ByteString getRemovals() {
+      public org.apache.pekko.protobufv3.internal.ByteString getRemovals() {
         return removals_;
       }
       /**
@@ -1429,7 +1429,7 @@ public final class TwoPhaseSetMessages {
        * @param value The removals to set.
        * @return This builder for chaining.
        */
-      public Builder setRemovals(akka.protobufv3.internal.ByteString value) {
+      public Builder setRemovals(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1450,13 +1450,13 @@ public final class TwoPhaseSetMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -1474,23 +1474,23 @@ public final class TwoPhaseSetMessages {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public TwoPhaseSet2 parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new TwoPhaseSet2(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
@@ -1501,22 +1501,22 @@ public final class TwoPhaseSetMessages {
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_docs_ddata_TwoPhaseSet_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_docs_ddata_TwoPhaseSet_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_docs_ddata_TwoPhaseSet2_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_docs_ddata_TwoPhaseSet2_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -1526,20 +1526,20 @@ public final class TwoPhaseSetMessages {
       "removals\030\002 \001(\014B\033\n\027docs.ddata.protobuf.ms" +
       "gH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_docs_ddata_TwoPhaseSet_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_docs_ddata_TwoPhaseSet_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_docs_ddata_TwoPhaseSet_descriptor,
         new java.lang.String[] { "Adds", "Removals", });
     internal_static_docs_ddata_TwoPhaseSet2_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_docs_ddata_TwoPhaseSet2_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_docs_ddata_TwoPhaseSet2_descriptor,
         new java.lang.String[] { "Adds", "Removals", });
   }
diff --git a/akka-docs/src/main/java/docs/persistence/proto/FlightAppModels.java b/akka-docs/src/main/java/docs/persistence/proto/FlightAppModels.java
index 01f71d0dbb..c2b0d78ff2 100644
--- a/akka-docs/src/main/java/docs/persistence/proto/FlightAppModels.java
+++ b/akka-docs/src/main/java/docs/persistence/proto/FlightAppModels.java
@@ -10,17 +10,17 @@ package docs.persistence.proto;
 public final class FlightAppModels {
   private FlightAppModels() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface SeatReservedOrBuilder extends
       // @@protoc_insertion_point(interface_extends:docs.persistence.SeatReserved)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string letter = 1;
@@ -36,7 +36,7 @@ public final class FlightAppModels {
      * required string letter = 1;
      * @return The bytes for letter.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getLetterBytes();
 
     /**
@@ -76,19 +76,19 @@ public final class FlightAppModels {
      * optional string seatType = 3;
      * @return The bytes for seatType.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getSeatTypeBytes();
   }
   /**
    * Protobuf type {@code docs.persistence.SeatReserved}
    */
   public  static final class SeatReserved extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:docs.persistence.SeatReserved)
       SeatReservedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use SeatReserved.newBuilder() to construct.
-    private SeatReserved(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private SeatReserved(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private SeatReserved() {
@@ -99,26 +99,26 @@ public final class FlightAppModels {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new SeatReserved();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private SeatReserved(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -128,7 +128,7 @@ public final class FlightAppModels {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               letter_ = bs;
               break;
@@ -139,7 +139,7 @@ public final class FlightAppModels {
               break;
             }
             case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000004;
               seatType_ = bs;
               break;
@@ -153,23 +153,23 @@ public final class FlightAppModels {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return docs.persistence.proto.FlightAppModels.internal_static_docs_persistence_SeatReserved_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return docs.persistence.proto.FlightAppModels.internal_static_docs_persistence_SeatReserved_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -195,8 +195,8 @@ public final class FlightAppModels {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           letter_ = s;
@@ -208,17 +208,17 @@ public final class FlightAppModels {
      * required string letter = 1;
      * @return The bytes for letter.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getLetterBytes() {
       java.lang.Object ref = letter_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         letter_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -265,8 +265,8 @@ public final class FlightAppModels {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           seatType_ = s;
@@ -282,17 +282,17 @@ public final class FlightAppModels {
      * optional string seatType = 3;
      * @return The bytes for seatType.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getSeatTypeBytes() {
       java.lang.Object ref = seatType_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         seatType_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -316,16 +316,16 @@ public final class FlightAppModels {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, letter_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, letter_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeUInt32(2, row_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, seatType_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, seatType_);
       }
       unknownFields.writeTo(output);
     }
@@ -337,14 +337,14 @@ public final class FlightAppModels {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, letter_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, letter_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(2, row_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, seatType_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, seatType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -406,71 +406,71 @@ public final class FlightAppModels {
 
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
     public static docs.persistence.proto.FlightAppModels.SeatReserved parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -490,7 +490,7 @@ public final class FlightAppModels {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -498,16 +498,16 @@ public final class FlightAppModels {
      * Protobuf type {@code docs.persistence.SeatReserved}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:docs.persistence.SeatReserved)
         docs.persistence.proto.FlightAppModels.SeatReservedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return docs.persistence.proto.FlightAppModels.internal_static_docs_persistence_SeatReserved_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return docs.persistence.proto.FlightAppModels.internal_static_docs_persistence_SeatReserved_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -520,12 +520,12 @@ public final class FlightAppModels {
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -542,7 +542,7 @@ public final class FlightAppModels {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
         return docs.persistence.proto.FlightAppModels.internal_static_docs_persistence_SeatReserved_descriptor;
       }
@@ -589,34 +589,34 @@ public final class FlightAppModels {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other instanceof docs.persistence.proto.FlightAppModels.SeatReserved) {
           return mergeFrom((docs.persistence.proto.FlightAppModels.SeatReserved)other);
         } else {
@@ -658,13 +658,13 @@ public final class FlightAppModels {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         docs.persistence.proto.FlightAppModels.SeatReserved parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage = (docs.persistence.proto.FlightAppModels.SeatReserved) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -691,8 +691,8 @@ public final class FlightAppModels {
       public java.lang.String getLetter() {
         java.lang.Object ref = letter_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             letter_ = s;
@@ -706,17 +706,17 @@ public final class FlightAppModels {
        * required string letter = 1;
        * @return The bytes for letter.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getLetterBytes() {
         java.lang.Object ref = letter_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           letter_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -750,7 +750,7 @@ public final class FlightAppModels {
        * @return This builder for chaining.
        */
       public Builder setLetterBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -820,8 +820,8 @@ public final class FlightAppModels {
       public java.lang.String getSeatType() {
         java.lang.Object ref = seatType_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             seatType_ = s;
@@ -839,17 +839,17 @@ public final class FlightAppModels {
        * optional string seatType = 3;
        * @return The bytes for seatType.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getSeatTypeBytes() {
         java.lang.Object ref = seatType_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           seatType_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -895,7 +895,7 @@ public final class FlightAppModels {
        * @return This builder for chaining.
        */
       public Builder setSeatTypeBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -906,13 +906,13 @@ public final class FlightAppModels {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -930,23 +930,23 @@ public final class FlightAppModels {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public SeatReserved parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new SeatReserved(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
@@ -957,17 +957,17 @@ public final class FlightAppModels {
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_docs_persistence_SeatReserved_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_docs_persistence_SeatReserved_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -976,14 +976,14 @@ public final class FlightAppModels {
       "\030\002 \002(\r\022\020\n\010seatType\030\003 \001(\tB\032\n\026docs.persist" +
       "ence.protoH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_docs_persistence_SeatReserved_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_docs_persistence_SeatReserved_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_docs_persistence_SeatReserved_descriptor,
         new java.lang.String[] { "Letter", "Row", "SeatType", });
   }
diff --git a/akka-docs/src/main/paradox/actors.md b/akka-docs/src/main/paradox/actors.md
index d59269ce5b..ebbdcbfb35 100644
--- a/akka-docs/src/main/paradox/actors.md
+++ b/akka-docs/src/main/paradox/actors.md
@@ -50,8 +50,8 @@ as well as @ref:[Actor References, Paths and Addresses](general/addressing.md).
 
 @@@ div { .group-scala }
 
-Actors are implemented by extending the @scaladoc[Actor](akka.actor.Actor) base trait and implementing the
-@scaladoc[receive](akka.actor.Actor#receive:akka.actor.Actor.Receive) method. The `receive` method should define a series of case
+Actors are implemented by extending the @scaladoc[Actor](pekko.actor.Actor) base trait and implementing the
+@scaladoc[receive](pekko.actor.Actor#receive:org.apache.pekko.actor.Actor.Receive) method. The `receive` method should define a series of case
 statements (which has the type `PartialFunction[Any, Unit]`) that define
 which messages your Actor can handle, using standard Scala pattern matching,
 along with the implementation of how the messages should be processed.
@@ -60,11 +60,11 @@ along with the implementation of how the messages should be processed.
 
 @@@ div { .group-java }
 
-Actor classes are implemented by extending the @javadoc[AbstractActor](akka.actor.AbstractActor) class and setting
-the “initial behavior” in the @javadoc[createReceive](akka.actor.AbstractActor#createReceive()) method.
+Actor classes are implemented by extending the @javadoc[AbstractActor](pekko.actor.AbstractActor) class and setting
+the “initial behavior” in the @javadoc[createReceive](pekko.actor.AbstractActor#createReceive()) method.
 
-The `createReceive` method has no arguments and returns @javadoc[AbstractActor.Receive](akka.actor.AbstractActor.Receive). It defines which messages your Actor can handle, along with the implementation of how the messages should be processed. You can build such behavior with a builder named
-@javadoc[ReceiveBuilder](akka.actor.typed.javadsl.ReceiveBuilder). This build has a convenient factory in `AbstractActor` called @javadoc[receiveBuilder](akka.actor.AbstractActor#receiveBuilder()).
+The `createReceive` method has no arguments and returns @javadoc[AbstractActor.Receive](pekko.actor.AbstractActor.Receive). It defines which messages your Actor can handle, along with the implementation of how the messages should be processed. You can build such behavior with a builder named
+@javadoc[ReceiveBuilder](pekko.actor.typed.javadsl.ReceiveBuilder). This build has a convenient factory in `AbstractActor` called @javadoc[receiveBuilder](pekko.actor.AbstractActor#receiveBuilder()).
 
 @@@
 
@@ -79,15 +79,15 @@ Java
 Please note that the Akka Actor @scala[`receive`] message loop is exhaustive, which is different compared to Erlang and the late Scala Actors. This means that you
 need to provide a pattern match for all messages that it can accept and if you
 want to be able to handle unknown messages then you need to have a default case
-as in the example above. Otherwise an @apidoc[akka.actor.UnhandledMessage] will be published to the @apidoc[akka.actor.ActorSystem]'s
-@apidoc[akka.event.EventStream].
+as in the example above. Otherwise an @apidoc[actor.UnhandledMessage] will be published to the @apidoc[actor.ActorSystem]'s
+@apidoc[event.EventStream].
 
 Note further that the return type of the behavior defined above is @scaladoc[Unit](scala.Unit); if
 the actor shall reply to the received message then this must be done explicitly
 as explained below.
 
-The result of the @scala[@scaladoc[receive](akka.actor.Actor#receive:akka.actor.Actor.Receive) method is a partial function object, which is]
-@java[@javadoc[createReceive](akka.actor.AbstractActor#createReceive()) method is @javadoc[AbstractActor.Receive](akka.actor.AbstractActor.Receive) which is a wrapper around partial
+The result of the @scala[@scaladoc[receive](pekko.actor.Actor#receive:org.apache.pekko.actor.Actor.Receive) method is a partial function object, which is]
+@java[@javadoc[createReceive](pekko.actor.AbstractActor#createReceive()) method is @javadoc[AbstractActor.Receive](pekko.actor.AbstractActor.Receive) which is a wrapper around partial
 scala function object. It is] stored within the actor as its “initial behavior”,
 see @ref:[Become/Unbecome](#become-unbecome) for
 further information on changing the behavior of an actor after its
@@ -103,7 +103,7 @@ construction.
 
 ### Props
 
-@apidoc[akka.actor.Props] is a configuration class to specify options for the creation
+@apidoc[actor.Props] is a configuration class to specify options for the creation
 of actors, think of it as an immutable and thus freely shareable recipe for
 creating an actor including associated deployment information (e.g., which
 dispatcher to use, see more below). Here are some examples of how to create a
@@ -117,7 +117,7 @@ Java
 
 
 The second variant shows how to pass constructor arguments to the
-@apidoc[akka.actor.Actor] being created, but it should only be used outside of actors as
+@apidoc[actor.Actor] being created, but it should only be used outside of actors as
 explained below.
 
 The last line shows a possibility to pass constructor arguments regardless of
@@ -128,7 +128,7 @@ found.
 
 @@@ note { .group-scala }
 
-The recommended approach to create the actor @apidoc[akka.actor.Props] is not supported
+The recommended approach to create the actor @apidoc[actor.Props] is not supported
 for cases when the actor constructor takes value classes as arguments.
 
 @@@
@@ -149,7 +149,7 @@ is completely fine.
 
 There were two use-cases for these methods: passing constructor arguments to
 the actor—which is solved by the newly introduced
-@scala[@scaladoc[Props.apply(clazz, args)](akka.actor.Props$#apply(clazz:Class[_],args:Any*):akka.actor.Props)] @java[@javadoc[Props.create(clazz, args)](akka.actor.Props#create(java.lang.Class,java.lang.Object...))] method above or the recommended practice
+@scala[@scaladoc[Props.apply(clazz, args)](pekko.actor.Props$#apply(clazz:Class[_],args:Any*):org.apache.pekko.actor.Props)] @java[@javadoc[Props.create(clazz, args)](pekko.actor.Props#create(java.lang.Class,java.lang.Object...))] method above or the recommended practice
 below—and creating actors “on the spot” as anonymous classes. The latter should
 be solved by making these actors named classes instead (if they are not
 declared within a top-level `object` then the enclosing instance’s `this`
@@ -166,7 +166,7 @@ encapsulation. Never pass an actor’s `this` reference into `Props`!
 
 #### Edge cases
 
-There are two edge cases in actor creation with @scaladoc[akka.actor.Props](akka.actor.Props):
+There are two edge cases in actor creation with @scaladoc[actor.Props](pekko.actor.Props):
 
 * An actor with @scaladoc[AnyVal](scala.AnyVal) arguments.
 
@@ -181,7 +181,7 @@ There are two edge cases in actor creation with @scaladoc[akka.actor.Props](akka
 In both cases, an @javadoc[IllegalArgumentException](java.lang.IllegalArgumentException) will be thrown stating
 no matching constructor could be found.
 
-The next section explains the recommended ways to create @scaladoc[Actor](akka.actor.Actor) props in a way,
+The next section explains the recommended ways to create @scaladoc[Actor](pekko.actor.Actor) props in a way,
 which simultaneously safe-guards against these edge cases.
 
 @@@
@@ -189,10 +189,10 @@ which simultaneously safe-guards against these edge cases.
 #### Recommended Practices
 
 It is a good idea to provide @scala[factory methods on the companion object of each
-@apidoc[Actor](akka.actor.Actor)] @java[static factory methods for each @apidoc[Actor](akka.actor.Actor)] which help keeping the creation of
+@apidoc[Actor](actor.Actor)] @java[static factory methods for each @apidoc[Actor](actor.Actor)] which help keeping the creation of
 suitable `Props` as close to the actor definition as possible. This also avoids the pitfalls
-associated with using the @scala[@scaladoc[Props.apply(...)](akka.actor.Props$#apply(clazz:Class[_],args:Any*):akka.actor.Props) method which takes a by-name
-argument, since within a companion object] @java[ @javadoc[Props.create(...)](akka.actor.Props#create(java.lang.Class,java.lang.Object...)) method which takes
+associated with using the @scala[@scaladoc[Props.apply(...)](pekko.actor.Props$#apply(clazz:Class[_],args:Any*):org.apache.pekko.actor.Props) method which takes a by-name
+argument, since within a companion object] @java[ @javadoc[Props.create(...)](pekko.actor.Props#create(java.lang.Class,java.lang.Object...)) method which takes
 arguments as constructor parameters, since within static method]
 the given code block will not retain a reference to its enclosing scope:
 
@@ -215,9 +215,9 @@ Java
 
 ### Creating Actors with Props
 
-Actors are created by passing a @apidoc[akka.actor.Props] instance into the
-`actorOf` factory method which is available on @apidoc[akka.actor.ActorSystem] and
-@apidoc[akka.actor.ActorContext].
+Actors are created by passing a @apidoc[actor.Props] instance into the
+`actorOf` factory method which is available on @apidoc[actor.ActorSystem] and
+@apidoc[actor.ActorContext].
 
 Scala
 :  @@snip [ActorDocSpec.scala](/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala) { #system-actorOf }
@@ -239,7 +239,7 @@ It is recommended to create a hierarchy of children, grand-children and so on
 such that it fits the logical failure-handling structure of the application,
 see @ref:[Actor Systems](general/actor-systems.md).
 
-The call to `actorOf` returns an instance of @apidoc[akka.actor.ActorRef]. This is a
+The call to `actorOf` returns an instance of @apidoc[actor.ActorRef]. This is a
 handle to the actor instance and the only way to interact with it. The
 `ActorRef` is immutable and has a one to one relationship with the Actor
 it represents. The `ActorRef` is also serializable and network-aware.
@@ -251,7 +251,7 @@ The name parameter is optional, but you should preferably name your actors,
 since that is used in log messages and for identifying actors. The name must
 not be empty or start with `$`, but it may contain URL encoded characters
 (eg., `%20` for a blank space).  If the given name is already in use by
-another child to the same parent an @apidoc[akka.actor.InvalidActorNameException] is thrown.
+another child to the same parent an @apidoc[actor.InvalidActorNameException] is thrown.
 
 Actors are automatically started asynchronously when created.
 
@@ -272,8 +272,8 @@ calling the constructor manually:
 
 ### Dependency Injection
 
-If your @apidoc[akka.actor.Actor] has a constructor that takes parameters then those need to
-be part of the @apidoc[akka.actor.Props] as well, as described @ref:[above](#props). But there
+If your @apidoc[actor.Actor] has a constructor that takes parameters then those need to
+be part of the @apidoc[actor.Props] as well, as described @ref:[above](#props). But there
 are cases when a factory method must be used, for example when the actual
 constructor arguments are determined by a dependency injection framework.
 
@@ -285,7 +285,7 @@ Java
 
 @@@ warning
 
-You might be tempted at times to offer an @apidoc[akka.actor.IndirectActorProducer]
+You might be tempted at times to offer an @apidoc[actor.IndirectActorProducer]
 which always returns the same instance, e.g. by using a @scala[`lazy val`.] @java[static field.] This is
 not supported, as it goes against the meaning of an actor restart, which is
 described here: @ref:[What Restarting Means](general/supervision.md#supervision-restart).
@@ -302,25 +302,25 @@ guideline and the [Akka Java Spring](https://github.com/typesafehub/activator-ak
 
 ## Actor API
 
-@scala[The @apidoc[akka.actor.Actor] trait defines only one abstract method, the above mentioned
+@scala[The @apidoc[actor.Actor] trait defines only one abstract method, the above mentioned
 `receive`, which implements the behavior of the actor.]
-@java[The @apidoc[akka.actor.AbstractActor] class defines a method called `createReceive`,
+@java[The @apidoc[actor.AbstractActor] class defines a method called `createReceive`,
 that is used to set the “initial behavior” of the actor.]
 
 If the current actor behavior does not match a received message,
 `unhandled` is called, which by default publishes an
-@apidoc[akka.actor.UnhandledMessage(message, sender, recipient)](akka.actor.UnhandledMessage) on the actor
+@apidoc[actor.UnhandledMessage(message, sender, recipient)](actor.UnhandledMessage) on the actor
 system’s event stream (set configuration item
 `akka.actor.debug.unhandled` to `on` to have them converted into
 actual Debug messages).
 
 In addition, it offers:
 
-* @scala[@scaladoc[self](akka.actor.Actor#self:akka.actor.ActorRef)] @java[@javadoc[getSelf()](akka.actor.AbstractActor#getSelf())] reference to the @apidoc[akka.actor.ActorRef] of the actor
-* @scala[@scaladoc[sender](akka.actor.Actor#sender():akka.actor.ActorRef)] @java[@javadoc[getSender()](akka.actor.AbstractActor#getSender())] reference sender Actor of the last received message, typically used as described in
+* @scala[@scaladoc[self](pekko.actor.Actor#self:org.apache.pekko.actor.ActorRef)] @java[@javadoc[getSelf()](pekko.actor.AbstractActor#getSelf())] reference to the @apidoc[actor.ActorRef] of the actor
+* @scala[@scaladoc[sender](pekko.actor.Actor#sender():org.apache.pekko.actor.ActorRef)] @java[@javadoc[getSender()](pekko.actor.AbstractActor#getSender())] reference sender Actor of the last received message, typically used as described in
   @scala[[Actor.Reply](#actor-reply)]
   @java[[LambdaActor.Reply](#lambdaactor-reply)]
-* @scala[@scaladoc[supervisorStrategy](akka.actor.Actor#supervisorStrategy:akka.actor.SupervisorStrategy)] @java[@javadoc[supervisorStrategy()](akka.actor.AbstractActor#supervisorStrategy())] user overridable definition the strategy to use for supervising child actors
+* @scala[@scaladoc[supervisorStrategy](pekko.actor.Actor#supervisorStrategy:org.apache.pekko.actor.SupervisorStrategy)] @java[@javadoc[supervisorStrategy()](pekko.actor.AbstractActor#supervisorStrategy())] user overridable definition the strategy to use for supervising child actors
 
   This strategy is typically declared inside the actor to have access
   to the actor’s internal state within the decider function: since failure is
@@ -331,7 +331,7 @@ In addition, it offers:
   occurred within a distant descendant it is still reported one level up at a
   time).
 
-* @scala[@scaladoc[context](akka.actor.Actor#context:akka.actor.ActorContext)] @java[@javadoc[getContext()](akka.actor.AbstractActor#getContext())] exposes contextual information for the actor and the current message, such as:
+* @scala[@scaladoc[context](pekko.actor.Actor#context:org.apache.pekko.actor.ActorContext)] @java[@javadoc[getContext()](pekko.actor.AbstractActor#getContext())] exposes contextual information for the actor and the current message, such as:
     * factory methods to create child actors (`actorOf`)
     * system that the actor belongs to
     * parent supervisor
@@ -351,12 +351,12 @@ The remaining visible methods are user-overridable life-cycle hooks which are
 described in the following:
 
 Scala
-:  @@snip [Actor.scala](/akka-actor/src/main/scala/akka/actor/Actor.scala) { #lifecycle-hooks }
+:  @@snip [Actor.scala](/akka-actor/src/main/scala/org/apache/pekko/actor/Actor.scala) { #lifecycle-hooks }
 
 Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #lifecycle-callbacks }
 
-The implementations shown above are the defaults provided by the @scala[@scaladoc[Actor](akka.actor.Actor) trait.] @java[@javadoc[AbstractActor](akka.actor.AbstractActor) class.]
+The implementations shown above are the defaults provided by the @scala[@scaladoc[Actor](pekko.actor.Actor) trait.] @java[@javadoc[AbstractActor](pekko.actor.AbstractActor) class.]
 
 ### Actor Lifecycle
 
@@ -365,7 +365,7 @@ The implementations shown above are the defaults provided by the @scala[@scalado
 A path in an actor system represents a "place" that might be occupied
 by a living actor. Initially (apart from system initialized actors) a path is
 empty. When `actorOf()` is called it assigns an *incarnation* of the actor
-described by the passed @apidoc[akka.actor.Props] to the given path. An actor incarnation is
+described by the passed @apidoc[actor.Props] to the given path. An actor incarnation is
 identified by the path *and a UID*.
 
 It is worth noting about the difference between:
@@ -375,10 +375,10 @@ It is worth noting about the difference between:
 
 as explained below.
 
-A restart only swaps the @apidoc[akka.actor.Actor]
-instance defined by the @apidoc[akka.actor.Props] but the incarnation and hence the UID remains
+A restart only swaps the @apidoc[actor.Actor]
+instance defined by the @apidoc[actor.Props] but the incarnation and hence the UID remains
 the same.
-As long as the incarnation is the same, you can keep using the same @apidoc[akka.actor.ActorRef].
+As long as the incarnation is the same, you can keep using the same @apidoc[actor.ActorRef].
 Restart is handled by the @ref:[Supervision Strategy](fault-tolerance.md#creating-a-supervisor-strategy) of actor's parent actor,
 and there is more discussion about @ref:[what restart means](general/supervision.md#supervision-restart).
 
@@ -388,7 +388,7 @@ are notified of the termination. After the incarnation is stopped, the path can
 be reused again by creating an actor with `actorOf()`. In this case, the
 name of the new incarnation will be the same as the previous one, but the
 UIDs will differ. An actor can be stopped by the actor itself, another actor
-or the @apidoc[ActorSystem](akka.actor.ActorSystem) (see @ref:[Stopping actors](#stopping-actors)).
+or the @apidoc[ActorSystem](actor.ActorSystem) (see @ref:[Stopping actors](#stopping-actors)).
 
 @@@ note
 
@@ -399,18 +399,18 @@ stop all the child Actors that this parent has created.
 
 @@@
 
-An @apidoc[akka.actor.ActorRef] always represents an incarnation (path and UID) not just a
+An @apidoc[actor.ActorRef] always represents an incarnation (path and UID) not just a
 given path. Therefore, if an actor is stopped, and a new one with the same
 name is created then an `ActorRef` of the old incarnation will not point
 to the new one.
 
-@apidoc[akka.actor.ActorSelection] on the other hand points to the path (or multiple paths
+@apidoc[actor.ActorSelection] on the other hand points to the path (or multiple paths
 if wildcards are used) and is completely oblivious to which incarnation is currently
 occupying it. `ActorSelection` cannot be watched for this reason. It is
 possible to resolve the current incarnation's `ActorRef` living under the
-path by sending an @apidoc[akka.actor.Identify] message to the `ActorSelection` which
-will be replied to with an @apidoc[akka.actor.ActorIdentity] containing the correct reference
-(see @ref:[ActorSelection](#actorselection)). This can also be done with the @apidoc[resolveOne](akka.actor.ActorSelection) {scala="#resolveOne(timeout:scala.concurrent.duration.FiniteDuration):scala.concurrent.Future[akka.actor.ActorRef]" java="#resolveOne(java.time.Duration)"}
+path by sending an @apidoc[actor.Identify] message to the `ActorSelection` which
+will be replied to with an @apidoc[actor.ActorIdentity] containing the correct reference
+(see @ref:[ActorSelection](#actorselection)). This can also be done with the @apidoc[resolveOne](actor.ActorSelection) {scala="#resolveOne(timeout:scala.concurrent.duration.FiniteDuration):scala.concurrent.Future[actor.ActorRef]" java="#resolveOne(java.time.Duration)"}
 method of the `ActorSelection`, which returns a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] of the matching
 `ActorRef`.
 
@@ -419,7 +419,7 @@ method of the `ActorSelection`, which returns a @scala[@scaladoc[Future](scala.c
 
 To be notified when another actor terminates (i.e., stops permanently,
 not a temporary failure and restart), an actor may register itself for reception
-of the @apidoc[akka.actor.Terminated] message dispatched by the other actor upon
+of the @apidoc[actor.Terminated] message dispatched by the other actor upon
 termination (see @ref:[Stopping Actors](#stopping-actors)). This service is provided by the
 `DeathWatch` component of the actor system.
 
@@ -431,7 +431,7 @@ Scala
 Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #import-terminated #watch }
 
-It should be noted that the @apidoc[akka.actor.Terminated] message is generated
+It should be noted that the @apidoc[actor.Terminated] message is generated
 independently of the order in which registration and termination occur.
 In particular, the watching actor will receive a `Terminated` message even if the
 watched actor has already been terminated at the time of registration.
@@ -445,13 +445,13 @@ monitoring of an already terminated actor leads to the immediate generation of
 the `Terminated` message.
 
 It is also possible to deregister from watching another actor’s liveliness
-using @apidoc[context.unwatch(target)](akka.actor.ActorContext) {scala="#unwatch(subject:akka.actor.ActorRef):akka.actor.ActorRef" java="#unwatch(akka.actor.ActorRef)"}. This works even if the `Terminated`
+using @apidoc[context.unwatch(target)](actor.ActorContext) {scala="#unwatch(subject:org.apache.pekko.actor.ActorRef):org.apache.pekko.actor.ActorRef" java="#unwatch(org.apache.pekko.actor.ActorRef)"}. This works even if the `Terminated`
 message has already been enqueued in the mailbox; after calling `unwatch`
 no `Terminated` message for that actor will be processed anymore.
 
 ### Start Hook
 
-Right after starting the actor, its @scala[@scaladoc[preStart](akka.actor.Actor#preStart():Unit)]@java[@javadoc[preStart](akka.actor.AbstractActor#preStart())] method is invoked.
+Right after starting the actor, its @scala[@scaladoc[preStart](pekko.actor.Actor#preStart():Unit)]@java[@javadoc[preStart](pekko.actor.AbstractActor#preStart())] method is invoked.
 
 Scala
 :  @@snip [ActorDocSpec.scala](/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala) { #preStart }
@@ -460,7 +460,7 @@ Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #preStart }
 
 This method is called when the actor is first created. During restarts, it is
-called by the default implementation of @scala[@scaladoc[postRestart](akka.actor.Actor#postRestart(reason:Throwable):Unit)]@java[@javadoc[postRestart](akka.actor.AbstractActor#postRestart(java.lang.Throwable))], which means that
+called by the default implementation of @scala[@scaladoc[postRestart](pekko.actor.Actor#postRestart(reason:Throwable):Unit)]@java[@javadoc[postRestart](pekko.actor.AbstractActor#postRestart(java.lang.Throwable))], which means that
 by overriding that method you can choose whether the initialization code in
 this method is called only exactly once for this actor or every restart.
 Initialization code which is part of the actor’s constructor will always be
@@ -475,16 +475,16 @@ handling strategy. Actors may be restarted in case an exception is thrown while
 processing a message (see @ref:[supervision](general/supervision.md)). This restart involves the hooks
 mentioned above:
 
-1. The old actor is informed by calling @scala[@scaladoc[preRestart](akka.actor.Actor#preRestart(reason:Throwable,message:Option[Any]):Unit)]@java[@javadoc[preRestart](akka.actor.AbstractActor#preRestart(java.lang.Throwable,java.util.Optional))] with the exception
+1. The old actor is informed by calling @scala[@scaladoc[preRestart](pekko.actor.Actor#preRestart(reason:Throwable,message:Option[Any]):Unit)]@java[@javadoc[preRestart](pekko.actor.AbstractActor#preRestart(java.lang.Throwable,java.util.Optional))] with the exception
    which caused the restart, and the message which triggered that exception; the
    latter may be `None` if the restart was not caused by processing a
    message, e.g. when a supervisor does not trap the exception and is restarted
    in turn by its supervisor, or if an actor is restarted due to a sibling’s
    failure. If the message is available, then that message’s sender is also
-   accessible in the usual way (i.e. by calling @scala[@scaladoc[sender](akka.actor.Actor#sender():akka.actor.ActorRef)] @java[@javadoc[getSender()](akka.actor.AbstractActor#getSender())]).
+   accessible in the usual way (i.e. by calling @scala[@scaladoc[sender](pekko.actor.Actor#sender():org.apache.pekko.actor.ActorRef)] @java[@javadoc[getSender()](pekko.actor.AbstractActor#getSender())]).
    This method is the best place for cleaning up, preparing hand-over to the
    fresh actor instance, etc.  By default, it stops all children and calls
-   @scala[@scaladoc[postStop](akka.actor.Actor#postStop():Unit)]@java[@javadoc[postStop](akka.actor.AbstractActor#postStop())].
+   @scala[@scaladoc[postStop](pekko.actor.Actor#postStop():Unit)]@java[@javadoc[postStop](pekko.actor.AbstractActor#postStop())].
 2. The initial factory from the `actorOf` call is used
    to produce the fresh instance.
 3. The new actor’s `postRestart` method is invoked with the exception
@@ -509,11 +509,11 @@ See @ref:[Discussion: Message Ordering](general/message-delivery-reliability.md#
 
 ### Stop Hook
 
-After stopping an actor, its @scala[@scaladoc[postStop](akka.actor.Actor#postStop():Unit)]@java[@javadoc[postStop](akka.actor.AbstractActor#postStop())] hook is called, which may be used
+After stopping an actor, its @scala[@scaladoc[postStop](pekko.actor.Actor#postStop():Unit)]@java[@javadoc[postStop](pekko.actor.AbstractActor#postStop())] hook is called, which may be used
 e.g. for deregistering this actor from other services. This hook is guaranteed
 to run after message queuing has been disabled for this actor, i.e. messages
-sent to a stopped actor will be redirected to the @apidoc[deadLetters](akka.actor.ActorSystem) {scala="#deadLetters:akka.actor.ActorRef" java="#deadLetters()"} of the
-@apidoc[akka.actor.ActorSystem].
+sent to a stopped actor will be redirected to the @apidoc[deadLetters](actor.ActorSystem) {scala="#deadLetters:org.apache.pekko.actor.ActorRef" java="#deadLetters()"} of the
+@apidoc[actor.ActorSystem].
 
 
 ## Identifying Actors via Actor Selection
@@ -525,7 +525,7 @@ differ if the supervision chain includes any remote supervisors. These paths
 are used by the system to look up actors, e.g. when a remote message is
 received and the recipient is searched, but they are also useful more directly:
 actors may look up other actors by specifying absolute or relative
-paths—logical or physical—and receive back an @apidoc[akka.actor.ActorSelection] with the
+paths—logical or physical—and receive back an @apidoc[actor.ActorSelection] with the
 result:
 
 Scala
@@ -566,15 +566,15 @@ Scala
 Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #selection-wildcard }
 
-Messages can be sent via the @apidoc[akka.actor.ActorSelection] and the path of the
+Messages can be sent via the @apidoc[actor.ActorSelection] and the path of the
 `ActorSelection` is looked up when delivering each message. If the selection
 does not match any actors the message will be dropped.
 
-To acquire an @apidoc[akka.actor.ActorRef] for an `ActorSelection` you need to send
-a message to the selection and use the @scala[@scaladoc[sender](akka.actor.Actor#sender():akka.actor.ActorRef)] @java[@javadoc[getSender()](akka.actor.AbstractActor#getSender())]) reference of the reply from
-the actor. There is a built-in @apidoc[akka.actor.Identify] message that all Actors will
-understand and automatically reply to with an @apidoc[akka.actor.ActorIdentity] message
-containing the @apidoc[akka.actor.ActorRef]. This message is handled specially by the
+To acquire an @apidoc[actor.ActorRef] for an `ActorSelection` you need to send
+a message to the selection and use the @scala[@scaladoc[sender](pekko.actor.Actor#sender():org.apache.pekko.actor.ActorRef)] @java[@javadoc[getSender()](pekko.actor.AbstractActor#getSender())]) reference of the reply from
+the actor. There is a built-in @apidoc[actor.Identify] message that all Actors will
+understand and automatically reply to with an @apidoc[actor.ActorIdentity] message
+containing the @apidoc[actor.ActorRef]. This message is handled specially by the
 actors which are traversed in the sense that if a concrete name lookup fails
 (i.e. a non-wildcard path element does not correspond to a live actor) then a
 negative result is generated. Please note that this does not mean that delivery
@@ -587,9 +587,9 @@ Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #import-identify #identify }
 
 You can also acquire an `ActorRef` for an `ActorSelection` with
-the @apidoc[resolveOne](akka.actor.ActorSelection) {scala="#resolveOne(timeout:scala.concurrent.duration.FiniteDuration):scala.concurrent.Future[akka.actor.ActorRef]" java="#resolveOne(java.time.Duration)"} method of the `ActorSelection`. It returns a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)]
+the @apidoc[resolveOne](actor.ActorSelection) {scala="#resolveOne(timeout:scala.concurrent.duration.FiniteDuration):scala.concurrent.Future[actor.ActorRef]" java="#resolveOne(java.time.Duration)"} method of the `ActorSelection`. It returns a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)]
 of the matching `ActorRef` if such an actor exists. It is completed with
-failure @apidoc[akka.actor.ActorNotFound] if no such actor exists or the identification
+failure @apidoc[actor.ActorNotFound] if no such actor exists or the identification
 didn't complete within the supplied `timeout`.
 
 Remote actor addresses may also be looked up, if @ref:[remoting](remoting.md) is enabled:
@@ -627,7 +627,7 @@ Java
 
 Messages are sent to an Actor through one of the following methods.
 
-* @scala[@scaladoc[!](akka.actor.ActorRef#!(message:Any)(implicitsender:akka.actor.ActorRef):Unit)] @java[@javadoc[tell](akka.actor.ActorRef#tell(java.lang.Object,akka.actor.ActorRef))] means “fire-and-forget”, e.g. send a message asynchronously and return
+* @scala[@scaladoc[!](pekko.actor.ActorRef#!(message:Any)(implicitsender:org.apache.pekko.actor.ActorRef):Unit)] @java[@javadoc[tell](pekko.actor.ActorRef#tell(java.lang.Object,org.apache.pekko.actor.ActorRef))] means “fire-and-forget”, e.g. send a message asynchronously and return
   immediately. @scala[Also known as `tell`.]
 * @scala[`?`] @java[`ask`] sends a message asynchronously and returns a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)]
   representing a possible reply. @scala[Also known as `ask`.]
@@ -638,14 +638,14 @@ Message ordering is guaranteed on a per-sender basis.
 
 There are performance implications of using `ask` since something needs to
 keep track of when it times out, there needs to be something that bridges
-a `Promise` into an @apidoc[akka.actor.ActorRef] and it also needs to be reachable through
+a `Promise` into an @apidoc[actor.ActorRef] and it also needs to be reachable through
 remoting. So always prefer `tell` for performance, and only `ask` if you must.
 
 @@@
 
 @@@ div { .group-java }
 
-In all these methods you have the option of passing along your own @apidoc[akka.actor.ActorRef].
+In all these methods you have the option of passing along your own @apidoc[actor.ActorRef].
 Make it a practice of doing so because it will allow the receiver actors to be able to respond
 to your message since the sender reference is sent along with the message.
 
@@ -671,17 +671,17 @@ in its `sender(): ActorRef` member method. The target actor can use this
 to reply to the original sender, by using `sender() ! replyMsg`.
 
 If invoked from an instance that is **not** an Actor the sender will be
-@scaladoc[deadLetters](akka.actor.ActorSystem#deadLetters:akka.actor.ActorRef) actor reference by default.
+@scaladoc[deadLetters](pekko.actor.ActorSystem#deadLetters:org.apache.pekko.actor.ActorRef) actor reference by default.
 
 @@@
 
 @@@ div { .group-java }
 
 The sender reference is passed along with the message and available within the
-receiving actor via its @javadoc[getSender()](akka.actor.AbstractActor#getSender()) method while processing this
-message. Inside of an actor it is usually @javadoc[getSelf()](akka.actor.AbstractActor#getSelf()) who shall be the
+receiving actor via its @javadoc[getSender()](pekko.actor.AbstractActor#getSender()) method while processing this
+message. Inside of an actor it is usually @javadoc[getSelf()](pekko.actor.AbstractActor#getSelf()) who shall be the
 sender, but there can be cases where replies shall be routed to some other
-actor—e.g. the parent—in which the second argument to @javadoc[tell](akka.actor.ActorRef#tell(java.lang.Object,akka.actor.ActorRef)) would be a
+actor—e.g. the parent—in which the second argument to @javadoc[tell](pekko.actor.ActorRef#tell(java.lang.Object,org.apache.pekko.actor.ActorRef)) would be a
 different one. Outside of an actor and if no reply is needed the second
 argument can be `null`; if a reply is needed outside of an actor you can use
 the ask-pattern described next.
@@ -692,7 +692,7 @@ the ask-pattern described next.
 ### Ask: Send-And-Receive-Future
 
 The `ask` pattern involves actors as well as futures, hence it is offered as
-a use pattern rather than a method on @apidoc[akka.actor.ActorRef]:
+a use pattern rather than a method on @apidoc[actor.ActorRef]:
 
 Scala
 :  @@snip [ActorDocSpec.scala](/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala) { #ask-pipeTo }
@@ -701,7 +701,7 @@ Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #import-ask #ask-pipe }
 
 
-This example demonstrates `ask` together with the @scala[@scaladoc[pipeTo](akka.pattern.PipeToSupport$PipeableFuture#pipeTo(recipient:akka.actor.ActorRef)(implicitsender:akka.actor.ActorRef):scala.concurrent.Future[T])]@java[@javadoc[pipeTo](akka.pattern.PipeToSupport.PipeableCompletionStage#pipeTo(akka.actor.ActorRef,akka.actor.ActorRef))] pattern on
+This example demonstrates `ask` together with the @scala[@scaladoc[pipeTo](pekko.pattern.PipeToSupport$PipeableFuture#pipeTo(recipient:org.apache.pekko.actor.ActorRef)(implicitsender:org.apache.pekko.actor.ActorRef):scala.concurrent.Future[T])]@java[@javadoc[pipeTo](pekko.pattern.PipeToSupport.PipeableCompletionStage#pipeTo(org.apache.pekko.actor.ActorRef,org.apache.pekko.actor.ActorRef))] pattern on
 futures, because this is likely to be a common combination. Please note that
 all of the above is completely non-blocking and asynchronous: `ask` produces
 a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)], @scala[three] @java[two] of which are composed into a new future using the
@@ -717,11 +717,11 @@ which it is destroyed in order not to leak resources; see more below.
 
 @@@ warning
 
-To complete the @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] with an exception you need to send an @apidoc[akka.actor.Status.Failure] message to the sender.
+To complete the @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] with an exception you need to send an @apidoc[actor.Status.Failure] message to the sender.
 This is *not done automatically* when an actor throws an exception while processing a message.
 
 @scala[Please note that Scala's `Try` sub types @scaladoc[scala.util.Failure](scala.util.Failure) and @scaladoc[scala.util.Success](scala.util.Success) are not treated
-especially, and would complete the ask @scala[`Future`]@java[`CompletionStage`] with the given value - only the @scaladoc[akka.actor.Status](akka.actor.Status$) messages
+especially, and would complete the ask @scala[`Future`]@java[`CompletionStage`] with the given value - only the @scaladoc[actor.Status](pekko.actor.Status$) messages
 are treated specially by the ask pattern.]
 
 @@@
@@ -733,8 +733,8 @@ Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #reply-exception }
 
 If the actor does not complete the @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)], it will expire after the timeout period,
-@scala[completing it with an @scaladoc[AskTimeoutException](akka.pattern.AskTimeoutException). The timeout is taken from one of the following locations in order of precedence:]
-@java[specified as parameter to the `ask` method; this will complete the `CompletionStage` with an @javadoc[AskTimeoutException](akka.pattern.AskTimeoutException).]
+@scala[completing it with an @scaladoc[AskTimeoutException](pekko.pattern.AskTimeoutException). The timeout is taken from one of the following locations in order of precedence:]
+@java[specified as parameter to the `ask` method; this will complete the `CompletionStage` with an @javadoc[AskTimeoutException](pekko.pattern.AskTimeoutException).]
 
 @@@ div { .group-scala }
 
@@ -742,7 +742,7 @@ If the actor does not complete the @scala[@scaladoc[Future](scala.concurrent.Fut
 
     @@snip [ActorDocSpec.scala](/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala) { #using-explicit-timeout }
 
- 2. implicit argument of type `akka.util.Timeout`, e.g.
+ 2. implicit argument of type `org.apache.pekko.util.Timeout`, e.g.
 
     @@snip [ActorDocSpec.scala](/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala) { #using-implicit-timeout }
 
@@ -781,11 +781,11 @@ Java
 ## Receive messages
 
 An Actor has to
-@scala[implement the @scaladoc[receive](akka.actor.Actor#receive:akka.actor.Actor.Receive) method to receive messages:]
-@java[define its initial receive behavior by implementing the @javadoc[createReceive](akka.actor.AbstractActor#createReceive()) method in the `AbstractActor`:]
+@scala[implement the @scaladoc[receive](pekko.actor.Actor#receive:org.apache.pekko.actor.Actor.Receive) method to receive messages:]
+@java[define its initial receive behavior by implementing the @javadoc[createReceive](pekko.actor.AbstractActor#createReceive()) method in the `AbstractActor`:]
 
 Scala
-:  @@snip [Actor.scala](/akka-actor/src/main/scala/akka/actor/Actor.scala) { #receive }
+:  @@snip [Actor.scala](/akka-actor/src/main/scala/org/apache/pekko/actor/Actor.scala) { #receive }
 
 Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #createReceive }
@@ -800,9 +800,9 @@ pattern matching. Here is an example:
 
 @@@ div { .group-java }
 
-The return type is @javadoc[AbstractActor.Receive](akka.actor.AbstractActor.Receive) that defines which messages your Actor can handle,
+The return type is @javadoc[AbstractActor.Receive](pekko.actor.AbstractActor.Receive) that defines which messages your Actor can handle,
 along with the implementation of how the messages should be processed.
-You can build such behavior with a builder named @javadoc[receiveBuilder](akka.actor.AbstractActor#receiveBuilder()). Here is an example:
+You can build such behavior with a builder named @javadoc[receiveBuilder](pekko.actor.AbstractActor#receiveBuilder()). Here is an example:
 
 @@@
 
@@ -832,14 +832,14 @@ That has benefits such as:
 * works better with performance profiling tools
 * Java HotSpot has a better opportunity for making optimizations
 
-The @javadoc[Receive](akka.actor.AbstractActor.Receive) can be implemented in other ways than using the `ReceiveBuilder` since in the
+The @javadoc[Receive](pekko.actor.AbstractActor.Receive) can be implemented in other ways than using the `ReceiveBuilder` since in the
 end, it is just a wrapper around a Scala `PartialFunction`. In Java, you can implement `PartialFunction` by
 extending `AbstractPartialFunction`. For example, one could implement an adapter
 to [Vavr Pattern Matching DSL](https://docs.vavr.io/#_pattern_matching). See the [Akka Vavr sample project](https://github.com/akka/akka-samples/tree/2.5/akka-sample-vavr) for more details.
 
 If the validation of the `ReceiveBuilder` match logic turns out to be a bottleneck for some of your
-actors you can consider implementing it at a lower level by extending @javadoc[UntypedAbstractActor](akka.actor.UntypedAbstractActor) instead
-of @javadoc[AbstractActor](akka.actor.AbstractActor). The partial functions created by the `ReceiveBuilder` consist of multiple lambda
+actors you can consider implementing it at a lower level by extending @javadoc[UntypedAbstractActor](pekko.actor.UntypedAbstractActor) instead
+of @javadoc[AbstractActor](pekko.actor.AbstractActor). The partial functions created by the `ReceiveBuilder` consist of multiple lambda
 expressions for every match statement, where each lambda is referencing the code to be run. This is something
 that the JVM can have problems optimizing and the resulting code might not be as performant as the
 untyped version. When extending `UntypedAbstractActor` each message is received as an untyped
@@ -853,7 +853,7 @@ untyped version. When extending `UntypedAbstractActor` each message is received
 ## Reply to messages
 
 If you want to have a handle for replying to a message, you can use
-@scala[@scaladoc[sender](akka.actor.Actor#sender():akka.actor.ActorRef)] @java[@javadoc[getSender()](akka.actor.AbstractActor#getSender())], which gives you an ActorRef. You can reply by sending to
+@scala[@scaladoc[sender](pekko.actor.Actor#sender():org.apache.pekko.actor.ActorRef)] @java[@javadoc[getSender()](pekko.actor.AbstractActor#getSender())], which gives you an ActorRef. You can reply by sending to
 that ActorRef with @scala[`sender() ! replyMsg`.] @java[`getSender().tell(replyMsg, getSelf())`.] You can also store the ActorRef
 for replying later, or passing it on to other actors. If there is no sender (a
 message was sent without an actor or future context) then the sender
@@ -867,9 +867,9 @@ Java
 
 ## Receive timeout
 
-The @java[@scaladoc[ActorContext.setReceiveTimeout](akka.actor.ActorContext#setReceiveTimeout(timeout:scala.concurrent.duration.Duration):Unit)]@java[@javadoc[ActorContext.setReceiveTimeout](akka.actor.AbstractActor.ActorContext#setReceiveTimeout(java.time.Duration))] defines the inactivity timeout after which
-the sending of a @apidoc[akka.actor.ReceiveTimeout] message is triggered.
-When specified, the receive function should be able to handle an `akka.actor.ReceiveTimeout` message.
+The @java[@scaladoc[ActorContext.setReceiveTimeout](pekko.actor.ActorContext#setReceiveTimeout(timeout:scala.concurrent.duration.Duration):Unit)]@java[@javadoc[ActorContext.setReceiveTimeout](pekko.actor.AbstractActor.ActorContext#setReceiveTimeout(java.time.Duration))] defines the inactivity timeout after which
+the sending of a @apidoc[actor.ReceiveTimeout] message is triggered.
+When specified, the receive function should be able to handle an `org.apache.pekko.actor.ReceiveTimeout` message.
 1 millisecond is the minimum supported timeout.
 
 Please note that the receive timeout might fire and enqueue the `ReceiveTimeout` message right after
@@ -888,7 +888,7 @@ Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #receive-timeout }
 
 Messages marked with @apidoc[NotInfluenceReceiveTimeout] will not reset the timer. This can be useful when
-@apidoc[akka.actor.ReceiveTimeout] should be fired by external inactivity but not influenced by internal activity,
+@apidoc[actor.ReceiveTimeout] should be fired by external inactivity but not influenced by internal activity,
 e.g. scheduled tick messages.
 
 
@@ -908,20 +908,20 @@ Java
 
 The @ref:[Scheduler](scheduler.md#schedule-periodically) documentation describes the difference between
 `fixed-delay` and `fixed-rate` scheduling. If you are uncertain of which one to use you should pick
-@apidoc[startTimerWithFixedDelay](akka.actor.TimerScheduler) {scala="#startTimerWithFixedDelay(key:Any,msg:Any,initialDelay:scala.concurrent.duration.FiniteDuration,delay:scala.concurrent.duration.FiniteDuration):Unit" java="#startTimerWithFixedDelay(java.lang.Object,java.lang.Object,java.time.Duration,java.time.Duration)"}.
+@apidoc[startTimerWithFixedDelay](actor.TimerScheduler) {scala="#startTimerWithFixedDelay(key:Any,msg:Any,initialDelay:scala.concurrent.duration.FiniteDuration,delay:scala.concurrent.duration.FiniteDuration):Unit" java="#startTimerWithFixedDelay(java.lang.Object,java.lang.Object,java.time.Duration,java.time.Duration)"}.
 
 Each timer has a key and can be replaced or cancelled. It's guaranteed that a message from the
 previous incarnation of the timer with the same key is not received, even though it might already
 be enqueued in the mailbox when it was cancelled or the new timer was started.
 
 The timers are bound to the lifecycle of the actor that owns it and thus are cancelled
-automatically when it is restarted or stopped. Note that the @apidoc[akka.actor.TimerScheduler] is not thread-safe,
+automatically when it is restarted or stopped. Note that the @apidoc[actor.TimerScheduler] is not thread-safe,
 i.e. it must only be used within the actor that owns it.
 
 ## Stopping actors
 
-Actors are stopped by invoking the `stop` method of a @apidoc[akka.actor.ActorRefFactory],
-i.e. @apidoc[akka.actor.ActorContext] or @apidoc[akka.actor.ActorSystem]. Typically the context is used for stopping
+Actors are stopped by invoking the `stop` method of a @apidoc[actor.ActorRefFactory],
+i.e. @apidoc[actor.ActorContext] or @apidoc[actor.ActorSystem]. Typically the context is used for stopping
 the actor itself or child actors and the system for stopping top-level actors. The actual
 termination of the actor is performed asynchronously, i.e. `stop` may return before
 the actor is stopped.
@@ -935,14 +935,14 @@ Java
 
 Processing of the current message, if any, will continue before the actor is stopped,
 but additional messages in the mailbox will not be processed. By default, these
-messages are sent to the @apidoc[deadLetters](akka.actor.ActorSystem) {scala="#deadLetters:akka.actor.ActorRef" java="#deadLetters()"} of the `ActorSystem`, but that
+messages are sent to the @apidoc[deadLetters](actor.ActorSystem) {scala="#deadLetters:org.apache.pekko.actor.ActorRef" java="#deadLetters()"} of the `ActorSystem`, but that
 depends on the mailbox implementation.
 
 Termination of an actor proceeds in two steps: first the actor suspends its
 mailbox processing and sends a stop command to all its children, then it keeps
 processing the internal termination notifications from its children until the last one is
-gone, finally terminating itself (invoking @scala[@scaladoc[postStop](akka.actor.Actor#postStop():Unit)]@java[@javadoc[postStop](akka.actor.AbstractActor#postStop())], dumping mailbox,
-publishing @apidoc[akka.actor.Terminated] on the @ref:[DeathWatch](#deathwatch), telling
+gone, finally terminating itself (invoking @scala[@scaladoc[postStop](pekko.actor.Actor#postStop():Unit)]@java[@javadoc[postStop](pekko.actor.AbstractActor#postStop())], dumping mailbox,
+publishing @apidoc[actor.Terminated] on the @ref:[DeathWatch](#deathwatch), telling
 its supervisor). This procedure ensures that actor system sub-trees terminate
 in an orderly fashion, propagating the stop command to the leaves and
 collecting their confirmation back to the stopped supervisor. If one of the
@@ -950,7 +950,7 @@ actors do not respond (i.e. processing a message for extended periods of time
 and therefore not receiving the stop command), this whole process will be
 stuck.
 
-Upon @apidoc[ActorSystem.terminate()](akka.actor.ActorSystem) {scala="#terminate():scala.concurrent.Future[akka.actor.Terminated]" java="#terminate()"}, the system guardian actors will be
+Upon @apidoc[ActorSystem.terminate()](actor.ActorSystem) {scala="#terminate():scala.concurrent.Future[actor.Terminated]" java="#terminate()"}, the system guardian actors will be
 stopped, and the aforementioned process will ensure proper termination of the
 whole system. See @ref:[Coordinated Shutdown](coordinated-shutdown.md).
 
@@ -967,8 +967,8 @@ Java
 
 Since stopping an actor is asynchronous, you cannot immediately reuse the
 name of the child you just stopped; this will result in an
-@apidoc[akka.actor.InvalidActorNameException]. Instead, `watch()` the terminating
-actor and create its replacement in response to the @apidoc[akka.actor.Terminated]
+@apidoc[actor.InvalidActorNameException]. Instead, `watch()` the terminating
+actor and create its replacement in response to the @apidoc[actor.Terminated]
 message which will eventually arrive.
 
 @@@
@@ -976,7 +976,7 @@ message which will eventually arrive.
 
 ### PoisonPill
 
-You can also send an actor the @apidoc[akka.actor.PoisonPill] message, which will
+You can also send an actor the @apidoc[actor.PoisonPill] message, which will
 stop the actor when the message is processed. `PoisonPill` is enqueued as
 ordinary messages and will be handled after messages that were already queued
 in the mailbox.
@@ -990,7 +990,7 @@ Java
 
 ### Killing an Actor
 
-You can also "kill" an actor by sending a @apidoc[akka.actor.Kill] message. Unlike `PoisonPill` this will cause the actor to throw a @apidoc[akka.actor.ActorKilledException], triggering a failure. The actor will
+You can also "kill" an actor by sending a @apidoc[actor.Kill] message. Unlike `PoisonPill` this will cause the actor to throw a @apidoc[actor.ActorKilledException], triggering a failure. The actor will
 suspend operation and its supervisor will be asked how to handle the failure,
 which may mean resuming the actor, restarting it or terminating it completely.
 See @ref:[What Supervision Means](general/supervision.md#supervision-directives) for more information.
@@ -1010,7 +1010,7 @@ over which design you do not have control over.
 
 ### Graceful Stop
 
-@scala[@scaladoc[gracefulStop](akka.pattern.GracefulStopSupport#gracefulStop(target:akka.actor.ActorRef,timeout:scala.concurrent.duration.FiniteDuration,stopMessage:Any):scala.concurrent.Future[Boolean])]@java[@javadoc[gracefulStop](akka.pattern.Patterns#gracefulStop(akka.actor.ActorRef,scala.concurrent.duration.FiniteDuration,java.lang.Object))] is useful if you need to wait for termination or compose ordered
+@scala[@scaladoc[gracefulStop](pekko.pattern.GracefulStopSupport#gracefulStop(target:org.apache.pekko.actor.ActorRef,timeout:scala.concurrent.duration.FiniteDuration,stopMessage:Any):scala.concurrent.Future[Boolean])]@java[@javadoc[gracefulStop](pekko.pattern.Patterns#gracefulStop(org.apache.pekko.actor.ActorRef,scala.concurrent.duration.FiniteDuration,java.lang.Object))] is useful if you need to wait for termination or compose ordered
 termination of several actors:
 
 Scala
@@ -1019,7 +1019,7 @@ Scala
 Java
 :  @@snip [ActorDocTest.java](/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java) { #import-gracefulStop #gracefulStop}
 
-When `gracefulStop()` returns successfully, the actor’s @scala[@scaladoc[postStop](akka.actor.Actor#postStop():Unit)]@java[@javadoc[postStop](akka.actor.AbstractActor#postStop())] hook
+When `gracefulStop()` returns successfully, the actor’s @scala[@scaladoc[postStop](pekko.actor.Actor#postStop():Unit)]@java[@javadoc[postStop](pekko.actor.AbstractActor#postStop())] hook
 will have been executed: there exists a happens-before edge between the end of
 `postStop()` and the return of `gracefulStop()`.
 
@@ -1034,7 +1034,7 @@ Keep in mind that an actor stopping and its name being deregistered are
 separate events that happen asynchronously from each other. Therefore it may
 be that you will find the name still in use after `gracefulStop()`
 returned. To guarantee proper deregistration, only reuse names from
-within a supervisor you control and only in response to a @apidoc[akka.actor.Terminated]
+within a supervisor you control and only in response to a @apidoc[actor.Terminated]
 message, i.e. not for top-level actors.
 
 @@@
@@ -1045,7 +1045,7 @@ message, i.e. not for top-level actors.
 ### Upgrade
 
 Akka supports hotswapping the Actor’s message loop (e.g. its implementation) at
-runtime: invoke the @apidoc[context.become](akka.actor.ActorContext) {scala="#become(behavior:akka.actor.Actor.Receive,discardOld:Boolean):Unit" java="#become(scala.PartialFunction,boolean)"} method from within the Actor.
+runtime: invoke the @apidoc[context.become](actor.ActorContext) {scala="#become(behavior:org.apache.pekko.actor.Actor.Receive,discardOld:Boolean):Unit" java="#become(scala.PartialFunction,boolean)"} method from within the Actor.
 `become` takes a @scala[`PartialFunction[Any, Unit]`] @java[`PartialFunction`] that implements the new
 message handler. The hotswapped code is kept in a Stack that can be pushed and
 popped.
@@ -1066,7 +1066,7 @@ Java
 
 This variant of the `become` method is useful for many different things,
 such as to implement a Finite State Machine (FSM). It will replace the current behavior (i.e. the top of the behavior
-stack), which means that you do not use @apidoc[unbecome](akka.actor.ActorContext) {scala="#unbecome():Unit" java="#unbecome()"}, instead always the
+stack), which means that you do not use @apidoc[unbecome](actor.ActorContext) {scala="#unbecome():Unit" java="#unbecome()"}, instead always the
 next behavior is explicitly installed.
 
 The other way of using `become` does not replace but add to the top of
@@ -1087,7 +1087,7 @@ See this @extref[Unnested receive example](github:akka-docs/src/test/scala/docs/
 
 ## Stash
 
-The @scala[@scaladoc[Stash](akka.actor.Stash) trait] @java[@javadoc[AbstractActorWithStash](akka.actor.AbstractActorWithStash) class] enables an actor to temporarily stash away messages
+The @scala[@scaladoc[Stash](pekko.actor.Stash) trait] @java[@javadoc[AbstractActorWithStash](pekko.actor.AbstractActorWithStash) class] enables an actor to temporarily stash away messages
 that can not or should not be handled using the actor's current
 behavior. Upon changing the actor's message handler, i.e., right
 before invoking @scala[`context.become` or `context.unbecome`] @java[`getContext().become()` or `getContext().unbecome()`], all
@@ -1099,7 +1099,7 @@ order as they have been received originally. @java[An actor that extends
 @@@ note  { .group-scala }
 
 The trait `Stash` extends the marker trait
-@scaladoc[RequiresMessageQueue](akka.dispatch.RequiresMessageQueue)[@scaladoc[DequeBasedMessageQueueSemantics](akka.dispatch.DequeBasedMessageQueueSemantics)] which
+@scaladoc[RequiresMessageQueue](pekko.dispatch.RequiresMessageQueue)[@scaladoc[DequeBasedMessageQueueSemantics](org.apache.pekko.dispatch.DequeBasedMessageQueueSemantics)] which
 requests the system to automatically choose a deque based
 mailbox implementation for the actor. If you want more
 control over the
@@ -1109,15 +1109,15 @@ mailbox, see the documentation on mailboxes: @ref:[Mailboxes](mailboxes.md).
 
 @@@ note { .group-java }
 
-The abstract class @javadoc[AbstractActorWithStash](akka.actor.AbstractActorWithStash) implements the marker
-interface @javadoc[RequiresMessageQueue](akka.dispatch.RequiresMessageQueue)<@javadoc[DequeBasedMessageQueueSemantics](akka.dispatch.DequeBasedMessageQueueSemantics)>
+The abstract class @javadoc[AbstractActorWithStash](pekko.actor.AbstractActorWithStash) implements the marker
+interface @javadoc[RequiresMessageQueue](pekko.dispatch.RequiresMessageQueue)<@javadoc[DequeBasedMessageQueueSemantics](pekko.dispatch.DequeBasedMessageQueueSemantics)>
 which requests the system to automatically choose a deque based
 mailbox implementation for the actor. If you want more
 control over the mailbox, see the documentation on mailboxes: @ref:[Mailboxes](mailboxes.md).
 
 @@@
 
-Here is an example of the @scala[@scaladoc[Stash](akka.actor.Stash) trait] @java[@javadoc[AbstractActorWithStash](akka.actor.AbstractActorWithStash) class] in action:
+Here is an example of the @scala[@scaladoc[Stash](pekko.actor.Stash) trait] @java[@javadoc[AbstractActorWithStash](pekko.actor.AbstractActorWithStash) class] in action:
 
 Scala
 :  @@snip [ActorDocSpec.scala](/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala) { #stash }
@@ -1132,7 +1132,7 @@ messages that aren't handled by the other cases. It is illegal to
 stash the same message twice; to do so results in an
 @javadoc[IllegalStateException](java.lang.IllegalStateException) being thrown. The stash may also be bounded
 in which case invoking `stash()` may lead to a capacity violation,
-which results in a @apidoc[akka.actor.StashOverflowException]. The capacity of the
+which results in a @apidoc[actor.StashOverflowException]. The capacity of the
 stash can be configured using the `stash-capacity` setting (an `Int`) of the
 mailbox's configuration.
 
@@ -1149,8 +1149,8 @@ major impact on performance.
 
 @@@ warning { .group-scala }
 
-Note that the @scaladoc[Stash](akka.actor.Stash) trait must be mixed into (a subclass of) the
-@scaladoc[Actor](akka.actor.Actor) trait before any trait/class that overrides the @scaladoc[preRestart](akka.actor.Actor#preRestart(reason:Throwable,message:Option[Any]):Unit)]
+Note that the @scaladoc[Stash](pekko.actor.Stash) trait must be mixed into (a subclass of) the
+@scaladoc[Actor](pekko.actor.Actor) trait before any trait/class that overrides the @scaladoc[preRestart](org.apache.pekko.actor.Actor#preRestart(reason:Throwable,message:Option[Any]):Unit)]
 callback. This means it's not possible to write
 `Actor with MyActor with Stash` if `MyActor` overrides `preRestart`.
 
@@ -1160,7 +1160,7 @@ Note that the stash is part of the ephemeral actor state, unlike the
 mailbox. Therefore, it should be managed like other parts of the
 actor's state which have the same property.
 
-However, the @scala[@scaladoc[Stash](akka.actor.Stash) trait] @java[@javadoc[AbstractActorWithStash](akka.actor.AbstractActorWithStash) class]
+However, the @scala[@scaladoc[Stash](pekko.actor.Stash) trait] @java[@javadoc[AbstractActorWithStash](pekko.actor.AbstractActorWithStash) class]
 implementation of `preRestart` will call `unstashAll()`. This means
 that before the actor restarts, it will transfer all stashed messages back to the actor's mailbox.
 
@@ -1170,7 +1170,7 @@ This is usually the desired behavior.
 @@@ note
 
 If you want to enforce that your actor can only work with an unbounded stash,
-then you should use the @scala[@scaladoc[UnboundedStash](akka.actor.UnboundedStash) trait] @java[@javadoc[AbstractActorWithUnboundedStash](akka.actor.AbstractActorWithUnboundedStash) class] instead.
+then you should use the @scala[@scaladoc[UnboundedStash](pekko.actor.UnboundedStash) trait] @java[@javadoc[AbstractActorWithUnboundedStash](pekko.actor.AbstractActorWithUnboundedStash) class] instead.
 
 @@@
 
@@ -1179,7 +1179,7 @@ then you should use the @scala[@scaladoc[UnboundedStash](akka.actor.UnboundedSta
 ## Extending Actors using PartialFunction chaining
 
 Sometimes it can be useful to share common behavior among a few actors, or compose one actor's behavior from multiple smaller functions.
-This is possible because an actor's @scala[@scaladoc[receive](akka.actor.Actor#receive:akka.actor.Actor.Receive)]@java[@javadoc[createReceive](akka.actor.AbstractActor#createReceive())] method returns an `Actor.Receive`, which is a type alias for `PartialFunction[Any,Unit]`,
+This is possible because an actor's @scala[@scaladoc[receive](pekko.actor.Actor#receive:org.apache.pekko.actor.Actor.Receive)]@java[@javadoc[createReceive](pekko.actor.AbstractActor#createReceive())] method returns an `Actor.Receive`, which is a type alias for `PartialFunction[Any,Unit]`,
 and partial functions can be chained together using the `PartialFunction#orElse` method. You can chain as many functions as you need,
 however you should keep in mind that "first match" wins - which may be important when combining functions that both can handle the same type of message.
 
@@ -1196,7 +1196,7 @@ Instead of inheritance the same pattern can be applied via composition - compose
 ## Initialization patterns
 
 The rich lifecycle hooks of Actors provide a useful toolkit to implement various initialization patterns. During the
-lifetime of an @apidoc[akka.actor.ActorRef], an actor can potentially go through several restarts, where the old instance is replaced by
+lifetime of an @apidoc[actor.ActorRef], an actor can potentially go through several restarts, where the old instance is replaced by
 a fresh one, invisibly to the outside observer who only sees the `ActorRef`.
 
 Initialization might be necessary every time an actor is instantiated,
@@ -1214,13 +1214,13 @@ restarts. The following section provides a pattern for this case.
 
 ### Initialization via preStart
 
-The method @scala[@scaladoc[preStart](akka.actor.Actor#preStart():Unit)]@java[@javadoc[preStart](akka.actor.AbstractActor#preStart())] of an actor is only called once directly during the initialization of the first instance, that
-is, at the creation of its `ActorRef`. In the case of restarts, `preStart()` is called from @scala[@scaladoc[postRestart](akka.actor.Actor#postRestart(reason:Throwable):Unit)]@java[@javadoc[postRestart](akka.actor.AbstractActor#postRestart(java.lang.Throwable))], therefore
+The method @scala[@scaladoc[preStart](pekko.actor.Actor#preStart():Unit)]@java[@javadoc[preStart](pekko.actor.AbstractActor#preStart())] of an actor is only called once directly during the initialization of the first instance, that
+is, at the creation of its `ActorRef`. In the case of restarts, `preStart()` is called from @scala[@scaladoc[postRestart](pekko.actor.Actor#postRestart(reason:Throwable):Unit)]@java[@javadoc[postRestart](pekko.actor.AbstractActor#postRestart(java.lang.Throwable))], therefore
 if not overridden, `preStart()` is called on every restart. However, by overriding `postRestart()` one can disable
 this behavior, and ensure that there is only one call to `preStart()`.
 
 One useful usage of this pattern is to disable creation of new `ActorRefs` for children during restarts. This can be
-achieved by overriding @scala[@scaladoc[preRestart](akka.actor.Actor#preRestart(reason:Throwable,message:Option[Any]):Unit)]@java[@javadoc[preRestart](akka.actor.AbstractActor#preRestart(java.lang.Throwable,java.util.Optional))]. Below is the default implementation of these lifecycle hooks:
+achieved by overriding @scala[@scaladoc[preRestart](pekko.actor.Actor#preRestart(reason:Throwable,message:Option[Any]):Unit)]@java[@javadoc[preRestart](pekko.actor.AbstractActor#preRestart(java.lang.Throwable,java.util.Optional))]. Below is the default implementation of these lifecycle hooks:
 
 Scala
 :  @@snip [InitializationDocSpec.scala](/akka-docs/src/test/scala/docs/actor/InitializationDocSpec.scala) { #preStartInit }
@@ -1229,7 +1229,7 @@ Java
 :  @@snip [InitializationDocTest.java](/akka-docs/src/test/java/jdocs/actor/InitializationDocTest.java) { #preStartInit }
 
 
-Please note, that the child actors are *still restarted*, but no new @apidoc[akka.actor.ActorRef] is created. One can recursively apply
+Please note, that the child actors are *still restarted*, but no new @apidoc[actor.ActorRef] is created. One can recursively apply
 the same principles for the children, ensuring that their `preStart()` method is called only at the creation of their
 refs.
 
@@ -1239,7 +1239,7 @@ For more information see @ref:[What Restarting Means](general/supervision.md#sup
 
 There are cases when it is impossible to pass all the information needed for actor initialization in the constructor,
 for example in the presence of circular dependencies. In this case, the actor should listen for an initialization message,
-and use @apidoc[become()](akka.actor.ActorContext) {scala="#become(behavior:akka.actor.Actor.Receive,discardOld:Boolean):Unit" java="#become(scala.PartialFunction,boolean)"} or a finite state-machine state transition to encode the initialized and uninitialized states
+and use @apidoc[become()](actor.ActorContext) {scala="#become(behavior:org.apache.pekko.actor.Actor.Receive,discardOld:Boolean):Unit" java="#become(scala.PartialFunction,boolean)"} or a finite state-machine state transition to encode the initialized and uninitialized states
 of the actor.
 
 Scala
@@ -1254,7 +1254,7 @@ until the initialization finishes, and replaying them after the actor became ini
 @@@ warning
 
 This pattern should be used with care, and applied only when none of the patterns above are applicable. One of
-the potential issues is that messages might be lost when sent to remote actors. Also, publishing an @apidoc[akka.actor.ActorRef] in
+the potential issues is that messages might be lost when sent to remote actors. Also, publishing an @apidoc[actor.ActorRef] in
 an uninitialized state might lead to the condition that it receives a user message before the initialization has been
 done.
 
diff --git a/akka-docs/src/main/paradox/additional/ide.md b/akka-docs/src/main/paradox/additional/ide.md
index da48ed11ad..aae5ecd8bf 100644
--- a/akka-docs/src/main/paradox/additional/ide.md
+++ b/akka-docs/src/main/paradox/additional/ide.md
@@ -4,7 +4,7 @@
 
 For a smooth development experience, when using an IDE such as Eclipse or IntelliJ, you can disable the auto-importer from suggesting `javadsl` imports when working in Scala, or viceversa.
 
-In IntelliJ, the auto-importer settings are under "Editor" / "General" / "Auto Import". Use a name mask such as `akka.stream.javadsl*` or `akka.stream.scaladsl*` or `*javadsl*` or `*scaladsl*` to indicate the DSL you want to exclude from import/completion. See screenshot below: 
+In IntelliJ, the auto-importer settings are under "Editor" / "General" / "Auto Import". Use a name mask such as `org.apache.pekko.stream.javadsl*` or `org.apache.pekko.stream.scaladsl*` or `*javadsl*` or `*scaladsl*` to indicate the DSL you want to exclude from import/completion. See screenshot below: 
 
 ![idetip-auto-importer-solution.png](../images/idetip-auto-importer-solution.png)
 
diff --git a/akka-docs/src/main/paradox/additional/operations.md b/akka-docs/src/main/paradox/additional/operations.md
index 0f29afbf0b..840e146e18 100644
--- a/akka-docs/src/main/paradox/additional/operations.md
+++ b/akka-docs/src/main/paradox/additional/operations.md
@@ -43,7 +43,7 @@ See documentation of @extref:[Akka Management](akka-management:).
 
 ### JMX
 
-Information and management of the cluster is available as JMX MBeans with the root name `akka.Cluster`.
+Information and management of the cluster is available as JMX MBeans with the root name `org.apache.pekko.Cluster`.
 The JMX information can be displayed with an ordinary JMX console such as JConsole or JVisualVM.
 
 From JMX you can:
diff --git a/akka-docs/src/main/paradox/additional/osgi.md b/akka-docs/src/main/paradox/additional/osgi.md
index 470740a696..08ed384d84 100644
--- a/akka-docs/src/main/paradox/additional/osgi.md
+++ b/akka-docs/src/main/paradox/additional/osgi.md
@@ -106,11 +106,11 @@ dynamic in this way. ActorRefs may safely be exposed to other bundles.
 
 ## Activator
 
-To bootstrap Akka inside an OSGi environment, you can use the @apidoc[akka.osgi.ActorSystemActivator](akka.osgi.ActorSystemActivator) class
-to conveniently set up the @apidoc[ActorSystem](akka.actor.ActorSystem).
+To bootstrap Akka inside an OSGi environment, you can use the @apidoc[osgi.ActorSystemActivator](osgi.ActorSystemActivator) class
+to conveniently set up the @apidoc[ActorSystem](actor.ActorSystem).
 
 @@snip [Activator.scala](/akka-osgi/src/test/scala/docs/osgi/Activator.scala) { #Activator }
 
-The goal here is to map the OSGi lifecycle more directly to the Akka lifecycle. The @apidoc[ActorSystemActivator](akka.osgi.ActorSystemActivator) creates
+The goal here is to map the OSGi lifecycle more directly to the Akka lifecycle. The @apidoc[ActorSystemActivator](osgi.ActorSystemActivator) creates
 the actor system with a class loader that finds resources (`application.conf` and `reference.conf` files) and classes
 from the application bundle and all transitive dependencies.
diff --git a/akka-docs/src/main/paradox/additional/rolling-updates.md b/akka-docs/src/main/paradox/additional/rolling-updates.md
index 7f156e40ab..cea606aff9 100644
--- a/akka-docs/src/main/paradox/additional/rolling-updates.md
+++ b/akka-docs/src/main/paradox/additional/rolling-updates.md
@@ -56,7 +56,7 @@ akka.cluster.app-version = 1.2.3
 ```
 
 To understand which is old and new it compares the version numbers using normal conventions,
-see @apidoc[akka.util.Version] for more details.
+see @apidoc[util.Version] for more details.
 
 Rebalance is also disabled during rolling updates, since shards from stopped nodes are anyway supposed to be
 started on new nodes. Messages to shards that were stopped on the old nodes will allocate corresponding shards
diff --git a/akka-docs/src/main/paradox/cluster-client.md b/akka-docs/src/main/paradox/cluster-client.md
index 99daeeeb1a..2c37e57318 100644
--- a/akka-docs/src/main/paradox/cluster-client.md
+++ b/akka-docs/src/main/paradox/cluster-client.md
@@ -29,7 +29,7 @@ version=AkkaVersion
 An actor system that is not part of the cluster can communicate with actors
 somewhere in the cluster via the @apidoc[ClusterClient], the client can run in an `ActorSystem` that is part of
 another cluster. It only needs to know the location of one (or more) nodes to use as initial
-contact points. It will establish a connection to a @apidoc[akka.cluster.client.ClusterReceptionist] somewhere in
+contact points. It will establish a connection to a @apidoc[cluster.client.ClusterReceptionist] somewhere in
 the cluster. It will monitor the connection to the receptionist and establish a new
 connection if the link goes down. When looking for a new receptionist it uses fresh
 contact points retrieved from the previous establishment, or periodically refreshed contacts,
@@ -50,18 +50,18 @@ within the same cluster. Similar functionality as the @apidoc[ClusterClient] is
 provided more efficiently by @ref:[Distributed Publish Subscribe in Cluster](distributed-pub-sub.md) for actors that
 belong to the same cluster.
 
-The connecting system must have its `akka.actor.provider` set  to `remote` or `cluster` when using
+The connecting system must have its `org.apache.pekko.actor.provider` set  to `remote` or `cluster` when using
 the cluster client.
 
 The receptionist is supposed to be started on all nodes, or all nodes with a specified role,
-in the cluster. The receptionist can be started with the @apidoc[akka.cluster.client.ClusterReceptionist] extension
+in the cluster. The receptionist can be started with the @apidoc[cluster.client.ClusterReceptionist] extension
 or as an ordinary actor.
 
 You can send messages via the @apidoc[ClusterClient] to any actor in the cluster that is registered
-in the @apidoc[DistributedPubSubMediator] used by the @apidoc[akka.cluster.client.ClusterReceptionist].
+in the @apidoc[DistributedPubSubMediator] used by the @apidoc[cluster.client.ClusterReceptionist].
 The @apidoc[ClusterClientReceptionist] provides methods for registration of actors that
 should be reachable from the client. Messages are wrapped in `ClusterClient.Send`,
-@scala[@scaladoc[`ClusterClient.SendToAll`](akka.cluster.client.ClusterClient$)]@java[`ClusterClient.SendToAll`] or @scala[@scaladoc[`ClusterClient.Publish`](akka.cluster.client.ClusterClient$)]@java[`ClusterClient.Publish`].
+@scala[@scaladoc[`ClusterClient.SendToAll`](pekko.cluster.client.ClusterClient$)]@java[`ClusterClient.SendToAll`] or @scala[@scaladoc[`ClusterClient.Publish`](org.apache.pekko.cluster.client.ClusterClient$)]@java[`ClusterClient.Publish`].
 
 Both the @apidoc[ClusterClient] and the @apidoc[ClusterClientReceptionist] emit events that can be subscribed to.
 The @apidoc[ClusterClient] sends out notifications about the list of contact points received
@@ -93,9 +93,9 @@ what clients are connected to.
 Response messages from the destination actor are tunneled via the receptionist
 to avoid inbound connections from other cluster nodes to the client:
 
-* @scala[@scaladoc[`sender()`](akka.actor.Actor)]@java[@javadoc[`getSender()`](akka.actor.Actor)], as seen by the destination actor, is not the client itself,
+* @scala[@scaladoc[`sender()`](pekko.actor.Actor)]@java[@javadoc[`getSender()`](pekko.actor.Actor)], as seen by the destination actor, is not the client itself,
   but the receptionist
-* @scala[@scaladoc[`sender()`](akka.actor.Actor)] @java[@javadoc[`getSender()`](akka.actor.Actor)] of the response messages, sent back from the destination and seen by the client,
+* @scala[@scaladoc[`sender()`](pekko.actor.Actor)] @java[@javadoc[`getSender()`](pekko.actor.Actor)] of the response messages, sent back from the destination and seen by the client,
   is `deadLetters`
 
 since the client should normally send subsequent messages via the @apidoc[ClusterClient].
@@ -117,34 +117,34 @@ On the cluster nodes, first start the receptionist. Note, it is recommended to l
 when the actor system is started by defining it in the `akka.extensions` configuration property:
 
 ```
-akka.extensions = ["akka.cluster.client.ClusterClientReceptionist"]
+akka.extensions = ["org.apache.pekko.cluster.client.ClusterClientReceptionist"]
 ```
 
 Next, register the actors that should be available for the client.
 
 Scala
-:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala) { #server }
+:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #server }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java) { #server }
+:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #server }
 
 On the client, you create the @apidoc[ClusterClient] actor and use it as a gateway for sending
 messages to the actors identified by their path (without address information) somewhere
 in the cluster.
 
 Scala
-:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala) { #client }
+:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #client }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java) { #client }
+:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #client }
 
 The `initialContacts` parameter is a @scala[`Set[ActorPath]`]@java[`Set`], which can be created like this:
 
 Scala
-:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala) { #initialContacts }
+:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #initialContacts }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java) { #initialContacts }
+:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #initialContacts }
 
 You will probably define the address information of the initial contact points in configuration or system property.
 See also @ref:[Configuration](#cluster-client-config).
@@ -155,9 +155,9 @@ A more comprehensive sample is available in the tutorial named
 
 ## ClusterClientReceptionist Extension
 
-In the example above the receptionist is started and accessed with the `akka.cluster.client.ClusterClientReceptionist` extension.
+In the example above the receptionist is started and accessed with the `org.apache.pekko.cluster.client.ClusterClientReceptionist` extension.
 That is convenient and perfectly fine in most cases, but it can be good to know that it is possible to
-start the `akka.cluster.client.ClusterReceptionist` actor as an ordinary actor and you can have several
+start the `org.apache.pekko.cluster.client.ClusterReceptionist` actor as an ordinary actor and you can have several
 different receptionists at the same time, serving different types of clients.
 
 Note that the @apidoc[ClusterClientReceptionist] uses the @apidoc[DistributedPubSub] extension, which is described
@@ -178,31 +178,31 @@ receptionists), as they become available. The code illustrates subscribing to th
 initial state.
 
 Scala
-:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala) { #clientEventsListener }
+:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #clientEventsListener }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java) { #clientEventsListener }
+:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #clientEventsListener }
 
 Similarly we can have an actor that behaves in a similar fashion for learning what cluster clients are connected to a @apidoc[ClusterClientReceptionist]:
 
 Scala
-:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala) { #receptionistEventsListener }
+:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #receptionistEventsListener }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java) { #receptionistEventsListener }
+:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #receptionistEventsListener }
 
 
 ## Configuration
 
-The @apidoc[ClusterClientReceptionist] extension (or @apidoc[akka.cluster.client.ClusterReceptionistSettings]) can be configured
+The @apidoc[ClusterClientReceptionist] extension (or @apidoc[cluster.client.ClusterReceptionistSettings]) can be configured
 with the following properties:
 
 @@snip [reference.conf](/akka-cluster-tools/src/main/resources/reference.conf) { #receptionist-ext-config }
 
 The following configuration properties are read by the @apidoc[ClusterClientSettings]
-when created with a @scala[@scaladoc[`ActorSystem`](akka.actor.ActorSystem)]@java[@javadoc[`ActorSystem`](akka.actor.ActorSystem)] parameter. It is also possible to amend the @apidoc[ClusterClientSettings]
+when created with a @scala[@scaladoc[`ActorSystem`](pekko.actor.ActorSystem)]@java[@javadoc[`ActorSystem`](pekko.actor.ActorSystem)] parameter. It is also possible to amend the @apidoc[ClusterClientSettings]
 or create it from another config section with the same layout as below. @apidoc[ClusterClientSettings] is
-a parameter to the @scala[@scaladoc[`ClusterClient.props`](akka.cluster.client.ClusterClient$)]@java[@javadoc[`ClusterClient.props`](akka.cluster.client.ClusterClient$)] factory method, i.e. each client can be configured
+a parameter to the @scala[@scaladoc[`ClusterClient.props`](pekko.cluster.client.ClusterClient$)]@java[@javadoc[`ClusterClient.props`](pekko.cluster.client.ClusterClient$)] factory method, i.e. each client can be configured
 with different settings if needed.
 
 @@snip [reference.conf](/akka-cluster-tools/src/main/resources/reference.conf) { #cluster-client-config }
diff --git a/akka-docs/src/main/paradox/cluster-dc.md b/akka-docs/src/main/paradox/cluster-dc.md
index 9abe58bb95..0883d5eb43 100644
--- a/akka-docs/src/main/paradox/cluster-dc.md
+++ b/akka-docs/src/main/paradox/cluster-dc.md
@@ -22,10 +22,10 @@ For the full documentation of this feature and for new projects see @ref:[Multi-
 This is how to create a singleton proxy for a specific data center:
 
 Scala
-:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala) { #create-singleton-proxy-dc }
+:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala) { #create-singleton-proxy-dc }
 
 Java
-:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java) { #create-singleton-proxy-dc }
+:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java) { #create-singleton-proxy-dc }
 
 If using the own data center as the `withDataCenter` parameter that would be a proxy for the singleton in the own data center, which
 is also the default if `withDataCenter` is not given.
@@ -37,7 +37,7 @@ For the full documentation of this feature and for new projects see @ref:[Multi-
 This is how to create a sharding proxy for a specific data center:
 
 Scala
-:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala) { #proxy-dc }
+:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #proxy-dc }
 
 Java
 :  @@snip [ClusterShardingTest.java](/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #proxy-dc }
diff --git a/akka-docs/src/main/paradox/cluster-metrics.md b/akka-docs/src/main/paradox/cluster-metrics.md
index dab31ff9ff..d476f636fc 100644
--- a/akka-docs/src/main/paradox/cluster-metrics.md
+++ b/akka-docs/src/main/paradox/cluster-metrics.md
@@ -36,23 +36,23 @@ will participate in Cluster Metrics collection and dissemination.
 
 ## Metrics Collector
 
-Metrics collection is delegated to an implementation of `akka.cluster.metrics.MetricsCollector`.
+Metrics collection is delegated to an implementation of `org.apache.pekko.cluster.metrics.MetricsCollector`.
 
 Different collector implementations provide different subsets of metrics published to the cluster.
 Certain message routing and let-it-crash functions may not work when Sigar is not provisioned.
 
 Cluster metrics extension comes with two built-in collector implementations:
 
-1. `akka.cluster.metrics.SigarMetricsCollector`, which requires Sigar provisioning, and is more rich/precise
-2. `akka.cluster.metrics.JmxMetricsCollector`, which is used as fall back, and is less rich/precise
+1. `org.apache.pekko.cluster.metrics.SigarMetricsCollector`, which requires Sigar provisioning, and is more rich/precise
+2. `org.apache.pekko.cluster.metrics.JmxMetricsCollector`, which is used as fall back, and is less rich/precise
 
 You can also plug-in your own metrics collector implementation.
 
 By default, metrics extension will use collector provider fall back and will try to load them in this order:
 
 1. configured user-provided collector
-2. built-in `akka.cluster.metrics.SigarMetricsCollector`
-3. and finally `akka.cluster.metrics.JmxMetricsCollector`
+2. built-in `org.apache.pekko.cluster.metrics.SigarMetricsCollector`
+3. and finally `org.apache.pekko.cluster.metrics.JmxMetricsCollector`
 
 ## Metrics Events
 
@@ -60,7 +60,7 @@ Metrics extension periodically publishes current snapshot of the cluster metrics
 
 The publication interval is controlled by the `akka.cluster.metrics.collector.sample-interval` setting.
 
-The payload of the `akka.cluster.metrics.ClusterMetricsChanged` event will contain
+The payload of the `org.apache.pekko.cluster.metrics.ClusterMetricsChanged` event will contain
 latest metrics of the node as well as other cluster member nodes metrics gossip
 which was received during the collector sample interval.
 
@@ -126,7 +126,7 @@ It can be configured to use a specific MetricsSelector to produce the probabilit
 * `load` / `SystemLoadAverageMetricsSelector` - System load average for the past 1 minute, corresponding value can be found in `top` of Linux systems. The system is possibly nearing a bottleneck if the system load average is nearing number of cpus/cores. Weights based on remaining load capacity; 1 - (load / processors)
 * `cpu` / `CpuMetricsSelector` - CPU utilization in percentage, sum of User + Sys + Nice + Wait. Weights based on remaining cpu capacity; 1 - utilization
 * `mix` / `MixMetricsSelector` - Combines heap, cpu and load. Weights based on mean of remaining capacity of the combined selectors.
-* Any custom implementation of `akka.cluster.metrics.MetricsSelector`
+* Any custom implementation of `org.apache.pekko.cluster.metrics.MetricsSelector`
 
 The collected metrics values are smoothed with [exponential weighted moving average](https://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average). In the @ref:[Cluster configuration](cluster-usage.md#cluster-configuration) you can adjust how quickly past data is decayed compared to new data.
 
@@ -194,10 +194,10 @@ Java
 
 ## Custom Metrics Collector
 
-Metrics collection is delegated to the implementation of `akka.cluster.metrics.MetricsCollector`
+Metrics collection is delegated to the implementation of `org.apache.pekko.cluster.metrics.MetricsCollector`
 
 You can plug-in your own metrics collector instead of built-in
-`akka.cluster.metrics.SigarMetricsCollector` or `akka.cluster.metrics.JmxMetricsCollector`.
+`org.apache.pekko.cluster.metrics.SigarMetricsCollector` or `org.apache.pekko.cluster.metrics.JmxMetricsCollector`.
 
 Look at those two implementations for inspiration.
 
diff --git a/akka-docs/src/main/paradox/cluster-routing.md b/akka-docs/src/main/paradox/cluster-routing.md
index 7e557f6ffc..250d57bc70 100644
--- a/akka-docs/src/main/paradox/cluster-routing.md
+++ b/akka-docs/src/main/paradox/cluster-routing.md
@@ -78,7 +78,7 @@ Set it to a lower value if you want to limit total number of routees.
 The same type of router could also have been defined in code:
 
 Scala
-:  @@snip [StatsService.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala) { #router-lookup-in-code }
+:  @@snip [StatsService.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala) { #router-lookup-in-code }
 
 Java
 :  @@snip [StatsService.java](/akka-docs/src/test/java/jdocs/cluster/StatsService.java) { #router-lookup-in-code }
@@ -99,7 +99,7 @@ the average number of characters per word when all results have been collected.
 Messages:
 
 Scala
-:  @@snip [StatsMessages.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsMessages.scala) { #messages }
+:  @@snip [StatsMessages.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala) { #messages }
 
 Java
 :  @@snip [StatsMessages.java](/akka-docs/src/test/java/jdocs/cluster/StatsMessages.java) { #messages }
@@ -107,7 +107,7 @@ Java
 The worker that counts number of characters in each word:
 
 Scala
-:  @@snip [StatsWorker.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsWorker.scala) { #worker }
+:  @@snip [StatsWorker.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala) { #worker }
 
 Java
 :  @@snip [StatsWorker.java](/akka-docs/src/test/java/jdocs/cluster/StatsWorker.java) { #worker }
@@ -116,7 +116,7 @@ The service that receives text from users and splits it up into words, delegates
 
 @@@ div { .group-scala }
 
-@@snip [StatsService.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala) { #service }
+@@snip [StatsService.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala) { #service }
 
 @@@
 
@@ -179,7 +179,7 @@ Set it to a lower value if you want to limit total number of routees.
 The same type of router could also have been defined in code:
 
 Scala
-:  @@snip [StatsService.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala) { #router-deploy-in-code }
+:  @@snip [StatsService.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala) { #router-deploy-in-code }
 
 Java
 :  @@snip [StatsService.java](/akka-docs/src/test/java/jdocs/cluster/StatsService.java) { #router-deploy-in-code }
diff --git a/akka-docs/src/main/paradox/cluster-sharding.md b/akka-docs/src/main/paradox/cluster-sharding.md
index 4a0b97553c..6a8b7ea9be 100644
--- a/akka-docs/src/main/paradox/cluster-sharding.md
+++ b/akka-docs/src/main/paradox/cluster-sharding.md
@@ -27,7 +27,7 @@ For an introduction to Sharding concepts see @ref:[Cluster Sharding](typed/clust
 This is what an entity actor may look like:
 
 Scala
-:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala) { #counter-actor }
+:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-actor }
 
 Java
 :  @@snip [ClusterShardingTest.java](/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #counter-actor }
@@ -47,7 +47,7 @@ when there is no match between the roles of the current cluster node and the rol
 `ClusterShardingSettings`.
 
 Scala
-:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala) { #counter-start }
+:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-start }
 
 Java
 :  @@snip [ClusterShardingTest.java](/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #counter-start }
@@ -56,7 +56,7 @@ The @scala[`extractEntityId` and `extractShardId` are two] @java[`messageExtract
 identifier and the shard identifier from incoming messages.
 
 Scala
-:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala) { #counter-extractor }
+:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-extractor }
 
 Java
 :  @@snip [ClusterShardingTest.java](/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #counter-extractor }
@@ -94,7 +94,7 @@ delegate the message to the right node and it will create the entity actor on de
 first message for a specific entity is delivered.
 
 Scala
-:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala) { #counter-usage }
+:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-usage }
 
 Java
 :  @@snip [ClusterShardingTest.java](/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #counter-usage }
@@ -172,7 +172,7 @@ the `rememberEntities` flag to true in `ClusterShardingSettings` when calling
 extract from the `EntityId`.
 
 Scala
-:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala) { #extractShardId-StartEntity }
+:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #extractShardId-StartEntity }
 
 Java
 :  @@snip [ClusterShardingTest.java](/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #extractShardId-StartEntity }
@@ -184,7 +184,7 @@ you need to create an intermediate parent actor that defines the `supervisorStra
 child entity actor.
 
 Scala
-:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala) { #supervisor }
+:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #supervisor }
 
 Java
 :  @@snip [ClusterShardingTest.java](/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #supervisor }
@@ -192,7 +192,7 @@ Java
 You start such a supervisor in the same way as if it was the entity actor.
 
 Scala
-:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala) { #counter-supervisor-start }
+:  @@snip [ClusterShardingSpec.scala](/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-supervisor-start }
 
 Java
 :  @@snip [ClusterShardingTest.java](/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #counter-supervisor-start }
diff --git a/akka-docs/src/main/paradox/cluster-singleton.md b/akka-docs/src/main/paradox/cluster-singleton.md
index f4ae5973a8..15b98de93d 100644
--- a/akka-docs/src/main/paradox/cluster-singleton.md
+++ b/akka-docs/src/main/paradox/cluster-singleton.md
@@ -22,7 +22,7 @@ To use Cluster Singleton, you must add the following dependency in your project:
 
 For the full documentation of this feature and for new projects see @ref:[Cluster Singleton - Introduction](typed/cluster-singleton.md#introduction).
 
-The cluster singleton pattern is implemented by `akka.cluster.singleton.ClusterSingletonManager`.
+The cluster singleton pattern is implemented by `org.apache.pekko.cluster.singleton.ClusterSingletonManager`.
 It manages one singleton actor instance among all cluster nodes or a group of nodes tagged with
 a specific role. `ClusterSingletonManager` is an actor that is supposed to be started as early as possible
 on all nodes, or all nodes with specified role, in the cluster. The actual singleton actor is
@@ -30,10 +30,10 @@ started by the `ClusterSingletonManager` on the oldest node by creating a child
 supplied `Props`. `ClusterSingletonManager` makes sure that at most one singleton instance
 is running at any point in time.
 
-You can access the singleton actor by using the provided `akka.cluster.singleton.ClusterSingletonProxy`,
+You can access the singleton actor by using the provided `org.apache.pekko.cluster.singleton.ClusterSingletonProxy`,
 which will route all messages to the current instance of the singleton. The proxy will keep track of
 the oldest node in the cluster and resolve the singleton's `ActorRef` by explicitly sending the
-singleton's `actorSelection` the `akka.actor.Identify` message and waiting for it to reply.
+singleton's `actorSelection` the `org.apache.pekko.actor.Identify` message and waiting for it to reply.
 This is performed periodically if the singleton doesn't reply within a certain (configurable) time.
 Given the implementation, there might be periods of time during which the `ActorRef` is unavailable,
 e.g., when a node leaves the cluster. In these cases, the proxy will buffer the messages sent to the
@@ -55,19 +55,19 @@ Before explaining how to create a cluster singleton actor, let's define message
 which will be used by the singleton.
 
 Scala
-:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala) { #singleton-message-classes }
+:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala) { #singleton-message-classes }
 
 Java
-:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/akka/cluster/singleton/TestSingletonMessages.java) { #singleton-message-classes }
+:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/TestSingletonMessages.java) { #singleton-message-classes }
 
 On each node in the cluster you need to start the `ClusterSingletonManager` and
 supply the `Props` of the singleton actor, in this case the JMS queue consumer.
 
 Scala
-:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala) { #create-singleton-manager }
+:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala) { #create-singleton-manager }
 
 Java
-:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java) { #create-singleton-manager }
+:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java) { #create-singleton-manager }
 
 Here we limit the singleton to nodes tagged with the `"worker"` role, but all nodes, independent of
 role, can be used by not specifying `withRole`.
@@ -79,19 +79,19 @@ perfectly fine `terminationMessage` if you only need to stop the actor.
 Here is how the singleton actor handles the `terminationMessage` in this example.
 
 Scala
-:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala) { #consumer-end }
+:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala) { #consumer-end }
 
 Java
-:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/akka/cluster/singleton/Consumer.java) { #consumer-end }
+:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java) { #consumer-end }
 
 With the names given above, access to the singleton can be obtained from any cluster node using a properly
 configured proxy.
 
 Scala
-:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala) { #create-singleton-proxy }
+:  @@snip [ClusterSingletonManagerSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala) { #create-singleton-proxy }
 
 Java
-:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java) { #create-singleton-proxy }
+:  @@snip [ClusterSingletonManagerTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java) { #create-singleton-proxy }
 
 A more comprehensive sample is available in the tutorial named 
 @scala[[Distributed workers with Akka and Scala!](https://github.com/typesafehub/activator-akka-distributed-workers)]@java[[Distributed workers with Akka and Java!](https://github.com/typesafehub/activator-akka-distributed-workers-java)].
diff --git a/akka-docs/src/main/paradox/cluster-usage.md b/akka-docs/src/main/paradox/cluster-usage.md
index b74e0c504d..1221503335 100644
--- a/akka-docs/src/main/paradox/cluster-usage.md
+++ b/akka-docs/src/main/paradox/cluster-usage.md
@@ -53,7 +53,7 @@ Java
 
 And the minimum configuration required is to set a host/port for remoting and the `akka.actor.provider = "cluster"`.
 
-@@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #config-seeds }
+@@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #config-seeds }
 
 The actor registers itself as subscriber of certain cluster events. It receives events corresponding to the current state
 of the cluster when the subscription starts and then it receives events for changes that happen in the cluster.
@@ -87,7 +87,7 @@ Java
 
 For more information see @ref[tuning joins](typed/cluster.md#tuning-joins)
 
-It's also possible to specifically join a single node as illustrated in below example, but @apidoc[joinSeedNodes](cluster.Cluster) {scala="#joinSeedNodes(seedNodes:Seq[akka.actor.Address]):Unit" java="#joinSeedNodes(java.util.List)"} should be
+It's also possible to specifically join a single node as illustrated in below example, but @apidoc[joinSeedNodes](cluster.Cluster) {scala="#joinSeedNodes(seedNodes:Seq[org.apache.pekko.actor.Address]):Unit" java="#joinSeedNodes(java.util.List)"} should be
 preferred since it has redundancy and retry mechanisms built-in.
 
 Scala
@@ -108,7 +108,7 @@ See @ref:[Downing](typed/cluster.md#downing) in the documentation of the new API
 ## Subscribe to Cluster Events
 
 You can subscribe to change notifications of the cluster membership by using
-@scala[@scaladoc[Cluster(system).subscribe](akka.cluster.Cluster#subscribe(subscriber:akka.actor.ActorRef,to:Class[_]*):Unit)]@java[@javadoc[Cluster.get(system).subscribe](akka.cluster.Cluster#subscribe(akka.actor.ActorRef,akka.cluster.ClusterEvent.SubscriptionInitialStateMode,java.lang.Class...))].
+@scala[@scaladoc[Cluster(system).subscribe](pekko.cluster.Cluster#subscribe(subscriber:org.apache.pekko.actor.ActorRef,to:Class[_]*):Unit)]@java[@javadoc[Cluster.get(system).subscribe](pekko.cluster.Cluster#subscribe(org.apache.pekko.actor.ActorRef,org.apache.pekko.cluster.ClusterEvent.SubscriptionInitialStateMode,java.lang.Class...))].
 
 Scala
 :  @@snip [SimpleClusterListener2.scala](/akka-docs/src/test/scala/docs/cluster/SimpleClusterListener2.scala) { #subscribe }
@@ -122,7 +122,7 @@ as the first message, followed by events for incremental updates.
 Note that you may receive an empty `CurrentClusterState`, containing no members,
 followed by @apidoc[MemberUp](ClusterEvent.MemberUp) events from other nodes which already joined,
 if you start the subscription before the initial join procedure has completed.
-This may for example happen when you start the subscription immediately after @apidoc[cluster.join()](cluster.Cluster) {scala="#join(address:akka.actor.Address):Unit" java="#join(akka.actor.Address)"} like below.
+This may for example happen when you start the subscription immediately after @apidoc[cluster.join()](cluster.Cluster) {scala="#join(address:org.apache.pekko.actor.Address):Unit" java="#join(org.apache.pekko.actor.Address)"} like below.
 This is expected behavior. When the node has been accepted in the cluster you will
 receive `MemberUp` for that node, and other nodes.
 
@@ -143,7 +143,7 @@ Java
 
 
 If you find it inconvenient to handle the `CurrentClusterState` you can use
-@scala[@scaladoc[ClusterEvent.InitialStateAsEvents](akka.cluster.ClusterEvent$$InitialStateAsEvents$)] @java[@javadoc[ClusterEvent.initialStateAsEvents()](akka.cluster.ClusterEvent#initialStateAsEvents())] as parameter to @apidoc[subscribe](akka.cluster.Cluster) {scala="#subscribe(subscriber:akka.actor.ActorRef,to:Class[_]*):Unit" java="#subscribe(akka.actor.ActorRef,akka.cluster.ClusterEvent.SubscriptionInitialStateMode,java.lang.Class...)"}.
+@scala[@scaladoc[ClusterEvent.InitialStateAsEvents](cluster.ClusterEvent$$InitialStateAsEvents$)] @java[@javadoc[ClusterEvent.initialStateAsEvents()](pekko.cluster.ClusterEvent#initialStateAsEvents())] as parameter to @apidoc[subscribe](pekko.cluster.Cluster) {scala="#subscribe(subscriber:org.apache.pekko.actor.ActorRef,to:Class[_]*):Unit" java="#subscribe(org.apache.pekko.actor.ActorRef,org.apache.pekko.cluster.ClusterEvent.SubscriptionInitialStateMode,java.lang.Class...)"}.
 That means that instead of receiving `CurrentClusterState` as the first message you will receive
 the events corresponding to the current state to mimic what you would have seen if you were
 listening to the events when they occurred in the past. Note that those initial events only correspond
@@ -252,7 +252,7 @@ An alternative is to register tasks to the @ref:[Coordinated Shutdown](coordinat
 @@@ note
 
 Register a OnMemberRemoved callback on a cluster that have been shutdown, the callback will be invoked immediately on
-the caller thread, otherwise it will be invoked later when the current member status changed to @scala[@scaladoc[Removed](akka.cluster.MemberStatus$$Removed$)]@java[@javadoc[Removed](akka.cluster.MemberStatus#removed())]. You may
+the caller thread, otherwise it will be invoked later when the current member status changed to @scala[@scaladoc[Removed](pekko.cluster.MemberStatus$$Removed$)]@java[@javadoc[Removed](pekko.cluster.MemberStatus#removed())]. You may
 want to install some cleanup handling after the cluster was started up, but the cluster might already be shutting
 down when you installing, and depending on the race is not healthy.
 
@@ -318,15 +318,15 @@ unreachable from the rest of the cluster. Please see:
 Set up your project according to the instructions in @ref:[Multi Node Testing](multi-node-testing.md) and @ref:[Multi JVM Testing](multi-jvm-testing.md), i.e.
 add the `sbt-multi-jvm` plugin and the dependency to `akka-multi-node-testkit`.
 
-First, as described in @ref:[Multi Node Testing](multi-node-testing.md), we need some scaffolding to configure the @scaladoc[MultiNodeSpec](akka.remote.testkit.MultiNodeSpec).
-Define the participating @ref:[roles](typed/cluster.md#node-roles) and their @ref:[configuration](#configuration) in an object extending @scaladoc[MultiNodeConfig](akka.remote.testkit.MultiNodeConfig):
+First, as described in @ref:[Multi Node Testing](multi-node-testing.md), we need some scaffolding to configure the @scaladoc[MultiNodeSpec](pekko.remote.testkit.MultiNodeSpec).
+Define the participating @ref:[roles](typed/cluster.md#node-roles) and their @ref:[configuration](#configuration) in an object extending @scaladoc[MultiNodeConfig](pekko.remote.testkit.MultiNodeConfig):
 
-@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala) { #MultiNodeConfig }
+@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala) { #MultiNodeConfig }
 
 Define one concrete test class for each role/node. These will be instantiated on the different nodes (JVMs). They can be
 implemented differently, but often they are the same and extend an abstract test class, as illustrated here.
 
-@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala) { #concrete-tests }
+@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala) { #concrete-tests }
 
 Note the naming convention of these classes. The name of the classes must end with `MultiJvmNode1`, `MultiJvmNode2`
 and so on. It is possible to define another suffix to be used by the `sbt-multi-jvm`, but the default should be
@@ -334,34 +334,34 @@ fine in most cases.
 
 Then the abstract `MultiNodeSpec`, which takes the `MultiNodeConfig` as constructor parameter.
 
-@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala) { #abstract-test }
+@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala) { #abstract-test }
 
 Most of this can be extracted to a separate trait to avoid repeating this in all your tests.
 
 Typically you begin your test by starting up the cluster and let the members join, and create some actors.
 That can be done like this:
 
-@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala) { #startup-cluster }
+@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala) { #startup-cluster }
 
-From the test you interact with the cluster using the `Cluster` extension, e.g. @scaladoc[join](akka.cluster.Cluster#join(address:akka.actor.Address):Unit).
+From the test you interact with the cluster using the `Cluster` extension, e.g. @scaladoc[join](pekko.cluster.Cluster#join(address:org.apache.pekko.actor.Address):Unit).
 
-@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala) { #join }
+@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala) { #join }
 
 Notice how the *testActor* from @ref:[testkit](testing.md) is added as @ref:[subscriber](#cluster-subscriber)
 to cluster changes and then waiting for certain events, such as in this case all members becoming 'Up'.
 
-The above code was running for all roles (JVMs). @scaladoc[runOn](akka.remote.testkit.MultiNodeSpec#runOn(nodes:akka.remote.testconductor.RoleName*)(thunk:=%3EUnit):Unit) is a convenient utility to declare that a certain block
+The above code was running for all roles (JVMs). @scaladoc[runOn](pekko.remote.testkit.MultiNodeSpec#runOn(nodes:org.apache.pekko.remote.testconductor.RoleName*)(thunk:=%3EUnit):Unit) is a convenient utility to declare that a certain block
 of code should only run for a specific role.
 
-@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala) { #test-statsService }
+@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala) { #test-statsService }
 
 Once again we take advantage of the facilities in @ref:[testkit](testing.md) to verify expected behavior.
-Here using `testActor` as sender (via @scaladoc[ImplicitSender](akka.testkit.ImplicitSender)) and verifying the reply with @scaladoc[expectMsgType](akka.testkit.TestKit#expectMsgType[T](max:scala.concurrent.duration.FiniteDuration)(implicitt:scala.reflect.ClassTag[T]):T).
+Here using `testActor` as sender (via @scaladoc[ImplicitSender](pekko.testkit.ImplicitSender)) and verifying the reply with @scaladoc[expectMsgType](org.apache.pekko.testkit.TestKit#expectMsgType[T](max:scala.concurrent.duration.FiniteDuration)(implicitt:scala.reflect.ClassTag[T]):T).
 
 In the above code you can see `node(third)`, which is useful facility to get the root actor reference of
-the actor system for a specific role. This can also be used to grab the @scaladoc[akka.actor.Address](akka.actor.Address) of that node.
+the actor system for a specific role. This can also be used to grab the @scaladoc[actor.Address](pekko.actor.Address) of that node.
 
-@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsSampleSpec.scala) { #addresses }
+@@snip [StatsSampleSpec.scala](/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala) { #addresses }
 
 @@@
 
diff --git a/akka-docs/src/main/paradox/common/binary-compatibility-rules.md b/akka-docs/src/main/paradox/common/binary-compatibility-rules.md
index 8a4090bf7b..bc13249eed 100644
--- a/akka-docs/src/main/paradox/common/binary-compatibility-rules.md
+++ b/akka-docs/src/main/paradox/common/binary-compatibility-rules.md
@@ -135,12 +135,12 @@ to change at any time (even if best-effort is taken to keep them compatible).
 
 When browsing the source code and/or looking for methods available to be called, especially from Java which does not
 have as rich of an access protection system as Scala has, you may sometimes find methods or classes annotated with
-the `/** INTERNAL API */` comment or the @javadoc[@InternalApi](akka.annotation.InternalApi) annotation. 
+the `/** INTERNAL API */` comment or the @javadoc[@InternalApi](pekko.annotation.InternalApi) annotation. 
 
 No compatibility guarantees are given about these classes. They may change or even disappear in minor versions,
 and user code is not supposed to call them.
 
-Side-note on JVM representation details of the Scala `private[akka]` pattern that Akka is using extensively in 
+Side-note on JVM representation details of the Scala `private[pekko]` pattern that Akka is using extensively in 
 its internals: Such methods or classes, which act as "accessible only from the given package" in Scala, are compiled
 down to `public` (!) in raw Java bytecode. The access restriction, that Scala understands is carried along
 as metadata stored in the classfile. Thus, such methods are safely guarded from being accessed from Scala,
@@ -151,11 +151,11 @@ into Internal APIs, as they are subject to change without any warning.
 
 In addition to the special internal API marker two annotations exist in Akka and specifically address the following use cases:
 
- * @javadoc[@ApiMayChange](akka.annotation.ApiMayChange) – which marks APIs which are known to be not fully stable yet. Read more in @ref:[Modules marked "May Change"](may-change.md)
- * @javadoc[@DoNotInherit](akka.annotation.DoNotInherit) – which marks APIs that are designed under a closed-world assumption, and thus must not be
+ * @javadoc[@ApiMayChange](pekko.annotation.ApiMayChange) – which marks APIs which are known to be not fully stable yet. Read more in @ref:[Modules marked "May Change"](may-change.md)
+ * @javadoc[@DoNotInherit](pekko.annotation.DoNotInherit) – which marks APIs that are designed under a closed-world assumption, and thus must not be
 extended outside Akka itself (or such code will risk facing binary incompatibilities). E.g. an interface may be
 marked using this annotation, and while the type is public, it is not meant for extension by user-code. This allows
-adding new methods to these interfaces without risking to break client code. Examples of such API are the @scaladoc[FlowOps](akka.stream.scaladsl.FlowOps)
+adding new methods to these interfaces without risking to break client code. Examples of such API are the @scaladoc[FlowOps](pekko.stream.scaladsl.FlowOps)
 trait or the Akka HTTP domain model.
 
 Please note that a best-effort approach is always taken when having to change APIs and breakage is avoided as much as 
diff --git a/akka-docs/src/main/paradox/common/circuitbreaker.md b/akka-docs/src/main/paradox/common/circuitbreaker.md
index fce5d0b9c7..508fd633d4 100644
--- a/akka-docs/src/main/paradox/common/circuitbreaker.md
+++ b/akka-docs/src/main/paradox/common/circuitbreaker.md
@@ -49,13 +49,13 @@ The Akka library provides an implementation of a circuit breaker called
   
 * State transition listeners:
 
-    - Callbacks can be provided for every state entry via @apidoc[onOpen](CircuitBreaker) {scala="#onOpen(callback:=%3EUnit):akka.pattern.CircuitBreaker" java="#addOnOpenListener(java.lang.Runnable)"}, @apidoc[onClose](CircuitBreaker) {scala="#onClose(callback:=%3EUnit):akka.pattern.CircuitBreaker" java="#addOnCloseListener(java.lang.Runnable)"}, and @apidoc[onHalfOpen](CircuitBreaker) {scala="#onHalfOpen(callback:=%3EUnit):akka.pattern.CircuitBreaker" java="#addOnHalfOpenListener(java.lang.Runnable)"}
+    - Callbacks can be provided for every state entry via @apidoc[onOpen](CircuitBreaker) {scala="#onOpen(callback:=%3EUnit):org.apache.pekko.pattern.CircuitBreaker" java="#addOnOpenListener(java.lang.Runnable)"}, @apidoc[onClose](CircuitBreaker) {scala="#onClose(callback:=%3EUnit):org.apache.pekko.pattern.CircuitBreaker" java="#addOnCloseListener(java.lang.Runnable)"}, and @apidoc[onHalfOpen](CircuitBreaker) {scala="#onHalfOpen(callback:=%3EUnit):org.apache.pekko.pattern.CircuitBreaker" java="#addOnHalfOpenListener(java.lang.Runnable)"}
     - These are executed in the @scaladoc[ExecutionContext](scala.concurrent.ExecutionContext) provided.
   
 * Calls result listeners:
 
     - Callbacks can be used eg. to collect statistics about all invocations or to react on specific call results like success, failures or timeouts.
-    - Supported callbacks are: @apidoc[onCallSuccess](CircuitBreaker) {scala="#onCallSuccess(callback:Long=%3EUnit):akka.pattern.CircuitBreaker" java="#addOnCallSuccessListener(java.util.function.Consumer)"}, @apidoc[onCallFailure](CircuitBreaker) {scala="#onCallFailure(callback:Long=%3EUnit):akka.pattern.CircuitBreaker" java="#addOnCallFailureListener(java.util.function.Consumer)"}, @apidoc[onCallTimeout](CircuitBreaker) {scala="#onCallTimeout(callback:Long=%3EUnit):akka.pattern.CircuitBreaker" java="#addOnCallTimeoutListener(java.util.function.Consumer)"}, @apidoc[onCallBreakerOpen](CircuitBreaker) {scala="#onCallBreakerOpen(callback:=%3EUnit):akka.pattern.CircuitBreaker" java="#addOnCallBreakerOpenListener(java.lang.Runnable)"}.
+    - Supported callbacks are: @apidoc[onCallSuccess](CircuitBreaker) {scala="#onCallSuccess(callback:Long=%3EUnit):org.apache.pekko.pattern.CircuitBreaker" java="#addOnCallSuccessListener(java.util.function.Consumer)"}, @apidoc[onCallFailure](CircuitBreaker) {scala="#onCallFailure(callback:Long=%3EUnit):org.apache.pekko.pattern.CircuitBreaker" java="#addOnCallFailureListener(java.util.function.Consumer)"}, @apidoc[onCallTimeout](CircuitBreaker) {scala="#onCallTimeout(callback:Long=%3EUnit):org.apache.pekko.pattern.CircuitBreaker" java="#addOnCallTimeoutListener(java.util.function.Consumer)"}, @apidoc[onCallBreakerOpen](CircuitBreaker) {scala="#onCallBreakerOpen(callback:=%3EUnit):org.apache.pekko.pattern.CircuitBreaker" java="#addOnCallBreakerOpenListener(java.lang.Runnable)"}.
     - These are executed in the @scaladoc[ExecutionContext](scala.concurrent.ExecutionContext) provided.
    
 
@@ -80,9 +80,9 @@ Java
 
 ### Future & Synchronous based API
 
-Once a circuit breaker actor has been initialized, interacting with that actor is done by either using the Future based API or the synchronous API. Both of these APIs are considered `Call Protection` because whether synchronously or asynchronously, the purpose of the circuit breaker is to protect your system from cascading failures while making a call to another service. In the future based API, we use the @scala[@scaladoc[withCircuitBreaker](akka.pattern.CircuitBreaker#withCircuitBreaker[T](body:=%3Escala.concurrent.Future[T]):scala.concurrent.Future[T])]@java[@javadoc[callWithCircuitBreakerCS](akka.pattern.CircuitBreaker#callWithCircuitBreakerCS(java.util.concurrent.Callable))] which takes an asynchronous method (some method wrapped in a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionState](java.util.concurrent.CompletionStage)]), for instance a call to retrieve data from a database, and we pipe the result back to the sender. If for some reason the database in this example isn't responding, or there is another issue, the circuit breaker will open and stop trying to hit the database again and again until the timeout is over.
+Once a circuit breaker actor has been initialized, interacting with that actor is done by either using the Future based API or the synchronous API. Both of these APIs are considered `Call Protection` because whether synchronously or asynchronously, the purpose of the circuit breaker is to protect your system from cascading failures while making a call to another service. In the future based API, we use the @scala[@scaladoc[withCircuitBreaker](pekko.pattern.CircuitBreaker#withCircuitBreaker[T](body:=%3Escala.concurrent.Future[T]):scala.concurrent.Future[T])]@java[@javadoc[callWithCircuitBreakerCS](pekko.pattern.CircuitBreaker#callWithCircuitBreakerCS(java.util.concurrent.Callable))] which takes an asynchronous method (some method wrapped in a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionState](java.util.concurrent.CompletionStage)]), for instance a call to retrieve data from a database, and we pipe the result back to the sender. If for some reason the database in this example isn't responding, or there is another issue, the circuit breaker will open and stop trying to hit the database again and again until the timeout is over.
 
-The Synchronous API would also wrap your call with the circuit breaker logic, however, it uses the @scala[@scaladoc[withSyncCircuitBreaker](akka.pattern.CircuitBreaker#withSyncCircuitBreaker[T](body:=%3ET):T)]@java[@javadoc[callWithSyncCircuitBreaker](akka.pattern.CircuitBreaker#callWithSyncCircuitBreaker(java.util.concurrent.Callable))] and receives a method that is not wrapped in a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionState](java.util.concurrent.CompletionStage)].
+The Synchronous API would also wrap your call with the circuit breaker logic, however, it uses the @scala[@scaladoc[withSyncCircuitBreaker](pekko.pattern.CircuitBreaker#withSyncCircuitBreaker[T](body:=%3ET):T)]@java[@javadoc[callWithSyncCircuitBreaker](pekko.pattern.CircuitBreaker#callWithSyncCircuitBreaker(java.util.concurrent.Callable))] and receives a method that is not wrapped in a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionState](java.util.concurrent.CompletionStage)].
 
 Scala
 : @@snip [CircuitBreakerDocSpec.scala](/akka-docs/src/test/scala/docs/circuitbreaker/CircuitBreakerDocSpec.scala) { #circuit-breaker-usage }
@@ -92,7 +92,7 @@ Java
 
 @@@ note
 
-Using the @scala[@apidoc[CircuitBreaker](CircuitBreaker$)'s companion object @scaladoc[apply](akka.pattern.CircuitBreaker$#apply(scheduler:akka.actor.Scheduler,maxFailures:Int,callTimeout:scala.concurrent.duration.FiniteDuration,resetTimeout:scala.concurrent.duration.FiniteDuration):akka.pattern.CircuitBreaker)]@java[@javadoc[CircuitBreaker.create](akka.pattern.CircuitBreaker#create(akka.actor.Scheduler,int,java.time.Duration,java.time.Duration))] method
+Using the @scala[@apidoc[CircuitBreaker](CircuitBreaker$)'s companion object @scaladoc[apply](pekko.pattern.CircuitBreaker$#apply(scheduler:org.apache.pekko.actor.Scheduler,maxFailures:Int,callTimeout:scala.concurrent.duration.FiniteDuration,resetTimeout:scala.concurrent.duration.FiniteDuration):org.apache.pekko.pattern.CircuitBreaker)]@java[@javadoc[CircuitBreaker.create](pekko.pattern.CircuitBreaker#create(org.apache.pekko.actor.Scheduler,int,java.time.Duration,java.time.Duration))] method
 will return a @apidoc[CircuitBreaker] where callbacks are executed in the caller's thread.
 This can be useful if the asynchronous @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionState](java.util.concurrent.CompletionStage)] behavior is unnecessary, for
 example invoking a synchronous-only API.
@@ -105,7 +105,7 @@ By default, the circuit breaker treats @javadoc[Exception](java.lang.Exception)
 On failure, the failure count will increment. If the failure count reaches the *maxFailures*, the circuit breaker will be opened.
 However, some applications may require certain exceptions to not increase the failure count.
 In other cases one may want to increase the failure count even if the call succeeded.
-Akka circuit breaker provides a way to achieve such use cases: @scala[@scaladoc[withCircuitBreaker](akka.pattern.CircuitBreaker#withCircuitBreaker[T](body:=%3Escala.concurrent.Future[T],defineFailureFn:scala.util.Try[T]=%3EBoolean):scala.concurrent.Future[T]) and @scaladoc[withSyncCircuitBreaker](akka.pattern.CircuitBreaker#withSyncCircuitBreaker[T](body:=%3ET,defineFailureFn:scala.util.Try[T]=%3EBoolean):T)]@java[@javadoc[callWithCircuitBreaker](akka.pattern.CircuitBreaker#callWithCircuitBreaker(java.util.concurrent.Callable,java.util.function.BiFunction)), @javadoc[callWithSyncCircuitBreaker](akka.pattern.CircuitBreaker#callWithSyncCircuitBreaker(java.util.concurrent.Callable,java.util.function.BiFunction)) and @javadoc[callWithCircuitBreakerCS](akka.pattern.CircuitBreaker#callWithCircuitBreakerCS(java.util.concurrent.Callable,java.util.function.BiFunction))].
+Akka circuit breaker provides a way to achieve such use cases: @scala[@scaladoc[withCircuitBreaker](pekko.pattern.CircuitBreaker#withCircuitBreaker[T](body:=%3Escala.concurrent.Future[T],defineFailureFn:scala.util.Try[T]=%3EBoolean):scala.concurrent.Future[T]) and @scaladoc[withSyncCircuitBreaker](pekko.pattern.CircuitBreaker#withSyncCircuitBreaker[T](body:=%3ET,defineFailureFn:scala.util.Try[T]=%3EBoolean):T)]@java[@javadoc[callWithCircuitBreaker](pekko.pattern.CircuitBreaker#callWithCircuitBreaker(java.util.concurrent.Callable,java.util.function.BiFunction)), @javadoc[callWithSyncCircuitBreaker](pekko.pattern.CircuitBreaker#callWithSyncCircuitBreaker(java.util.concurrent.Callable,java.util.function.BiFunction)) and @javadoc[callWithCircuitBreakerCS](pekko.pattern.CircuitBreaker#callWithCircuitBreakerCS(java.util.concurrent.Callable,java.util.function.BiFunction))].
 
 All methods above accept an argument `defineFailureFn`
 
diff --git a/akka-docs/src/main/paradox/common/io-layer.md b/akka-docs/src/main/paradox/common/io-layer.md
index ffba4509ab..8e99f210ed 100644
--- a/akka-docs/src/main/paradox/common/io-layer.md
+++ b/akka-docs/src/main/paradox/common/io-layer.md
@@ -1,6 +1,6 @@
 # I/O Layer Design
 
-The `akka.io` package has been developed in collaboration between the Akka
+The `org.apache.pekko.io` package has been developed in collaboration between the Akka
 and [spray.io](http://spray.io) teams. Its design incorporates the experiences with the
 `spray-io` module along with improvements that were jointly developed for
 more general consumption as an actor-based service.
@@ -26,7 +26,7 @@ instead allow completely protocol-specific user-level APIs.
 ## Basic Architecture
 
 Each transport implementation will be made available as a separate Akka
-extension, offering an @apidoc[akka.actor.ActorRef] representing the initial point of
+extension, offering an @apidoc[actor.ActorRef] representing the initial point of
 contact for client code. This "manager" accepts requests for establishing a
 communications channel (e.g. connect or listen on a TCP socket). Each
 communications channel is represented by one dedicated actor, which is exposed
@@ -84,7 +84,7 @@ actors to notice the demise of their user-level handler actors and terminate in
 an orderly fashion in that case as well; this naturally reduces the chances of
 leaking open channels.
 
-The choice of using @apidoc[akka.actor.ActorRef] for exposing all functionality entails
+The choice of using @apidoc[actor.ActorRef] for exposing all functionality entails
 that these references can be distributed or delegated freely and in general
 handled as the user sees fit, including the use of remoting and life-cycle
 monitoring (just to name two).
diff --git a/akka-docs/src/main/paradox/common/may-change.md b/akka-docs/src/main/paradox/common/may-change.md
index fee1bd7738..e9dbddb871 100644
--- a/akka-docs/src/main/paradox/common/may-change.md
+++ b/akka-docs/src/main/paradox/common/may-change.md
@@ -13,7 +13,7 @@ Concretely **may change** means that an API or module is in early access mode an
 
 Complete modules can be marked as **may change**, which will be stated in the module's description and in the docs.
 
-Individual public APIs can be annotated with @javadoc[ApiMayChange](akka.annotation.ApiMayChange) to signal that it has less
+Individual public APIs can be annotated with @javadoc[ApiMayChange](pekko.annotation.ApiMayChange) to signal that it has less
 guarantees than the rest of the module it lives in. For example, when while introducing "new" Java 8 APIs into
 existing stable modules, these APIs may be marked with this annotation to signal that they are not frozen yet.
 Please use such methods and classes with care, however if you see such APIs that is the best point in time to try them
diff --git a/akka-docs/src/main/paradox/coordination.md b/akka-docs/src/main/paradox/coordination.md
index 7fb7cc673a..30c0e6d2bb 100644
--- a/akka-docs/src/main/paradox/coordination.md
+++ b/akka-docs/src/main/paradox/coordination.md
@@ -85,7 +85,7 @@ Leases can be used for @ref[Split Brain Resolver](split-brain-resolver.md#lease)
 ## Implementing a lease
 
 Implementations should extend
-the @scala[`akka.coordination.lease.scaladsl.Lease`]@java[`akka.coordination.lease.javadsl.Lease`] 
+the @scala[`org.apache.pekko.coordination.lease.scaladsl.Lease`]@java[`org.apache.pekko.coordination.lease.javadsl.Lease`] 
 
 Scala
 :  @@snip [LeaseDocSpec.scala](/akka-docs/src/test/scala/docs/coordination/LeaseDocSpec.scala) { #lease-example }
diff --git a/akka-docs/src/main/paradox/discovery/index.md b/akka-docs/src/main/paradox/discovery/index.md
index 64b0091600..b6b509f6d0 100644
--- a/akka-docs/src/main/paradox/discovery/index.md
+++ b/akka-docs/src/main/paradox/discovery/index.md
@@ -49,28 +49,28 @@ See @ref:[Migration hints](#migrating-from-akka-management-discovery-before-1-0-
 Loading the extension:
 
 Scala
-:  @@snip [CompileOnlySpec.scala](/akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala) { #loading }
+:  @@snip [CompileOnlySpec.scala](/akka-discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala) { #loading }
 
 Java
-:  @@snip [CompileOnlyTest.java](/akka-discovery/src/test/java/jdoc/akka/discovery/CompileOnlyTest.java) { #loading }
+:  @@snip [CompileOnlyTest.java](/akka-discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java) { #loading }
 
 A `Lookup` contains a mandatory `serviceName` and an optional `portName` and `protocol`. How these are interpreted is discovery 
 method dependent e.g.DNS does an A/AAAA record query if any of the fields are missing and an SRV query for a full look up:
 
 Scala
-:  @@snip [CompileOnlySpec.scala](/akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala) { #basic }
+:  @@snip [CompileOnlySpec.scala](/akka-discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala) { #basic }
 
 Java
-:  @@snip [CompileOnlyTest.java](/akka-discovery/src/test/java/jdoc/akka/discovery/CompileOnlyTest.java) { #basic }
+:  @@snip [CompileOnlyTest.java](/akka-discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java) { #basic }
 
 
 `portName` and `protocol` are optional and their meaning is interpreted by the method.
 
 Scala
-:  @@snip [CompileOnlySpec.scala](/akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala) { #full }
+:  @@snip [CompileOnlySpec.scala](/akka-discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala) { #full }
 
 Java
-:  @@snip [CompileOnlyTest.java](/akka-discovery/src/test/java/jdoc/akka/discovery/CompileOnlyTest.java) { #full }
+:  @@snip [CompileOnlyTest.java](/akka-discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java) { #full }
 
 Port can be used when a service opens multiple ports e.g. a HTTP port and an Akka remoting port.
 
@@ -257,8 +257,8 @@ At least version `1.0.0` of any Akka Management module should be used if also us
 
 Migration steps:
 
-* Any custom discovery method should now implement `akka.discovery.ServiceDiscovery`
-* `discovery-method` now has to be a configuration location under `akka.discovery` with at minimum a property `class` specifying the fully qualified name of the implementation of `akka.discovery.ServiceDiscovery`.
+* Any custom discovery method should now implement `org.apache.pekko.discovery.ServiceDiscovery`
+* `discovery-method` now has to be a configuration location under `akka.discovery` with at minimum a property `class` specifying the fully qualified name of the implementation of `org.apache.pekko.discovery.ServiceDiscovery`.
   Previous versions allowed this to be a class name or a fully qualified config location e.g. `akka.discovery.kubernetes-api` rather than just `kubernetes-api`
 
 
diff --git a/akka-docs/src/main/paradox/dispatchers.md b/akka-docs/src/main/paradox/dispatchers.md
index f830b81755..18bdb00b4f 100644
--- a/akka-docs/src/main/paradox/dispatchers.md
+++ b/akka-docs/src/main/paradox/dispatchers.md
@@ -29,7 +29,7 @@ Java
 
 ## Setting the dispatcher for an Actor
 
-So in case you want to give your @apidoc[akka.actor.Actor] a different dispatcher than the default, you need to do two things, of which the first
+So in case you want to give your @apidoc[actor.Actor] a different dispatcher than the default, you need to do two things, of which the first
 is to configure the dispatcher:
 
 
@@ -81,7 +81,7 @@ Java
 
 @@@ note
 
-The dispatcher you specify in @apidoc[withDispatcher](akka.actor.Props) {scala="#withDispatcher(d:String):akka.actor.Props" java="#withDispatcher(java.lang.String)"} and the `dispatcher` property in the deployment
+The dispatcher you specify in @apidoc[withDispatcher](actor.Props) {scala="#withDispatcher(d:String):org.apache.pekko.actor.Props" java="#withDispatcher(java.lang.String)"} and the `dispatcher` property in the deployment
 configuration is in fact a path into your configuration.
 So in this example it's a top-level section, but you could for instance put it as a sub-section,
 where you'd use periods to denote sub-sections, like this: `"foo.bar.my-dispatcher"`
diff --git a/akka-docs/src/main/paradox/distributed-data.md b/akka-docs/src/main/paradox/distributed-data.md
index 3b7524940c..bfe5fb40e4 100644
--- a/akka-docs/src/main/paradox/distributed-data.md
+++ b/akka-docs/src/main/paradox/distributed-data.md
@@ -22,12 +22,12 @@ For the full documentation of this feature and for new projects see @ref:[Distri
 
 ## Using the Replicator
 
-The @apidoc[akka.cluster.ddata.Replicator] actor provides the API for interacting with the data.
+The @apidoc[cluster.ddata.Replicator] actor provides the API for interacting with the data.
 The `Replicator` actor must be started on each node in the cluster, or group of nodes tagged
 with a specific role. It communicates with other `Replicator` instances with the same path
 (without address) that are running on other nodes . For convenience it can be used with the
-@apidoc[akka.cluster.ddata.DistributedData] extension but it can also be started as an ordinary
-actor using the @apidoc[Replicator.props](akka.cluster.ddata.Replicator$) {scala="#props(settings:akka.cluster.ddata.ReplicatorSettings):akka.actor.Props" java="#props(akka.cluster.ddata.ReplicatorSettings)"}. If it is started as an ordinary actor it is important
+@apidoc[cluster.ddata.DistributedData] extension but it can also be started as an ordinary
+actor using the @apidoc[Replicator.props](cluster.ddata.Replicator$) {scala="#props(settings:org.apache.pekko.cluster.ddata.ReplicatorSettings):org.apache.pekko.actor.Props" java="#props(org.apache.pekko.cluster.ddata.ReplicatorSettings)"}. If it is started as an ordinary actor it is important
 that it is given the same name, started on same path, on all nodes.
 
 Cluster members with status @ref:[WeaklyUp](typed/cluster-membership.md#weakly-up),
@@ -39,7 +39,7 @@ as part of the cluster. So 3 nodes + 5 `WeaklyUp` is essentially a
 3 node cluster as far as consistent actions are concerned.
 
 Below is an example of an actor that schedules tick messages to itself and for each tick
-adds or removes elements from a @apidoc[ORSet](akka.cluster.ddata.ORSet) (observed-remove set). It also subscribes to
+adds or removes elements from a @apidoc[ORSet](cluster.ddata.ORSet) (observed-remove set). It also subscribes to
 changes of this.
 
 Scala
@@ -53,18 +53,18 @@ Java
 
 For the full documentation of this feature and for new projects see @ref:[Distributed Data - Update](typed/distributed-data.md#update).
 
-To modify and replicate a data value you send a @apidoc[Replicator.Update](akka.cluster.ddata.Replicator.Update) message to the local
-@apidoc[akka.cluster.ddata.Replicator].
+To modify and replicate a data value you send a @apidoc[Replicator.Update](cluster.ddata.Replicator.Update) message to the local
+@apidoc[cluster.ddata.Replicator].
 
-The current data value for the `key` of the `Update` is passed as parameter to the @scala[@scaladoc[modify](akka.cluster.ddata.Replicator.Update#modify:Option[A]=%3EA)]@java[@javadoc[modify()](akka.cluster.ddata.Replicator.Update#modify())]
+The current data value for the `key` of the `Update` is passed as parameter to the @scala[@scaladoc[modify](pekko.cluster.ddata.Replicator.Update#modify:Option[A]=%3EA)]@java[@javadoc[modify()](pekko.cluster.ddata.Replicator.Update#modify())]
 function of the `Update`. The function is supposed to return the new value of the data, which
 will then be replicated according to the given consistency level.
 
 The `modify` function is called by the `Replicator` actor and must therefore be a pure
 function that only uses the data parameter and stable fields from enclosing scope. It must
-for example not access the sender (@scala[@scaladoc[sender()](akka.actor.Actor#sender():akka.actor.ActorRef)]@java[@javadoc[getSender()](akka.actor.AbstractActor#getSender())]) reference of an enclosing actor.
+for example not access the sender (@scala[@scaladoc[sender()](pekko.actor.Actor#sender():org.apache.pekko.actor.ActorRef)]@java[@javadoc[getSender()](pekko.actor.AbstractActor#getSender())]) reference of an enclosing actor.
 
-`Update` is intended to only be sent from an actor running in same local @apidoc[akka.actor.ActorSystem]
+`Update` is intended to only be sent from an actor running in same local @apidoc[actor.ActorSystem]
  as the `Replicator`, because the `modify` function is typically not serializable.
  
 Scala
@@ -73,10 +73,10 @@ Scala
 Java
 : @@snip [DistributedDataDocTest.java](/akka-docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java) { #update }
 
-As reply of the `Update` a @apidoc[Replicator.UpdateSuccess](akka.cluster.ddata.Replicator.UpdateSuccess) is sent to the sender of the
+As reply of the `Update` a @apidoc[Replicator.UpdateSuccess](cluster.ddata.Replicator.UpdateSuccess) is sent to the sender of the
 `Update` if the value was successfully replicated according to the supplied 
-@ref:[write consistency level](typed/distributed-data.md#write-consistency) within the supplied timeout. Otherwise a @apidoc[Replicator.UpdateFailure](akka.cluster.ddata.Replicator.UpdateFailure) subclass is
-sent back. Note that a @apidoc[Replicator.UpdateTimeout](akka.cluster.ddata.Replicator.UpdateTimeout) reply does not mean that the update completely failed
+@ref:[write consistency level](typed/distributed-data.md#write-consistency) within the supplied timeout. Otherwise a @apidoc[Replicator.UpdateFailure](cluster.ddata.Replicator.UpdateFailure) subclass is
+sent back. Note that a @apidoc[Replicator.UpdateTimeout](cluster.ddata.Replicator.UpdateTimeout) reply does not mean that the update completely failed
 or was rolled back. It may still have been replicated to some nodes, and will eventually
 be replicated to all nodes with the gossip protocol.
 
@@ -93,15 +93,15 @@ Scala
 Java
 : @@snip [DistributedDataDocTest.java](/akka-docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java) { #update-response2 }
 
-You will always see your own writes. For example if you send two @apidoc[akka.cluster.ddata.Replicator.Update] messages
+You will always see your own writes. For example if you send two @apidoc[cluster.ddata.Replicator.Update] messages
 changing the value of the same `key`, the `modify` function of the second message will
 see the change that was performed by the first `Update` message.
 
 It is possible to abort the `Update` when inspecting the state parameter that is passed in to
 the `modify` function by throwing an exception. That happens before the update is performed and
-a @apidoc[Replicator.ModifyFailure](akka.cluster.ddata.Replicator.ModifyFailure) is sent back as reply.
+a @apidoc[Replicator.ModifyFailure](cluster.ddata.Replicator.ModifyFailure) is sent back as reply.
 
-In the `Update` message you can pass an optional request context, which the @apidoc[akka.cluster.ddata.Replicator]
+In the `Update` message you can pass an optional request context, which the @apidoc[cluster.ddata.Replicator]
 does not care about, but is included in the reply messages. This is a convenient
 way to pass contextual information (e.g. original sender) without having to use `ask`
 or maintain local correlation data structures.
@@ -117,7 +117,7 @@ Java
 
 For the full documentation of this feature and for new projects see @ref:[Distributed Data - Get](typed/distributed-data.md#get).
 
-To retrieve the current value of a data you send @apidoc[Replicator.Get](akka.cluster.ddata.Replicator.Get) message to the
+To retrieve the current value of a data you send @apidoc[Replicator.Get](cluster.ddata.Replicator.Get) message to the
 `Replicator`. You supply a consistency level which has the following meaning:
 
 Scala
@@ -126,9 +126,9 @@ Scala
 Java
 : @@snip [DistributedDataDocTest.java](/akka-docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java) { #get }
 
-As reply of the `Get` a @apidoc[Replicator.GetSuccess](akka.cluster.ddata.Replicator.GetSuccess) is sent to the sender of the
-`Get` if the value was successfully retrieved according to the supplied @ref:[read consistency level](typed/distributed-data.md#read-consistency) within the supplied timeout. Otherwise a @apidoc[Replicator.GetFailure](akka.cluster.ddata.Replicator.GetFailure) is sent.
-If the key does not exist the reply will be @apidoc[Replicator.NotFound](akka.cluster.ddata.Replicator.NotFound).
+As reply of the `Get` a @apidoc[Replicator.GetSuccess](cluster.ddata.Replicator.GetSuccess) is sent to the sender of the
+`Get` if the value was successfully retrieved according to the supplied @ref:[read consistency level](typed/distributed-data.md#read-consistency) within the supplied timeout. Otherwise a @apidoc[Replicator.GetFailure](cluster.ddata.Replicator.GetFailure) is sent.
+If the key does not exist the reply will be @apidoc[Replicator.NotFound](cluster.ddata.Replicator.NotFound).
 
 Scala
 : @@snip [DistributedDataDocSpec.scala](/akka-docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala) { #get-response1 }
@@ -143,9 +143,9 @@ Scala
 Java
 : @@snip [DistributedDataDocTest.java](/akka-docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java) { #get-response2 }
 
-In the @apidoc[akka.cluster.ddata.Replicator.Get] message you can pass an optional request context in the same way as for the
-@apidoc[akka.cluster.ddata.Replicator.Update] message, described above. For example the original sender can be passed and replied
-to after receiving and transforming @apidoc[akka.cluster.ddata.Replicator.GetSuccess].
+In the @apidoc[cluster.ddata.Replicator.Get] message you can pass an optional request context in the same way as for the
+@apidoc[cluster.ddata.Replicator.Update] message, described above. For example the original sender can be passed and replied
+to after receiving and transforming @apidoc[cluster.ddata.Replicator.GetSuccess].
 
 Scala
 : @@snip [DistributedDataDocSpec.scala](/akka-docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala) { #get-request-context }
@@ -157,15 +157,15 @@ Java
 
 For the full documentation of this feature and for new projects see @ref:[Distributed Data - Subscribe](typed/distributed-data.md#subscribe).
 
-You may also register interest in change notifications by sending @apidoc[Replicator.Subscribe](akka.cluster.ddata.Replicator.Subscribe)
-message to the `Replicator`. It will send @apidoc[Replicator.Changed](akka.cluster.ddata.Replicator.Changed) messages to the registered
+You may also register interest in change notifications by sending @apidoc[Replicator.Subscribe](cluster.ddata.Replicator.Subscribe)
+message to the `Replicator`. It will send @apidoc[Replicator.Changed](cluster.ddata.Replicator.Changed) messages to the registered
 subscriber when the data for the subscribed key is updated. Subscribers will be notified
 periodically with the configured `notify-subscribers-interval`, and it is also possible to
 send an explicit `Replicator.FlushChanges` message to the `Replicator` to notify the subscribers
 immediately.
 
 The subscriber is automatically removed if the subscriber is terminated. A subscriber can
-also be deregistered with the @apidoc[Replicator.Unsubscribe](akka.cluster.ddata.Replicator.Unsubscribe) message.
+also be deregistered with the @apidoc[Replicator.Unsubscribe](cluster.ddata.Replicator.Unsubscribe) message.
 
 Scala
 : @@snip [DistributedDataDocSpec.scala](/akka-docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala) { #subscribe }
@@ -177,7 +177,7 @@ Java
 
 For the full documentation of this feature and for new projects see @ref:[Distributed Data Consistency](typed/distributed-data.md#consistency).
  
-Here is an example of using @apidoc[akka.cluster.ddata.Replicator.WriteMajority] and @apidoc[akka.cluster.ddata.Replicator.ReadMajority]:
+Here is an example of using @apidoc[cluster.ddata.Replicator.WriteMajority] and @apidoc[cluster.ddata.Replicator.ReadMajority]:
 
 Scala
 : @@snip [ShoppingCart.scala](/akka-docs/src/test/scala/docs/ddata/ShoppingCart.scala) { #read-write-majority }
@@ -199,11 +199,11 @@ Scala
 Java
 : @@snip [ShoppingCart.java](/akka-docs/src/test/java/jdocs/ddata/ShoppingCart.java) { #add-item }
 
-In some rare cases, when performing an @apidoc[akka.cluster.ddata.Replicator.Update] it is needed to first try to fetch latest data from
-other nodes. That can be done by first sending a @apidoc[akka.cluster.ddata.Replicator.Get] with @apidoc[akka.cluster.ddata.Replicator.ReadMajority] and then continue with
-the @apidoc[akka.cluster.ddata.Replicator.Update] when the @apidoc[akka.cluster.ddata.Replicator.GetSuccess], @apidoc[akka.cluster.ddata.Replicator.GetFailure] or @apidoc[akka.cluster.ddata.Replicator.NotFound] reply is received. This might be
-needed when you need to base a decision on latest information or when removing entries from an @apidoc[akka.cluster.ddata.ORSet]
-or @apidoc[akka.cluster.ddata.ORMap]. If an entry is added to an `ORSet` or `ORMap` from one node and removed from another
+In some rare cases, when performing an @apidoc[cluster.ddata.Replicator.Update] it is needed to first try to fetch latest data from
+other nodes. That can be done by first sending a @apidoc[cluster.ddata.Replicator.Get] with @apidoc[cluster.ddata.Replicator.ReadMajority] and then continue with
+the @apidoc[cluster.ddata.Replicator.Update] when the @apidoc[cluster.ddata.Replicator.GetSuccess], @apidoc[cluster.ddata.Replicator.GetFailure] or @apidoc[cluster.ddata.Replicator.NotFound] reply is received. This might be
+needed when you need to base a decision on latest information or when removing entries from an @apidoc[cluster.ddata.ORSet]
+or @apidoc[cluster.ddata.ORMap]. If an entry is added to an `ORSet` or `ORMap` from one node and removed from another
 node the entry will only be removed if the added entry is visible on the node where the removal is
 performed (hence the name observed-removed set).
 
@@ -242,7 +242,7 @@ As deleted keys continue to be included in the stored data on each node as well
 messages, a continuous series of updates and deletes of top-level entities will result in
 growing memory usage until an ActorSystem runs out of memory. To use Akka Distributed Data
 where frequent adds and removes are required, you should use a fixed number of top-level data
-types that support both updates and removals, for example @apidoc[akka.cluster.ddata.ORMap] or @apidoc[akka.cluster.ddata.ORSet].
+types that support both updates and removals, for example @apidoc[cluster.ddata.ORMap] or @apidoc[cluster.ddata.ORSet].
 
 @@@
 
@@ -278,6 +278,6 @@ paper by Mark Shapiro et. al.
 
 ## Configuration
 
-The @apidoc[akka.cluster.ddata.DistributedData] extension can be configured with the following properties:
+The @apidoc[cluster.ddata.DistributedData] extension can be configured with the following properties:
 
 @@snip [reference.conf](/akka-distributed-data/src/main/resources/reference.conf) { #distributed-data }
diff --git a/akka-docs/src/main/paradox/distributed-pub-sub.md b/akka-docs/src/main/paradox/distributed-pub-sub.md
index f9b8dde25d..5c86b5a92f 100644
--- a/akka-docs/src/main/paradox/distributed-pub-sub.md
+++ b/akka-docs/src/main/paradox/distributed-pub-sub.md
@@ -25,7 +25,7 @@ How do I send a message to an actor without knowing which node it is running on?
 How do I send messages to all actors in the cluster that have registered interest
 in a named topic?
 
-This pattern provides a mediator actor, @apidoc[akka.cluster.pubsub.DistributedPubSubMediator](akka.cluster.pubsub.DistributedPubSubMediator),
+This pattern provides a mediator actor, @apidoc[cluster.pubsub.DistributedPubSubMediator](cluster.pubsub.DistributedPubSubMediator),
 that manages a registry of actor references and replicates the entries to peer
 actors among all cluster nodes or a group of nodes tagged with a specific role.
 
@@ -84,41 +84,41 @@ can explicitly remove entries with `DistributedPubSubMediator.Unsubscribe`.
 An example of a subscriber actor:
 
 Scala
-:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #subscriber }
+:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #subscriber }
 
 Java
-:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java) { #subscriber }
+:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java) { #subscriber }
 
 Subscriber actors can be started on several nodes in the cluster, and all will receive
 messages published to the "content" topic.
 
 Scala
-:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #start-subscribers }
+:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #start-subscribers }
 
 Java
-:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java) { #start-subscribers }
+:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java) { #start-subscribers }
 
 A simple actor that publishes to this "content" topic:
 
 Scala
-:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #publisher }
+:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #publisher }
 
 Java
-:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java) { #publisher }
+:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java) { #publisher }
 
 It can publish messages to the topic from anywhere in the cluster:
 
 Scala
-:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #publish-message }
+:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #publish-message }
 
 Java
-:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java) { #publish-message }
+:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java) { #publish-message }
 
 ### Topic Groups
 
 Actors may also be subscribed to a named topic with a `group` id.
 If subscribing with a group id, each message published to a topic with the
-`sendOneMessageToEachGroup` flag set to `true` is delivered via the supplied @apidoc[akka.routing.RoutingLogic]
+`sendOneMessageToEachGroup` flag set to `true` is delivered via the supplied @apidoc[org.apache.pekko.routing.RoutingLogic]
 (default random) to one actor within each subscribing group.
 
 If all the subscribed actors have the same group id, then this works just like
@@ -148,7 +148,7 @@ cluster aware router where the routees dynamically can register themselves.
 
 The message will be delivered to one recipient with a matching path, if any such
 exists in the registry. If several entries match the path because it has been registered
-on several nodes the message will be sent via the supplied @apidoc[RoutingLogic](akka.routing.RoutingLogic) (default random)
+on several nodes the message will be sent via the supplied @apidoc[RoutingLogic](org.apache.pekko.routing.RoutingLogic) (default random)
 to one destination. The sender of the message can specify that local affinity is preferred,
 i.e. the message is sent to an actor in the same local actor system as the used mediator actor,
 if any such exists, otherwise route to any other matching entry.
@@ -169,35 +169,35 @@ can explicitly remove entries with @apidoc[DistributedPubSubMediator.Remove].
 An example of a destination actor:
 
 Scala
-:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #send-destination }
+:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #send-destination }
 
 Java
-:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java) { #send-destination }
+:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java) { #send-destination }
 
 Destination actors can be started on several nodes in the cluster, and all will receive
 messages sent to the path (without address information).
 
 Scala
-:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #start-send-destinations }
+:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #start-send-destinations }
 
 Java
-:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java) { #start-send-destinations }
+:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java) { #start-send-destinations }
 
 A simple actor that sends to the path:
 
 Scala
-:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #sender }
+:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #sender }
 
 Java
-:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java) { #sender }
+:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java) { #sender }
 
 It can send messages to the path from anywhere in the cluster:
 
 Scala
-:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #send-message }
+:  @@snip [DistributedPubSubMediatorSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala) { #send-message }
 
 Java
-:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java) { #send-message }
+:  @@snip [DistributedPubSubMediatorTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java) { #send-message }
 
 It is also possible to broadcast messages to the actors that have been registered with
 @apidoc[DistributedPubSubMediator.Put]. Send @apidoc[DistributedPubSubMediator.SendToAll] message to the local mediator and the wrapped message
@@ -213,7 +213,7 @@ if the message should be sent to a matching path on the self node or not.
 
 ## DistributedPubSub Extension
 
-In the example above the mediator is started and accessed with the @apidoc[akka.cluster.pubsub.DistributedPubSub](akka.cluster.pubsub.DistributedPubSub) extension.
+In the example above the mediator is started and accessed with the @apidoc[cluster.pubsub.DistributedPubSub](cluster.pubsub.DistributedPubSub) extension.
 That is convenient and perfectly fine in most cases, but it can be good to know that it is possible to
 start the mediator actor as an ordinary actor and you can have several different mediators at the same
 time to be able to divide a large number of actors/topics to different mediators. For example you might
@@ -228,7 +228,7 @@ It is recommended to load the extension when the actor system is started by defi
 and then it takes a while for it to be populated.
 
 ```
-akka.extensions = ["akka.cluster.pubsub.DistributedPubSub"]
+akka.extensions = ["org.apache.pekko.cluster.pubsub.DistributedPubSub"]
 ```
 
 ## Delivery Guarantee
diff --git a/akka-docs/src/main/paradox/durable-state/persistence-query.md b/akka-docs/src/main/paradox/durable-state/persistence-query.md
index f79ac56c39..f33d3d0bbb 100644
--- a/akka-docs/src/main/paradox/durable-state/persistence-query.md
+++ b/akka-docs/src/main/paradox/durable-state/persistence-query.md
@@ -40,9 +40,9 @@ At present the query is based on _tags_. So if you have not tagged your objects,
 The example below shows how to get the  `DurableStateStoreQuery` from the `DurableStateStoreRegistry` extension.
 
 Scala
-:  @@snip [DurableStateStoreQueryUsageCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala) { #get-durable-state-store-query-example }
+:  @@snip [DurableStateStoreQueryUsageCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala) { #get-durable-state-store-query-example }
 
 Java
-:  @@snip [DurableStateStoreQueryUsageCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java) { #get-durable-state-store-query-example } 
+:  @@snip [DurableStateStoreQueryUsageCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java) { #get-durable-state-store-query-example } 
 
 The @apidoc[DurableStateChange] elements can be `UpdatedDurableState` or `DeletedDurableState`.
diff --git a/akka-docs/src/main/paradox/event-bus.md b/akka-docs/src/main/paradox/event-bus.md
index d87173c4b9..e5fe2f2b37 100644
--- a/akka-docs/src/main/paradox/event-bus.md
+++ b/akka-docs/src/main/paradox/event-bus.md
@@ -1,11 +1,11 @@
 # Classic Event Bus
 
 Originally conceived as a way to send messages to groups of actors, the
-@scala[@scaladoc[EventBus](akka.event.EventBus)]@java[@javadoc[EventBus](akka.event.japi.EventBus)] has been generalized into a set of @scala[composable traits] @java[abstract base classes]
+@scala[@scaladoc[EventBus](pekko.event.EventBus)]@java[@javadoc[EventBus](pekko.event.japi.EventBus)] has been generalized into a set of @scala[composable traits] @java[abstract base classes]
 implementing a simple interface:
 
 Scala
-:  @@snip [EventBus.scala](/akka-actor/src/main/scala/akka/event/EventBus.scala) { #event-bus-api }
+:  @@snip [EventBus.scala](/akka-actor/src/main/scala/org/apache/pekko/event/EventBus.scala) { #event-bus-api }
 
 Java
 :  @@snip [EventBusDocTest.java](/akka-docs/src/test/java/jdocs/event/EventBusDocTest.java) { #event-bus-api }
@@ -35,14 +35,14 @@ for any concrete implementation.
 
 The classifiers presented here are part of the Akka distribution, but rolling
 your own in case you do not find a perfect match is not difficult, check the
-implementation of the existing ones on @extref[github](github:akka-actor/src/main/scala/akka/event/EventBus.scala) 
+implementation of the existing ones on @extref[github](github:akka-actor/src/main/scala/org/apache/pekko/event/EventBus.scala) 
 
 ### Lookup Classification
 
 The simplest classification is just to extract an arbitrary classifier from
 each event and maintaining a set of subscribers for each possible classifier.
 This can be compared to tuning in on a radio station. The @scala[trait
-@scaladoc[LookupClassification](akka.event.LookupClassification)]@java[abstract class @scaladoc[LookupEventBus](akka.event.japi.LookupEventBus)] is still generic in that it abstracts over how to
+@scaladoc[LookupClassification](pekko.event.LookupClassification)]@java[abstract class @scaladoc[LookupEventBus](org.apache.pekko.event.japi.LookupEventBus)] is still generic in that it abstracts over how to
 compare subscribers and how exactly to classify them.
 
 The necessary methods to be implemented are illustrated with the following example:
@@ -207,7 +207,7 @@ stream for logging: these are the handlers which are configured for example in
 
 ```text
 akka {
-  loggers = ["akka.event.Logging$DefaultLogger"]
+  loggers = ["org.apache.pekko.event.Logging$DefaultLogger"]
 }
 ```
 
diff --git a/akka-docs/src/main/paradox/fault-tolerance.md b/akka-docs/src/main/paradox/fault-tolerance.md
index 0b6948309a..42a99e3c91 100644
--- a/akka-docs/src/main/paradox/fault-tolerance.md
+++ b/akka-docs/src/main/paradox/fault-tolerance.md
@@ -242,7 +242,7 @@ Java
 The supervision strategy to restart a classic actor only provides immediate restart. In some cases that will only trigger
 the same failure right away and giving things a bit of time before restarting is required to actually resolve the failure.
 
-The `akka.pattern.BackoffSupervisor` implements the so-called
+The `org.apache.pekko.pattern.BackoffSupervisor` implements the so-called
 *exponential backoff supervision strategy*, starting a child actor again when it fails, each time with a growing time delay between restarts.
 
 This pattern is useful when the started actor fails [1] because some external resource is not available,
@@ -295,7 +295,7 @@ and re-starting after the same configured interval. By adding additional randomn
 re-start intervals the actors will start in slightly different points in time, thus avoiding
 large spikes of traffic hitting the recovering shared database or other resource that they all need to contact.
 
-The `akka.pattern.BackoffSupervisor` actor can also be configured to stop and start the actor after a delay when the actor 
+The `org.apache.pekko.pattern.BackoffSupervisor` actor can also be configured to stop and start the actor after a delay when the actor 
 crashes and the supervision strategy decides that it should restart.
 
 The following snippet shows how to create a backoff supervisor which will start the given echo actor after it has crashed
@@ -309,7 +309,7 @@ Java
 
 ### Customization
 
-The `akka.pattern.BackoffOnFailureOptions` and `akka.pattern.BackoffOnRestartOptions` can be used to customize the behavior of the back-off supervisor actor.
+The `org.apache.pekko.pattern.BackoffOnFailureOptions` and `org.apache.pekko.pattern.BackoffOnRestartOptions` can be used to customize the behavior of the back-off supervisor actor.
 Options are:
 * `withAutoReset`: The backoff is reset if no failure/stop occurs within the duration. This is the default behaviour with `minBackoff` as default value
 * `withManualReset`: The child must send `BackoffSupervisor.Reset` to its backoff supervisor (parent)
@@ -325,7 +325,7 @@ Some examples:
 
 @@snip [BackoffSupervisorDocSpec.scala](/akka-docs/src/test/scala/docs/pattern/BackoffSupervisorDocSpec.scala) { #backoff-custom-stop }
 
-The above code sets up a back-off supervisor that requires the child actor to send a `akka.pattern.BackoffSupervisor.Reset` message
+The above code sets up a back-off supervisor that requires the child actor to send a `org.apache.pekko.pattern.BackoffSupervisor.Reset` message
 to its parent when a message is successfully processed, resetting the back-off. It also uses a default stopping strategy, any exception
 will cause the child to stop.
 
diff --git a/akka-docs/src/main/paradox/futures.md b/akka-docs/src/main/paradox/futures.md
index 29bf5ac0c9..c2f9cbf1d5 100644
--- a/akka-docs/src/main/paradox/futures.md
+++ b/akka-docs/src/main/paradox/futures.md
@@ -15,7 +15,7 @@ Akka offers tiny helpers for use with @scala[@scaladoc[Future](scala.concurrent.
 
 ## After
 
-@scala[`akka.pattern.after`]@java[@javadoc[akka.pattern.Patterns.after](akka.pattern.Patterns#after)] makes it easy to complete a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] with a value or exception after a timeout.
+@scala[`org.apache.pekko.pattern.after`]@java[@javadoc[org.apache.pekko.pattern.Patterns.after](pekko.pattern.Patterns#after)] makes it easy to complete a @scala[@scaladoc[Future](pekko.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] with a value or exception after a timeout.
 
 Scala
 :  @@snip [FutureDocSpec.scala](/akka-docs/src/test/scala/docs/future/FutureDocSpec.scala) { #after }
@@ -25,7 +25,7 @@ Java
 
 ## Retry
 
-@scala[`akka.pattern.retry`]@java[@javadoc[akka.pattern.Patterns.retry](akka.pattern.Patterns#retry)] will retry a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] some number of times with a delay between each attempt.
+@scala[`org.apache.pekko.pattern.retry`]@java[@javadoc[org.apache.pekko.pattern.Patterns.retry](pekko.pattern.Patterns#retry)] will retry a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] some number of times with a delay between each attempt.
 
 Scala
 :   @@snip [FutureDocSpec.scala](/akka-docs/src/test/scala/docs/future/FutureDocSpec.scala) { #retry }
diff --git a/akka-docs/src/main/paradox/general/actor-systems.md b/akka-docs/src/main/paradox/general/actor-systems.md
index e748fb4350..0cf132056b 100644
--- a/akka-docs/src/main/paradox/general/actor-systems.md
+++ b/akka-docs/src/main/paradox/general/actor-systems.md
@@ -107,7 +107,7 @@ while Akka does the heavy lifting under the hood.
 ## Terminating ActorSystem
 
 When you know everything is done for your application, you can have the user guardian
- actor stop, or call the @scala[@scaladoc[terminate](akka.actor.typed.ActorSystem#terminate():Unit)]@java[@javadoc[terminate()](akka.actor.typed.ActorSystem#terminate())] method of @apidoc[ActorSystem](typed.ActorSystem). That will run @ref:[`CoordinatedShutdown`](../coordinated-shutdown.md)
+ actor stop, or call the @scala[@scaladoc[terminate](pekko.actor.typed.ActorSystem#terminate():Unit)]@java[@javadoc[terminate()](pekko.actor.typed.ActorSystem#terminate())] method of @apidoc[ActorSystem](typed.ActorSystem). That will run @ref:[`CoordinatedShutdown`](../coordinated-shutdown.md)
 stopping all running actors.
 
 If you want to execute some operations while terminating @apidoc[ActorSystem](typed.ActorSystem),
diff --git a/akka-docs/src/main/paradox/general/addressing.md b/akka-docs/src/main/paradox/general/addressing.md
index cda134807f..0bb1fe335c 100644
--- a/akka-docs/src/main/paradox/general/addressing.md
+++ b/akka-docs/src/main/paradox/general/addressing.md
@@ -15,7 +15,7 @@ within an actor system, please read on for the details.
 
 An actor reference is a subtype of @apidoc[ActorRef](typed.ActorRef), whose foremost purpose is
 to support sending messages to the actor it represents. Each actor has access
-to its canonical (local) reference through the @apidoc[ActorContext.self](typed.*.ActorContext) {scala="#self:akka.actor.typed.ActorRef[T]" java="#getSelf()"} field; this
+to its canonical (local) reference through the @apidoc[ActorContext.self](typed.*.ActorContext) {scala="#self:org.apache.pekko.actor.typed.ActorRef[T]" java="#getSelf()"} field; this
 reference can be included in messages to other actors to get replies back.
 
 There are several different types of actor references that are supported
@@ -36,7 +36,7 @@ transparently and send them to the remote JVM.
 actor references for all practical purposes:
     * `PromiseActorRef` is the special representation of a @scaladoc[Promise](scala.concurrent.Promise)
 for the purpose of being completed by the response from an actor.
-`akka.pattern.ask` creates this actor reference.
+`org.apache.pekko.pattern.ask` creates this actor reference.
     * `DeadLetterActorRef` is the default implementation of the dead
 letters service to which Akka routes all messages whose destinations
 are shut down or non-existent.
@@ -154,7 +154,7 @@ other actors are found; its name is `"/"`. The next level consists of the
 following:
 
  * `"/user"` is the guardian actor for all user-created top-level actors;
-actors created using @apidoc[ActorSystem.actorOf](ActorRefFactory) {scala="#actorOf(props:akka.actor.Props):akka.actor.ActorRef" java="#actorOf(akka.actor.Props)"} are found below this one.
+actors created using @apidoc[ActorSystem.actorOf](ActorRefFactory) {scala="#actorOf(props:org.apache.pekko.actor.Props):org.apache.pekko.actor.ActorRef" java="#actorOf(org.apache.pekko.actor.Props)"} are found below this one.
  * `"/system"` is the guardian actor for all system-created top-level actors,
 e.g. logging listeners or actors automatically deployed by configuration at
 the start of the actor system.
@@ -162,7 +162,7 @@ the start of the actor system.
 stopped or non-existing actors are re-routed (on a best-effort basis: messages
 may be lost even within the local JVM).
  * `"/temp"` is the guardian for all short-lived system-created actors, e.g.
-those which are used in the implementation of @scala[@scaladoc[ActorRef.ask](akka.pattern.AskableActorRef#ask(message:Any)(implicittimeout:akka.util.Timeout,implicitsender:akka.actor.ActorRef):scala.concurrent.Future[Any])]@java[@javadoc[Patterns.ask](akka.pattern.Patterns#ask(akka.actor.ActorRef,java.lang.Object,java.time.Duration))].
+those which are used in the implementation of @scala[@scaladoc[ActorRef.ask](pekko.pattern.AskableActorRef#ask(message:Any)(implicittimeout:org.apache.pekko.util.Timeout,implicitsender:org.apache.pekko.actor.ActorRef):scala.concurrent.Future[Any])]@java[@javadoc[Patterns.ask](pekko.pattern.Patterns#ask(org.apache.pekko.actor.ActorRef,java.lang.Object,java.time.Duration))].
  * `"/remote"` is an artificial path below which all actors reside whose
 supervisors are remote actor references
 
diff --git a/akka-docs/src/main/paradox/general/configuration.md b/akka-docs/src/main/paradox/general/configuration.md
index 2840d84dd0..4763008f43 100644
--- a/akka-docs/src/main/paradox/general/configuration.md
+++ b/akka-docs/src/main/paradox/general/configuration.md
@@ -80,9 +80,9 @@ akka {
   # Logger config for Akka internals and classic actors, the new API relies
   # directly on SLF4J and your config for the logger backend.
 
-  # Loggers to register at boot time (akka.event.Logging$DefaultLogger logs
+  # Loggers to register at boot time (org.apache.pekko.event.Logging$DefaultLogger logs
   # to STDOUT)
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
+  loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"]
 
   # Log level used by the configured loggers (see "loggers") as soon
   # as they have been started; before that, see "stdout-loglevel"
@@ -96,7 +96,7 @@ akka {
 
   # Filter of log events that is used by the LoggingAdapter before
   # publishing log events to the eventStream.
-  logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+  logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
 
   actor {
     provider = "cluster"
diff --git a/akka-docs/src/main/paradox/general/message-delivery-reliability.md b/akka-docs/src/main/paradox/general/message-delivery-reliability.md
index 54799cc196..a61d9b196c 100644
--- a/akka-docs/src/main/paradox/general/message-delivery-reliability.md
+++ b/akka-docs/src/main/paradox/general/message-delivery-reliability.md
@@ -35,8 +35,8 @@ role of the “Dead Letter Office”.
 
 ## The General Rules
 
-These are the rules for message sends (i.e. the @scala[@scaladoc[tell](akka.actor.ActorRef#tell(msg:Any,sender:akka.actor.ActorRef):Unit) or @scaladoc[!](akka.actor.ActorRef#!(message:Any)(implicitsender:akka.actor.ActorRef):Unit)]@java[@javadoc[tell](akka.actor.ActorRef#tell(java.lang.Object,akka.actor.ActorRef))] method, which
-also underlies the @scaladoc[ask](akka.pattern.AskSupport#ask(actorRef:akka.actor.ActorRef):akka.pattern.AskableActorRef) pattern):
+These are the rules for message sends (i.e. the @scala[@scaladoc[tell](pekko.actor.ActorRef#tell(msg:Any,sender:org.apache.pekko.actor.ActorRef):Unit) or @scaladoc[!](pekko.actor.ActorRef#!(message:Any)(implicitsender:org.apache.pekko.actor.ActorRef):Unit)]@java[@javadoc[tell](pekko.actor.ActorRef#tell(java.lang.Object,org.apache.pekko.actor.ActorRef))] method, which
+also underlies the @scaladoc[ask](pekko.pattern.AskSupport#ask(actorRef:org.apache.pekko.actor.ActorRef):org.apache.pekko.pattern.AskableActorRef) pattern):
 
 * **at-most-once delivery**, i.e. no guaranteed delivery
 * **message ordering per sender–receiver pair**
@@ -197,7 +197,7 @@ this you should only rely on @ref:[The General Rules](#the-general-rules).
 
 The Akka test suite relies on not losing messages in the local context (and for
 non-error condition tests also for remote deployment), meaning that we
-actually do apply the best effort to keep our tests stable. A local @apidoc[tell](akka.actor.ActorRef) {scala="#tell(msg:Any,sender:akka.actor.ActorRef):Unit"  java="#tell(java.lang.Object,akka.actor.ActorRef)"}
+actually do apply the best effort to keep our tests stable. A local @apidoc[tell](actor.ActorRef) {scala="#tell(msg:Any,sender:org.apache.pekko.actor.ActorRef):Unit"  java="#tell(java.lang.Object,org.apache.pekko.actor.ActorRef)"}
 operation can however fail for the same reasons as a normal method call can on
 the JVM:
 
@@ -207,7 +207,7 @@ the JVM:
 
 In addition, local sends can fail in Akka-specific ways:
 
-* if the mailbox does not accept the message (e.g. full @apidoc[akka.dispatch.BoundedMailbox])
+* if the mailbox does not accept the message (e.g. full @apidoc[dispatch.BoundedMailbox])
 * if the receiving actor fails while processing the message or is already
 terminated
 
@@ -338,7 +338,7 @@ guaranteed delivery.
 
 ### How do I Receive Dead Letters?
 
-An actor can subscribe to class @apidoc[akka.actor.DeadLetter](akka.actor.DeadLetter) on the event
+An actor can subscribe to class @apidoc[actor.DeadLetter](actor.DeadLetter) on the event
 stream, see @ref:[Event Stream](../event-bus.md#event-stream)
 for how to do that. The subscribed actor will then receive all dead
 letters published in the (local) system from that point onwards. Dead letters
@@ -356,6 +356,6 @@ that some messages which it sends to itself are lost. There is one which
 happens quite easily in complex shutdown scenarios that is usually benign:
 seeing instances of a graceful stop command for an actor being dropped means that two
 stop requests were given, but only one can succeed. In the
-same vein, you might see @apidoc[akka.actor.Terminated](akka.actor.Terminated) messages from children
+same vein, you might see @apidoc[actor.Terminated](actor.Terminated) messages from children
 while stopping a hierarchy of actors turning up in dead letters if the parent
 is still watching the child when the parent terminates.
diff --git a/akka-docs/src/main/paradox/general/stream/stream-design.md b/akka-docs/src/main/paradox/general/stream/stream-design.md
index 371706d809..a14cfcf5aa 100644
--- a/akka-docs/src/main/paradox/general/stream/stream-design.md
+++ b/akka-docs/src/main/paradox/general/stream/stream-design.md
@@ -39,11 +39,11 @@ The process of materialization will often create specific objects that are usefu
 
 ## Interoperation with other Reactive Streams implementations
 
-Akka Streams fully implement the Reactive Streams specification and interoperate with all other conformant implementations. We chose to completely separate the Reactive Streams interfaces from the user-level API because we regard them to be an SPI that is not targeted at endusers. In order to obtain a [Publisher](https://javadoc.io/doc/org.reactivestreams/reactive-streams/latest/org/reactivestreams/Publisher.html) or [Subscriber](https://javadoc.io/doc/org.reactivestreams/reactive-streams/latest/org/reactivestreams/Subscriber.html) from an Akka Stream topology, a corresponding @apidoc[Sink.asPublisher](Sink$) {scala="#asPublisher[T](fanout:Boolean):akka.stream.scaladsl.Sink[T,org.reactivestreams.Publisher[T]]" java="#asPublisher(akka.stream.javadsl.AsPublisher)"} or @apidoc[Source.asSubscriber](Source$) {scala="#asSubscriber[T]:akka.stream.scaladsl.Source[T,org.reactivestreams.Subscriber[T]]" java="#asSubscriber()"} element must be used.
+Akka Streams fully implement the Reactive Streams specification and interoperate with all other conformant implementations. We chose to completely separate the Reactive Streams interfaces from the user-level API because we regard them to be an SPI that is not targeted at endusers. In order to obtain a [Publisher](https://javadoc.io/doc/org.reactivestreams/reactive-streams/latest/org/reactivestreams/Publisher.html) or [Subscriber](https://javadoc.io/doc/org.reactivestreams/reactive-streams/latest/org/reactivestreams/Subscriber.html) from an Akka Stream topology, a corresponding @apidoc[Sink.asPublisher](Sink$) {scala="#asPublisher[T](fanout:Boolean):org.apache.pekko.stream.scaladsl.Sink[T,org.reactivestreams.Publisher[T]]" java="#asPublisher(org.apache.pekko.stream.javadsl.AsPublisher)"} or @apidoc[Source.asSubscriber](Source$) {scala="#asSubscriber[T]:org.apache.pekko.stream.scaladsl.Source[T,org.reactivestreams.Subscriber[T]]" java="#asSubscriber()"} element must be used.
 
 All stream Processors produced by the default materialization of Akka Streams are restricted to having a single Subscriber, additional Subscribers will be rejected. The reason for this is that the stream topologies described using our DSL never require fan-out behavior from the Publisher sides of the elements, all fan-out is done using explicit elements like @apidoc[Broadcast[T]](stream.*.Broadcast).
 
-This means that @scala[@scaladoc[Sink.asPublisher(true)](akka.stream.scaladsl.Sink$#asPublisher[T](fanout:Boolean):akka.stream.scaladsl.Sink[T,org.reactivestreams.Publisher[T]])]@java[@javadoc[Sink.asPublisher(WITH_FANOUT)](akka.stream.javadsl.Sink#asPublisher(akka.stream.javadsl.AsPublisher))] (for enabling fan-out support) must be used where broadcast behavior is needed for interoperation with other Reactive Streams implementations.
+This means that @scala[@scaladoc[Sink.asPublisher(true)](pekko.stream.scaladsl.Sink$#asPublisher[T](fanout:Boolean):org.apache.pekko.stream.scaladsl.Sink[T,org.reactivestreams.Publisher[T]])]@java[@javadoc[Sink.asPublisher(WITH_FANOUT)](pekko.stream.javadsl.Sink#asPublisher(org.apache.pekko.stream.javadsl.AsPublisher))] (for enabling fan-out support) must be used where broadcast behavior is needed for interoperation with other Reactive Streams implementations.
 
 ### Rationale and benefits from Sink/Source/Flow not directly extending Reactive Streams interfaces
 
@@ -65,7 +65,7 @@ Another not obvious gain from hiding the Reactive Streams interfaces comes from
 Libraries which selected to expose and directly extend the Reactive Streams types will now have a tougher time to adapt the JDK9+ types -- all their classes that extend Subscriber and friends will need to be copied or changed to extend the exact same interface,
 but from a different package. In Akka we simply expose the new type when asked to -- already supporting JDK9 types, from the day JDK9 was released.
 
-The other, and perhaps more important reason for hiding the Reactive Streams interfaces comes back to the first points of this explanation: the fact of Reactive Streams being an SPI, and as such is hard to "get right" in ad-hoc implementations. Thus Akka Streams discourages the use of the hard to implement pieces of the underlying infrastructure, and offers simpler, more type-safe, yet more powerful abstractions for users to work with: @apidoc[GraphStage]s and operators. It is of course still (and easily) possible to accept or obtain Reactive Streams (or JDK+ Flow) representations of the stream operators by using methods like @apidoc[Sink.asPublisher](Sink$) {scala="#asPublisher[T](fanout:Boolean):akka.stream.scaladsl.Sink[T,org.reactivestreams.Publisher[T]]" java="#asPublisher(akka.stream.javadsl.AsPublisher)"} or @apidoc[fromSubscriber](Sink$) {scala="#fromSubscriber[T](subscriber:org.reactivestreams.Subscriber[T]):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#fromSubscriber(org.reactivestreams.Subscriber)"}.
+The other, and perhaps more important reason for hiding the Reactive Streams interfaces comes back to the first points of this explanation: the fact of Reactive Streams being an SPI, and as such is hard to "get right" in ad-hoc implementations. Thus Akka Streams discourages the use of the hard to implement pieces of the underlying infrastructure, and offers simpler, more type-safe, yet more powerful abstractions for users to work with: @apidoc[GraphStage]s and operators. It is of course still (and easily) possible to accept or obtain Reactive Streams (or JDK+ Flow) representations of the stream operators by using methods like @apidoc[Sink.asPublisher](Sink$) {scala="#asPublisher[T](fanout:Boolean):org.apache.pekko.stream.scaladsl.Sink[T,org.reactivestreams.Publisher[T]]" java="#asPublisher(org.apache.pekko.stream.javadsl.AsPublisher)"} or @apidoc[fromSubscriber](Sink$) {scala="#fromSubscriber[T](subscriber:org.reactivestreams.Subscriber[T]):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#fromSubscriber(org.reactivestreams.Subscriber)"}.
 
 ## What shall users of streaming libraries expect?
 
diff --git a/akka-docs/src/main/paradox/general/supervision.md b/akka-docs/src/main/paradox/general/supervision.md
index 3061ea5083..5cb05cba41 100644
--- a/akka-docs/src/main/paradox/general/supervision.md
+++ b/akka-docs/src/main/paradox/general/supervision.md
@@ -98,8 +98,8 @@ Lifecycle monitoring is implemented using a @apidoc[typed.Terminated] message to
 received by the monitoring actor, where the default behavior is to throw a
 special @apidoc[typed.DeathPactException] if not otherwise handled. In order to start
 listening for @apidoc[typed.Terminated] messages, invoke
-@apidoc[ActorContext.watch(targetActorRef)](typed.*.ActorContext) {scala="#watch[U](other:akka.actor.typed.ActorRef[U]):Unit" java="#watch(akka.actor.typed.ActorRef)"}.  To stop listening, invoke
-@apidoc[ActorContext.unwatch(targetActorRef)](typed.*.ActorContext) {scala="#unwatch[U](other:akka.actor.typed.ActorRef[U]):Unit" java="#unwatch(akka.actor.typed.ActorRef)"}.  One important property is that the
+@apidoc[ActorContext.watch(targetActorRef)](typed.*.ActorContext) {scala="#watch[U](other:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#watch(org.apache.pekko.actor.typed.ActorRef)"}.  To stop listening, invoke
+@apidoc[ActorContext.unwatch(targetActorRef)](typed.*.ActorContext) {scala="#unwatch[U](other:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#unwatch(org.apache.pekko.actor.typed.ActorRef)"}.  One important property is that the
 message will be delivered irrespective of the order in which the monitoring
 request and target’s termination occur, i.e. you still get the message even if
 at the time of registration the target is already dead.
diff --git a/akka-docs/src/main/paradox/io-dns.md b/akka-docs/src/main/paradox/io-dns.md
index 74a7dfa6b3..b7262e2013 100644
--- a/akka-docs/src/main/paradox/io-dns.md
+++ b/akka-docs/src/main/paradox/io-dns.md
@@ -27,7 +27,7 @@ Users should pick one of the built in extensions.
 
 @@@
 
-Akka DNS is a pluggable way to interact with DNS. Implementations much implement `akka.io.DnsProvider` and provide a configuration
+Akka DNS is a pluggable way to interact with DNS. Implementations much implement `org.apache.pekko.io.DnsProvider` and provide a configuration
 block that specifies the implementation via `provider-object`.
 
 @@@ note { title="DNS via Akka Discovery" }
@@ -92,7 +92,7 @@ Scala
 Java
 :  @@snip [DnsCompileOnlyDocTest.java](/akka-docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java) { #srv }
 
-The `DnsProtocol.Resolved` will contain `akka.io.dns.SRVRecord`s.
+The `DnsProtocol.Resolved` will contain `org.apache.pekko.io.dns.SRVRecord`s.
 
 
 
diff --git a/akka-docs/src/main/paradox/io-udp.md b/akka-docs/src/main/paradox/io-udp.md
index 24e1eb1d39..833fcf2d91 100644
--- a/akka-docs/src/main/paradox/io-udp.md
+++ b/akka-docs/src/main/paradox/io-udp.md
@@ -112,11 +112,11 @@ connect, thus writes do not suffer an additional performance penalty.
 ## UDP Multicast
 
 Akka provides a way to control various options of `DatagramChannel` through the
-`akka.io.Inet.SocketOption` interface. The example below shows
+`org.apache.pekko.io.Inet.SocketOption` interface. The example below shows
 how to setup a receiver of multicast messages using IPv6 protocol.
 
-To select a Protocol Family you must extend `akka.io.Inet.DatagramChannelCreator`
-class which @scala[extends]@java[implements] `akka.io.Inet.SocketOption`. Provide custom logic
+To select a Protocol Family you must extend `org.apache.pekko.io.Inet.DatagramChannelCreator`
+class which @scala[extends]@java[implements] `org.apache.pekko.io.Inet.SocketOption`. Provide custom logic
 for opening a datagram channel by overriding `create` method.
 
 Scala
diff --git a/akka-docs/src/main/paradox/io.md b/akka-docs/src/main/paradox/io.md
index c064b4d835..ac7c70823d 100644
--- a/akka-docs/src/main/paradox/io.md
+++ b/akka-docs/src/main/paradox/io.md
@@ -32,8 +32,8 @@ full-service high-level NIO wrapper for end users.
 The I/O API is completely actor based, meaning that all operations are implemented with message passing instead of
 direct method calls. Every I/O driver (TCP, UDP) has a special actor, called a *manager* that serves
 as an entry point for the API. I/O is broken into several drivers. The manager for a particular driver
-is accessible @scala[through the @scaladoc[IO](akka.io.IO$) entry point]@java[by querying an @javadoc[ActorSystem](akka.actor.ActorSystem)]. For example the following code
-looks up the TCP manager and returns its @apidoc[ActorRef](akka.actor.ActorRef):
+is accessible @scala[through the @scaladoc[IO](pekko.io.IO$) entry point]@java[by querying an @javadoc[ActorSystem](pekko.actor.ActorSystem)]. For example the following code
+looks up the TCP manager and returns its @apidoc[ActorRef](actor.ActorRef):
 
 Scala
 :  @@snip [IODocSpec.scala](/akka-docs/src/test/scala/docs/io/IODocSpec.scala) { #manager }
@@ -42,9 +42,9 @@ Java
 :  @@snip [EchoManager.java](/akka-docs/src/test/java/jdocs/io/japi/EchoManager.java) { #manager }
 
 The manager receives I/O command messages and instantiates worker actors in response. The worker actors present
-themselves to the API user in the reply to the command that was sent. For example after a @apidoc[Connect](akka.io.Tcp.Connect) command sent to
+themselves to the API user in the reply to the command that was sent. For example after a @apidoc[Connect](io.Tcp.Connect) command sent to
 the TCP manager the manager creates an actor representing the TCP connection. All operations related to the given TCP
-connections can be invoked by sending messages to the connection actor which announces itself by sending a @apidoc[Connected](akka.io.Tcp.Connected)
+connections can be invoked by sending messages to the connection actor which announces itself by sending a @apidoc[Connected](io.Tcp.Connected)
 message.
 
 ### DeathWatch and Resource Management
@@ -71,8 +71,8 @@ Akka supports two types of flow control:
 
 Each of these models is available in both the TCP and the UDP implementations of Akka I/O.
 
-Individual writes can be acknowledged by providing an ack object in the write message (@apidoc[Write](akka.io.Tcp.Write) in the case of TCP and
-@apidoc[Send](akka.io.Udp.Send) for UDP). When the write is complete the worker will send the ack object to the writing actor. This can be
+Individual writes can be acknowledged by providing an ack object in the write message (@apidoc[Write](io.Tcp.Write) in the case of TCP and
+@apidoc[Send](io.Udp.Send) for UDP). When the write is complete the worker will send the ack object to the writing actor. This can be
 used to implement *ack-based* flow control; sending new data only when old data has been acknowledged.
 
 If a write (or any other command) fails, the driver notifies the actor that sent the command with a special message
@@ -92,28 +92,28 @@ not error handling. In other words, data may still be lost, even if every write
 
 ### ByteString
 
-To maintain isolation, actors should communicate with immutable objects only. @apidoc[ByteString](akka.util.ByteString) is an
+To maintain isolation, actors should communicate with immutable objects only. @apidoc[ByteString](util.ByteString) is an
 immutable container for bytes. It is used by Akka's I/O system as an efficient, immutable alternative
 the traditional byte containers used for I/O on the JVM, such as @scala[@scaladoc[Array](scala.Array)[@scaladoc[Byte](scala.Byte)]]@java[`byte[]`] and @javadoc[ByteBuffer](java.nio.ByteBuffer).
 
 `ByteString` is a [rope-like](https://en.wikipedia.org/wiki/Rope_\(computer_science\)) data structure that is immutable
 and provides fast concatenation and slicing operations (perfect for I/O). When two `ByteString`s are concatenated
 together they are both stored within the resulting `ByteString` instead of copying both to a new @scala[`Array`]@java[array]. Operations
-such as @apidoc[drop](akka.util.ByteString) {scala="#drop(n:Int):akka.util.ByteString" java="#drop(int)"} and @apidoc[take](akka.util.ByteString) {scala="#take(n:Int):akka.util.ByteString" java="#take(int)"} return `ByteString`s that still reference the original @scala[`Array`]@java[array], but just change the
+such as @apidoc[drop](util.ByteString) {scala="#drop(n:Int):org.apache.pekko.util.ByteString" java="#drop(int)"} and @apidoc[take](util.ByteString) {scala="#take(n:Int):org.apache.pekko.util.ByteString" java="#take(int)"} return `ByteString`s that still reference the original @scala[`Array`]@java[array], but just change the
 offset and length that is visible. Great care has also been taken to make sure that the internal @scala[`Array`]@java[array] cannot be
 modified. Whenever a potentially unsafe @scala[`Array`]@java[array] is used to create a new `ByteString` a defensive copy is created. If
-you require a `ByteString` that only blocks as much memory as necessary for its content, use the @apidoc[compact](akka.util.ByteString) {scala="#compact:akka.util.CompactByteString" java="#compact()"} method to
-get a @apidoc[CompactByteString](akka.util.CompactByteString) instance. If the `ByteString` represented only a slice of the original array, this will
+you require a `ByteString` that only blocks as much memory as necessary for its content, use the @apidoc[compact](util.ByteString) {scala="#compact:org.apache.pekko.util.CompactByteString" java="#compact()"} method to
+get a @apidoc[CompactByteString](util.CompactByteString) instance. If the `ByteString` represented only a slice of the original array, this will
 result in copying all bytes in that slice.
 
-`ByteString` inherits all methods from @scaladoc[IndexedSeq](scala.collection.immutable.IndexedSeq), and it also has some new ones. For more information, look up the @apidoc[akka.util.ByteString](akka.util.ByteString) class and @scaladoc[its companion object](akka.util.ByteString$) in the ScalaDoc.
+`ByteString` inherits all methods from @scaladoc[IndexedSeq](scala.collection.immutable.IndexedSeq), and it also has some new ones. For more information, look up the @apidoc[util.ByteString](util.ByteString) class and @scaladoc[its companion object](util.ByteString$) in the ScalaDoc.
 
-`ByteString` also comes with its own optimized builder and iterator classes @apidoc[ByteStringBuilder](akka.util.ByteStringBuilder) and
-@apidoc[ByteIterator](akka.util.ByteIterator) which provide extra features in addition to those of normal builders and iterators.
+`ByteString` also comes with its own optimized builder and iterator classes @apidoc[ByteStringBuilder](util.ByteStringBuilder) and
+@apidoc[ByteIterator](util.ByteIterator) which provide extra features in addition to those of normal builders and iterators.
 
 #### Compatibility with java.io
 
-A @apidoc[ByteStringBuilder](akka.util.ByteStringBuilder) can be wrapped in a @javadoc[java.io.OutputStream](java.io.OutputStream) via the @apidoc[asOutputStream](akka.util.ByteStringBuilder) {scala="#asOutputStream:java.io.OutputStream" java="#asOutputStream()"} method. Likewise, @apidoc[ByteIterator](akka.util.ByteIterator) can be wrapped in a @javadoc[java.io.InputStream](java.io.InputStream) via @apidoc[asInputStream](akka.util.ByteIterator) {scala="#asInputStream:java.io.InputStream" java="#asInputStream()"}. Using these, `akka.io` applications can integrate legacy code based on `java.io` streams.
+A @apidoc[ByteStringBuilder](util.ByteStringBuilder) can be wrapped in a @javadoc[java.io.OutputStream](java.io.OutputStream) via the @apidoc[asOutputStream](util.ByteStringBuilder) {scala="#asOutputStream:java.io.OutputStream" java="#asOutputStream()"} method. Likewise, @apidoc[ByteIterator](util.ByteIterator) can be wrapped in a @javadoc[java.io.InputStream](java.io.InputStream) via @apidoc[asInputStream](util.ByteIterator) {scala="#asInputStream:java.io.InputStream" java="#asInputStream()"}. Using these, `akka.io` applications can integrate legacy code based on `java.io` streams.
 
 ## Architecture in-depth
 
diff --git a/akka-docs/src/main/paradox/logging.md b/akka-docs/src/main/paradox/logging.md
index 49d0198774..cf04e4a1fb 100644
--- a/akka-docs/src/main/paradox/logging.md
+++ b/akka-docs/src/main/paradox/logging.md
@@ -45,15 +45,15 @@ Java
 For convenience, you can mix in the `log` member into actors, instead of defining it as above.
 
 ```scala
-class MyActor extends Actor with akka.actor.ActorLogging {
+class MyActor extends Actor with org.apache.pekko.actor.ActorLogging {
   ...
 }
 ```
 
 @@@
 
-The first parameter to @scala[@scaladoc[Logging](akka.event.Logging$#apply[T](bus:akka.event.LoggingBus,logSource:T)(implicitevidence$5:akka.event.LogSource[T]):akka.event.LoggingAdapter)] @java[@javadoc[Logging.getLogger](akka.event.Logging#getLogger(akka.event.LoggingBus,java.lang.Object))] could also be any
-@apidoc[LoggingBus], specifically @scala[@scaladoc[system.eventStream](akka.actor.ActorSystem#eventStream:akka.event.EventStream)] @java[@javadoc[system.getEventStream()](akka.actor.ActorSystem#getEventStream())]. 
+The first parameter to @scala[@scaladoc[Logging](pekko.event.Logging$#apply[T](bus:org.apache.pekko.event.LoggingBus,logSource:T)(implicitevidence$5:org.apache.pekko.event.LogSource[T]):org.apache.pekko.event.LoggingAdapter)] @java[@javadoc[Logging.getLogger](pekko.event.Logging#getLogger(org.apache.pekko.event.LoggingBus,java.lang.Object))] could also be any
+@apidoc[LoggingBus], specifically @scala[@scaladoc[system.eventStream](pekko.actor.ActorSystem#eventStream:org.apache.pekko.event.EventStream)] @java[@javadoc[system.getEventStream()](pekko.actor.ActorSystem#getEventStream())]. 
 In the demonstrated case, the actor system's address is included in the `akkaSource`
 representation of the log source (see @ref:[Logging Thread, Akka Source and Actor System in MDC](#logging-thread-akka-source-and-actor-system-in-mdc)),
 while in the second case this is not automatically done.
@@ -64,7 +64,7 @@ The source object is translated to a String according to the following rules:
  * in case of a String it is used as is
  * in case of a Class an approximation of its `simpleName` is used
  * in all other cases @scala[a compile error occurs unless an implicit
-@scaladoc[LogSource[T]](akka.event.LogSource) is in scope for the type in question] @java[the `simpleName` of its class] is used
+@scaladoc[LogSource[T]](pekko.event.LogSource) is in scope for the type in question] @java[the `simpleName` of its class] is used
 
 The log message may contain argument placeholders `{}`, which will be
 substituted if the log level is enabled. Compared to constructing a full string
@@ -81,8 +81,8 @@ Java
 :   @@snip [LoggingDocTest.java](/akka-docs/src/test/java/jdocs/event/LoggingDocTest.java) { #array }
 
 The Java @javadoc[Class](java.lang.Class) of the log source is also included in the generated
-@apidoc[akka.event.Logging.LogEvent]. In case of a simple string this is replaced with a “marker”
-class @apidoc[akka.event.DummyClassForStringSources] in order to allow special
+@apidoc[event.Logging.LogEvent]. In case of a simple string this is replaced with a “marker”
+class @apidoc[event.DummyClassForStringSources] in order to allow special
 treatment of this case, e.g. in the SLF4J event listener which will then use
 the string instead of the class’ name for looking up the logger instance to
 use.
@@ -132,7 +132,7 @@ akka {
 @@@ div { .group-scala }
 
 If you want very detailed logging of user-level messages then wrap your actors' behaviors with
-@scaladoc[LoggingReceive](akka.event.LoggingReceive) and enable the `receive` option:
+@scaladoc[LoggingReceive](pekko.event.LoggingReceive) and enable the `receive` option:
 
 ```ruby
 akka {
@@ -244,16 +244,16 @@ Also see the @ref:[logging options for TestKit](testing.md#actor-logging).
 ### Translating Log Source to String and Class
 
 The rules for translating the source object to the source string and class
-which are inserted into the @scaladoc[LogEvent](akka.event.Logging.LogEvent) during runtime are implemented
+which are inserted into the @scaladoc[LogEvent](pekko.event.Logging.LogEvent) during runtime are implemented
 using implicit parameters and thus fully customizable: create your own
-instance of @scaladoc[LogSource[T]](akka.event.LogSource) and have it in scope when creating the
+instance of @scaladoc[LogSource[T]](pekko.event.LogSource) and have it in scope when creating the
 logger.
 
 @@snip [LoggingDocSpec.scala](/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala) { #my-source }
 
 This example creates a log source which mimics traditional usage of Java
 loggers, which are based upon the originating object’s class name as log
-category. The override of @scaladoc[getClazz](akka.event.LogSource#getClazz(t:T):Class[_]) is only included for demonstration
+category. The override of @scaladoc[getClazz](pekko.event.LogSource#getClazz(t:T):Class[_]) is only included for demonstration
 purposes as it contains exactly the default behavior.
 
 @@@
@@ -262,8 +262,8 @@ purposes as it contains exactly the default behavior.
 
 You may also create the string representation up front and pass that in as
 the log source, but be aware that then the `Class[_]` which will be
-put in the @scaladoc[LogEvent](akka.event.Logging.LogEvent) is
-@scaladoc[akka.event.DummyClassForStringSources](akka.event.DummyClassForStringSources).
+put in the @scaladoc[LogEvent](pekko.event.Logging.LogEvent) is
+@scaladoc[event.DummyClassForStringSources](pekko.event.DummyClassForStringSources).
 
 The SLF4J event listener treats this case specially (using the actual string
 to look up the logger instance to use instead of the class’ name), and you
@@ -307,9 +307,9 @@ configuration property.
 
 ```ruby
 akka {
-  # Loggers to register at boot time (akka.event.Logging$DefaultLogger logs
+  # Loggers to register at boot time (org.apache.pekko.event.Logging$DefaultLogger logs
   # to STDOUT)
-  loggers = ["akka.event.Logging$DefaultLogger"]
+  loggers = ["org.apache.pekko.event.Logging$DefaultLogger"]
   # Options: OFF, ERROR, WARNING, INFO, DEBUG
   loglevel = "DEBUG"
 }
@@ -362,7 +362,7 @@ It has a single dependency: the slf4j-api jar. In your runtime, you also need a
 You need to enable the Slf4jLogger in the `loggers` element in
 the @ref:[configuration](general/configuration.md). Here you can also define the log level of the event bus.
 More fine grained log levels can be defined in the configuration of the SLF4J backend
-(e.g. logback.xml). You should also define @apidoc[akka.event.slf4j.Slf4jLoggingFilter] in
+(e.g. logback.xml). You should also define @apidoc[event.slf4j.Slf4jLoggingFilter] in
 the `logging-filter` configuration property. It will filter the log events using the backend
 configuration (e.g. logback.xml) before they are published to the event bus.
 
@@ -379,9 +379,9 @@ without any significant overhead, also for production.
 
 ```ruby
 akka {
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
+  loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"]
   loglevel = "DEBUG"
-  logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+  logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
 }
 ```
 
@@ -396,7 +396,7 @@ the first case and @scala[@javadoc[LoggerFactory.getLogger(s: String)](org.slf4j
 @@@ note
 
 Beware that the actor system’s name is appended to a @javadoc[String](java.lang.String) log
-source if the LoggingAdapter was created giving an @apidoc[akka.actor.ActorSystem] to
+source if the LoggingAdapter was created giving an @apidoc[actor.ActorSystem] to
 the factory. If this is not intended, give a @apidoc[LoggingBus] instead as
 shown below:
 
@@ -429,7 +429,7 @@ Logback has flexible configuration options and details can be found in the
 
 One part that is important to highlight is the importance of configuring an [AsyncAppender](https://logback.qos.ch/manual/appenders.html#AsyncAppender),
 because it offloads rendering of logging events to a background thread, increasing performance. It doesn't block
-the threads of the @apidoc[akka.actor.ActorSystem] while the underlying infrastructure writes the log messages to disk or other configured
+the threads of the @apidoc[actor.ActorSystem] while the underlying infrastructure writes the log messages to disk or other configured
 destination. It also contains a feature which will drop `INFO` and `DEBUG` messages if the logging
 load is high.
 
@@ -499,7 +499,7 @@ If you want to more accurately output the timestamp, use the MDC attribute `akka
 One useful feature available in Slf4j is [MDC](https://logback.qos.ch/manual/mdc.html),
 Akka has a way to let the application specify custom values, for this you need to use a
 specialized @apidoc[LoggingAdapter], the @apidoc[DiagnosticLoggingAdapter]. In order to
-get it you can use the factory, providing an @scala[@scaladoc[Actor](akka.actor.Actor)] @java[@javadoc[AbstractActor](akka.actor.AbstractActor)] as logSource:
+get it you can use the factory, providing an @scala[@scaladoc[Actor](pekko.actor.Actor)] @java[@javadoc[AbstractActor](pekko.actor.AbstractActor)] as logSource:
 
 Scala
 :   ```scala
@@ -534,7 +534,7 @@ Java
 @@@ div { .group-scala }
 
 For convenience, you can mix in the `log` member into actors, instead of defining it as above.
-This trait also lets you override @scaladoc[mdc(msg: Any)](akka.actor.DiagnosticActorLogging#mdc(currentMessage:Any):akka.event.Logging.MDC) for specifying MDC values
+This trait also lets you override @scaladoc[mdc(msg: Any)](pekko.actor.DiagnosticActorLogging#mdc(currentMessage:Any):org.apache.pekko.event.Logging.MDC) for specifying MDC values
 depending on current message and lets you forget about the cleanup as well, since it already does it for you.
 
 @@snip [LoggingDocSpec.scala](/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala) { #mdc-actor }
@@ -568,18 +568,18 @@ These are used to filter out rare and special events, for example you might want
 some malicious activity and mark them with a `SECURITY` tag, and in your appender configuration make these
 trigger emails and other notifications immediately.
 
-Markers are available through the LoggingAdapters, when obtained via @apidoc[Logging.withMarker](akka.event.Logging$) {scala="#withMarker(logSource:akka.actor.Actor):akka.event.DiagnosticMarkerBusLoggingAdapter" java="#withMarker(akka.actor.Actor)"}.
-The first argument passed into all log calls then should be a @apidpc[akka.event.LogMarker].
+Markers are available through the LoggingAdapters, when obtained via @apidoc[Logging.withMarker](event.Logging$) {scala="#withMarker(logSource:org.apache.pekko.actor.Actor):org.apache.pekko.event.DiagnosticMarkerBusLoggingAdapter" java="#withMarker(org.apache.pekko.actor.Actor)"}.
+The first argument passed into all log calls then should be a @apidoc[event.LogMarker].
 
 The slf4j bridge provided by Akka in `akka-slf4j` will automatically pick up this marker value and make it available to SLF4J.
 
 Akka is logging some events with markers. Some of these events also include structured MDC properties. 
 
 * The "SECURITY" marker is used for highlighting security related events or incidents.
-* Akka Actor is using the markers defined in @apidoc[akka.actor.ActorLogMarker$].
-* Akka Cluster is using the markers defined in @apidoc[akka.cluster.ClusterLogMarker$].
-* Akka Remoting is using the markers defined in @apidoc[akka.remote.RemoteLogMarker$].
-* Akka Cluster Sharding is using the markers defined in @apidoc[akka.cluster.sharding.ShardingLogMarker$].
+* Akka Actor is using the markers defined in @apidoc[actor.ActorLogMarker$].
+* Akka Cluster is using the markers defined in @apidoc[cluster.ClusterLogMarker$].
+* Akka Remoting is using the markers defined in @apidoc[remote.RemoteLogMarker$].
+* Akka Cluster Sharding is using the markers defined in @apidoc[cluster.sharding.ShardingLogMarker$].
 
 Markers and MDC properties are automatically picked up by the [Logstash Logback encoder](https://github.com/logstash/logstash-logback-encoder).
 
diff --git a/akka-docs/src/main/paradox/mailboxes.md b/akka-docs/src/main/paradox/mailboxes.md
index a36fd4e3e6..3e8dcf641f 100644
--- a/akka-docs/src/main/paradox/mailboxes.md
+++ b/akka-docs/src/main/paradox/mailboxes.md
@@ -18,7 +18,7 @@ To use Mailboxes, you must add the following dependency in your project:
 
 ## Introduction
 
-An Akka `Mailbox` holds the messages that are destined for an @apidoc[akka.actor.Actor].
+An Akka `Mailbox` holds the messages that are destined for an @apidoc[actor.Actor].
 Normally each `Actor` has its own mailbox, but with for example a @apidoc[BalancingPool]
 all routees will share a single mailbox instance.
 
@@ -39,7 +39,7 @@ Configuration of `SingleConsumerOnlyUnboundedMailbox` as default mailbox:
 
 ```
 akka.actor.default-mailbox {
-  mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+  mailbox-type = "org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox"
 }
 ```
 
@@ -96,7 +96,7 @@ dispatcher which will execute it. Then the mailbox is determined as follows:
 
  1. If the actor's deployment configuration section contains a `mailbox` key,
 this refers to a configuration section describing the mailbox type.
- 2. If the actor's @apidoc[Props](akka.actor.Props) contains a mailbox selection then that names a configuration section describing the
+ 2. If the actor's @apidoc[Props](actor.Props) contains a mailbox selection then that names a configuration section describing the
 mailbox type to be used. This needs to be an absolute config path,
 for example `myapp.special-mailbox`, and is not nested inside the `akka` namespace.
  3. If the dispatcher's configuration section contains a `mailbox-type` key
@@ -166,7 +166,7 @@ It can be configured like this:
 
 @@snip [DispatcherDocSpec.scala](/akka-docs/src/test/scala/docs/dispatcher/DispatcherDocSpec.scala) { #control-aware-mailbox-config }
 
-Control messages need to extend the @apidoc[akka.dispatch.ControlMessage] @scala[trait]@java[interface]:
+Control messages need to extend the @apidoc[dispatch.ControlMessage] @scala[trait]@java[interface]:
 
 Scala
 :   @@snip [DispatcherDocSpec.scala](/akka-docs/src/test/scala/docs/dispatcher/DispatcherDocSpec.scala) { #control-aware-mailbox-messages }
@@ -184,13 +184,13 @@ Java
 
 ## Special Semantics of `system.actorOf`
 
-In order to make @apidoc[system.actorOf](akka.actor.ActorRefFactory) {scala="#actorOf(props:akka.actor.Props):akka.actor.ActorRef" java="#actorOf(akka.actor.Props)"} both synchronous and non-blocking while
-keeping the return type @apidoc[akka.actor.ActorRef] (and the semantics that the returned
+In order to make @apidoc[system.actorOf](actor.ActorRefFactory) {scala="#actorOf(props:org.apache.pekko.actor.Props):org.apache.pekko.actor.ActorRef" java="#actorOf(org.apache.pekko.actor.Props)"} both synchronous and non-blocking while
+keeping the return type @apidoc[actor.ActorRef] (and the semantics that the returned
 ref is fully functional), special handling takes place for this case. Behind
 the scenes, a hollow kind of actor reference is constructed, which is sent to
 the system’s guardian actor who actually creates the actor and its context and
 puts those inside the reference. Until that has happened, messages sent to the
-@apidoc[akka.actor.ActorRef] will be queued locally, and only upon swapping the real
+@apidoc[actor.ActorRef] will be queued locally, and only upon swapping the real
 filling in will they be transferred into the real mailbox. Thus,
 
 Scala
@@ -214,4 +214,4 @@ Java
     @@@
 
 will probably fail; you will have to allow for some time to pass and retry the
-check à la @scala[@scaladoc[TestKit.awaitCond](akka.testkit.TestKit#awaitCond(p:=%3EBoolean,max:scala.concurrent.duration.Duration,interval:scala.concurrent.duration.Duration,message:String):Unit)]@java[@javadoc[TestKit.awaitCond](akka.testkit.javadsl.TestKit#awaitCond(java.time.Duration,java.time.Duration,java.lang.String,java.util.function.Supplier))].
+check à la @scala[@scaladoc[TestKit.awaitCond](pekko.testkit.TestKit#awaitCond(p:=%3EBoolean,max:scala.concurrent.duration.Duration,interval:scala.concurrent.duration.Duration,message:String):Unit)]@java[@javadoc[TestKit.awaitCond](pekko.testkit.javadsl.TestKit#awaitCond(java.time.Duration,java.time.Duration,java.lang.String,java.util.function.Supplier))].
diff --git a/akka-docs/src/main/paradox/multi-jvm-testing.md b/akka-docs/src/main/paradox/multi-jvm-testing.md
index 09dd1b20e9..5748f2fe84 100644
--- a/akka-docs/src/main/paradox/multi-jvm-testing.md
+++ b/akka-docs/src/main/paradox/multi-jvm-testing.md
@@ -53,7 +53,7 @@ multi-jvm:test
 To run individual tests use `testOnly`:
 
 ```none
-multi-jvm:testOnly akka.remote.RandomRoutedRemoteActor
+multi-jvm:testOnly org.apache.pekko.remote.RandomRoutedRemoteActor
 ```
 
 More than one test name can be listed to run multiple specific
@@ -63,7 +63,7 @@ It's also possible to specify JVM options with `testOnly` by including those
 options after the test names and `--`. For example:
 
 ```none
-multi-jvm:testOnly akka.remote.RandomRoutedRemoteActor -- -Dsome.option=something
+multi-jvm:testOnly org.apache.pekko.remote.RandomRoutedRemoteActor -- -Dsome.option=something
 ```
 
 ## Creating application tests
diff --git a/akka-docs/src/main/paradox/multi-node-testing.md b/akka-docs/src/main/paradox/multi-node-testing.md
index e9beb91c45..2fe5db09d9 100644
--- a/akka-docs/src/main/paradox/multi-node-testing.md
+++ b/akka-docs/src/main/paradox/multi-node-testing.md
@@ -46,14 +46,14 @@ This is a schematic overview of the test conductor.
 
 The test conductor server is responsible for coordinating barriers and sending commands to the test conductor
 clients that act upon them, e.g. throttling network traffic to/from another client. More information on the
-possible operations is available in the @apidoc[akka.remote.testconductor.Conductor](Conductor) API documentation.
+possible operations is available in the @apidoc[remote.testconductor.Conductor](Conductor) API documentation.
 
 ## The Multi Node Spec
 
 The Multi Node Spec consists of two parts. The @apidoc[MultiNodeConfig] that is responsible for common
 configuration and enumerating and naming the nodes under test. The `MultiNodeSpec` that contains a number
 of convenience functions for making the test nodes interact with each other. More information on the possible
-operations is available in the @apidoc[akka.remote.testkit.MultiNodeSpec](MultiNodeSpec) API documentation.
+operations is available in the @apidoc[remote.testkit.MultiNodeSpec](MultiNodeSpec) API documentation.
 
 The setup of the `MultiNodeSpec` is configured through java system properties that you set on all JVMs that's going to run a
 node under test. These can be set on the JVM command line with `-Dproperty=value`.
@@ -172,17 +172,17 @@ complete the test names.
 First we need some scaffolding to hook up the @apidoc[MultiNodeSpec] with your favorite test framework. Lets define a trait
 `STMultiNodeSpec` that uses ScalaTest to start and stop `MultiNodeSpec`.
 
-@@snip [STMultiNodeSpec.scala](/akka-remote-tests/src/test/scala/akka/remote/testkit/STMultiNodeSpec.scala) { #example }
+@@snip [STMultiNodeSpec.scala](/akka-remote-tests/src/test/scala/org/apache/pekko/remote/testkit/STMultiNodeSpec.scala) { #example }
 
 Then we need to define a configuration. Lets use two nodes `"node1` and `"node2"` and call it
 `MultiNodeSampleConfig`.
 
-@@snip [MultiNodeSample.scala](/akka-remote-tests/src/multi-jvm/scala/akka/remote/sample/MultiNodeSample.scala) { #package #config }
+@@snip [MultiNodeSample.scala](/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/sample/MultiNodeSample.scala) { #package #config }
 
 And then finally to the node test code. That starts the two nodes, and demonstrates a barrier, and a remote actor
 message send/receive.
 
-@@snip [MultiNodeSample.scala](/akka-remote-tests/src/multi-jvm/scala/akka/remote/sample/MultiNodeSample.scala) { #package #spec }
+@@snip [MultiNodeSample.scala](/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/sample/MultiNodeSample.scala) { #package #spec }
 
 ## Things to Keep in Mind
 
@@ -191,7 +191,7 @@ surprising ways.
 
  * Don't issue a shutdown of the first node. The first node is the controller and if it shuts down your test will break.
  * To be able to use `blackhole`, `passThrough`, and `throttle` you must activate the failure injector and
-throttler transport adapters by specifying @scala[@scaladoc[testTransport(on = true)](akka.remote.testkit.MultiNodeConfig#testTransport(on:Boolean):Unit)]@java[@javadoc[testTransport(true)](akka.remote.testkit.MultiNodeConfig#testTransport(boolean))] in your `MultiNodeConfig`.
+throttler transport adapters by specifying @scala[@scaladoc[testTransport(on = true)](pekko.remote.testkit.MultiNodeConfig#testTransport(on:Boolean):Unit)]@java[@javadoc[testTransport(true)](pekko.remote.testkit.MultiNodeConfig#testTransport(boolean))] in your `MultiNodeConfig`.
  * Throttling, shutdown and other failure injections can only be done from the first node, which again is the controller.
  * Don't ask for the address of a node using `node(address)` after the node has been shut down. Grab the address before
 shutting down the node.
diff --git a/akka-docs/src/main/paradox/persistence-fsm.md b/akka-docs/src/main/paradox/persistence-fsm.md
index facd859b13..79dbd0ed37 100644
--- a/akka-docs/src/main/paradox/persistence-fsm.md
+++ b/akka-docs/src/main/paradox/persistence-fsm.md
@@ -32,10 +32,10 @@ To demonstrate the features of the @scala[`PersistentFSM` trait]@java[`AbstractP
 The contract of our "WebStoreCustomerFSMActor" is that it accepts the following commands:
 
 Scala
-:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala) { #customer-commands }
+:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala) { #customer-commands }
 
 Java
-:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-commands }
+:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-commands }
 
 `AddItem` sent when the customer adds an item to a shopping cart
 `Buy` - when the customer finishes the purchase
@@ -45,10 +45,10 @@ Java
 The customer can be in one of the following states:
 
 Scala
-:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala) { #customer-states }
+:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala) { #customer-states }
 
 Java
-:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-states }
+:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-states }
 
 `LookingAround` customer is browsing the site, but hasn't added anything to the shopping cart
 `Shopping` customer has recently added items to the shopping cart
@@ -67,26 +67,26 @@ Customer's actions are "recorded" as a sequence of "domain events" which are per
 start in order to restore the latest customer's state:
 
 Scala
-:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala) { #customer-domain-events }
+:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala) { #customer-domain-events }
 
 Java
-:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-domain-events }
+:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-domain-events }
 
 Customer state data represents the items in a customer's shopping cart:
 
 Scala
-:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala) { #customer-states-data }
+:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala) { #customer-states-data }
 
 Java
-:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-states-data }
+:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-states-data }
 
 Here is how everything is wired together:
 
 Scala
-:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala) { #customer-fsm-body }
+:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala) { #customer-fsm-body }
 
 Java
-:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-fsm-body }
+:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-fsm-body }
 
 @@@ note
 
@@ -96,27 +96,27 @@ Override the `applyEvent` method to define how state data is affected by domain
 @@@
 
 Scala
-:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala) { #customer-apply-event }
+:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala) { #customer-apply-event }
 
 Java
-:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-apply-event }
+:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-apply-event }
 
 `andThen` can be used to define actions which will be executed following event's persistence - convenient for "side effects" like sending a message or logging.
 Notice that actions defined in `andThen` block are not executed on recovery:
 
 Scala
-:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala) { #customer-andthen-example }
+:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala) { #customer-andthen-example }
 
 Java
-:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-andthen-example }
+:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-andthen-example }
 
 A snapshot of state data can be persisted by calling the `saveStateSnapshot()` method:
 
 Scala
-:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala) { #customer-snapshot-example }
+:  @@snip [PersistentFSMSpec.scala](/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala) { #customer-snapshot-example }
 
 Java
-:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-snapshot-example }
+:  @@snip [AbstractPersistentFSMTest.java](/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java) { #customer-snapshot-example }
 
 On recovery state data is initialized according to the latest available snapshot, then the remaining domain events are replayed, triggering the
 `applyEvent` method.
@@ -132,38 +132,38 @@ Before reading the migration guide it is advised to understand @ref:[Persistence
 
 ### Migration steps
 
-1. Modify or create new commands to include `replyTo` @apidoc[akka.actor.typed.ActorRef]
+1. Modify or create new commands to include `replyTo` @apidoc[actor.typed.ActorRef]
 1. Typically persisted events will remain the same
 1. Create an `EventSourcedBehavior` that mimics the old `PersistentFSM`
 1. Replace any state timeouts with `Behaviors.withTimers` either hard coded or stored in the state
-1. Add an @apidoc[akka.persistence.typed.EventAdapter] to convert state transition events added by `PersistentFSM` into private events or filter them
-1. If snapshots are used add a @apidoc[akka.persistence.typed.SnapshotAdapter] to convert PersistentFSM snapshots into the `EventSourcedBehavior`s `State`
+1. Add an @apidoc[persistence.typed.EventAdapter] to convert state transition events added by `PersistentFSM` into private events or filter them
+1. If snapshots are used add a @apidoc[persistence.typed.SnapshotAdapter] to convert PersistentFSM snapshots into the `EventSourcedBehavior`s `State`
 
 The following is the shopping cart example above converted to an `EventSourcedBehavior`. 
 
 The new commands, note the replyTo field for getting the current cart.
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #commands }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #commands }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #commands }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #commands }
 
 The states of the FSM are represented using the `EventSourcedBehavior`'s state parameter along with the event and command handlers. Here are the states:
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #state }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #state }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #state }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #state }
 
 The command handler has a separate section for each of the PersistentFSM's states: 
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #command-handler }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #command-handler }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #command-handler }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #command-handler }
 
 Note that there is no explicit support for state timeout as with PersistentFSM but the same behavior can be achieved
 using `Behaviors.withTimers`. If the timer is the same for all events then it can be hard coded, otherwise the
@@ -172,34 +172,34 @@ constructing a `SnapshotAdapter`. This can be added to an internal event and the
 must also be taken to restart timers on recovery in the signal handler:
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #signal-handler }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #signal-handler }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #signal-handler }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #signal-handler }
 
 Then the event handler:
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #event-handler }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #event-handler }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #event-handler }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #event-handler }
 
 The last step is the adapters that will allow the new @apidoc[EventSourcedBehavior] to read the old data:
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #event-adapter }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #event-adapter }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #event-adapter }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #event-adapter }
 
 The snapshot adapter needs to adapt an internal type of PersistentFSM so a helper function is provided to build the @apidoc[SnapshotAdapter]:
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #snapshot-adapter }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #snapshot-adapter }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #snapshot-adapter }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #snapshot-adapter }
 
 That concludes all the steps to allow an @apidoc[EventSourcedBehavior] to read a `PersistentFSM`'s data. Once the new code has been running
 you can not roll back as the PersistentFSM will not be able to read data written by Persistence Typed. 
diff --git a/akka-docs/src/main/paradox/persistence-journals.md b/akka-docs/src/main/paradox/persistence-journals.md
index 9fedcfe426..a6840bfe01 100644
--- a/akka-docs/src/main/paradox/persistence-journals.md
+++ b/akka-docs/src/main/paradox/persistence-journals.md
@@ -20,10 +20,10 @@ A journal plugin extends `AsyncWriteJournal`.
 `AsyncWriteJournal` is an actor and the methods to be implemented are:
 
 Scala
-:  @@snip [AsyncWriteJournal.scala](/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala) { #journal-plugin-api }
+:  @@snip [AsyncWriteJournal.scala](/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteJournal.scala) { #journal-plugin-api }
 
 Java
-:  @@snip [AsyncWritePlugin.java](/akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncWritePlugin.java) { #async-write-plugin-api }
+:  @@snip [AsyncWritePlugin.java](/akka-persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncWritePlugin.java) { #async-write-plugin-api }
 
 If the storage backend API only supports synchronous, blocking writes, the methods should be implemented as:
 
@@ -36,10 +36,10 @@ Java
 A journal plugin must also implement the methods defined in `AsyncRecovery` for replays and sequence number recovery:
 
 Scala
-:  @@snip [AsyncRecovery.scala](/akka-persistence/src/main/scala/akka/persistence/journal/AsyncRecovery.scala) { #journal-plugin-api }
+:  @@snip [AsyncRecovery.scala](/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncRecovery.scala) { #journal-plugin-api }
 
 Java
-:  @@snip [AsyncRecoveryPlugin.java](/akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncRecoveryPlugin.java) { #async-replay-plugin-api }
+:  @@snip [AsyncRecoveryPlugin.java](/akka-persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncRecoveryPlugin.java) { #async-replay-plugin-api }
 
 A journal plugin can be activated with the following minimal configuration:
 
@@ -68,10 +68,10 @@ Don't run journal tasks/futures on the system default dispatcher, since that mig
 A snapshot store plugin must extend the `SnapshotStore` actor and implement the following methods:
 
 Scala
-:  @@snip [SnapshotStore.scala](/akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala) { #snapshot-store-plugin-api }
+:  @@snip [SnapshotStore.scala](/akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStore.scala) { #snapshot-store-plugin-api }
 
 Java
-:  @@snip [SnapshotStorePlugin.java](/akka-persistence/src/main/java/akka/persistence/snapshot/japi/SnapshotStorePlugin.java) { #snapshot-store-plugin-api }
+:  @@snip [SnapshotStorePlugin.java](/akka-persistence/src/main/java/org/apache/pekko/persistence/snapshot/japi/SnapshotStorePlugin.java) { #snapshot-store-plugin-api }
 
 A snapshot store plugin can be activated with the following minimal configuration:
 
diff --git a/akka-docs/src/main/paradox/persistence-plugins.md b/akka-docs/src/main/paradox/persistence-plugins.md
index 8e5a63adc8..3b0642ad68 100644
--- a/akka-docs/src/main/paradox/persistence-plugins.md
+++ b/akka-docs/src/main/paradox/persistence-plugins.md
@@ -32,7 +32,7 @@ However, these entries are provided as empty "", and require explicit user confi
 ## Eager initialization of persistence plugin
 
 By default, persistence plugins are started on-demand, as they are used. In some case, however, it might be beneficial
-to start a certain plugin eagerly. In order to do that, you should first add `akka.persistence.Persistence`
+to start a certain plugin eagerly. In order to do that, you should first add `org.apache.pekko.persistence.Persistence`
 under the `akka.extensions` key. Then, specify the IDs of plugins you wish to start automatically under
 `akka.persistence.journal.auto-start-journals` and `akka.persistence.snapshot-store.auto-start-snapshot-stores`.
 
@@ -41,18 +41,18 @@ For example, if you want eager initialization for the leveldb journal plugin and
 ```
 akka {
 
-  extensions = [akka.persistence.Persistence]
+  extensions = [org.apache.pekko.persistence.Persistence]
 
   persistence {
 
     journal {
       plugin = "akka.persistence.journal.leveldb"
-      auto-start-journals = ["akka.persistence.journal.leveldb"]
+      auto-start-journals = ["org.apache.pekko.persistence.journal.leveldb"]
     }
 
     snapshot-store {
       plugin = "akka.persistence.snapshot-store.local"
-      auto-start-snapshot-stores = ["akka.persistence.snapshot-store.local"]
+      auto-start-snapshot-stores = ["org.apache.pekko.persistence.snapshot-store.local"]
     }
 
   }
diff --git a/akka-docs/src/main/paradox/persistence-query-leveldb.md b/akka-docs/src/main/paradox/persistence-query-leveldb.md
index 8a0f3cb457..6fe929771b 100644
--- a/akka-docs/src/main/paradox/persistence-query-leveldb.md
+++ b/akka-docs/src/main/paradox/persistence-query-leveldb.md
@@ -25,7 +25,7 @@ Note that implementations for other journals may have different semantics.
 
 ## How to get the ReadJournal
 
-The `ReadJournal` is retrieved via the `akka.persistence.query.PersistenceQuery`
+The `ReadJournal` is retrieved via the `org.apache.pekko.persistence.query.PersistenceQuery`
 extension:
 
 Scala
@@ -104,7 +104,7 @@ Scala
 Java
 :  @@snip [LeveldbPersistenceQueryDocTest.java](/akka-docs/src/test/java/jdocs/persistence/query/LeveldbPersistenceQueryDocTest.java) { #EventsByTag }
 
-To tag events you create an @ref:[Event Adapters](persistence.md#event-adapters) that wraps the events in a `akka.persistence.journal.Tagged`
+To tag events you create an @ref:[Event Adapters](persistence.md#event-adapters) that wraps the events in a `org.apache.pekko.persistence.journal.Tagged`
 with the given `tags`.
 
 Scala
diff --git a/akka-docs/src/main/paradox/persistence-query.md b/akka-docs/src/main/paradox/persistence-query.md
index 97486f6750..518de50cc4 100644
--- a/akka-docs/src/main/paradox/persistence-query.md
+++ b/akka-docs/src/main/paradox/persistence-query.md
@@ -63,7 +63,7 @@ Java
 :  @@snip [PersistenceQueryDocTest.java](/akka-docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java) { #basic-usage }
 
 Journal implementers are encouraged to put this identifier in a variable known to the user, such that one can access it via
-@scala[@scaladoc[readJournalFor[NoopJournal](NoopJournal.identifier)](akka.persistence.query.PersistenceQuery#readJournalFor[T%3C:akka.persistence.query.scaladsl.ReadJournal](readJournalPluginId:String):T)]@java[@javadoc[getJournalFor(NoopJournal.class, NoopJournal.identifier)](akka.persistence.query.PersistenceQuery#getReadJournalFor(java.lang.Class,java.lang.String))], however this is not enforced.
+@scala[@scaladoc[readJournalFor[NoopJournal](NoopJournal.identifier)](pekko.persistence.query.PersistenceQuery#readJournalFor[T%3C:org.apache.pekko.persistence.query.scaladsl.ReadJournal](readJournalPluginId:String):T)]@java[@javadoc[getJournalFor(NoopJournal.class, NoopJournal.identifier)](pekko.persistence.query.PersistenceQuery#getReadJournalFor(java.lang.Class,java.lang.String))], however this is not enforced.
 
 Read journal implementations are available as [Community plugins](https://akka.io/community/#plugins-to-akka-persistence-query).
 
@@ -129,15 +129,15 @@ That includes the use case to query all domain events of an Aggregate Root type.
 Please refer to your read journal plugin's documentation to find out if and how it is supported.
 
 Some journals may support @ref:[tagging of events](typed/persistence.md#tagging) or
-@ref:[Event Adapters](persistence.md#event-adapters) that wraps the events in a @apidoc[akka.persistence.journal.Tagged](akka.persistence.journal.Tagged)
+@ref:[Event Adapters](persistence.md#event-adapters) that wraps the events in a @apidoc[persistence.journal.Tagged](persistence.journal.Tagged)
 with the given `tags`. The journal may support other ways of doing tagging - again,
 how exactly this is implemented depends on the used journal. Here is an example of such a tagging with an @apidoc[typed.*.EventSourcedBehavior]:
 
 Scala
-:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #tagging-query }
+:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #tagging-query }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #tagging-query }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #tagging-query }
 
 @@@ note
 
@@ -174,7 +174,7 @@ If your usage does not require a live stream, you can use the @apidoc[currentEve
 Query events for given entity type and slices. A slice is deterministically defined based on the persistence id.
 The purpose is to evenly distribute all persistence ids over the slices.
 
-See @apidoc[akka.persistence.query.typed.*.EventsBySliceQuery] and @apidoc[akka.persistence.query.typed.*.CurrentEventsBySliceQuery]. 
+See @apidoc[persistence.query.typed.*.EventsBySliceQuery] and @apidoc[persistence.query.typed.*.CurrentEventsBySliceQuery]. 
 
 ### Materialized values of queries
 
@@ -288,11 +288,11 @@ their exposed semantics as well as handled query scenarios.
 
 ### ReadJournal plugin API
 
-A read journal plugin must implement @apidoc[akka.persistence.query.ReadJournalProvider](akka.persistence.query.ReadJournalProvider) which
-creates instances of @scaladoc[akka.persistence.query.scaladsl.ReadJournal](akka.persistence.query.scaladsl.ReadJournal) and
-@javadoc[akka.persistence.query.javadsl.ReadJournal](akka.persistence.query.javadsl.ReadJournal). The plugin must implement both the `scaladsl`
-and the `javadsl` @scala[traits]@java[interfaces] because the @scaladoc[akka.stream.scaladsl.Source](akka.stream.scaladsl.Source) and 
-@javadoc[akka.stream.javadsl.Source](akka.stream.javadsl.Source) are different types and even though those types can be converted
+A read journal plugin must implement @apidoc[pekko.query.ReadJournalProvider](persistence.query.ReadJournalProvider) which
+creates instances of @scaladoc[pekko.persistence.query.scaladsl.ReadJournal](pekko.persistence.query.scaladsl.ReadJournal) and
+@javadoc[persistence.query.javadsl.ReadJournal](pekko.persistence.query.javadsl.ReadJournal). The plugin must implement both the `scaladsl`
+and the `javadsl` @scala[traits]@java[interfaces] because the @scaladoc[pekko.stream.scaladsl.Source](pekko.stream.scaladsl.Source) and 
+@javadoc[stream.javadsl.Source](pekko.stream.javadsl.Source) are different types and even though those types can be converted
 to each other it is most convenient for the end user to get access to the Java or Scala `Source` directly.
 As illustrated below one of the implementations can delegate to the other. 
 
diff --git a/akka-docs/src/main/paradox/persistence-schema-evolution.md b/akka-docs/src/main/paradox/persistence-schema-evolution.md
index 9d3d5d1531..6f16cb1356 100644
--- a/akka-docs/src/main/paradox/persistence-schema-evolution.md
+++ b/akka-docs/src/main/paradox/persistence-schema-evolution.md
@@ -52,7 +52,7 @@ differs from how one would go about it in a mutable database setting (e.g. in ty
 
 The system needs to be able to continue to work in the presence of "old" events which were stored under the "old" schema.
 We also want to limit complexity in the business logic layer, exposing a consistent view over all of the events of a given
-type to @scala[@scaladoc[PersistentActor](akka.persistence.PersistentActor)]@java[@javadoc[AbstractPersistentActor](akka.persistence.AbstractPersistentActor)] s and @ref:[persistence queries](persistence-query.md). This allows the business logic layer to focus on solving business problems
+type to @scala[@scaladoc[PersistentActor](pekko.persistence.PersistentActor)]@java[@javadoc[AbstractPersistentActor](pekko.persistence.AbstractPersistentActor)] s and @ref:[persistence queries](persistence-query.md). This allows the business logic layer to focus on solving business problems
 instead of having to explicitly deal with different schemas.
 
 In summary, schema evolution in event sourced systems exposes the following characteristics:
@@ -68,7 +68,7 @@ Before we explain the various techniques that can be used to safely evolve the s
 over time, we first need to define what the actual problem is, and what the typical styles of changes are.
 
 Since events are never deleted, we need to have a way to be able to replay (read) old events, in such way
-that does not force the @scala[@scaladoc[PersistentActor](akka.persistence.PersistentActor)]@java[@javadoc[AbstractPersistentActor](akka.persistence.AbstractPersistentActor)] to be aware of all possible versions of an event that it may have
+that does not force the @scala[@scaladoc[PersistentActor](pekko.persistence.PersistentActor)]@java[@javadoc[AbstractPersistentActor](pekko.persistence.AbstractPersistentActor)] to be aware of all possible versions of an event that it may have
 persisted in the past. Instead, we want the Actors to work on some form of "latest" version of the event and provide some
 means of either converting old "versions" of stored events into this "latest" event type, or constantly evolve the event
 definition - in a backwards compatible way - such that the new deserialization code can still read old events.
@@ -120,7 +120,7 @@ for its own message types such as @apidoc[PersistentRepr], @apidoc[AtomicWrite]
 @@@ note
 
 Serialization is **NOT** handled automatically by Akka Persistence itself. Instead, it only provides the above described
-serializers, and in case a @scala[@scaladoc[AsyncWriteJournal](akka.persistence.journal.AsyncWriteJournal)]@java[@javadoc[AsyncWriteJournal](akka.persistence.journal.japi.AsyncWriteJournal)] plugin implementation chooses to use them directly, the above serialization
+serializers, and in case a @scala[@scaladoc[AsyncWriteJournal](pekko.persistence.journal.AsyncWriteJournal)]@java[@javadoc[AsyncWriteJournal](pekko.persistence.journal.japi.AsyncWriteJournal)] plugin implementation chooses to use them directly, the above serialization
 scheme will be used.
 
 Please refer to your write journal's documentation to learn more about how it handles serialization!
@@ -141,7 +141,7 @@ Akka Persistence provided serializers wrap the user payload in an envelope conta
 be serialized using the user configured serializer, and if none is provided explicitly, Java serialization will be used for it.**
 
 The blue colored regions of the `PersistentMessage` indicate what is serialized using the generated protocol buffers
-serializers, and the yellow payload indicates the user provided event (by calling @scala[@scaladoc[persist(payload)(...)](akka.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist(payload,...)](akka.persistence.AbstractPersistentActorLike#persist(A,akka.japi.Procedure))].
+serializers, and the yellow payload indicates the user provided event (by calling @scala[@scaladoc[persist(payload)(...)](pekko.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist(payload,...)](pekko.persistence.AbstractPersistentActorLike#persist(A,org.apache.pekko.japi.Procedure))].
 As you can see, the `PersistentMessage` acts as an envelope around the payload, adding various fields related to the
 origin of the event (`persistenceId`, `sequenceNr` and more).
 
diff --git a/akka-docs/src/main/paradox/persistence.md b/akka-docs/src/main/paradox/persistence.md
index efd6498b6e..a1bc553610 100644
--- a/akka-docs/src/main/paradox/persistence.md
+++ b/akka-docs/src/main/paradox/persistence.md
@@ -36,13 +36,13 @@ Akka Persistence also provides point-to-point communication with at-least-once m
 
 ### Architecture
 
- * @scala[@scaladoc[PersistentActor](akka.persistence.PersistentActor)]@java[@javadoc[AbstractPersistentActor](akka.persistence.AbstractPersistentActor)]: Is a persistent, stateful actor. It is able to persist events to a journal and can react to
+ * @scala[@scaladoc[PersistentActor](pekko.persistence.PersistentActor)]@java[@javadoc[AbstractPersistentActor](pekko.persistence.AbstractPersistentActor)]: Is a persistent, stateful actor. It is able to persist events to a journal and can react to
 them in a thread-safe manner. It can be used to implement both *command* as well as *event sourced* actors.
 When a persistent actor is started or restarted, journaled messages are replayed to that actor so that it can
 recover its state from these messages.
- * @scala[@scaladoc[AtLeastOnceDelivery](akka.persistence.AtLeastOnceDelivery)]@java[@javadoc[AbstractPersistentActorWithAtLeastOnceDelivery](akka.persistence.AbstractPersistentActorWithAtLeastOnceDelivery)]: To send messages with at-least-once delivery semantics to destinations, also in
+ * @scala[@scaladoc[AtLeastOnceDelivery](pekko.persistence.AtLeastOnceDelivery)]@java[@javadoc[AbstractPersistentActorWithAtLeastOnceDelivery](pekko.persistence.AbstractPersistentActorWithAtLeastOnceDelivery)]: To send messages with at-least-once delivery semantics to destinations, also in
 case of sender and receiver JVM crashes.
- * @scala[@scaladoc[AsyncWriteJournal](akka.persistence.journal.AsyncWriteJournal)]@java[@javadoc[AsyncWriteJournal](akka.persistence.journal.japi.AsyncWriteJournal)]: A journal stores the sequence of messages sent to a persistent actor. An application can control which messages
+ * @scala[@scaladoc[AsyncWriteJournal](pekko.persistence.journal.AsyncWriteJournal)]@java[@javadoc[AsyncWriteJournal](pekko.persistence.journal.japi.AsyncWriteJournal)]: A journal stores the sequence of messages sent to a persistent actor. An application can control which messages
 are journaled and which are received by the persistent actor without being journaled. Journal maintains `highestSequenceNr` that is increased on each message.
 The storage backend of a journal is pluggable. 
 Replicated journals are available as [Community plugins](https://akka.io/community/).
@@ -54,9 +54,9 @@ development of event sourced applications (see section @ref:[Event Sourcing](typ
 
 ## Example
 
-Akka persistence supports Event Sourcing with the @scala[@scaladoc[PersistentActor](akka.persistence.PersistentActor) trait]@java[@javadoc[AbstractPersistentActor](akka.persistence.AbstractPersistentActor) abstract class]. An actor that extends this @scala[trait]@java[class] uses the
-@scala[@scaladoc[persist](akka.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](akka.persistence.AbstractPersistentActorLike#persist(A,akka.japi.Procedure))] method to persist and handle events. The behavior of @scala[a `PersistentActor`]@java[an `AbstractPersistentActor`]
-is defined by implementing @scala[@scaladoc[receiveRecover](akka.persistence.PersistentActor#receiveRecover:Eventsourced.this.Receive)]@java[@javadoc[createReceiveRecover](akka.persistence.AbstractPersistentActorLike#createReceiveRecover())] and @scala[@scaladoc[receiveCommand](akka.persistence.PersistentActor#receiveCommand:Eventsourced.this.Receive)]@java[@javadoc[createReceive](akka.persistence.AbstractPersistentActorLike#createReceive())]. This is demonstrated in the following example.
+Akka persistence supports Event Sourcing with the @scala[@scaladoc[PersistentActor](pekko.persistence.PersistentActor) trait]@java[@javadoc[AbstractPersistentActor](pekko.persistence.AbstractPersistentActor) abstract class]. An actor that extends this @scala[trait]@java[class] uses the
+@scala[@scaladoc[persist](pekko.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](pekko.persistence.AbstractPersistentActorLike#persist(A,org.apache.pekko.japi.Procedure))] method to persist and handle events. The behavior of @scala[a `PersistentActor`]@java[an `AbstractPersistentActor`]
+is defined by implementing @scala[@scaladoc[receiveRecover](pekko.persistence.PersistentActor#receiveRecover:Eventsourced.this.Receive)]@java[@javadoc[createReceiveRecover](pekko.persistence.AbstractPersistentActorLike#createReceiveRecover())] and @scala[@scaladoc[receiveCommand](pekko.persistence.PersistentActor#receiveCommand:Eventsourced.this.Receive)]@java[@javadoc[createReceive](pekko.persistence.AbstractPersistentActorLike#createReceive())]. This is demonstrated in the following example.
 
 Scala
 :  @@snip [PersistentActorExample.scala](/akka-docs/src/test/scala/docs/persistence/PersistentActorExample.scala) { #persistent-actor-example }
@@ -94,9 +94,9 @@ by default) and the actor continues with the next message.
 @@@ note
 
 It's also possible to switch between different command handlers during normal processing and recovery
-with @scala[@scaladoc[context.become()](akka.actor.ActorContext#become(behavior:akka.actor.Actor.Receive):Unit)]@java[@javadoc[getContext().become()](akka.actor.ActorContext#become(scala.PartialFunction))] and @scala[@scaladoc[context.unbecome()](akka.actor.ActorContext#unbecome():Unit)]@java[@javadoc[getContext().unbecome()](akka.actor.ActorContext#unbecome())]. To get the actor into the same state after
+with @scala[@scaladoc[context.become()](pekko.actor.ActorContext#become(behavior:org.apache.pekko.actor.Actor.Receive):Unit)]@java[@javadoc[getContext().become()](pekko.actor.ActorContext#become(scala.PartialFunction))] and @scala[@scaladoc[context.unbecome()](pekko.actor.ActorContext#unbecome():Unit)]@java[@javadoc[getContext().unbecome()](pekko.actor.ActorContext#unbecome())]. To get the actor into the same state after
 recovery you need to take special care to perform the same state transitions with `become` and
-`unbecome` in the @scala[@scaladoc[receiveRecover](akka.persistence.PersistentActor#receiveRecover:Eventsourced.this.Receive)]@java[@javadoc[createReceiveRecover](akka.persistence.AbstractPersistentActorLike#createReceiveRecover())] method as you would have done in the command handler.
+`unbecome` in the @scala[@scaladoc[receiveRecover](pekko.persistence.PersistentActor#receiveRecover:Eventsourced.this.Receive)]@java[@javadoc[createReceiveRecover](pekko.persistence.AbstractPersistentActorLike#createReceiveRecover())] method as you would have done in the command handler.
 Note that when using `become` from @scala[`receiveRecover`]@java[`createReceiveRecover`] it will still only use the @scala[`receiveRecover`]@java[`createReceiveRecover`]
 behavior when replaying the events. When replay is completed it will use the new behavior.
 
@@ -141,17 +141,17 @@ akka.persistence.max-concurrent-recoveries = 50
 
 Accessing the @scala[`sender()`]@java[sender with `getSender()`] for replayed messages will always result in a `deadLetters` reference,
 as the original sender is presumed to be long gone. If you indeed have to notify an actor during
-recovery in the future, store its @apidoc[akka.actor.ActorPath] explicitly in your persisted events.
+recovery in the future, store its @apidoc[actor.ActorPath] explicitly in your persisted events.
 
 @@@
 
 
 #### Recovery customization
 
-Applications may also customise how recovery is performed by returning a customised @apidoc[akka.persistence.Recovery$] object
-in the `recovery` method of a @scala[@scaladoc[PersistentActor](akka.persistence.PersistentActor)]@java[@javadoc[AbstractPersistentActor](akka.persistence.AbstractPersistentActor)],
+Applications may also customise how recovery is performed by returning a customised @apidoc[persistence.Recovery$] object
+in the `recovery` method of a @scala[@scaladoc[PersistentActor](pekko.persistence.PersistentActor)]@java[@javadoc[AbstractPersistentActor](pekko.persistence.AbstractPersistentActor)],
 
-To skip loading snapshots and replay all events you can use @scala[@scaladoc[SnapshotSelectionCriteria.None](akka.persistence.SnapshotSelectionCriteria$#None:akka.persistence.SnapshotSelectionCriteria)]@java[@javadoc[SnapshotSelectionCriteria.none()](akka.persistence.SnapshotSelectionCriteria#none())].
+To skip loading snapshots and replay all events you can use @scala[@scaladoc[SnapshotSelectionCriteria.None](pekko.persistence.SnapshotSelectionCriteria$#None:org.apache.pekko.persistence.SnapshotSelectionCriteria)]@java[@javadoc[SnapshotSelectionCriteria.none()](pekko.persistence.SnapshotSelectionCriteria#none())].
 This can be useful if snapshot serialization format has changed in an incompatible way.
 It should typically not be used when events have been deleted.
 
@@ -192,7 +192,7 @@ Java
 
 Sometimes there is a need for performing additional initialization when the
 recovery has completed before processing any other message sent to the persistent actor.
-The persistent actor will receive a special @apidoc[akka.persistence.RecoveryCompleted$] message right after recovery
+The persistent actor will receive a special @apidoc[persistence.RecoveryCompleted$] message right after recovery
 and before any other received messages.
 
 Scala
@@ -211,8 +211,8 @@ is called (logging the error by default) and the actor will be stopped.
 ### Internal stash
 
 The persistent actor has a private @ref:[stash](actors.md#stash) for internally caching incoming messages during
-[recovery](#recovery) or the @scala[@scaladoc[persist](akka.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](akka.persistence.AbstractPersistentActorLike#persist(A,akka.japi.Procedure))]\@scala[@scaladoc[persistAll](akka.persistence.PersistentActor#persistAll[A](events:Seq[A])(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAll](akka.persistence.AbstractPersistentActorLike#persistAll(java.lang.Iterable,akka.japi.Procedure))] method persisting events. You can still use/inherit from the
-@apidoc[akka.actor.Stash] interface. The internal stash cooperates with the normal stash by hooking into @apidoc[unstashAll](akka.actor.Stash) {scala="#unstashAll():Unit" java="#unstashAll()"}
+[recovery](#recovery) or the @scala[@scaladoc[persist](pekko.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](pekko.persistence.AbstractPersistentActorLike#persist(A,org.apache.pekko.japi.Procedure))]\@scala[@scaladoc[persistAll](pekko.persistence.PersistentActor#persistAll[A](events:Seq[A])(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAll](pekko.persistence.AbstractPersistentActorLike#persistAll(java.lang.Iterable,org.apache.pekko.japi.Procedure))] method persisting events. You can still use/inherit from the
+@apidoc[actor.Stash] interface. The internal stash cooperates with the normal stash by hooking into @apidoc[unstashAll](actor.Stash) {scala="#unstashAll():Unit" java="#unstashAll()"}
 making sure messages are unstashed properly to the internal stash to maintain ordering guarantees.
 
 You should be careful to not send more messages to a persistent actor than it can keep up with, otherwise the number
@@ -227,19 +227,19 @@ Note that the stash capacity is per actor. If you have many persistent actors, e
 you may need to define a small stash capacity to ensure that the total number of stashed messages in the system
 doesn't consume too much memory. Additionally, the persistent actor defines three strategies to handle failure when the
 internal stash capacity is exceeded. The default overflow strategy is the @apidoc[ThrowOverflowExceptionStrategy$], which
-discards the current received message and throws a @apidoc[akka.actor.StashOverflowException], causing actor restart if the default
-supervision strategy is used. You can override the @apidoc[internalStashOverflowStrategy](akka.persistence.PersistenceStash) {scala="#internalStashOverflowStrategy:akka.persistence.StashOverflowStrategy" java="#internalStashOverflowStrategy()"} method to return
+discards the current received message and throws a @apidoc[actor.StashOverflowException], causing actor restart if the default
+supervision strategy is used. You can override the @apidoc[internalStashOverflowStrategy](persistence.PersistenceStash) {scala="#internalStashOverflowStrategy:org.apache.pekko.persistence.StashOverflowStrategy" java="#internalStashOverflowStrategy()"} method to return
 @apidoc[DiscardToDeadLetterStrategy$] or @apidoc[ReplyToStrategy] for any "individual" persistent actor, or define the "default"
 for all persistent actors by providing FQCN, which must be a subclass of @apidoc[StashOverflowStrategyConfigurator], in the
 persistence configuration:
 
 ```
 akka.persistence.internal-stash-overflow-strategy=
-  "akka.persistence.ThrowExceptionConfigurator"
+  "org.apache.pekko.persistence.ThrowExceptionConfigurator"
 ```
 
 The `DiscardToDeadLetterStrategy` strategy also has a pre-packaged companion configurator
-@apidoc[akka.persistence.DiscardConfigurator].
+@apidoc[persistence.DiscardConfigurator].
 
 You can also query the default strategy via the Akka persistence extension singleton:    
 
@@ -268,13 +268,13 @@ be discarded. You can use bounded stash instead of it.
 ### Relaxed local consistency requirements and high throughput use-cases
 
 If faced with relaxed local consistency requirements and high throughput demands sometimes @scala[`PersistentActor`]@java[`AbstractPersistentActor`] and its
-@scala[@scaladoc[persist](akka.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](akka.persistence.AbstractPersistentActorLike#persist(A,akka.japi.Procedure))] may not be enough in terms of consuming incoming Commands at a high rate, because it has to wait until all
+@scala[@scaladoc[persist](pekko.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](pekko.persistence.AbstractPersistentActorLike#persist(A,org.apache.pekko.japi.Procedure))] may not be enough in terms of consuming incoming Commands at a high rate, because it has to wait until all
 Events related to a given Command are processed in order to start processing the next Command. While this abstraction is
 very useful for most cases, sometimes you may be faced with relaxed requirements about consistency – for example you may
 want to process commands as fast as you can, assuming that the Event will eventually be persisted and handled properly in
 the background, retroactively reacting to persistence failures if needed.
 
-The @scala[@scaladoc[persistAsync](akka.persistence.PersistentActor#persistAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAsync](akka.persistence.AbstractPersistentActorLike#persistAsync(A,akka.japi.Procedure))] method provides a tool for implementing high-throughput persistent actors. It will *not*
+The @scala[@scaladoc[persistAsync](pekko.persistence.PersistentActor#persistAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAsync](pekko.persistence.AbstractPersistentActorLike#persistAsync(A,org.apache.pekko.japi.Procedure))] method provides a tool for implementing high-throughput persistent actors. It will *not*
 stash incoming Commands while the Journal is still working on persisting and/or user code is executing event callbacks.
 
 In the below example, the event callbacks may be called "at any time", even after the next Command has been processed.
@@ -303,9 +303,9 @@ The callback will not be invoked if the actor is restarted (or stopped) in betwe
 
 ### Deferring actions until preceding persist handlers have executed
 
-Sometimes when working with @scala[@scaladoc[persistAsync](akka.persistence.PersistentActor#persistAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAsync](akka.persistence.AbstractPersistentActorLike#persistAsync(A,akka.japi.Procedure))] or @scala[@scaladoc[persist](akka.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](akka.persistence.AbstractPersistentActorLike#persist(A,akka.japi.Procedure))] you may find that it would be nice to define some actions in terms of
+Sometimes when working with @scala[@scaladoc[persistAsync](pekko.persistence.PersistentActor#persistAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAsync](pekko.persistence.AbstractPersistentActorLike#persistAsync(A,org.apache.pekko.japi.Procedure))] or @scala[@scaladoc[persist](pekko.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](pekko.persistence.AbstractPersistentActorLike#persist(A,org.apache.pekko.japi.Procedure))] you may find that it would be nice to define some actions in terms of
 ''happens-after the previous `persistAsync`/`persist` handlers have been invoked''. @scala[`PersistentActor`]@java[`AbstractPersistentActor`] provides utility methods
-called @scala[@scaladoc[defer](akka.persistence.PersistentActor#defer[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[defer](akka.persistence.AbstractPersistentActorLike#defer(A,akka.japi.Procedure))] and @scala[@scaladoc[deferAsync](akka.persistence.PersistentActor#deferAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[deferAsync](akka.persistence.AbstractPersistentActorLike#deferAsync(A,akka.japi.Procedure))], which work similarly to `persist` and `persistAsync` respectively yet do not persist the
+called @scala[@scaladoc[defer](pekko.persistence.PersistentActor#defer[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[defer](pekko.persistence.AbstractPersistentActorLike#defer(A,org.apache.pekko.japi.Procedure))] and @scala[@scaladoc[deferAsync](pekko.persistence.PersistentActor#deferAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[deferAsync](pekko.persistence.AbstractPersistentActorLike#deferAsync(A,org.apache.pekko.japi.Procedure))], which work similarly to `persist` and `persistAsync` respectively yet do not persist the
 passed in event. It is recommended to use them for *read* operations, and actions which do not have corresponding events in your
 domain model.
 
@@ -346,7 +346,7 @@ The callback will not be invoked if the actor is restarted (or stopped) in betwe
 
 ### Nested persist calls
 
-It is possible to call @scala[@scaladoc[persist](akka.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](akka.persistence.AbstractPersistentActorLike#persist(A,akka.japi.Procedure))] and @scala[@scaladoc[persistAsync](akka.persistence.PersistentActor#persistAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAsync](akka.persistence.AbstractPersistentActorLike#persistAsync(A,akka.japi.Procedure))] inside their respective callback blocks and they will properly
+It is possible to call @scala[@scaladoc[persist](pekko.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist](pekko.persistence.AbstractPersistentActorLike#persist(A,org.apache.pekko.japi.Procedure))] and @scala[@scaladoc[persistAsync](pekko.persistence.PersistentActor#persistAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAsync](pekko.persistence.AbstractPersistentActorLike#persistAsync(A,org.apache.pekko.japi.Procedure))] inside their respective callback blocks and they will properly
 retain both the thread safety (including the right value of @scala[`sender()`]@java[`getSender()`]) as well as stashing guarantees.
 
 In general it is encouraged to create command handlers which do not need to resort to nested event persisting,
@@ -411,7 +411,7 @@ and the actor will unconditionally be stopped.
 The reason that it cannot resume when persist fails is that it is unknown if the event was actually
 persisted or not, and therefore it is in an inconsistent state. Restarting on persistent failures
 will most likely fail anyway since the journal is probably unavailable. It is better to stop the
-actor and after a back-off timeout start it again. The @apidoc[akka.pattern.BackoffSupervisor$] actor
+actor and after a back-off timeout start it again. The @apidoc[pattern.BackoffSupervisor$] actor
 is provided to support such restarts.
 
 Scala
@@ -434,7 +434,7 @@ if you for example know that serialization format has changed in an incompatible
 ### Atomic writes
 
 Each event is stored atomically, but it is also possible to store several events atomically by
-using the @scala[@scaladoc[persistAll](akka.persistence.PersistentActor#persistAll[A](events:Seq[A])(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAll](akka.persistence.AbstractPersistentActorLike#persistAll(java.lang.Iterable,akka.japi.Procedure))] or @scala[@scaladoc[persistAllAsync](akka.persistence.PersistentActor#persistAllAsync[A](events:Seq[A])(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAllAsync](akka.persistence.AbstractPersistentActorLike#persistAllAsync(java.lang.Iterable,akka.japi.Procedure))] method. That means that all events passed to that method
+using the @scala[@scaladoc[persistAll](pekko.persistence.PersistentActor#persistAll[A](events:Seq[A])(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAll](pekko.persistence.AbstractPersistentActorLike#persistAll(java.lang.Iterable,org.apache.pekko.japi.Procedure))] or @scala[@scaladoc[persistAllAsync](pekko.persistence.PersistentActor#persistAllAsync[A](events:Seq[A])(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAllAsync](pekko.persistence.AbstractPersistentActorLike#persistAllAsync(java.lang.Iterable,org.apache.pekko.japi.Procedure))] method. That means that all events passed to that method
 are stored or none of them are stored if there is an error.
 
 The recovery of a persistent actor will therefore never be done partially with only a subset of events persisted by
@@ -445,7 +445,7 @@ command, i.e. `onPersistRejected` is called with an exception (typically @javado
 
 ### Batch writes
 
-In order to optimize throughput when using @scala[@scaladoc[persistAsync](akka.persistence.PersistentActor#persistAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAsync](akka.persistence.AbstractPersistentActorLike#persistAsync(A,akka.japi.Procedure))], a persistent actor
+In order to optimize throughput when using @scala[@scaladoc[persistAsync](pekko.persistence.PersistentActor#persistAsync[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persistAsync](pekko.persistence.AbstractPersistentActorLike#persistAsync(A,org.apache.pekko.japi.Procedure))], a persistent actor
 internally batches events to be stored under high load before writing them to
 the journal (as a single batch). The batch size is dynamically determined by
 how many events are emitted during the time of a journal round-trip: after
@@ -456,7 +456,7 @@ timer-based which keeps latencies at a minimum.
 ### Message deletion
 
 It is possible to delete all messages (journaled by a single persistent actor) up to a specified sequence number;
-Persistent actors may call the @scala[@scaladoc[deleteMessages](akka.persistence.PersistentActor#deleteMessages(toSequenceNr:Long):Unit)]@java[@javadoc[deleteMessages](akka.persistence.AbstractPersistentActorLike#deleteMessages(long))] method to this end.
+Persistent actors may call the @scala[@scaladoc[deleteMessages](pekko.persistence.PersistentActor#deleteMessages(toSequenceNr:Long):Unit)]@java[@javadoc[deleteMessages](pekko.persistence.AbstractPersistentActorLike#deleteMessages(long))] method to this end.
 
 Deleting messages in Event Sourcing based applications is typically either not used at all, or used in conjunction with
 [snapshotting](#snapshots), i.e. after a snapshot has been successfully stored, a `deleteMessages(toSequenceNr)`
@@ -472,8 +472,8 @@ you have to design your application so that it is not affected by missing messag
 
 @@@
 
-The result of the `deleteMessages` request is signaled to the persistent actor with a @apidoc[akka.persistence.DeleteMessagesSuccess]
-message if the delete was successful or a @apidoc[akka.persistence.DeleteMessagesFailure] message if it failed.
+The result of the `deleteMessages` request is signaled to the persistent actor with a @apidoc[persistence.DeleteMessagesSuccess]
+message if the delete was successful or a @apidoc[persistence.DeleteMessagesFailure] message if it failed.
 
 Message deletion doesn't affect the highest sequence number of the journal, even if all messages were deleted from it after `deleteMessages` invocation.
 
@@ -497,7 +497,7 @@ For critical failures, such as recovery or persisting events failing, the persis
 handler is invoked. This is because if the underlying journal implementation is signalling persistence failures it is most
 likely either failing completely or overloaded and restarting right-away and trying to persist the event again will most
 likely not help the journal recover – as it would likely cause a [Thundering herd problem](https://en.wikipedia.org/wiki/Thundering_herd_problem), as many persistent actors
-would restart and try to persist their events again. Instead, using a @apidoc[BackoffSupervisor](akka.pattern.BackoffSupervisor$) (as described in @ref:[Failures](#failures)) which
+would restart and try to persist their events again. Instead, using a @apidoc[BackoffSupervisor](pattern.BackoffSupervisor$) (as described in @ref:[Failures](#failures)) which
 implements an exponential-backoff strategy which allows for more breathing room for the journal to recover between
 restarts of the persistent actor.
 
@@ -520,7 +520,7 @@ to signal to an Actor that it should stop itself once it receives this message 
 automatically by Akka, leaving the target actor no way to refuse stopping itself when given a poison pill.
 
 This can be dangerous when used with `PersistentActor` due to the fact that incoming commands are *stashed* while
-the persistent actor is awaiting confirmation from the Journal that events have been written when @scala[@scaladoc[persist()](akka.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist()](akka.persistence.AbstractPersistentActorLike#persist(A,akka.japi.Procedure))] was used.
+the persistent actor is awaiting confirmation from the Journal that events have been written when @scala[@scaladoc[persist()](pekko.persistence.PersistentActor#persist[A](event:A)(handler:A=%3EUnit):Unit)]@java[@javadoc[persist()](pekko.persistence.AbstractPersistentActorLike#persist(A,org.apache.pekko.japi.Procedure))] was used.
 Since the incoming commands will be drained from the Actor's mailbox and put into its internal stash while awaiting the
 confirmation (thus, before calling the persist handlers) the Actor **may receive and (auto)handle the PoisonPill
 before it processes the other messages which have been put into its stash**, causing a pre-mature shutdown of the Actor.
@@ -562,8 +562,8 @@ See @ref:[Replay filter](typed/persistence.md#replay-filter) in the documentatio
 
 As you model your domain using actors, you may notice that some actors may be prone to accumulating extremely long event logs and experiencing long recovery times. Sometimes, the right approach may be to split out into a set of shorter lived actors. However, when this is not an option, you can use snapshots to reduce recovery times drastically.
 
-Persistent actors can save snapshots of internal state by calling the  @apidoc[saveSnapshot](akka.persistence.Snapshotter) {scala="#saveSnapshot(snapshot:Any):Unit" java="#saveSnapshot(java.lang.Object)"} method. If saving of a snapshot
-succeeds, the persistent actor receives a @apidoc[akka.persistence.SaveSnapshotSuccess] message, otherwise a @apidoc[akka.persistence.SaveSnapshotFailure] message
+Persistent actors can save snapshots of internal state by calling the  @apidoc[saveSnapshot](persistence.Snapshotter) {scala="#saveSnapshot(snapshot:Any):Unit" java="#saveSnapshot(java.lang.Object)"} method. If saving of a snapshot
+succeeds, the persistent actor receives a @apidoc[persistence.SaveSnapshotSuccess] message, otherwise a @apidoc[persistence.SaveSnapshotFailure] message
 
 Scala
 :  @@snip [PersistenceDocSpec.scala](/akka-docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala) { #save-snapshot }
@@ -571,13 +571,13 @@ Scala
 Java
 :  @@snip [LambdaPersistenceDocTest.java](/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java) { #save-snapshot }
 
-where `metadata` is of type @apidoc[akka.persistence.SnapshotMetadata] and contains:
+where `metadata` is of type @apidoc[persistence.SnapshotMetadata] and contains:
 
 * persistenceId 
 * sequenceNr
 * timestamp
 
-During recovery, the persistent actor is offered the latest saved snapshot via a @apidoc[akka.persistence.SnapshotOffer] message from
+During recovery, the persistent actor is offered the latest saved snapshot via a @apidoc[persistence.SnapshotOffer] message from
 which it can initialize internal state.
 
 Scala
@@ -590,7 +590,7 @@ The replayed messages that follow the `SnapshotOffer` message, if any, are young
 They finally recover the persistent actor to its current (i.e. latest) state.
 
 In general, a persistent actor is only offered a snapshot if that persistent actor has previously saved one or more snapshots
-and at least one of these snapshots matches the @apidoc[akka.persistence.SnapshotSelectionCriteria] that can be specified for recovery.
+and at least one of these snapshots matches the @apidoc[persistence.SnapshotSelectionCriteria] that can be specified for recovery.
 
 Scala
 :  @@snip [PersistenceDocSpec.scala](/akka-docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala) { #snapshot-criteria }
@@ -598,8 +598,8 @@ Scala
 Java
 :  @@snip [LambdaPersistenceDocTest.java](/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java) { #snapshot-criteria }
 
-If not specified, they default to @scala[@scaladoc[SnapshotSelectionCriteria.Latest](akka.persistence.SnapshotSelectionCriteria$#Latest:akka.persistence.SnapshotSelectionCriteria)]@java[@javadoc[SnapshotSelectionCriteria.latest()](akka.persistence.SnapshotSelectionCriteria#latest())] which selects the latest (= youngest) snapshot.
-To disable snapshot-based recovery, applications should use @scala[@scaladoc[SnapshotSelectionCriteria.None](akka.persistence.SnapshotSelectionCriteria$#None:akka.persistence.SnapshotSelectionCriteria)]@java[@javadoc[SnapshotSelectionCriteria.none()](akka.persistence.SnapshotSelectionCriteria#none())]. A recovery where no
+If not specified, they default to @scala[@scaladoc[SnapshotSelectionCriteria.Latest](pekko.persistence.SnapshotSelectionCriteria$#Latest:org.apache.pekko.persistence.SnapshotSelectionCriteria)]@java[@javadoc[SnapshotSelectionCriteria.latest()](pekko.persistence.SnapshotSelectionCriteria#latest())] which selects the latest (= youngest) snapshot.
+To disable snapshot-based recovery, applications should use @scala[@scaladoc[SnapshotSelectionCriteria.None](pekko.persistence.SnapshotSelectionCriteria$#None:org.apache.pekko.persistence.SnapshotSelectionCriteria)]@java[@javadoc[SnapshotSelectionCriteria.none()](pekko.persistence.SnapshotSelectionCriteria#none())]. A recovery where no
 saved snapshot matches the specified `SnapshotSelectionCriteria` will replay all journaled messages.
 
 @@@ note
@@ -609,7 +609,7 @@ or the @scala[`PersistentActor`]@java[persistent actor] can pick a snapshot stor
 
 Because some use cases may not benefit from or need snapshots, it is perfectly valid not to not configure a snapshot store.
 However, Akka will log a warning message when this situation is detected and then continue to operate until
-an actor tries to store a snapshot, at which point the operation will fail (by replying with an @apidoc[akka.persistence.SaveSnapshotFailure] for example).
+an actor tries to store a snapshot, at which point the operation will fail (by replying with an @apidoc[persistence.SaveSnapshotFailure] for example).
 
 Note that the "persistence mode" of @ref:[Cluster Sharding](cluster-sharding.md) makes use of snapshots. If you use that mode, you'll need to define a snapshot store plugin.
 
@@ -617,11 +617,11 @@ Note that the "persistence mode" of @ref:[Cluster Sharding](cluster-sharding.md)
 
 ### Snapshot deletion
 
-A persistent actor can delete individual snapshots by calling the @apidoc[deleteSnapshot](akka.persistence.Snapshotter) {scala="#deleteSnapshot(sequenceNr:Long):Unit" java="#deleteSnapshot(long)"} method with the sequence number of
+A persistent actor can delete individual snapshots by calling the @apidoc[deleteSnapshot](persistence.Snapshotter) {scala="#deleteSnapshot(sequenceNr:Long):Unit" java="#deleteSnapshot(long)"} method with the sequence number of
 when the snapshot was taken.
 
-To bulk-delete a range of snapshots matching @apidoc[akka.persistence.SnapshotSelectionCriteria],
-persistent actors should use the @apidoc[deleteSnapshots](akka.persistence.Snapshotter) {scala="#deleteSnapshots(criteria:akka.persistence.SnapshotSelectionCriteria):Unit" java="#deleteSnapshots(akka.persistence.SnapshotSelectionCriteria)"} method. Depending on the journal used this might be inefficient. It is 
+To bulk-delete a range of snapshots matching scala/org/apache/pekko/persistence.SnapshotSelectionCriteria],
+persistent actors should use the @apidoc[deleteSnapshots](persistence.Snapshotter) {scala="#deleteSnapshots(criteria:org.apache.pekko.persistence.SnapshotSelectionCriteria):Unit" java="#deleteSnapshots(org.apache.pekko.persistence.SnapshotSelectionCriteria)"} method. Depending on the journal used this might be inefficient. It is 
 best practice to do specific deletes with `deleteSnapshot` or to include a `minSequenceNr` as well as a `maxSequenceNr`
 for the `SnapshotSelectionCriteria`.
 
@@ -660,7 +660,7 @@ See @ref:[Scaling out](typed/persistence.md#scaling-out) in the documentation of
 
 ## At-Least-Once Delivery
 
-To send messages with at-least-once delivery semantics to destinations you can @scala[mix-in @scaladoc[AtLeastOnceDelivery](akka.persistence.AtLeastOnceDelivery) trait to your @scaladoc[PersistentActor](akka.persistence.PersistentActor)]@java[extend the @javadoc[AbstractPersistentActorWithAtLeastOnceDelivery](akka.persistence.AbstractPersistentActorWithAtLeastOnceDelivery) class instead of @javadoc[AbstractPersistentActor](akka.persistence.AbstractPersistentActor)]
+To send messages with at-least-once delivery semantics to destinations you can @scala[mix-in @scaladoc[AtLeastOnceDelivery](pekko.persistence.AtLeastOnceDelivery) trait to your @scaladoc[PersistentActor](pekko.persistence.PersistentActor)]@java[extend the @javadoc[AbstractPersistentActorWithAtLeastOnceDelivery](pekko.persistence.AbstractPersistentActorWithAtLeastOnceDelivery) class instead of @javadoc[AbstractPersistentActor](pekko.persistence.AbstractPersistentActor)]
 on the sending side.  It takes care of re-sending messages when they
 have not been confirmed within a configurable timeout.
 
@@ -674,7 +674,7 @@ received.
 
 At-least-once delivery implies that original message sending order is not always preserved,
 and the destination may receive duplicate messages.
-Semantics do not match those of a normal @apidoc[akka.actor.ActorRef] send operation:
+Semantics do not match those of a normal @apidoc[actor.ActorRef] send operation:
 
  * it is not at-most-once delivery
  * message order for the same sender–receiver pair is not preserved due to
@@ -682,14 +682,14 @@ possible resends
  * after a crash and restart of the destination messages are still
 delivered to the new actor incarnation
 
-These semantics are similar to what an @apidoc[akka.actor.ActorPath] represents (see
+These semantics are similar to what an @apidoc[actor.ActorPath] represents (see
 @ref:[Actor Lifecycle](actors.md#actor-lifecycle)), therefore you need to supply a path and not a
 reference when delivering messages. The messages are sent to the path with
 an actor selection.
 
 @@@
 
-Use the @scala[@scaladoc[deliver](akka.persistence.AtLeastOnceDelivery#deliver(destination:akka.actor.ActorPath)(deliveryIdToMessage:Long=%3EAny):Unit)]@java[@javadoc[deliver](akka.persistence.AbstractPersistentActorWithAtLeastOnceDelivery#deliver(akka.actor.ActorPath,akka.japi.Function))] method to send a message to a destination. Call the @scala[@scaladoc[confirmDelivery](akka.persistence.AtLeastOnceDelivery#confirmDelivery(deliveryId:Long):Boolean)]@java[@javadoc[confirmDelivery](akka.persistence.AtLeastOnceDeliveryLike#confirmDelivery(long))] method
+Use the @scala[@scaladoc[deliver](persistence.AtLeastOnceDelivery#deliver(destination:org.apache.pekko.actor.ActorPath)(deliveryIdToMessage:Long=%3EAny):Unit)]@java[@javadoc[deliver](pekko.persistence.AbstractPersistentActorWithAtLeastOnceDelivery#deliver(org.apache.pekko.actor.ActorPath,org.apache.pekko.japi.Function))] method to send a message to a destination. Call the @scala[@scaladoc[confirmDelivery](persistence.AtLeastOnceDelivery#confirmDelivery(deliveryId:Long):Boolean)]@java[@javadoc[confirmDelivery](pekko.persistence.AtLeastOnceDeliveryLike#confirmDelivery(long))] method
 when the destination has replied with a confirmation message.
 
 ### Relationship between deliver and confirmDelivery
@@ -726,42 +726,42 @@ correlation id (passed into the message). You can do this by storing such mappin
 from which you can retrieve the `deliveryId` to be passed into the `confirmDelivery` method once the receiver
 of your message has replied with your custom correlation id.
 
-The @scala[@scaladoc[AtLeastOnceDelivery](akka.persistence.AtLeastOnceDelivery) trait]@java[@javadoc[AbstractPersistentActorWithAtLeastOnceDelivery](akka.persistence.AbstractPersistentActorWithAtLeastOnceDelivery) class] has a state consisting of unconfirmed messages and a
+The @scala[@scaladoc[AtLeastOnceDelivery](pekko.persistence.AtLeastOnceDelivery) trait]@java[@javadoc[AbstractPersistentActorWithAtLeastOnceDelivery](pekko.persistence.AbstractPersistentActorWithAtLeastOnceDelivery) class] has a state consisting of unconfirmed messages and a
 sequence number. It does not store this state itself. You must persist events corresponding to the
-@scala[@scaladoc[deliver](akka.persistence.AtLeastOnceDelivery#deliver(destination:akka.actor.ActorPath)(deliveryIdToMessage:Long=%3EAny):Unit)]@java[@javadoc[deliver](akka.persistence.AbstractPersistentActorWithAtLeastOnceDelivery#deliver(akka.actor.ActorPath,akka.japi.Function))] and @scala[@scaladoc[confirmDelivery](akka.persistence.AtLeastOnceDelivery#confirmDelivery(deliveryId:Long):Boolean)]@java[@javadoc[confirmDelivery](akka.persistence.AtLeastOnceDeliveryLike#confirmDelivery(long))] invocations from your `PersistentActor` so that the state can
+@scala[@scaladoc[deliver](pekko.persistence.AtLeastOnceDelivery#deliver(destination:org.apache.pekko.actor.ActorPath)(deliveryIdToMessage:Long=%3EAny):Unit)]@java[@javadoc[deliver](pekko.persistence.AbstractPersistentActorWithAtLeastOnceDelivery#deliver(org.apache.pekko.actor.ActorPath,org.apache.pekko.japi.Function))] and @scala[@scaladoc[confirmDelivery](pekko.persistence.AtLeastOnceDelivery#confirmDelivery(deliveryId:Long):Boolean)]@java[@javadoc[confirmDelivery](pekko.persistence.AtLeastOnceDeliveryLike#confirmDelivery(long))] invocations from your `PersistentActor` so that the state can
 be restored by calling the same methods during the recovery phase of the `PersistentActor`. Sometimes
 these events can be derived from other business level events, and sometimes you must create separate events.
 During recovery, calls to `deliver` will not send out messages, those will be sent later
 if no matching `confirmDelivery` will have been performed.
 
-Support for snapshots is provided by @apidoc[getDeliverySnapshot](akka.persistence.AtLeastOnceDeliveryLike) {scala="#getDeliverySnapshot:akka.persistence.AtLeastOnceDelivery.AtLeastOnceDeliverySnapshot" java="#getDeliverySnapshot()"} and @apidoc[setDeliverySnapshot](akka.persistence.AtLeastOnceDeliveryLike) {scala="#setDeliverySnapshot(snapshot:akka.persistence.AtLeastOnceDelivery.AtLeastOnceDeliverySnapshot):Unit" java="#setDeliverySnapshot(akka.persistence.AtLeastOnceDelivery.AtLeastOnceDeliverySnapshot)"}.
-The @apidoc[akka.persistence.AtLeastOnceDelivery.AtLeastOnceDeliverySnapshot] contains the full delivery state, including unconfirmed messages.
+Support for snapshots is provided by @apidoc[getDeliverySnapshot](persistence.AtLeastOnceDeliveryLike) {scala="#getDeliverySnapshot:org.apache.pekko.persistence.AtLeastOnceDelivery.AtLeastOnceDeliverySnapshot" java="#getDeliverySnapshot()"} and @apidoc[setDeliverySnapshot](persistence.AtLeastOnceDeliveryLike) {scala="#setDeliverySnapshot(snapshot:org.apache.pekko.persistence.AtLeastOnceDelivery.AtLeastOnceDeliverySnapshot):Unit" java="#setDeliverySnapshot(org.apache.pekko.persistence.AtLeastOnceDelivery.AtLeastOnceDeliverySnapshot)"}.
+The @apidoc[persistence.AtLeastOnceDelivery.AtLeastOnceDeliverySnapshot] contains the full delivery state, including unconfirmed messages.
 If you need a custom snapshot for other parts of the actor state you must also include the
 `AtLeastOnceDeliverySnapshot`. It is serialized using protobuf with the ordinary Akka
 serialization mechanism. It is easiest to include the bytes of the `AtLeastOnceDeliverySnapshot`
 as a blob in your custom snapshot.
 
-The interval between redelivery attempts is defined by the @apidoc[redeliverInterval](akka.persistence.AtLeastOnceDeliveryLike) {scala="#redeliverInterval:scala.concurrent.duration.FiniteDuration" java="#redeliverInterval()"} method.
+The interval between redelivery attempts is defined by the @apidoc[redeliverInterval](persistence.AtLeastOnceDeliveryLike) {scala="#redeliverInterval:scala.concurrent.duration.FiniteDuration" java="#redeliverInterval()"} method.
 The default value can be configured with the `akka.persistence.at-least-once-delivery.redeliver-interval`
 configuration key. The method can be overridden by implementation classes to return non-default values.
 
 The maximum number of messages that will be sent at each redelivery burst is defined by the
-@apidoc[redeliverBurstLimit](akka.persistence.AtLeastOnceDeliveryLike) {scala="#redeliveryBurstLimit:Int" java="#redeliveryBurstLimit()"} method (burst frequency is half of the redelivery interval). If there's a lot of
+@apidoc[redeliverBurstLimit](persistence.AtLeastOnceDeliveryLike) {scala="#redeliveryBurstLimit:Int" java="#redeliveryBurstLimit()"} method (burst frequency is half of the redelivery interval). If there's a lot of
 unconfirmed messages (e.g. if the destination is not available for a long time), this helps to prevent an overwhelming
 amount of messages to be sent at once. The default value can be configured with the
 `akka.persistence.at-least-once-delivery.redelivery-burst-limit` configuration key. The method can be overridden
 by implementation classes to return non-default values.
 
-After a number of delivery attempts a @apidoc[akka.persistence.AtLeastOnceDelivery.UnconfirmedWarning] message
+After a number of delivery attempts a @apidoc[persistence.AtLeastOnceDelivery.UnconfirmedWarning] message
 will be sent to `self`. The re-sending will still continue, but you can choose to call
 `confirmDelivery` to cancel the re-sending. The number of delivery attempts before emitting the
-warning is defined by the @apidoc[warnAfterNumberOfUnconfirmedAttempts](akka.persistence.AtLeastOnceDeliveryLike) {scala="#warnAfterNumberOfUnconfirmedAttempts:Int" java="#warnAfterNumberOfUnconfirmedAttempts()"} method. The default value can be
+warning is defined by the @apidoc[warnAfterNumberOfUnconfirmedAttempts](persistence.AtLeastOnceDeliveryLike) {scala="#warnAfterNumberOfUnconfirmedAttempts:Int" java="#warnAfterNumberOfUnconfirmedAttempts()"} method. The default value can be
 configured with the `akka.persistence.at-least-once-delivery.warn-after-number-of-unconfirmed-attempts`
 configuration key. The method can be overridden by implementation classes to return non-default values.
 
-The @scala[@scaladoc[AtLeastOnceDelivery](akka.persistence.AtLeastOnceDelivery) trait]@java[@javadoc[AbstractPersistentActorWithAtLeastOnceDelivery](akka.persistence.AbstractPersistentActorWithAtLeastOnceDelivery) class] holds messages in memory until their successful delivery has been confirmed.
+The @scala[@scaladoc[AtLeastOnceDelivery](pekko.persistence.AtLeastOnceDelivery) trait]@java[@javadoc[AbstractPersistentActorWithAtLeastOnceDelivery](pekko.persistence.AbstractPersistentActorWithAtLeastOnceDelivery) class] holds messages in memory until their successful delivery has been confirmed.
 The maximum number of unconfirmed messages that the actor is allowed to hold in memory
-is defined by the @apidoc[maxUnconfirmedMessages](akka.persistence.AtLeastOnceDeliveryLike) {scala="#maxUnconfirmedMessages:Int" java="#maxUnconfirmedMessages()"} method. If this limit is exceed the `deliver` method will
+is defined by the @apidoc[maxUnconfirmedMessages](persistence.AtLeastOnceDeliveryLike) {scala="#maxUnconfirmedMessages:Int" java="#maxUnconfirmedMessages()"} method. If this limit is exceed the `deliver` method will
 not accept more messages and it will throw @apidoc[AtLeastOnceDelivery.MaxUnconfirmedMessagesExceededException].
 The default value can be configured with the `akka.persistence.at-least-once-delivery.max-unconfirmed-messages`
 configuration key. The method can be overridden by implementation classes to return non-default values.
@@ -775,7 +775,7 @@ Event Adapters help in situations where:
 
  * **Version Migrations** – existing events stored in *Version 1* should be "upcasted" to a new *Version 2* representation,
 and the process of doing so involves actual code, not just changes on the serialization layer. For these scenarios
-the @apidoc[toJournal](akka.persistence.journal.WriteEventAdapter) {scala="#toJournal(event:Any):Any" java="#toJournal(java.lang.Object)"} function is usually an identity function, however the @apidoc[fromJournal](akka.persistence.journal.ReadEventAdapter) {scala="#fromJournal(event:Any,manifest:String):akka.persistence.journal.EventSeq" java="#fromJournal(java.lang.Object,java.lang.String)"} is implemented as
+the @apidoc[toJournal](persistence.journal.WriteEventAdapter) {scala="#toJournal(event:Any):Any" java="#toJournal(java.lang.Object)"} function is usually an identity function, however the @apidoc[fromJournal](persistence.journal.ReadEventAdapter) {scala="#fromJournal(event:Any,manifest:String):org.apache.pekko.persistence.journal.EventSeq" java="#fromJournal(java.lang.Object,java.lang.String)"} is implemented as
 `v1.Event=>v2.Event`, performing the necessary mapping inside the fromJournal method.
 This technique is sometimes referred to as "upcasting" in other CQRS libraries.
  * **Separating Domain and Data models** – thanks to EventAdapters it is possible to completely separate the domain model
@@ -802,7 +802,7 @@ It is possible to bind multiple adapters to one class *for recovery*, in which c
 bound adapters will be applied to a given matching event (in order of definition in the configuration). Since each adapter may
 return from `0` to `n` adapted events (called as `EventSeq`), each adapter can investigate the event and if it should
 indeed adapt it return the adapted event(s) for it. Other adapters which do not have anything to contribute during this
-adaptation simply return @apidoc[EventSeq.empty](akka.persistence.journal.EventSeq$) {scala="#empty:akka.persistence.journal.EventSeq" java="#empty()"}. The adapted events are then delivered in-order to the `PersistentActor` during replay.
+adaptation simply return @apidoc[EventSeq.empty](persistence.journal.EventSeq$) {scala="#empty:org.apache.pekko.persistence.journal.EventSeq" java="#empty()"}. The adapted events are then delivered in-order to the `PersistentActor` during replay.
 
 @@@ note
 
@@ -874,7 +874,7 @@ configured in the following sections of the `reference.conf` configuration resou
 
 @@snip [PersistenceMultiDocSpec.scala](/akka-docs/src/test/scala/docs/persistence/PersistenceMultiDocSpec.scala) { #default-config }
 
-Note that in this case the actor overrides only the @apidoc[persistenceId](akka.persistence.PersistenceIdentity) {scala="#persistenceId:String" java="#persistenceId()"} method:
+Note that in this case the actor overrides only the @apidoc[persistenceId](persistence.PersistenceIdentity) {scala="#persistenceId:String" java="#persistenceId()"} method:
 
 Scala
 :  @@snip [PersistenceMultiDocSpec.scala](/akka-docs/src/test/scala/docs/persistence/PersistenceMultiDocSpec.scala) { #default-plugins }
@@ -882,7 +882,7 @@ Scala
 Java
 :  @@snip [PersistenceMultiDocTest.java](/akka-docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java) { #default-plugins }
 
-When the persistent actor overrides the @apidoc[journalPluginId](akka.persistence.PersistenceIdentity) {scala="#journalPluginId:String" java="#journalPluginId()"} and @apidoc[snapshotPluginId](akka.persistence.PersistenceIdentity) {scala="#snapshotPluginId:String" java="#snapshotPluginId()"} methods,
+When the persistent actor overrides the @apidoc[journalPluginId](persistence.PersistenceIdentity) {scala="#journalPluginId:String" java="#journalPluginId()"} and @apidoc[snapshotPluginId](persistence.PersistenceIdentity) {scala="#snapshotPluginId:String" java="#snapshotPluginId()"} methods,
 the actor will be serviced by these specific persistence plugins instead of the defaults:
 
 Scala
@@ -898,9 +898,9 @@ plugin entries with a standard `class` property as well as settings which are sp
 
 ## Give persistence plugin configurations at runtime
 
-By default, a persistent actor will use the configuration loaded at @apidoc[akka.actor.ActorSystem] creation time to create journal and snapshot store plugins.
+By default, a persistent actor will use the configuration loaded at @apidoc[actor.ActorSystem] creation time to create journal and snapshot store plugins.
 
-When the persistent actor overrides the @apidoc[journalPluginConfig](akka.persistence.RuntimePluginConfig) {scala="#journalPluginConfig:com.typesafe.config.Config" java="#journalPluginConfig()"} and @apidoc[snapshotPluginConfig](akka.persistence.RuntimePluginConfig) {scala="#snapshotPluginConfig:com.typesafe.config.Config" java="#snapshotPluginConfig()"} methods,
+When the persistent actor overrides the @apidoc[journalPluginConfig](persistence.RuntimePluginConfig) {scala="#journalPluginConfig:com.typesafe.config.Config" java="#journalPluginConfig()"} and @apidoc[snapshotPluginConfig](persistence.RuntimePluginConfig) {scala="#snapshotPluginConfig:com.typesafe.config.Config" java="#snapshotPluginConfig()"} methods,
 the actor will use the declared @javadoc[Config](com.typesafe.config.Config) objects with a fallback on the default configuration.
 It allows a dynamic configuration of the journal and the snapshot store at runtime:
 
diff --git a/akka-docs/src/main/paradox/project/migration-guide-2.5.x-2.6.x.md b/akka-docs/src/main/paradox/project/migration-guide-2.5.x-2.6.x.md
index 8ad57e6620..49821a9390 100644
--- a/akka-docs/src/main/paradox/project/migration-guide-2.5.x-2.6.x.md
+++ b/akka-docs/src/main/paradox/project/migration-guide-2.5.x-2.6.x.md
@@ -71,23 +71,23 @@ After being deprecated since 2.5.0, the following have been removed in Akka 2.6.
 * akka-agent module
     - If there is interest it may be moved to a separate, community-maintained repository.
 * akka-contrib module
-    - To migrate, take the components you are using from [Akka 2.5](https://github.com/akka/akka/tree/release-2.5/akka-contrib) and include them in your own project or library under your own package name.
+    - To migrate, take the components you are using from [Akka 2.5](https://github.com/org/apache/pekko/akka/tree/release-2.5/akka-contrib) and include them in your own project or library under your own package name.
 * Actor DSL
     - Actor DSL is a rarely used feature. Use plain `system.actorOf` instead of the DSL to create Actors if you have been using it.
-* `akka.stream.extra.Timing` operator
-    - If you need it you can now find it in `akka.stream.contrib.Timed` from [Akka Stream Contrib](https://github.com/akka/akka-stream-contrib/blob/master/src/main/scala/akka/stream/contrib/Timed.scala).
+* `org.apache.pekko.stream.extra.Timing` operator
+    - If you need it you can now find it in `org.apache.pekko.stream.contrib.Timed` from [Akka Stream Contrib](https://github.com/org/apache/pekko/akka-stream-contrib/blob/master/src/main/scala/org/apache/pekko/stream/contrib/Timed.scala).
 * Netty UDP (Classic remoting over UDP)
     - To continue to use UDP configure @ref[Artery UDP](../remoting-artery.md#configuring-ssl-tls-for-akka-remoting) or migrate to Artery TCP.
     - A full cluster restart is required to change to Artery.
 * `UntypedActor`
     - Use `AbstractActor` instead.
 * `JavaTestKit`
-    - Use `akka.testkit.javadsl.TestKit` instead.
+    - Use `org.apache.pekko.testkit.javadsl.TestKit` instead.
 * `UntypedPersistentActor`
     - Use `AbstractPersistentActor` instead.
 * `UntypedPersistentActorWithAtLeastOnceDelivery`
     - Use @apidoc[AbstractPersistentActorWithAtLeastOnceDelivery] instead.
-* `akka.stream.actor.ActorSubscriber` and `akka.stream.actor.ActorPublisher`
+* `org.apache.pekko.stream.actor.ActorSubscriber` and `org.apache.pekko.stream.actor.ActorPublisher`
     - Use `GraphStage` instead.
 
 After being deprecated since 2.4.0, the following have been removed in Akka 2.6.0.
@@ -121,7 +121,7 @@ After being deprecated since 2.2, the following have been removed in Akka 2.6.0.
 
 ### TypedActor
 
-`akka.actor.TypedActor` has been deprecated as of 2.6.0 in favor of the
+`org.apache.pekko.actor.TypedActor` has been deprecated as of 2.6.0 in favor of the
 `akka.actor.typed` API which should be used instead.
 
 There are several reasons for phasing out the old `TypedActor`. The primary reason is they use transparent
@@ -146,7 +146,7 @@ that sending a message will result in it being processed instantaneously. The go
 transparency is to unify message passing for both local and remote interactions, versus attempting
 to make remote interactions look like local method calls.
 
-Warnings about `TypedActor` have been [mentioned in documentation](https://doc.akka.io/docs/akka/2.5/typed-actors.html#when-to-use-typed-actors)
+Warnings about `TypedActor` have been [mentioned in documentation](https://doc.akka.io/docs/org/apache/pekko/2.5/typed-actors.html#when-to-use-typed-actors)
 for many years.
 
 ### Cluster Client
@@ -164,8 +164,8 @@ Akka is now using Protobuf version 3.9.0 for serialization of messages defined b
 
 ### ByteString.empty
 
-It is now recommended to use @apidoc[akka.util.ByteString]`.emptyByteString()` instead of
-@apidoc[akka.util.ByteString]`.empty()` when using Java because @apidoc[akka.util.ByteString]`.empty()`
+It is now recommended to use @apidoc[util.ByteString]`.emptyByteString()` instead of
+@apidoc[util.ByteString]`.empty()` when using Java because @apidoc[util.ByteString]`.empty()`
 is [no longer available as a static method](https://github.com/scala/bug/issues/11509) in the artifacts built for Scala 2.13.
 
 ### AkkaSslConfig
@@ -179,12 +179,12 @@ See documentation of @ref:[streaming IO with TLS](../stream/stream-io.md#tls).
 
 ### JavaLogger
 
-`akka.event.jul.JavaLogger` for integration with `java.util.logging` has been deprecated. Use SLF4J instead,
+`org.apache.pekko.event.jul.JavaLogger` for integration with `java.util.logging` has been deprecated. Use SLF4J instead,
 which also has support for `java.util.logging`.
 
-### akka.Main
+### org.apache.pekko.Main
 
-`akka.Main` is deprecated in favour of starting the `ActorSystem` from a custom main class instead. `akka.Main` was not
+`org.apache.pekko.Main` is deprecated in favour of starting the `ActorSystem` from a custom main class instead. `org.apache.pekko.Main` was not
 adding much value and typically a custom main class is needed anyway.
 
 ### Pluggable DNS
@@ -242,9 +242,9 @@ for how to do this.
 
 The following events that are published to the `eventStream` have changed:
 
-* classic `akka.remote.QuarantinedEvent` is `akka.remote.artery.QuarantinedEvent` in Artery
-* classic `akka.remote.GracefulShutdownQuarantinedEvent` is `akka.remote.artery.GracefulShutdownQuarantinedEvent` in Artery
-* classic `akka.remote.ThisActorSystemQuarantinedEvent` is `akka.remote.artery.ThisActorSystemQuarantinedEvent` in Artery
+* classic `org.apache.pekko.remote.QuarantinedEvent` is `org.apache.pekko.remote.artery.QuarantinedEvent` in Artery
+* classic `org.apache.pekko.remote.GracefulShutdownQuarantinedEvent` is `org.apache.pekko.remote.artery.GracefulShutdownQuarantinedEvent` in Artery
+* classic `org.apache.pekko.remote.ThisActorSystemQuarantinedEvent` is `org.apache.pekko.remote.artery.ThisActorSystemQuarantinedEvent` in Artery
 
 #### Migration from 2.5.x Artery to 2.6.x Artery
 
@@ -288,7 +288,7 @@ If you have a [Lightbend Subscription](https://www.lightbend.com/lightbend-subsc
 
 Cluster Sharding coordinator and @ref:[Remembering Entities](../cluster-sharding.md#remembering-entities) state could previously be stored in Distributed Data or via Akka Persistence.
 The Persistence mode has been deprecated in favour of using the Distributed Data mode for the coordinator state. A replacement for the state
-for Remembered Entities is tracked in [issue 27763](https://github.com/akka/akka/issues/27763).
+for Remembered Entities is tracked in [issue 27763](https://github.com/org/apache/pekko/akka/issues/27763).
 
 ## Java Serialization
 
@@ -615,7 +615,7 @@ Akka Typed APIs were still marked as @ref:[may change](../common/may-change.md)
 made before finalizing the APIs. Compared to Akka 2.5.x the source incompatible changes are:
 
 * `Behaviors.intercept` now takes a factory function for the interceptor.
-* `ActorSystem.scheduler` previously gave access to the classic `akka.actor.Scheduler` but now returns a specific `akka.actor.typed.Scheduler`.
+* `ActorSystem.scheduler` previously gave access to the classic `org.apache.pekko.actor.Scheduler` but now returns a specific `org.apache.pekko.actor.typed.Scheduler`.
   Additionally `schedule` method has been replaced by `scheduleWithFixedDelay` and `scheduleAtFixedRate`. Actors that need to schedule tasks should
   prefer `Behaviors.withTimers`.
 * `TimerScheduler.startPeriodicTimer`, replaced by `startTimerWithFixedDelay` or `startTimerAtFixedRate`
@@ -625,7 +625,7 @@ made before finalizing the APIs. Compared to Akka 2.5.x the source incompatible
   they were redundant with corresponding @scala[scaladsl.Behaviors.x]@java[javadsl.Behaviors.x].
 * `ActorContext` parameter removed in `javadsl.ReceiveBuilder` for the functional style in Java. Use `Behaviors.setup`
    to retrieve `ActorContext`, and use an enclosing class to hold initialization parameters and `ActorContext`.
-* Java @javadoc[EntityRef](akka.cluster.sharding.typed.javadsl.EntityRef) ask timeout now takes a `java.time.Duration` rather than a @apidoc[Timeout]
+* Java @javadoc[EntityRef](pekko.cluster.sharding.typed.javadsl.EntityRef) ask timeout now takes a `java.time.Duration` rather than a @apidoc[Timeout]
 * Changed method signature for `EventAdapter.fromJournal` and support for `manifest` in `EventAdapter`.
 * Renamed @scala[`widen`]@java[`Behaviors.widen`] to @scala[`transformMessages`]@java[`Behaviors.transformMessages`]
 * `BehaviorInterceptor`, `Behaviors.monitor`, `Behaviors.withMdc` and @scala[`transformMessages`]@java[`Behaviors.transformMessages`] takes
@@ -647,7 +647,7 @@ made before finalizing the APIs. Compared to Akka 2.5.x the source incompatible
   causing more confusion than adding value. Construction of `PersistentId` for the `EventSourcedBehavior` is
   facilitated by factory methods in `PersistenceId`.
 * `PersistenceId.apply(String)` renamed to `PersistenceId.ofUniqueId(String)`  
-* `akka.cluster.sharding.typed.scaladsl.Entity.apply` changed to use two parameter lists because the new
+* `org.apache.pekko.cluster.sharding.typed.scaladsl.Entity.apply` changed to use two parameter lists because the new
   `EntityContext.entityTypeKey` required additional type parameter that is inferred better with a secondary
   parameter list.
 * `EventSourcedBehavior.withEnforcedReplies` signature changed. Command is not required to extend `ExpectingReply`
@@ -661,8 +661,8 @@ made before finalizing the APIs. Compared to Akka 2.5.x the source incompatible
 #### Akka Typed Stream API changes
 
 * `ActorSource.actorRef` relying on `PartialFunction` has been replaced in the Java API with a variant more suitable to be called by Java.
-* Factories for creating a materializer from an `akka.actor.typed.ActorSystem` have been removed.
-  A stream can be run with an `akka.actor.typed.ActorSystem` @scala[in implicit scope]@java[parameter]
+* Factories for creating a materializer from an `org.apache.pekko.actor.typed.ActorSystem` have been removed.
+  A stream can be run with an `org.apache.pekko.actor.typed.ActorSystem` @scala[in implicit scope]@java[parameter]
   and therefore the need for creating a materializer has been reduced.
 * `actorRefWithAck` has been renamed to `actorRefWithBackpressure`
 
@@ -674,7 +674,7 @@ A default materializer is now provided out of the box. For the Java API just pas
 for Scala an implicit materializer is provided if there is an implicit `ActorSystem` available. This avoids leaking
 materializers and simplifies most stream use cases somewhat.
 
-The `ActorMaterializer` factories has been deprecated and replaced with a few corresponding factories in `akka.stream.Materializer`.
+The `ActorMaterializer` factories has been deprecated and replaced with a few corresponding factories in `org.apache.pekko.stream.Materializer`.
 New factories with per-materializer settings has not been provided but should instead be done globally through config or per stream,
 see below for more details.
 
@@ -684,7 +684,7 @@ and Scala `implicit val materializer = ActorMaterializer()` should be removed.
 Details about the stream materializer can be found in @ref:[Actor Materializer Lifecycle](../stream/stream-flows-and-basics.md#actor-materializer-lifecycle)
 
 When using streams from typed the same factories and methods for creating materializers and running streams as from classic can now be used with typed. The
-`akka.stream.typed.scaladsl.ActorMaterializer` and `akka.stream.typed.javadsl.ActorMaterializerFactory` that previously existed in the `akka-stream-typed` module has been removed.
+`org.apache.pekko.stream.typed.scaladsl.ActorMaterializer` and `org.apache.pekko.stream.typed.javadsl.ActorMaterializerFactory` that previously existed in the `akka-stream-typed` module has been removed.
 
 ### Materializer settings deprecated
 
@@ -725,10 +725,10 @@ used for individual streams when they are materialized.
 Setting attributes on individual streams can be done like so:
 
 Scala
-:  @@snip [StreamAttributeDocSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/StreamAttributeDocSpec.scala) { #attributes-on-stream }
+:  @@snip [StreamAttributeDocSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/StreamAttributeDocSpec.scala) { #attributes-on-stream }
 
 Java
-:  @@snip [StreamAttributeDocTest.java](/akka-stream-tests/src/test/java/akka/stream/StreamAttributeDocTest.java) { #attributes-on-stream }
+:  @@snip [StreamAttributeDocTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/StreamAttributeDocTest.java) { #attributes-on-stream }
 
 ### Stream cancellation available upstream
 
@@ -755,7 +755,7 @@ The operators that provide support for lazy and @scala[`Future`]@java[`Completio
 to be more consistent.
 
 The materialized value is now no longer wrapped in an @scala[`Option`]@java[`Optional`], instead the @scala[`Future`]@java[`CompletionStage`]
-is failed with a `akka.stream.NeverMaterializedException` in the cases that would previously lead to @scala[`None`]@java[an empty `Optional`] 
+is failed with a `org.apache.pekko.stream.NeverMaterializedException` in the cases that would previously lead to @scala[`None`]@java[an empty `Optional`] 
 
 A deferred creation of the stream based on the initial element like how the deprecated `lazyInit` worked can be achieved by combining 
 @scala[`future(Flow|Sink)`] @java[`completionStage(Flow|Sink)`] with `prefixAndTail`. See example in @scala[@ref:[futureFlow](../stream/operators/Flow/futureFlow.md)]
diff --git a/akka-docs/src/main/paradox/project/rolling-update.md b/akka-docs/src/main/paradox/project/rolling-update.md
index 361facd122..016d090d27 100644
--- a/akka-docs/src/main/paradox/project/rolling-update.md
+++ b/akka-docs/src/main/paradox/project/rolling-update.md
@@ -106,7 +106,7 @@ a rolling update to Akka 2.6.5 using default configuration. Then change the conf
 ```
 akka.actor {
   serializers {
-    jackson-cbor = "akka.serialization.jackson.JacksonCborSerializer"
+    jackson-cbor = "org.apache.pekko.serialization.jackson.JacksonCborSerializer"
   }
   serialization-identifiers {
     jackson-cbor = 33
diff --git a/akka-docs/src/main/paradox/remoting-artery.md b/akka-docs/src/main/paradox/remoting-artery.md
index fb23cce06c..bd0628a90f 100644
--- a/akka-docs/src/main/paradox/remoting-artery.md
+++ b/akka-docs/src/main/paradox/remoting-artery.md
@@ -101,7 +101,7 @@ This page describes the remoting subsystem, codenamed *Artery* that has replaced
 Remoting enables Actor systems on different hosts or JVMs to communicate with each other. By enabling remoting
 the system will start listening on a provided network address and also gains the ability to connect to other
 systems through the network. From the application's perspective there is no API difference between local or remote
-systems, @apidoc[akka.actor.ActorRef] instances that point to remote systems look exactly the same as local ones: they can be
+systems, @apidoc[actor.ActorRef] instances that point to remote systems look exactly the same as local ones: they can be
 sent messages to, watched, etc.
 Every `ActorRef` contains hostname and port information and can be passed around even on the network. This means
 that on a network every `ActorRef` is a unique identifier of an actor on that network.
@@ -159,7 +159,7 @@ unique name of the system and will be used by other systems to open a connection
 that if a host has multiple names (different DNS records pointing to the same IP address) then only one of these
 can be *canonical*. If a message arrives to a system but it contains a different hostname than the expected canonical
 name then the message will be dropped. If multiple names for a system would be allowed, then equality checks among
-@apidoc[akka.actor.ActorRef] instances would no longer to be trusted and this would violate the fundamental assumption that
+@apidoc[actor.ActorRef] instances would no longer to be trusted and this would violate the fundamental assumption that
 an actor has a globally unique reference on a given network. As a consequence, this also means that localhost addresses
 (e.g. *127.0.0.1*) cannot be used in general (apart from local development) since they are not unique addresses in a
 real network.
@@ -171,24 +171,24 @@ for details.
 
 ## Acquiring references to remote actors
 
-In order to communicate with an actor, it is necessary to have its @apidoc[akka.actor.ActorRef]. In the local case it is usually
+In order to communicate with an actor, it is necessary to have its @apidoc[actor.ActorRef]. In the local case it is usually
 the creator of the actor (the caller of `actorOf()`) is who gets the `ActorRef` for an actor that it can
 then send to other actors. In other words:
 
- * An Actor can get a remote Actor's reference by receiving a message from it (as it's available as @scala[@scaladoc[sender()](akka.actor.Actor#sender():akka.actor.ActorRef)]@java[@javadoc[getSender()](akka.actor.AbstractActor#getSender())] then),
+ * An Actor can get a remote Actor's reference by receiving a message from it (as it's available as @scala[@scaladoc[sender()](pekko.actor.Actor#sender():org.apache.pekko.actor.ActorRef)]@java[@javadoc[getSender()](pekko.actor.AbstractActor#getSender())] then),
 or inside of a remote message (e.g. *PleaseReply(message: String, remoteActorRef: ActorRef)*)
 
 Alternatively, an actor can look up another located at a known path using
-@apidoc[akka.actor.ActorSelection]. These methods are available even in remoting enabled systems:
+@apidoc[actor.ActorSelection]. These methods are available even in remoting enabled systems:
 
- * Remote Lookup    : used to look up an actor on a remote node with @apidoc[actorSelection(path)](akka.actor.ActorRefFactory) {scala="#actorSelection(path:String):akka.actor.ActorSelection" java="#actorSelection(java.lang.String)"}
- * Remote Creation  : used to create an actor on a remote node with @apidoc[actorOf(Props(...), actorName)](akka.actor.ActorRefFactory) {scala="#actorOf(props:akka.actor.Props,name:String):akka.actor.ActorRef" java="#actorOf(akka.actor.Props,java.lang.String)"}
+ * Remote Lookup    : used to look up an actor on a remote node with @apidoc[actorSelection(path)](actor.ActorRefFactory) {scala="#actorSelection(path:String):org.apache.pekko.actor.ActorSelection" java="#actorSelection(java.lang.String)"}
+ * Remote Creation  : used to create an actor on a remote node with @apidoc[actorOf(Props(...), actorName)](actor.ActorRefFactory) {scala="#actorOf(props:org.apache.pekko.actor.Props,name:String):org.apache.pekko.actor.ActorRef" java="#actorOf(org.apache.pekko.actor.Props,java.lang.String)"}
 
 In the next sections the two alternatives are described in detail.
 
 ### Looking up Remote Actors
 
-@apidoc[actorSelection(path)](akka.actor.ActorRefFactory) {scala="#actorSelection(path:String):akka.actor.ActorSelection" java="#actorSelection(java.lang.String)"} will obtain an @apidoc[akka.actor.ActorSelection] to an Actor on a remote node, e.g.:
+@apidoc[actorSelection(path)](actor.ActorRefFactory) {scala="#actorSelection(path:String):org.apache.pekko.actor.ActorSelection" java="#actorSelection(java.lang.String)"} will obtain an @apidoc[actor.ActorSelection] to an Actor on a remote node, e.g.:
 
 Scala
 :   ```
@@ -232,11 +232,11 @@ Java
     @@@
 
 
-To acquire an @apidoc[akka.actor.ActorRef] for an @apidoc[akka.actor.ActorSelection] you need to
-send a message to the selection and use the @scala[@scaladoc[sender()](akka.actor.Actor#sender():akka.actor.ActorRef)]@java[@javadoc[getSender()](akka.actor.AbstractActor#getSender())] reference of the reply from
-the actor. There is a built-in @apidoc[akka.actor.Identify] message that all Actors will understand
-and automatically reply to with a @apidoc[akka.actor.ActorIdentity] message containing the
-`ActorRef`. This can also be done with the @apidoc[resolveOne](akka.actor.ActorSelection) {scala="#resolveOne(timeout:scala.concurrent.duration.FiniteDuration):scala.concurrent.Future[akka.actor.ActorRef]" java="#resolveOne(java.time.Duration)"} method of
+To acquire an @apidoc[actor.ActorRef] for an @apidoc[actor.ActorSelection] you need to
+send a message to the selection and use the @scala[@scaladoc[sender()](pekko.actor.Actor#sender():org.apache.pekko.actor.ActorRef)]@java[@javadoc[getSender()](pekko.actor.AbstractActor#getSender())] reference of the reply from
+the actor. There is a built-in @apidoc[actor.Identify] message that all Actors will understand
+and automatically reply to with a @apidoc[actor.ActorIdentity] message containing the
+`ActorRef`. This can also be done with the @apidoc[resolveOne](actor.ActorSelection) {scala="#resolveOne(timeout:scala.concurrent.duration.FiniteDuration):scala.concurrent.Future[org.apache.pekko.actor.ActorRef]" java="#resolveOne(java.time.Duration)"} method of
 the `ActorSelection`, which returns a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] of the matching
 `ActorRef`.
 
@@ -257,7 +257,7 @@ be delivered just fine.
 
 ## Remote Security
 
-An @apidoc[akka.actor.ActorSystem] should not be exposed via Akka Remote (Artery) over plain Aeron/UDP or TCP to an untrusted
+An @apidoc[actor.ActorSystem] should not be exposed via Akka Remote (Artery) over plain Aeron/UDP or TCP to an untrusted
 network (e.g. Internet). It should be protected by network security, such as a firewall. If that is not considered
 as enough protection @ref:[TLS with mutual authentication](#remote-tls) should be enabled.
 
@@ -385,7 +385,7 @@ to the JVM to prevent blocking. It is NOT as secure because it reuses the seed.
 
 As soon as an actor system can connect to another remotely, it may in principle
 send any possible message to any actor contained within that remote system. One
-example may be sending a @apidoc[akka.actor.PoisonPill] to the system guardian, shutting
+example may be sending a @apidoc[actor.PoisonPill] to the system guardian, shutting
 that system down. This is not always desired, and it can be disabled with the
 following setting:
 
@@ -394,11 +394,11 @@ akka.remote.artery.untrusted-mode = on
 ```
 
 This disallows sending of system messages (actor life-cycle commands,
-DeathWatch, etc.) and any message extending @apidoc[akka.actor.PossiblyHarmful] to the
+DeathWatch, etc.) and any message extending @apidoc[actor.PossiblyHarmful] to the
 system on which this flag is set. Should a client send them nonetheless they
 are dropped and logged (at DEBUG level in order to reduce the possibilities for
 a denial of service attack). `PossiblyHarmful` covers the predefined
-messages like @apidoc[akka.actor.PoisonPill] and @apidoc[akka.actor.Kill], but it can also be added
+messages like @apidoc[actor.PoisonPill] and @apidoc[actor.Kill], but it can also be added
 as a marker trait to user-defined messages.
 
 @@@ warning
@@ -428,9 +428,9 @@ untrusted mode when incoming via the remoting layer:
 
  * remote deployment (which also means no remote supervision)
  * remote DeathWatch
- * @apidoc[system.stop()](akka.actor.ActorRefFactory) {scala="#stop(actor:akka.actor.ActorRef):Unit" java="#stop(akka.actor.ActorRef)"}, @apidoc[akka.actor.PoisonPill], @apidoc[akka.actor.Kill]
- * sending any message which extends from the @apidoc[akka.actor.PossiblyHarmful] marker
-interface, which includes @apidoc[akka.actor.Terminated]
+ * @apidoc[system.stop()](actor.ActorRefFactory) {scala="#stop(actor:org.apache.pekko.actor.ActorRef):Unit" java="#stop(org.apache.pekko.actor.ActorRef)"}, @apidoc[actor.PoisonPill], @apidoc[actor.Kill]
+ * sending any message which extends from the @apidoc[actor.PossiblyHarmful] marker
+interface, which includes @apidoc[actor.Terminated]
  * messages sent with actor selection, unless destination defined in `trusted-selection-paths`.
 
 @@@ note
@@ -442,9 +442,9 @@ It is good practice for a client-facing system to only contain a well-defined
 set of entry point actors, which then forward requests (possibly after
 performing validation) to another actor system containing the actual worker
 actors. If messaging between these two server-side systems is done using
-local @apidoc[akka.actor.ActorRef] (they can be exchanged safely between actor systems
+local @apidoc[actor.ActorRef] (they can be exchanged safely between actor systems
 within the same JVM), you can restrict the messages on this interface by
-marking them @apidoc[akka.actor.PossiblyHarmful] so that a client cannot forge them.
+marking them @apidoc[actor.PossiblyHarmful] so that a client cannot forge them.
 
 @@@
 
@@ -471,7 +471,7 @@ association with the destination system is irrecoverable failed, and Terminated
 actors on the remote system. It is placed in a so called quarantined state. Quarantine usually does not
 happen if remote watch or remote deployment is not used.
 
-Each @apidoc[akka.actor.ActorSystem] instance has an unique identifier (UID), which is important for differentiating between
+Each @apidoc[actor.ActorSystem] instance has an unique identifier (UID), which is important for differentiating between
 incarnations of a system when it is restarted with the same hostname and port. It is the specific
 incarnation (UID) that is quarantined. The only way to recover from this state is to restart one of the
 actor systems.
@@ -490,7 +490,7 @@ partition heals. A cluster member is not quarantined when the failure detector t
 (`system-message-buffer-size` config).
  * Unexpected exception occurs in the control subchannel of the remoting infrastructure.
 
-The UID of the @apidoc[akka.actor.ActorSystem] is exchanged in a two-way handshake when the first message is sent to
+The UID of the @apidoc[actor.ActorSystem] is exchanged in a two-way handshake when the first message is sent to
 a destination. The handshake will be retried until the other system replies and no other messages will
 pass through until the handshake is completed. If the handshake cannot be established within a timeout
 (`handshake-timeout` config) the association is stopped (freeing up resources). Queued messages will be
@@ -510,7 +510,7 @@ by the built-in failure detector.
 
 ### Failure Detector
 
-Under the hood remote death watch uses heartbeat messages and a failure detector to generate @apidoc[akka.actor.Terminated]
+Under the hood remote death watch uses heartbeat messages and a failure detector to generate @apidoc[actor.Terminated]
 message from network failures and JVM crashes, in addition to graceful termination of watched
 actor.
 
@@ -582,10 +582,10 @@ the ability to serialize directly into and from ByteBuffers.
 As the new feature only changes how bytes are read and written, and the rest of the serialization infrastructure
 remained the same, we recommend reading the @ref:[Serialization](serialization.md) documentation first.
 
-Implementing an `akka.serialization.ByteBufferSerializer` works the same way as any other serializer,
+Implementing an `org.apache.pekko.serialization.ByteBufferSerializer` works the same way as any other serializer,
 
 Scala
-:  @@snip [Serializer.scala](/akka-actor/src/main/scala/akka/serialization/Serializer.scala) { #ByteBufferSerializer }
+:  @@snip [Serializer.scala](/akka-actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala) { #ByteBufferSerializer }
 
 Java
 :  @@snip [ByteBufferSerializerDocTest.java](/akka-docs/src/test/java/jdocs/actor/ByteBufferSerializerDocTest.java) { #ByteBufferSerializer-interface }
@@ -646,7 +646,7 @@ specific events
  * Providing protocol stability across major Akka versions to support rolling updates of large-scale systems
 
 The main incompatible change from the previous implementation that the protocol field of the string representation of an
-@apidoc[akka.actor.ActorRef] is always *akka* instead of the previously used *akka.tcp* or *akka.ssl.tcp*. Configuration properties
+@apidoc[actor.ActorRef] is always *akka* instead of the previously used *akka.tcp* or *akka.ssl.tcp*. Configuration properties
 are also different.
 
 
diff --git a/akka-docs/src/main/paradox/remoting.md b/akka-docs/src/main/paradox/remoting.md
index eca32fb317..fca481296a 100644
--- a/akka-docs/src/main/paradox/remoting.md
+++ b/akka-docs/src/main/paradox/remoting.md
@@ -287,7 +287,7 @@ The list of allowed classes has to be configured on the "remote" system, in othe
 others will be attempting to remote deploy Actors. That system, locally, knows best which Actors it should or
 should not allow others to remote deploy onto it. The full settings section may for example look like this:
 
-@@snip [RemoteDeploymentAllowListSpec.scala](/akka-remote/src/test/scala/akka/remote/classic/RemoteDeploymentAllowListSpec.scala) { #allow-list-config }
+@@snip [RemoteDeploymentAllowListSpec.scala](/akka-remote/src/test/scala/org/apache/pekko/remote/classic/RemoteDeploymentAllowListSpec.scala) { #allow-list-config }
 
 Actor classes not included in the allow list will not be allowed to be remote deployed onto this system.
 
@@ -325,8 +325,8 @@ Please see:
 
 ### Using the Failure Detector
  
-Remoting uses the `akka.remote.PhiAccrualFailureDetector` failure detector by default, or you can provide your by
-implementing the `akka.remote.FailureDetector` and configuring it:
+Remoting uses the `org.apache.pekko.remote.PhiAccrualFailureDetector` failure detector by default, or you can provide your by
+implementing the `org.apache.pekko.remote.FailureDetector` and configuring it:
 
 ```
 akka.remote.watch-failure-detector.implementation-class = "com.example.CustomFailureDetector"
@@ -376,7 +376,7 @@ you register as listener to the below described types in on the `ActorSystem.eve
 To subscribe to any remote event, subscribe to
 `RemotingLifecycleEvent`.  To subscribe to events related only to
 the lifecycle of associations, subscribe to
-`akka.remote.AssociationEvent`.
+`org.apache.pekko.remote.AssociationEvent`.
 
 @@@
 
diff --git a/akka-docs/src/main/paradox/routing.md b/akka-docs/src/main/paradox/routing.md
index 012ace478b..2f22d05f8c 100644
--- a/akka-docs/src/main/paradox/routing.md
+++ b/akka-docs/src/main/paradox/routing.md
@@ -19,7 +19,7 @@ To use Routing, you must add the following dependency in your project:
 ## Introduction
 
 Messages can be sent via a router to efficiently route them to destination actors, known as
-its *routees*. A @apidoc[akka.routing.Router] can be used inside or outside of an actor, and you can manage the
+its *routees*. A @apidoc[routing.Router] can be used inside or outside of an actor, and you can manage the
 routees yourselves or use a self contained router actor with configuration capabilities.
 
 Different routing strategies can be used, according to your application's needs. Akka comes with
@@ -37,26 +37,26 @@ Scala
 Java
 :  @@snip [RouterDocTest.java](/akka-docs/src/test/java/jdocs/routing/RouterDocTest.java) { #router-in-actor }
 
-We create a `Router` and specify that it should use @apidoc[akka.routing.RoundRobinRoutingLogic] when routing the
+We create a `Router` and specify that it should use @apidoc[routing.RoundRobinRoutingLogic] when routing the
 messages to the routees.
 
 The routing logic shipped with Akka are:
 
- * @apidoc[akka.routing.RoundRobinRoutingLogic]
- * @apidoc[akka.routing.RandomRoutingLogic]
- * @apidoc[akka.routing.SmallestMailboxRoutingLogic]
- * @apidoc[akka.routing.BroadcastRoutingLogic]
- * @apidoc[akka.routing.ScatterGatherFirstCompletedRoutingLogic]
- * @apidoc[akka.routing.TailChoppingRoutingLogic]
- * @apidoc[akka.routing.ConsistentHashingRoutingLogic]
+ * @apidoc[routing.RoundRobinRoutingLogic]
+ * @apidoc[routing.RandomRoutingLogic]
+ * @apidoc[routing.SmallestMailboxRoutingLogic]
+ * @apidoc[routing.BroadcastRoutingLogic]
+ * @apidoc[routing.ScatterGatherFirstCompletedRoutingLogic]
+ * @apidoc[routing.TailChoppingRoutingLogic]
+ * @apidoc[routing.ConsistentHashingRoutingLogic]
 
-We create the routees as ordinary child actors wrapped in @apidoc[akka.routing.ActorRefRoutee]. We watch
+We create the routees as ordinary child actors wrapped in @apidoc[routing.ActorRefRoutee]. We watch
 the routees to be able to replace them if they are terminated.
 
-Sending messages via the router is done with the @apidoc[route](akka.routing.Router) {scala="#route(message:Any,sender:akka.actor.ActorRef):Unit" java="#route(java.lang.Object,akka.actor.ActorRef)"} method, as is done for the `Work` messages
+Sending messages via the router is done with the @apidoc[route](routing.Router) {scala="#route(message:Any,sender:org.apache.pekko.actor.ActorRef):Unit" java="#route(java.lang.Object,org.apache.pekko.actor.ActorRef)"} method, as is done for the `Work` messages
 in the example above.
 
-The `Router` is immutable and the @apidoc[akka.routing.RoutingLogic] is thread safe; meaning that they can also be used
+The `Router` is immutable and the @apidoc[org.apache.pekko.routing.RoutingLogic] is thread safe; meaning that they can also be used
 outside of actors.  
 
 @@@ note
@@ -87,7 +87,7 @@ This is in contrast with Remote Deployment where such marker props is not necess
 If the props of an actor is NOT wrapped in `FromConfig` it will ignore the router section of the deployment configuration.
 
 You send messages to the routees via the router actor in the same way as for ordinary actors,
-i.e. via its @apidoc[akka.actor.ActorRef]. The router actor forwards messages onto its routees without changing 
+i.e. via its @apidoc[actor.ActorRef]. The router actor forwards messages onto its routees without changing 
 the original sender. When a routee replies to a routed message, the reply will be sent to the 
 original sender, not to the router actor.
 
@@ -125,7 +125,7 @@ Java
 In addition to being able to create local actors as routees, you can instruct the router to
 deploy its created children on a set of remote hosts. Routees will be deployed in round-robin
 fashion. In order to deploy routees remotely, wrap the router configuration in a
-@apidoc[akka.remote.routing.RemoteRouterConfig], attaching the remote addresses of the nodes to deploy to. Remote
+@apidoc[remote.routing.RemoteRouterConfig], attaching the remote addresses of the nodes to deploy to. Remote
 deployment requires the `akka-remote` module to be included in the classpath.
 
 Scala
@@ -175,14 +175,14 @@ while still re-creating the children, will still preserve the same number of act
 This means that if you have not specified `supervisorStrategy` of the router or its parent a
 failure in a routee will escalate to the parent of the router, which will by default restart the router,
 which will restart all routees (it uses Escalate and does not stop routees during restart). The reason 
-is to make the default behave such that adding @apidoc[withRouter](akka.actor.Props) {scala="#withRouter(r:akka.routing.RouterConfig):akka.actor.Props" java="#withRouter(akka.routing.RouterConfig)"} to a child’s definition does not 
+is to make the default behave such that adding @apidoc[withRouter](actor.Props) {scala="#withRouter(r:org.apache.pekko.routing.RouterConfig):org.apache.pekko.actor.Props" java="#withRouter(org.apache.pekko.routing.RouterConfig)"} to a child’s definition does not 
 change the supervision strategy applied to the child. This might be an inefficiency that you can avoid 
 by specifying the strategy when defining the router.
 
 Setting the strategy is done like this:
 
 Scala
-:  @@snip [RoutingSpec.scala](/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala) { #supervision }
+:  @@snip [RoutingSpec.scala](/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala) { #supervision }
 
 Java
 :  @@snip [RouterDocTest.java](/akka-docs/src/test/java/jdocs/routing/RouterDocTest.java) { #supervision }
@@ -200,7 +200,7 @@ a resizer.
 
 Sometimes, rather than having the router actor create its routees, it is desirable to create routees
 separately and provide them to the router for its use. You can do this by passing in
-paths of the routees to the router's configuration. Messages will be sent with @apidoc[akka.actor.ActorSelection] 
+paths of the routees to the router's configuration. Messages will be sent with @apidoc[actor.ActorSelection] 
 to these paths, wildcards can be and will result in the same semantics as explicitly using `ActorSelection`.
 
 The example below shows how to create a router by providing it with the path strings of three
@@ -414,7 +414,7 @@ You can then implement a priority mailbox and configure your dispatcher:
 
 Bear in mind that `BalancingDispatcher` requires a message queue that must be thread-safe for
 multiple concurrent consumers. So it is mandatory for the message queue backing a custom mailbox
-for this kind of dispatcher to implement akka.dispatch.MultipleConsumerSemantics. See details
+for this kind of dispatcher to implement org.apache.pekko.dispatch.MultipleConsumerSemantics. See details
 on how to implement your custom mailbox in @ref:[Mailboxes](mailboxes.md).
 
 @@@
@@ -511,7 +511,7 @@ It then waits for first reply it gets back. This result will be sent back to ori
 Other replies are discarded.
 
 It is expecting at least one reply within a configured duration, otherwise it will reply with
-@apidoc[akka.pattern.AskTimeoutException] in a @apidoc[akka.actor.Status.Failure].
+@apidoc[pattern.AskTimeoutException] in a @apidoc[actor.Status.Failure].
 
 ScatterGatherFirstCompletedPool defined in configuration:
 
@@ -608,13 +608,13 @@ insight into how consistent hashing is implemented.
 
 There is 3 ways to define what data to use for the consistent hash key.
 
- * You can define @scala[@scaladoc[hashMapping](akka.routing.ConsistentHashingPool#hashMapping:akka.routing.ConsistentHashingRouter.ConsistentHashMapping)]@java[@javadoc[withHashMapper](akka.routing.ConsistentHashingRoutingLogic#withHashMapper(akka.routing.ConsistentHashingRouter.ConsistentHashMapper))] of the router to map incoming
+ * You can define @scala[@scaladoc[hashMapping](pekko.routing.ConsistentHashingPool#hashMapping:org.apache.pekko.routing.ConsistentHashingRouter.ConsistentHashMapping)]@java[@javadoc[withHashMapper](pekko.routing.ConsistentHashingRoutingLogic#withHashMapper(org.apache.pekko.routing.ConsistentHashingRouter.ConsistentHashMapper))] of the router to map incoming
 messages to their consistent hash key. This makes the decision
 transparent for the sender.
- * The messages may implement @apidoc[akka.routing.ConsistentHashingRouter.ConsistentHashable].
+ * The messages may implement @apidoc[routing.ConsistentHashingRouter.ConsistentHashable].
 The key is part of the message and it's convenient to define it together
 with the message definition.
- * The messages can be wrapped in a @apidoc[akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope]
+ * The messages can be wrapped in a @apidoc[routing.ConsistentHashingRouter.ConsistentHashableEnvelope]
 to define what data to use for the consistent hash key. The sender knows
 the key to use.
 
@@ -685,8 +685,8 @@ consistent hash node ring to make the distribution more uniform.
 Most messages sent to router actors will be forwarded according to the routers' routing logic.
 However there are a few types of messages that have special behavior.
 
-Note that these special messages, except for the @apidoc[akka.routing.Broadcast] message, are only handled by 
-self contained router actors and not by the @apidoc[akka.routing.Router] component described 
+Note that these special messages, except for the @apidoc[routing.Broadcast] message, are only handled by 
+self contained router actors and not by the @apidoc[routing.Router] component described 
 in @ref:[A Simple Router](#simple-router).
 
 ### Broadcast Messages
@@ -718,7 +718,7 @@ possibly get the broadcast message multiple times, while other routees get no br
 
 ### PoisonPill Messages
 
-A @apidoc[akka.actor.PoisonPill] message has special handling for all actors, including for routers. When any actor
+A @apidoc[actor.PoisonPill] message has special handling for all actors, including for routers. When any actor
 receives a `PoisonPill` message, that actor will be stopped. See the @ref:[PoisonPill](actors.md#poison-pill)
 documentation for details.
 
@@ -757,7 +757,7 @@ automatically unless it is a dynamic router, e.g. using a resizer.
 
 ### Kill Messages
 
-@apidoc[akka.actor.Kill] messages are another type of message that has special handling. See
+@apidoc[actor.Kill] messages are another type of message that has special handling. See
 @ref:[Killing an Actor](actors.md#killing-actors) for general information about how actors handle `Kill` messages.
 
 When a `Kill` message is sent to a router the router processes the message internally, and does
@@ -774,10 +774,10 @@ Scala
 Java
 :  @@snip [RouterDocTest.java](/akka-docs/src/test/java/jdocs/routing/RouterDocTest.java) { #kill }
 
-As with the @apidoc[akka.actor.PoisonPill] message, there is a distinction between killing a router, which
+As with the @apidoc[actor.PoisonPill] message, there is a distinction between killing a router, which
 indirectly kills its children (who happen to be routees), and killing routees directly (some of whom
 may not be children.) To kill routees directly the router should be sent a `Kill` message wrapped
-in a @apidoc[akka.routing.Broadcast] message.
+in a @apidoc[routing.Broadcast] message.
 
 Scala
 :  @@snip [RouterDocSpec.scala](/akka-docs/src/test/scala/docs/routing/RouterDocSpec.scala) { #broadcastKill }
@@ -787,11 +787,11 @@ Java
 
 ### Management Messages
 
- * Sending @apidoc[akka.routing.GetRoutees] to a router actor will make it send back its currently used routees
-in a @apidoc[akka.routing.Routees] message.
- * Sending @apidoc[akka.routing.AddRoutee] to a router actor will add that routee to its collection of routees.
- * Sending @apidoc[akka.routing.RemoveRoutee] to a router actor will remove that routee to its collection of routees.
- * Sending @apidoc[akka.routing.AdjustPoolSize] to a pool router actor will add or remove that number of routees to
+ * Sending @apidoc[routing.GetRoutees] to a router actor will make it send back its currently used routees
+in a @apidoc[routing.Routees] message.
+ * Sending @apidoc[routing.AddRoutee] to a router actor will add that routee to its collection of routees.
+ * Sending @apidoc[routing.RemoveRoutee] to a router actor will remove that routee to its collection of routees.
+ * Sending @apidoc[routing.AdjustPoolSize] to a pool router actor will add or remove that number of routees to
 its collection of routees.
 
 These management messages may be handled after other messages, so if you send `AddRoutee` immediately followed by
@@ -805,7 +805,7 @@ and when you receive the `Routees` reply you know that the preceding change has
 @scala[Most]@java[All] pools can be used with a fixed number of routees or with a resize strategy to adjust the number
 of routees dynamically.
 
-There are two types of resizers: the default @apidoc[akka.routing.Resizer] and the @apidoc[akka.routing.OptimalSizeExploringResizer].
+There are two types of resizers: the default @apidoc[routing.Resizer] and the @apidoc[routing.OptimalSizeExploringResizer].
 
 ### Default Resizer
 
@@ -839,7 +839,7 @@ will be used instead of any programmatically sent parameters.*
 
 ### Optimal Size Exploring Resizer
 
-The @apidoc[akka.routing.OptimalSizeExploringResizer] resizes the pool to an optimal size that provides the most message throughput.
+The @apidoc[routing.OptimalSizeExploringResizer] resizes the pool to an optimal size that provides the most message throughput.
 
 This resizer works best when you expect the pool size to performance function to be a convex function.
 For example, when you have a CPU bound tasks, the optimal size is bound to the number of CPU cores.
@@ -898,7 +898,7 @@ routees.
 A normal actor can be used for routing messages, but an actor's single-threaded processing can
 become a bottleneck. Routers can achieve much higher throughput with an optimization to the usual
 message-processing pipeline that allows concurrent routing. This is achieved by embedding routers'
-routing logic directly in their @apidoc[akka.actor.ActorRef] rather than in the router actor. Messages sent to
+routing logic directly in their @apidoc[actor.ActorRef] rather than in the router actor. Messages sent to
 a router's `ActorRef` can be immediately routed to the routee, bypassing the single-threaded
 router actor entirely.
 
@@ -931,7 +931,7 @@ Java
 :  @@snip [CustomRouterDocTest.java](/akka-docs/src/test/java/jdocs/routing/CustomRouterDocTest.java) { #routing-logic }
 
 `select` will be called for each message and in this example pick a few destinations by round-robin,
-by reusing the existing @apidoc[akka.routing.RoundRobinRoutingLogic] and wrap the result in a @apidoc[akka.routing.SeveralRoutees]
+by reusing the existing @apidoc[routing.RoundRobinRoutingLogic] and wrap the result in a @apidoc[routing.SeveralRoutees]
 instance.  `SeveralRoutees` will send the message to all of the supplied routes.
 
 The implementation of the routing logic must be thread safe, since it might be used outside of actors.
@@ -944,12 +944,12 @@ Scala
 Java
 :  @@snip [CustomRouterDocTest.java](/akka-docs/src/test/java/jdocs/routing/CustomRouterDocTest.java) { #unit-test-logic }
 
-You could stop here and use the `RedundancyRoutingLogic` with a `akka.routing.Router`
+You could stop here and use the `RedundancyRoutingLogic` with a `org.apache.pekko.routing.Router`
 as described in @ref:[A Simple Router](#simple-router).
 
 Let us continue and make this into a self contained, configurable, router actor.
 
-Create a class that extends @apidoc[akka.routing.Pool], @apidoc[akka.routing.Group] or @apidoc[akka.routing.CustomRouterConfig]. That class is a factory
+Create a class that extends @apidoc[routing.Pool], @apidoc[routing.Group] or @apidoc[routing.CustomRouterConfig]. That class is a factory
 for the routing logic and holds the configuration for the router. Here we make it a `Group`.
 
 Scala
@@ -976,7 +976,7 @@ Java
 :  @@snip [CustomRouterDocSpec.scala](/akka-docs/src/test/scala/docs/routing/CustomRouterDocSpec.scala) { #jconfig }
 
 Note the fully qualified class name in the `router` property. The router class must extend
-`akka.routing.RouterConfig` (`Pool`, `Group` or `CustomRouterConfig`) and have 
+`org.apache.pekko.routing.RouterConfig` (`Pool`, `Group` or `CustomRouterConfig`) and have 
 constructor with one `com.typesafe.config.Config` parameter.
 The deployment section of the configuration is passed to the constructor.
 
@@ -989,7 +989,7 @@ Java
 ## Configuring Dispatchers
 
 The dispatcher for created children of the pool will be taken from
-@apidoc[akka.actor.Props] as described in @ref:[Dispatchers](dispatchers.md).
+@apidoc[actor.Props] as described in @ref:[Dispatchers](dispatchers.md).
 
 To make it easy to define the dispatcher of the routees of the pool you can
 define the dispatcher inline in the deployment section of the config.
@@ -1009,8 +1009,8 @@ after it has been created.
 
 The “head” router cannot always run on the same dispatcher, because it
 does not process the same type of messages, hence this special actor does
-not use the dispatcher configured in @apidoc[akka.actor.Props], but takes the
-`routerDispatcher` from the @apidoc[akka.routing.RouterConfig] instead, which defaults to
+not use the dispatcher configured in @apidoc[actor.Props], but takes the
+`routerDispatcher` from the @apidoc[routing.RouterConfig] instead, which defaults to
 the actor system’s default dispatcher. All standard routers allow setting this
 property in their constructor or factory method, custom routers have to
 implement the method in a suitable way.
@@ -1024,7 +1024,7 @@ Java
 @@@ note
 
 It is not allowed to configure the `routerDispatcher` to be a
-@apidoc[akka.dispatch.BalancingDispatcherConfigurator] since the messages meant
+@apidoc[dispatch.BalancingDispatcherConfigurator] since the messages meant
 for the special router actor cannot be processed by any other actor.
 
 @@@
diff --git a/akka-docs/src/main/paradox/scheduler.md b/akka-docs/src/main/paradox/scheduler.md
index d722679a0a..a6d73e865e 100644
--- a/akka-docs/src/main/paradox/scheduler.md
+++ b/akka-docs/src/main/paradox/scheduler.md
@@ -23,16 +23,16 @@ To use Scheduler, you must add the following dependency in your project:
 
 Sometimes the need for making things happen in the future arises, and where do
 you go look then?  Look no further than @apidoc[actor.ActorSystem]! There you find the
-@scala[@scaladoc[scheduler](akka.actor.ActorSystem#scheduler:akka.actor.Scheduler)]@java[@javadoc[getScheduler()](akka.actor.ActorSystem#getScheduler())] method that returns an instance of
-@apidoc[akka.actor.Scheduler], this instance is unique per ActorSystem and is
+@scala[@scaladoc[scheduler](pekko.actor.ActorSystem#scheduler:org.apache.pekko.actor.Scheduler)]@java[@javadoc[getScheduler()](pekko.actor.ActorSystem#getScheduler())] method that returns an instance of
+@apidoc[actor.Scheduler], this instance is unique per ActorSystem and is
 used internally for scheduling things to happen at specific points in time.
 
 You can schedule sending of messages to actors and execution of tasks
 (functions or Runnable).  You will get a @apidoc[Cancellable] back that you can call
-@scala[@scaladoc[cancel](akka.actor.Cancellable#cancel():Boolean)]@java[@javadoc[cancel()](akka.actor.Cancellable#cancel())] on to cancel the execution of the scheduled operation.
+@scala[@scaladoc[cancel](pekko.actor.Cancellable#cancel():Boolean)]@java[@javadoc[cancel()](pekko.actor.Cancellable#cancel())] on to cancel the execution of the scheduled operation.
 
 When scheduling periodic or single messages in an actor to itself it is recommended to
-use the @ref:[Actor Timers](actors.md#actors-timers) instead of using the @apidoc[akka.actor.Scheduler]
+use the @ref:[Actor Timers](actors.md#actors-timers) instead of using the @apidoc[actor.Scheduler]
 directly.
 
 The scheduler in Akka is designed for high-throughput of thousands up to millions 
@@ -51,7 +51,7 @@ is not the use-case the Akka scheduler is implemented for.
 
 @@@ warning
 
-The default implementation of @apidoc[akka.actor.Scheduler] used by Akka is based on job
+The default implementation of @apidoc[actor.Scheduler] used by Akka is based on job
 buckets which are emptied according to a fixed schedule.  It does not
 execute tasks at the exact time, but on every tick, it will run everything
 that is (over)due.  The accuracy of the default Scheduler can be modified
@@ -95,9 +95,9 @@ Java
 
 If you schedule functions or Runnable instances you should be extra careful
 to not close over unstable references. In practice this means not using `this`
-inside the closure in the scope of an Actor instance, not accessing @scala[@scaladoc[sender](akka.actor.Actor#sender():akka.actor.ActorRef)]@java[@javadoc[sender()](akka.actor.Actor#sender())] directly
+inside the closure in the scope of an Actor instance, not accessing @scala[@scaladoc[sender](pekko.actor.Actor#sender():org.apache.pekko.actor.ActorRef)]@java[@javadoc[sender()](pekko.actor.Actor#sender())] directly
 and not calling the methods of the Actor instance directly. If you need to
-schedule an invocation schedule a message to @scala[@scaladoc[self](akka.actor.Actor#self:akka.actor.ActorRef)]@java[@javadoc[self()](akka.actor.Actor#self())] instead (containing the
+schedule an invocation schedule a message to @scala[@scaladoc[self](pekko.actor.Actor#self:org.apache.pekko.actor.ActorRef)]@java[@javadoc[self()](pekko.actor.Actor#self())] instead (containing the
 necessary parameters) and then call the method when the message is received.
 
 @@@
@@ -157,19 +157,19 @@ which may in worst case cause undesired load on the system. `scheduleWithFixedDe
 The actual scheduler implementation is loaded reflectively upon
 @apidoc[actor.ActorSystem] start-up, which means that it is possible to provide a
 different one using the `akka.scheduler.implementation` configuration
-property. The referenced class must implement the @scala[@apidoc[akka.actor.Scheduler]]@java[@apidoc[akka.actor.AbstractScheduler]]
+property. The referenced class must implement the @scala[@apidoc[actor.Scheduler]]@java[@apidoc[actor.AbstractScheduler]]
 interface.
 
 ## The Cancellable interface
 
-Scheduling a task will result in a @apidoc[akka.actor.Cancellable] (or throw an
+Scheduling a task will result in a @apidoc[actor.Cancellable] (or throw an
 @javadoc[IllegalStateException](java.lang.IllegalStateException) if attempted after the scheduler’s shutdown).
 This allows you to cancel something that has been scheduled for execution.
 
 @@@ warning
 
 This does not abort the execution of the task, if it had already been
-started.  Check the return value of @scala[@scaladoc[cancel](akka.actor.Cancellable#cancel():Boolean)]@java[@javadoc[cancel()](akka.actor.Cancellable#cancel())] to detect whether the
+started.  Check the return value of @scala[@scaladoc[cancel](pekko.actor.Cancellable#cancel():Boolean)]@java[@javadoc[cancel()](pekko.actor.Cancellable#cancel())] to detect whether the
 scheduled task was canceled or will (eventually) have run.
 
 @@@
diff --git a/akka-docs/src/main/paradox/serialization-jackson.md b/akka-docs/src/main/paradox/serialization-jackson.md
index c79be746dd..223190fe58 100644
--- a/akka-docs/src/main/paradox/serialization-jackson.md
+++ b/akka-docs/src/main/paradox/serialization-jackson.md
@@ -35,15 +35,15 @@ in serialization-bindings configuration. Typically you will create a marker @sca
 for that purpose and let the messages @scala[extend]@java[implement] that.
 
 Scala
-:  @@snip [SerializationDocSpec.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #marker-interface }
+:  @@snip [SerializationDocSpec.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #marker-interface }
 
 Java
-:  @@snip [MySerializable.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/MySerializable.java) { #marker-interface }
+:  @@snip [MySerializable.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/MySerializable.java) { #marker-interface }
 
 Then you configure the class name of the marker @scala[trait]@java[interface] in `serialization-bindings` to
 one of the supported Jackson formats: `jackson-json` or `jackson-cbor`
 
-@@snip [config](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #serialization-bindings }
+@@snip [config](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #serialization-bindings }
 
 A good convention would be to name the marker interface `CborSerializable` or `JsonSerializable`.
 In this documentation we have used `MySerializable` to make it clear that the marker interface itself is not
@@ -107,17 +107,17 @@ MismatchedInputException: Cannot construct instance of `...` (although at least
 That is probably because the class has a constructor with a single parameter, like:
 
 Java
-:  @@snip [SerializationDocTest.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/SerializationDocTest.java) { #one-constructor-param-1 }
+:  @@snip [SerializationDocTest.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/SerializationDocTest.java) { #one-constructor-param-1 }
 
 That can be solved by adding @javadoc[@JsonCreator](com.fasterxml.jackson.annotation.JsonCreator) or @javadoc[@JsonProperty](com.fasterxml.jackson.annotation.JsonProperty) annotations:
 
 Java
-:  @@snip [SerializationDocTest.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/SerializationDocTest.java) { #one-constructor-param-2 }
+:  @@snip [SerializationDocTest.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/SerializationDocTest.java) { #one-constructor-param-2 }
 
 or
 
 Java
-:  @@snip [SerializationDocTest.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/SerializationDocTest.java) { #one-constructor-param-3 }
+:  @@snip [SerializationDocTest.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/SerializationDocTest.java) { #one-constructor-param-3 }
 
 
 The `ParameterNamesModule` is configured with `JsonCreator.Mode.PROPERTIES` as described in the
@@ -134,10 +134,10 @@ and @javadoc[@JsonSubTypes](com.fasterxml.jackson.annotation.JsonSubTypes) annot
 Example:
 
 Scala
-:  @@snip [SerializationDocSpec.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #polymorphism }
+:  @@snip [SerializationDocSpec.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #polymorphism }
 
 Java
-:  @@snip [SerializationDocTest.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/SerializationDocTest.java) { #polymorphism }
+:  @@snip [SerializationDocTest.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/SerializationDocTest.java) { #polymorphism }
 
 If you haven't defined the annotations you will see an exception like this:
 
@@ -174,7 +174,7 @@ The easiest workaround is to define the case objects as case class without any f
 Alternatively, you can define an intermediate trait for the case object and a custom deserializer for it. The example below builds on the previous `Animal` sample by adding a fictitious, single instance, new animal, an `Unicorn`. 
 
 Scala
-:  @@snip [SerializationDocSpec.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #polymorphism-case-object }
+:  @@snip [SerializationDocSpec.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #polymorphism-case-object }
 
 The case object `Unicorn` can't be used in a @javadoc[@JsonSubTypes](com.fasterxml.jackson.annotation.JsonSubTypes) annotation, but its trait can. When serializing the case object we need to know which type tag to use, hence the @javadoc[@JsonTypeName](com.fasterxml.jackson.annotation.JsonTypeName) annotation on the object. When deserializing, Jackson will only know about the trait variant therefore we need a custom deserializer that returns the case object. 
 
@@ -183,7 +183,7 @@ On the other hand, if the ADT only has case objects, you can solve it by impleme
 @javadoc[StdDeserializer](com.fasterxml.jackson.databind.deser.std.StdDeserializer).
 
 Scala
-:  @@snip [CustomAdtSerializer.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/CustomAdtSerializer.scala) { #adt-trait-object }
+:  @@snip [CustomAdtSerializer.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/CustomAdtSerializer.scala) { #adt-trait-object }
 
 ### Enumerations
 
@@ -194,7 +194,7 @@ statically specify the type information to a field. When using the `@JsonScalaEn
 value is serialized as a JsonString.
 
 Scala
-:  @@snip [JacksonSerializerSpec.scala](/akka-serialization-jackson/src/test/scala/akka/serialization/jackson/JacksonSerializerSpec.scala) { #jackson-scala-enumeration }
+:  @@snip [JacksonSerializerSpec.scala](/akka-serialization-jackson/src/test/scala/org/apache/pekko/serialization/jackson/JacksonSerializerSpec.scala) { #jackson-scala-enumeration }
     
 @@@
 
@@ -222,41 +222,41 @@ Adding an optional field can be done without any migration code. The default val
 Old class:
 
 Scala
-:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v1/ItemAdded.scala) { #add-optional }
+:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v1/ItemAdded.scala) { #add-optional }
 
 Java
-:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v1/ItemAdded.java) { #add-optional }
+:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1/ItemAdded.java) { #add-optional }
 
 
 New class with a new optional `discount` property and a new `note` field with default value:
 
 Scala
-:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2a/ItemAdded.scala) { #add-optional }
+:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2a/ItemAdded.scala) { #add-optional }
 
 Java
-:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2a/ItemAdded.java) { #add-optional }
+:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/ItemAdded.java) { #add-optional }
 
 ### Add Mandatory Field
 
 Let's say we want to have a mandatory `discount` property without default value instead:
 
 Scala
-:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2b/ItemAdded.scala) { #add-mandatory }
+:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2b/ItemAdded.scala) { #add-mandatory }
 
 Java
-:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2b/ItemAdded.java) { #add-mandatory }
+:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2b/ItemAdded.java) { #add-mandatory }
 
 To add a new mandatory field we have to use a @apidoc[JacksonMigration] class and set the default value in the migration code.
 
 This is how a migration class would look like for adding a `discount` field:
 
 Scala
-:  @@snip [ItemAddedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2b/ItemAddedMigration.scala) { #add-mandatory }
+:  @@snip [ItemAddedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2b/ItemAddedMigration.scala) { #add-mandatory }
 
 Java
-:  @@snip [ItemAddedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2b/ItemAddedMigration.java) { #add-mandatory }
+:  @@snip [ItemAddedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2b/ItemAddedMigration.java) { #add-mandatory }
 
-Override the @scala[@scaladoc[currentVersion](akka.serialization.jackson.JacksonMigration#currentVersion:Int)]@java[@javadoc[currentVersion()](akka.serialization.jackson.JacksonMigration#currentVersion())] method to define the version number of the current (latest) version. The first version,
+Override the @scala[@scaladoc[currentVersion](pekko.serialization.jackson.JacksonMigration#currentVersion:Int)]@java[@javadoc[currentVersion()](pekko.serialization.jackson.JacksonMigration#currentVersion())] method to define the version number of the current (latest) version. The first version,
 when no migration was used, is always 1. Increase this version number whenever you perform a change that is not
 backwards compatible without migration code.
 
@@ -269,7 +269,7 @@ to get access to mutators.
 
 The migration class must be defined in configuration file:
 
-@@snip [config](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #migrations-conf }
+@@snip [config](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #migrations-conf }
 
 The same thing could have been done for the `note` field, adding a default value of `""` in the `ItemAddedMigration`.
 
@@ -278,18 +278,18 @@ The same thing could have been done for the `note` field, adding a default value
 Let's say that we want to rename the `productId` field to `itemId` in the previous example.
 
 Scala
-:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2c/ItemAdded.scala) { #rename }
+:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2c/ItemAdded.scala) { #rename }
 
 Java
-:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2c/ItemAdded.java) { #rename }
+:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2c/ItemAdded.java) { #rename }
 
 The migration code would look like:
 
 Scala
-:  @@snip [ItemAddedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2c/ItemAddedMigration.scala) { #rename }
+:  @@snip [ItemAddedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2c/ItemAddedMigration.scala) { #rename }
 
 Java
-:  @@snip [ItemAddedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2c/ItemAddedMigration.java) { #rename }
+:  @@snip [ItemAddedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2c/ItemAddedMigration.java) { #rename }
 
 ### Structural Changes
 
@@ -298,34 +298,34 @@ In a similar way we can do arbitrary structural changes.
 Old class:
 
 Scala
-:  @@snip [Customer.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v1/Customer.scala) { #structural }
+:  @@snip [Customer.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v1/Customer.scala) { #structural }
 
 Java
-:  @@snip [Customer.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v1/Customer.java) { #structural }
+:  @@snip [Customer.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1/Customer.java) { #structural }
 
 New class:
 
 Scala
-:  @@snip [Customer.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2a/Customer.scala) { #structural }
+:  @@snip [Customer.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2a/Customer.scala) { #structural }
 
 Java
-:  @@snip [Customer.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2a/Customer.java) { #structural }
+:  @@snip [Customer.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/Customer.java) { #structural }
 
 with the `Address` class:
 
 Scala
-:  @@snip [Address.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2a/Address.scala) { #structural }
+:  @@snip [Address.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2a/Address.scala) { #structural }
 
 Java
-:  @@snip [Address.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2a/Address.java) { #structural }
+:  @@snip [Address.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/Address.java) { #structural }
 
 The migration code would look like:
 
 Scala
-:  @@snip [CustomerMigration.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2a/CustomerMigration.scala) { #structural }
+:  @@snip [CustomerMigration.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2a/CustomerMigration.scala) { #structural }
 
 Java
-:  @@snip [CustomerMigration.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2a/CustomerMigration.java) { #structural }
+:  @@snip [CustomerMigration.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/CustomerMigration.java) { #structural }
 
 ### Rename Class
 
@@ -334,32 +334,32 @@ It is also possible to rename the class. For example, let's rename `OrderAdded`
 Old class:
 
 Scala
-:  @@snip [OrderAdded.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v1/OrderAdded.scala) { #rename-class }
+:  @@snip [OrderAdded.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v1/OrderAdded.scala) { #rename-class }
 
 Java
-:  @@snip [OrderAdded.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v1/OrderAdded.java) { #rename-class }
+:  @@snip [OrderAdded.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1/OrderAdded.java) { #rename-class }
 
 New class:
 
 Scala
-:  @@snip [OrderPlaced.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2a/OrderPlaced.scala) { #rename-class }
+:  @@snip [OrderPlaced.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2a/OrderPlaced.scala) { #rename-class }
 
 Java
-:  @@snip [OrderPlaced.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2a/OrderPlaced.java) { #rename-class }
+:  @@snip [OrderPlaced.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/OrderPlaced.java) { #rename-class }
 
 The migration code would look like:
 
 Scala
-:  @@snip [OrderPlacedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2a/OrderPlacedMigration.scala) { #rename-class }
+:  @@snip [OrderPlacedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2a/OrderPlacedMigration.scala) { #rename-class }
 
 Java
-:  @@snip [OrderPlacedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2a/OrderPlacedMigration.java) { #rename-class }
+:  @@snip [OrderPlacedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/OrderPlacedMigration.java) { #rename-class }
 
 Note the override of the @apidoc[transformClassName(fromVersion, className)](JacksonMigration) {scala="#transformClassName(fromVersion:Int,className:String):String" java="#transformClassName(int,java.lang.String)"} method to define the new class name.
 
 That type of migration must be configured with the old class name as key. The actual class can be removed.
 
-@@snip [config](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #migrations-conf-rename }
+@@snip [config](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #migrations-conf-rename }
 
 ### Remove from serialization-bindings
 
@@ -369,7 +369,7 @@ during rolling update with serialization changes, or when reading old stored dat
 when changing from Jackson serializer to another serializer (e.g. Protobuf) and thereby changing the serialization
 binding, but it should still be possible to deserialize old data with Jackson.
 
-@@snip [config](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #allowed-class-prefix }
+@@snip [config](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #allowed-class-prefix }
 
 It's a list of class names or prefixes of class names.
 
@@ -390,43 +390,43 @@ Let's take, for example, the case above where we [renamed a field](#rename-field
 The starting schema is:
 
 Scala
-:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v1/ItemAdded.scala) { #add-optional }
+:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v1/ItemAdded.scala) { #add-optional }
 
 Java
-:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v1/ItemAdded.java) { #add-optional }
+:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1/ItemAdded.java) { #add-optional }
 
 In a first deployment, we still don't make any change to the event class:
 
 Scala
-:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v1/ItemAdded.scala) { #forward-one-rename }
+:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v1/ItemAdded.scala) { #forward-one-rename }
 
 Java
-:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v1/ItemAdded.java) { #forward-one-rename }
+:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1/ItemAdded.java) { #forward-one-rename }
 
 but we introduce a migration that can read the newer schema which is versioned `2`:
 
 Scala
-:  @@snip [ItemAddedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v1withv2/ItemAddedMigration.scala) { #forward-one-rename }
+:  @@snip [ItemAddedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v1withv2/ItemAddedMigration.scala) { #forward-one-rename }
 
 Java
-:  @@snip [ItemAddedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v1withv2/ItemAddedMigration.java) { #forward-one-rename }
+:  @@snip [ItemAddedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1withv2/ItemAddedMigration.java) { #forward-one-rename }
 
 Once all running nodes have the new migration code which can read version `2` of `ItemAdded` we can proceed with the 
 second step. So, we deploy the updated event:
 
 Scala
-:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2c/ItemAdded.scala) { #rename }
+:  @@snip [ItemAdded.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2c/ItemAdded.scala) { #rename }
 
 Java
-:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2c/ItemAdded.java) { #rename }
+:  @@snip [ItemAdded.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2c/ItemAdded.java) { #rename }
 
 and the final migration code which no longer needs forward-compatibility code:
 
 Scala
-:  @@snip [ItemAddedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/v2c/ItemAddedMigration.scala) { #rename }
+:  @@snip [ItemAddedMigration.scala](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/v2c/ItemAddedMigration.scala) { #rename }
 
 Java
-:  @@snip [ItemAddedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/akka/serialization/jackson/v2c/ItemAddedMigration.java) { #rename }
+:  @@snip [ItemAddedMigration.java](/akka-serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2c/ItemAddedMigration.java) { #rename }
 
 
 
@@ -481,12 +481,12 @@ By default the configuration for the Jackson serializers and their @javadoc[Obje
 the `akka.serialization.jackson` section. It is possible to override that configuration in a more
 specific `akka.serialization.jackson.` section.
 
-@@snip [config](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #specific-config }
+@@snip [config](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #specific-config }
 
 It's also possible to define several bindings and use different configuration for them. For example,
 different settings for remote messages and persisted events.
 
-@@snip [config](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #several-config }
+@@snip [config](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #several-config }
 
 ### Manifest-less serialization
 
@@ -511,7 +511,7 @@ Since this configuration can only be applied to a single root type, you will usu
 apply it to a per binding configuration, not to the regular `jackson-json` or `jackson-cbor`
 configurations.
 
-@@snip [config](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #manifestless }
+@@snip [config](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #manifestless }
 
 Note that Akka remoting already implements manifest compression, and so this optimization will have
 no significant impact for messages sent over remoting. It's only useful for messages serialized for
@@ -531,6 +531,6 @@ ISO-8601 (rfc3339) `yyyy-MM-dd'T'HH:mm:ss.SSSZ` format instead of numeric arrays
 interoperability but it is slower. If you don't need the ISO format for interoperability with external systems
 you can change the following configuration for better performance of date/time fields.
 
-@@snip [config](/akka-serialization-jackson/src/test/scala/doc/akka/serialization/jackson/SerializationDocSpec.scala) { #date-time }
+@@snip [config](/akka-serialization-jackson/src/test/scala/doc/org/apache/pekko/serialization/jackson/SerializationDocSpec.scala) { #date-time }
 
 Jackson is still be able to deserialize the other format independent of this setting.
diff --git a/akka-docs/src/main/paradox/serialization.md b/akka-docs/src/main/paradox/serialization.md
index b3ec2f2782..d4b76450d9 100644
--- a/akka-docs/src/main/paradox/serialization.md
+++ b/akka-docs/src/main/paradox/serialization.md
@@ -36,7 +36,7 @@ Akka itself uses Protocol Buffers to serialize internal messages (for example cl
 ### Configuration
 
 For Akka to know which `Serializer` to use for what, you need to edit your configuration: 
-in the `akka.actor.serializers`-section, you bind names to implementations of the @apidoc[akka.serialization.Serializer](Serializer)
+in the `akka.actor.serializers`-section, you bind names to implementations of the @apidoc[serialization.Serializer](Serializer)
 you wish to use, like this:
 
 @@snip [SerializationDocSpec.scala](/akka-docs/src/test/scala/docs/serialization/SerializationDocSpec.scala) { #serialize-serializers-config }
@@ -94,7 +94,7 @@ It is important to use the serializer identifier in this way to support rolling
 consisting of the bytes, the serializer id, and the manifest should always be transferred or stored together so that
 they can be deserialized with different `serialization-bindings` configuration.
 
-The @apidoc[SerializationExtension$] is a Classic @apidoc[akka.actor.Extension], but it can be used with an @apidoc[akka.actor.typed.ActorSystem](typed.ActorSystem) like this:
+The @apidoc[SerializationExtension$] is a Classic @apidoc[actor.Extension], but it can be used with an @apidoc[actor.typed.ActorSystem](typed.ActorSystem) like this:
 
 Scala
 :  @@snip [SerializationDocSpec.scala](/akka-docs/src/test/scala/docs/serialization/SerializationDocSpec.scala) { #programmatic-typed }
@@ -108,7 +108,7 @@ The first code snippet on this page contains a configuration file that reference
 
 ### Creating new Serializers
 
-A custom `Serializer` has to inherit from @scala[@apidoc[akka.serialization.Serializer](Serializer)]@java[@apidoc[akka.serialization.JSerializer](JSerializer)] and can be defined like the following:
+A custom `Serializer` has to inherit from @scala[@apidoc[serialization.Serializer](Serializer)]@java[@apidoc[serialization.JSerializer](JSerializer)] and can be defined like the following:
 
 Scala
 :  @@snip [SerializationDocSpec.scala](/akka-docs/src/test/scala/docs/serialization/SerializationDocSpec.scala) { #imports }
@@ -130,7 +130,7 @@ rolling updates.
 
 @@@ div { .group-scala }
 
-If you prefer to define the identifier in cofiguration that is supported by the @apidoc[akka.serialization.BaseSerializer] trait, which
+If you prefer to define the identifier in cofiguration that is supported by the @apidoc[serialization.BaseSerializer] trait, which
 implements the `def identifier` by reading it from configuration based on the serializer's class name:
 
 Scala
@@ -139,7 +139,7 @@ Scala
 @@@
 
 The manifest is a type hint so that the same serializer can be used for different
-classes. The manifest parameter in @scala[@scaladoc[fromBinary](akka.serialization.Serializer#fromBinary(bytes:Array[Byte],manifest:Option[Class[_]]):AnyRef)]@java[@javadoc[fromBinaryJava](akka.serialization.JSerializer#fromBinaryJava(byte%5B%5D,java.lang.Class))] is the class of the object that
+classes. The manifest parameter in @scala[@scaladoc[fromBinary](pekko.serialization.Serializer#fromBinary(bytes:Array[Byte],manifest:Option[Class[_]]):AnyRef)]@java[@javadoc[fromBinaryJava](pekko.serialization.JSerializer#fromBinaryJava(byte%5B%5D,java.lang.Class))] is the class of the object that
 was serialized. In @scala[`fromBinary`]@java[`fromBinaryJava`] you can match on the class and deserialize the
 bytes to different objects.
 
@@ -160,7 +160,7 @@ instead of a @javadoc[Class](java.lang.Class). That means that the class can be
 can still deserialize old data by matching  on the `String`. This is especially useful
 for @ref:[Persistence](persistence.md).
 
-The manifest string can also encode a version number that can be used in @scala[@scaladoc[fromBinary](akka.serialization.Serializer#fromBinary(bytes:Array[Byte],manifest:Option[Class[_]]):AnyRef)]@java[@javadoc[fromBinaryJava](akka.serialization.JSerializer#fromBinaryJava(byte%5B%5D,java.lang.Class))] to
+The manifest string can also encode a version number that can be used in @scala[@scaladoc[fromBinary](pekko.serialization.Serializer#fromBinary(bytes:Array[Byte],manifest:Option[Class[_]]):AnyRef)]@java[@javadoc[fromBinaryJava](pekko.serialization.JSerializer#fromBinaryJava(byte%5B%5D,java.lang.Class))] to
 deserialize in different ways to migrate old data to new domain objects.
 
 If the data was originally serialized with `Serializer` and in a later version of the
@@ -193,17 +193,17 @@ Actor references are typically included in the messages.
 All ActorRefs are serializable when using @ref:[Serialization with Jackson](serialization-jackson.md),
 but in case you are writing your own serializer, you might want to know how to serialize and deserialize them properly.
 
-To serialize actor references to/from string representation you would use the @apidoc[akka.actor.typed.ActorRefResolver].
+To serialize actor references to/from string representation you would use the @apidoc[actor.typed.ActorRefResolver].
 
 For example here's how a serializer could look for `Ping` and `Pong` messages:
 
 Scala
-:  @@snip [PingSerializer.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/PingSerializer.scala) { #serializer }
+:  @@snip [PingSerializer.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala) { #serializer }
 
 Java
-:  @@snip [PingSerializerExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/PingSerializerExampleTest.java) { #serializer }
+:  @@snip [PingSerializerExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java) { #serializer }
 
-Serialization of Classic @apidoc[akka.actor.ActorRef] is described in @ref:[Classic Serialization](serialization-classic.md#serializing-actorrefs).
+Serialization of Classic @apidoc[actor.ActorRef] is described in @ref:[Classic Serialization](serialization-classic.md#serializing-actorrefs).
 Classic and Typed actor references have the same serialization format so they can be interchanged.
 
 ### Deep serialization of Actors
@@ -256,7 +256,7 @@ and this could lead to very surprising errors.
 ## Rolling updates
 
 A serialized remote message (or persistent event) consists of serializer-id, the manifest, and the binary payload.
-When deserializing it is only looking at the serializer-id to pick which @scala[`Serializer`]@java[`JSerializer`] to use for @scala[@scaladoc[fromBinary](akka.serialization.Serializer#fromBinary(bytes:Array[Byte],manifest:Option[Class[_]]):AnyRef)]@java[@javadoc[fromBinaryJava](akka.serialization.JSerializer#fromBinaryJava(byte%5B%5D,java.lang.Class))].
+When deserializing it is only looking at the serializer-id to pick which @scala[`Serializer`]@java[`JSerializer`] to use for @scala[@scaladoc[fromBinary](pekko.serialization.Serializer#fromBinary(bytes:Array[Byte],manifest:Option[Class[_]]):AnyRef)]@java[@javadoc[fromBinaryJava](pekko.serialization.JSerializer#fromBinaryJava(byte%5B%5D,java.lang.Class))].
 The message class (the bindings) is not used for deserialization. The manifest is only used within the
 @scala[`Serializer`]@java[`JSerializer`] to decide how to deserialize the payload, so one @scala[`Serializer`]@java[`JSerializer`] can handle many classes.
 
@@ -285,10 +285,10 @@ Normally, messages sent between local actors (i.e. same JVM) do not undergo seri
 @@snip [SerializationDocSpec.scala](/akka-docs/src/test/scala/docs/serialization/SerializationDocSpec.scala) { #serialize-messages-config }
 
 Certain messages can be excluded from verification by extending the marker @scala[trait]@java[interface]
-@apidoc[akka.actor.NoSerializationVerificationNeeded](NoSerializationVerificationNeeded) or define a class name prefix in configuration
+@apidoc[actor.NoSerializationVerificationNeeded](NoSerializationVerificationNeeded) or define a class name prefix in configuration
 `akka.actor.no-serialization-verification-needed-class-prefix`.
 
-If you want to verify that your @apidoc[akka.actor.Props] are serializable you can enable the following config option:
+If you want to verify that your @apidoc[actor.Props] are serializable you can enable the following config option:
 
 @@snip [SerializationDocSpec.scala](/akka-docs/src/test/scala/docs/serialization/SerializationDocSpec.scala) { #serialize-creators-config }
 
diff --git a/akka-docs/src/main/paradox/split-brain-resolver.md b/akka-docs/src/main/paradox/split-brain-resolver.md
index 3b082715f5..478215c824 100644
--- a/akka-docs/src/main/paradox/split-brain-resolver.md
+++ b/akka-docs/src/main/paradox/split-brain-resolver.md
@@ -32,7 +32,7 @@ You need to enable the Split Brain Resolver by configuring it as downing provide
 the `ActorSystem` (`application.conf`):
 
 ```
-akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
 ```
 
 You should also consider the different available @ref:[downing strategies](#strategies).
@@ -363,7 +363,7 @@ Configuration:
 ```
 akka {
   cluster {
-    downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+    downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
     split-brain-resolver {
       active-strategy = "lease-majority"
       lease-majority {
diff --git a/akka-docs/src/main/paradox/stream/actor-interop.md b/akka-docs/src/main/paradox/stream/actor-interop.md
index bb32de79e9..29dd9311c3 100644
--- a/akka-docs/src/main/paradox/stream/actor-interop.md
+++ b/akka-docs/src/main/paradox/stream/actor-interop.md
@@ -64,7 +64,7 @@ Scala
 Java
 :   @@snip [IntegrationDocTest.java](/akka-docs/src/test/java/jdocs/stream/IntegrationDocTest.java) { #ask-actor }
 
-The stream can be completed with failure by sending `akka.actor.Status.Failure` as reply from the actor.
+The stream can be completed with failure by sending `org.apache.pekko.actor.Status.Failure` as reply from the actor.
 
 If the `ask` fails due to timeout the stream will be completed with
 `TimeoutException` failure. If that is not desired outcome you can use `recover`
@@ -93,7 +93,7 @@ message after each stream element to make back-pressure work.
 
 If the target actor terminates the stream will be cancelled. When the stream is completed successfully the
 given `onCompleteMessage` will be sent to the destination actor. When the stream is completed with
-failure a `akka.actor.Status.Failure` message will be sent to the destination actor.
+failure a `org.apache.pekko.actor.Status.Failure` message will be sent to the destination actor.
 
 Scala
 :   @@snip [IntegrationDocSpec.scala](/akka-docs/src/test/scala/docs/stream/IntegrationDocSpec.scala) { #actorRefWithBackpressure }
@@ -136,7 +136,7 @@ the stream). The elements will be buffered until the stream can process them. Yo
 the queue and they will be emitted to the stream if there is demand from downstream, otherwise they will
 be buffered until request for demand is received.
 
-Use overflow strategy `akka.stream.OverflowStrategy.backpressure` to avoid dropping of elements if the
+Use overflow strategy `org.apache.pekko.stream.OverflowStrategy.backpressure` to avoid dropping of elements if the
 buffer is full, instead the returned @scala[`Future`]@java[`CompletionStage`] does not complete until there is space in the
 buffer and `offer` should not be called again until it completes.
 
@@ -174,8 +174,8 @@ if you want a backpressured actor interface.
 
 The stream can be completed successfully by sending any message to the actor that is handled
 by the completion matching function that was provided when the actor reference was created.
-If the returned completion strategy is `akka.stream.CompletionStrategy.immediately` the completion will be signaled immediately.
-If the completion strategy is `akka.stream.CompletionStrategy.draining`, already buffered elements will be processed before signaling completion.
+If the returned completion strategy is `org.apache.pekko.stream.CompletionStrategy.immediately` the completion will be signaled immediately.
+If the completion strategy is `org.apache.pekko.stream.CompletionStrategy.draining`, already buffered elements will be processed before signaling completion.
 Any elements that are in the actor's mailbox and subsequent elements sent to the actor will not be processed.
 
 The stream can be completed with failure by sending any message to the
@@ -228,7 +228,7 @@ Sends the elements of the stream to the given @java[`ActorRef`]@scala[`ActorR
 
 ### Topic.source
 
-A source that will subscribe to a @apidoc[akka.actor.typed.pubsub.Topic$] and stream messages published to the topic.
+A source that will subscribe to a @apidoc[actor.typed.pubsub.Topic$] and stream messages published to the topic.
 
 @@@ note
 See also: @ref[ActorSink.actorRefWithBackpressure operator reference docs](operators/PubSub/source.md)
@@ -236,7 +236,7 @@ See also: @ref[ActorSink.actorRefWithBackpressure operator reference docs](opera
 
 ### Topic.sink
 
-A sink that will publish emitted messages to a @apidoc[akka.actor.typed.pubsub.Topic$].
+A sink that will publish emitted messages to a @apidoc[actor.typed.pubsub.Topic$].
 
 @@@ note
 See also: @ref[ActorSink.actorRefWithBackpressure operator reference docs](operators/PubSub/sink.md)
diff --git a/akka-docs/src/main/paradox/stream/operators/ActorFlow/ask.md b/akka-docs/src/main/paradox/stream/operators/ActorFlow/ask.md
index 5b786401c2..07c35f646b 100644
--- a/akka-docs/src/main/paradox/stream/operators/ActorFlow/ask.md
+++ b/akka-docs/src/main/paradox/stream/operators/ActorFlow/ask.md
@@ -19,7 +19,7 @@ This operator is included in:
 
 ## Signature
 
-@apidoc[ActorFlow.ask](ActorFlow$) { scala="#ask%5BI,Q,A](ref:akka.actor.typed.ActorRef%5BQ])(makeMessage:(I,akka.actor.typed.ActorRef%5BA])=%3EQ)(implicittimeout:akka.util.Timeout):akka.stream.scaladsl.Flow%5BI,A,akka.NotUsed]" java="#ask(akka.actor.typed.ActorRef,java.time.Duration,java.util.function.BiFunction)" }
+@apidoc[ActorFlow.ask](ActorFlow$) { scala="#ask%5BI,Q,A](ref:org.apache.pekko.actor.typed.ActorRef%5BQ])(makeMessage:(I,org.apache.pekko.actor.typed.ActorRef%5BA])=%3EQ)(implicittimeout:org.apache.pekko.util.Timeout):org.apache.pekko.stream.scaladsl.Flow%5BI,A,org.apache.pekko.NotUsed]" java="#ask(org.apache.pekko.actor.typed.ActorRef,java.time.Duration,java.util.function.BiFunction)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithContext.md b/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithContext.md
index d7e27630bb..cc8e8ace05 100644
--- a/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithContext.md
+++ b/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithContext.md
@@ -19,7 +19,7 @@ This operator is included in:
 
 ## Signature
 
-@apidoc[ActorFlow.askWithContext](ActorFlow$) { scala="#askWithContext%5BI,Q,A,Ctx](ref:akka.actor.typed.ActorRef%5BQ])(makeMessage:(I,akka.actor.typed.ActorRef%5BA])=%3EQ)(implicittimeout:akka.util.Timeout):akka.stream.scaladsl.Flow%5B(I,Ctx),(A,Ctx),akka.NotUsed]" java="#askWithContext(akka.actor.typed.ActorRef,java.time.Duration,java.util.function.BiFunction)" }
+@apidoc[ActorFlow.askWithContext](ActorFlow$) { scala="#askWithContext%5BI,Q,A,Ctx](ref:org.apache.pekko.actor.typed.ActorRef%5BQ])(makeMessage:(I,org.apache.pekko.actor.typed.ActorRef%5BA])=%3EQ)(implicittimeout:org.apache.pekko.util.Timeout):org.apache.pekko.stream.scaladsl.Flow%5B(I,Ctx),(A,Ctx),org.apache.pekko.NotUsed]" java="#askWithContext(org.apache.pekko.actor.typed.ActorRef,java.time.Duration,java.util.function.BiFunction)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithStatus.md b/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithStatus.md
index f57b937bae..90fae8e26f 100644
--- a/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithStatus.md
+++ b/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithStatus.md
@@ -18,12 +18,12 @@ This operator is included in:
 
 ## Signature
 
-@apidoc[ActorFlow.askWithStatus](ActorFlow$) { scala="#askWithStatus[I,Q,A](parallelism:Int)(ref:akka.actor.typed.ActorRef[Q])(makeMessage:(I,akka.actor.typed.ActorRef[akka.pattern.StatusReply[A]])=>Q)(implicittimeout:akka.util.Timeout):akka.stream.scaladsl.Flow[I,A,akka.NotUsed]" java ="#askWithStatus[I,Q,A](parallelism:Int,ref:akka.actor.typed.ActorRef[Q],timeout:java.time.Duration,makeMessage:java.util.function.BiFunction[I,akka.actor.typed.ActorRef[akka.pattern.StatusReply[A]],Q]):akka.stream.javadsl.Flow[I,A,akka.NotUsed]" }
-@apidoc[ActorFlow.askWithStatus](ActorFlow$) { scala="#askWithStatus[I,Q,A](ref:akka.actor.typed.ActorRef[Q])(makeMessage:(I,akka.actor.typed.ActorRef[akka.pattern.StatusReply[A]])=>Q)(implicittimeout:akka.util.Timeout):akka.stream.scaladsl.Flow[I,A,akka.NotUsed]" java ="#askWithStatus[I,Q,A](ref:akka.actor.typed.ActorRef[Q],timeout:java.time.Duration,makeMessage:java.util.function.BiFunction[I,akka.actor.typed.ActorRef[akka.pattern.StatusReply[A]],Q]):akka.stream.javadsl.Flow[I,A,akka.NotUsed]" }
+@apidoc[ActorFlow.askWithStatus](ActorFlow$) { scala="#askWithStatus[I,Q,A](parallelism:Int)(ref:org.apache.pekko.actor.typed.ActorRef[Q])(makeMessage:(I,org.apache.pekko.actor.typed.ActorRef[org.apache.pekko.pattern.StatusReply[A]])=>Q)(implicittimeout:org.apache.pekko.util.Timeout):org.apache.pekko.stream.scaladsl.Flow[I,A,org.apache.pekko.NotUsed]" java ="#askWithStatus[I,Q,A](parallelism:Int,ref:org.apache.pekko.actor.typed.ActorRef[Q],timeout:java.time.Duration,makeMessage:java.util.function.BiFunction[I,org.apache.pekko.actor.typed.ActorRef[org.apache.pekko.pattern.StatusReply[A]],Q]):org.apache.pekko.stream.javadsl.Flow[I,A,org.apache.pekko.NotUsed]" }
+@apidoc[ActorFlow.askWithStatus](ActorFlow$) { scala="#askWithStatus[I,Q,A](ref:org.apache.pekko.actor.typed.ActorRef[Q])(makeMessage:(I,org.apache.pekko.actor.typed.ActorRef[org.apache.pekko.pattern.StatusReply[A]])=>Q)(implicittimeout:org.apache.pekko.util.Timeout):org.apache.pekko.stream.scaladsl.Flow[I,A,org.apache.pekko.NotUsed]" java ="#askWithStatus[I,Q,A](ref:org.apache.pekko.actor.typed.ActorRef[Q],timeout:java.time.Duration,makeMessage:java.util.function.BiFunction[I,org.apache.pekko.actor.typed.ActorRef[org.apache.pekko.pattern.StatusReply[A]],Q]):org.apache.pekko.stream.javadsl.Flow[I,A,org.apache.pekko.NotUsed]" }
 
 ## Description
 
-Use the @ref[Ask pattern](../../../typed/interaction-patterns.md#request-response-with-ask-from-outside-an-actor) to send a request-reply message to the target `ref` actor when you expect the reply to be `akka.pattern.StatusReply`.
+Use the @ref[Ask pattern](../../../typed/interaction-patterns.md#request-response-with-ask-from-outside-an-actor) to send a request-reply message to the target `ref` actor when you expect the reply to be `org.apache.pekko.pattern.StatusReply`.
 If any of the asks times out it will fail the stream with an @apidoc[AskTimeoutException].
 
 The `askWithStatus` operator requires
diff --git a/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithStatusAndContext.md b/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithStatusAndContext.md
index fb8d068412..7f472b8102 100644
--- a/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithStatusAndContext.md
+++ b/akka-docs/src/main/paradox/stream/operators/ActorFlow/askWithStatusAndContext.md
@@ -19,11 +19,11 @@ This operator is included in:
 
 ## Signature
 
-@apidoc[ActorFlow.askWithStatusAndContext](ActorFlow$) { scala="#askWithStatusAndContext[I,Q,A,Ctx](parallelism:Int)(ref:akka.actor.typed.ActorRef[Q])(makeMessage:(I,akka.actor.typed.ActorRef[akka.pattern.StatusReply[A]])=>Q)(implicittimeout:akka.util.Timeout):akka.stream.scaladsl.Flow[(I,Ctx),(A,Ctx),akka.NotUsed]" java ="#askWithStatusAndContext[I,Q,A,Ctx](parallelism:Int,ref:akka.actor.typed.ActorRef[Q],timeout:java.time.Duration,makeMessage:java.util.function.BiFunction[I,akka.actor.typed.ActorRef[akka.pattern.StatusReply[A]],Q])" }
+@apidoc[ActorFlow.askWithStatusAndContext](ActorFlow$) { scala="#askWithStatusAndContext[I,Q,A,Ctx](parallelism:Int)(ref:org.apache.pekko.actor.typed.ActorRef[Q])(makeMessage:(I,org.apache.pekko.actor.typed.ActorRef[org.apache.pekko.pattern.StatusReply[A]])=>Q)(implicittimeout:org.apache.pekko.util.Timeout):org.apache.pekko.stream.scaladsl.Flow[(I,Ctx),(A,Ctx),org.apache.pekko.NotUsed]" java ="#askWithStatusAndContext[I,Q,A,Ctx](parallelism:Int,ref:org.apache.pekko.actor.typed.ActorRef[Q],timeout:java.time.Duration,makeMessage:java.util.function.BiFunction[I,org.apache.pekko.actor.typed.ActorRef[org.apache.pekko.pattern.StatusReply[A]],Q])" }
 
 ## Description
 
-Use the @ref[Ask pattern](../../../typed/interaction-patterns.md#request-response-with-ask-from-outside-an-actor) to send a request-reply message to the target `ref` actor when you expect the reply to be `akka.pattern.StatusReply`.
+Use the @ref[Ask pattern](../../../typed/interaction-patterns.md#request-response-with-ask-from-outside-an-actor) to send a request-reply message to the target `ref` actor when you expect the reply to be `org.apache.pekko.pattern.StatusReply`.
 The stream context is not sent, instead it is locally recombined to the actor's reply.
 
 If any of the asks times out it will fail the stream with an @apidoc[AskTimeoutException].
diff --git a/akka-docs/src/main/paradox/stream/operators/ActorSink/actorRef.md b/akka-docs/src/main/paradox/stream/operators/ActorSink/actorRef.md
index ba80059d26..617f5c6039 100644
--- a/akka-docs/src/main/paradox/stream/operators/ActorSink/actorRef.md
+++ b/akka-docs/src/main/paradox/stream/operators/ActorSink/actorRef.md
@@ -19,7 +19,7 @@ This operator is included in:
 
 ## Signature
 
-@apidoc[ActorSink.actorRef](ActorSink$) { scala="#actorRef[T](ref:akka.actor.typed.ActorRef[T],onCompleteMessage:T,onFailureMessage:Throwable=>T):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#actorRef(akka.actor.typed.ActorRef,java.lang.Object,akka.japi.function.Function)" }
+@apidoc[ActorSink.actorRef](ActorSink$) { scala="#actorRef[T](ref:org.apache.pekko.actor.typed.ActorRef[T],onCompleteMessage:T,onFailureMessage:Throwable=>T):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#actorRef(org.apache.pekko.actor.typed.ActorRef,java.lang.Object,org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/ActorSink/actorRefWithBackpressure.md b/akka-docs/src/main/paradox/stream/operators/ActorSink/actorRefWithBackpressure.md
index e92a76b9cd..447382e565 100644
--- a/akka-docs/src/main/paradox/stream/operators/ActorSink/actorRefWithBackpressure.md
+++ b/akka-docs/src/main/paradox/stream/operators/ActorSink/actorRefWithBackpressure.md
@@ -19,7 +19,7 @@ This operator is included in:
 
 ## Signature
 
-@apidoc[ActorSink.actorRefWithBackpressure](ActorSink$) { scala="#actorRefWithBackpressure[T,M,A](ref:akka.actor.typed.ActorRef[M],messageAdapter:(akka.actor.typed.ActorRef[A],T)=>M,onInitMessage:akka.actor.typed.ActorRef[A]=>M,ackMessage:A,onCompleteMessage:M,onFailureMessage:Throwable=>M):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#actorRefWithBackpressure(akka.actor.typed.ActorRef,akka.japi.function.Function2,akka.japi.function.Function,java.lang.Object,java.lang.Object,akka.japi.function.Function)" }
+@apidoc[ActorSink.actorRefWithBackpressure](ActorSink$) { scala="#actorRefWithBackpressure[T,M,A](ref:org.apache.pekko.actor.typed.ActorRef[M],messageAdapter:(org.apache.pekko.actor.typed.ActorRef[A],T)=>M,onInitMessage:org.apache.pekko.actor.typed.ActorRef[A]=>M,ackMessage:A,onCompleteMessage:M,onFailureMessage:Throwable=>M):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#actorRefWithBackpressure(org.apache.pekko.actor.typed.ActorRef,org.apache.pekko.japi.function.Function2,org.apache.pekko.japi.function.Function,java.lang.Object,java.lang.Object,org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
@@ -35,10 +35,10 @@ See also:
 ## Examples
 
 Scala
-:  @@snip [ActorSourceSinkExample.scala](/akka-stream-typed/src/test/scala/docs/akka/stream/typed/ActorSourceSinkExample.scala) { #actor-sink-ref-with-backpressure }
+:  @@snip [ActorSourceSinkExample.scala](/akka-stream-typed/src/test/scala/docs/org/apache/pekko/stream/typed/ActorSourceSinkExample.scala) { #actor-sink-ref-with-backpressure }
 
 Java
-:  @@snip [ActorSinkWithAckExample.java](/akka-stream-typed/src/test/java/docs/akka/stream/typed/ActorSinkWithAckExample.java) { #actor-sink-ref-with-backpressure }
+:  @@snip [ActorSinkWithAckExample.java](/akka-stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSinkWithAckExample.java) { #actor-sink-ref-with-backpressure }
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/ActorSource/actorRef.md b/akka-docs/src/main/paradox/stream/operators/ActorSource/actorRef.md
index 55e3f40226..a5e73e2446 100644
--- a/akka-docs/src/main/paradox/stream/operators/ActorSource/actorRef.md
+++ b/akka-docs/src/main/paradox/stream/operators/ActorSource/actorRef.md
@@ -19,7 +19,7 @@ This operator is included in:
 
 ## Signature
 
-@apidoc[ActorSource.actorRef](ActorSource$) { scala="#actorRef[T](completionMatcher:PartialFunction[T,Unit],failureMatcher:PartialFunction[T,Throwable],bufferSize:Int,overflowStrategy:akka.stream.OverflowStrategy):akka.stream.scaladsl.Source[T,akka.actor.typed.ActorRef[T]]" java="#actorRef(java.util.function.Predicate,akka.japi.function.Function,int,akka.stream.OverflowStrategy)" }
+@apidoc[ActorSource.actorRef](ActorSource$) { scala="#actorRef[T](completionMatcher:PartialFunction[T,Unit],failureMatcher:PartialFunction[T,Throwable],bufferSize:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.actor.typed.ActorRef[T]]" java="#actorRef(java.util.function.Predicate,org.apache.pekko.japi.function.Function,int,org.apache.pekko.stream.OverflowStrategy)" }
 
 ## Description
 
@@ -35,7 +35,7 @@ See also:
 ## Examples
 
 Scala
-:  @@snip [ActorSourceSinkExample.scala](/akka-stream-typed/src/test/scala/docs/akka/stream/typed/ActorSourceSinkExample.scala) { #actor-source-ref }
+:  @@snip [ActorSourceSinkExample.scala](/akka-stream-typed/src/test/scala/docs/org/apache/pekko/stream/typed/ActorSourceSinkExample.scala) { #actor-source-ref }
 
 Java
-:  @@snip [ActorSourceExample.java](/akka-stream-typed/src/test/java/docs/akka/stream/typed/ActorSourceExample.java) { #actor-source-ref }
+:  @@snip [ActorSourceExample.java](/akka-stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceExample.java) { #actor-source-ref }
diff --git a/akka-docs/src/main/paradox/stream/operators/ActorSource/actorRefWithBackpressure.md b/akka-docs/src/main/paradox/stream/operators/ActorSource/actorRefWithBackpressure.md
index 30f0730e2f..ff6f23cc9c 100644
--- a/akka-docs/src/main/paradox/stream/operators/ActorSource/actorRefWithBackpressure.md
+++ b/akka-docs/src/main/paradox/stream/operators/ActorSource/actorRefWithBackpressure.md
@@ -19,7 +19,7 @@ This operator is included in:
 
 ## Signature
 
-@apidoc[ActorSource.actorRefWithBackpressure](ActorSource$) { scala="#actorRefWithBackpressure[T,Ack](ackTo:akka.actor.typed.ActorRef[Ack],ackMessage:Ack,completionMatcher:PartialFunction[T,akka.stream.CompletionStrategy],failureMatcher:PartialFunction[T,Throwable]):akka.stream.scaladsl.Source[T,akka.actor.typed.ActorRef[T]]" java="#actorRefWithBackpressure(akka.actor.typed.ActorRef,java.lang.Object,akka.japi.function.Function,akka.japi.function.Function)" }
+@apidoc[ActorSource.actorRefWithBackpressure](ActorSource$) { scala="#actorRefWithBackpressure[T,Ack](ackTo:org.apache.pekko.actor.typed.ActorRef[Ack],ackMessage:Ack,completionMatcher:PartialFunction[T,org.apache.pekko.stream.CompletionStrategy],failureMatcher:PartialFunction[T,Throwable]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.actor.typed.ActorRef[T]]" java="#actorRefWithBackpressure(org.apache.pekko.actor.typed.ActorRef,java.lang.Object,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
@@ -48,10 +48,10 @@ In this example we create the stream in an actor which itself reacts on the dema
 
 
 Scala
-:  @@snip [ActorSourceSinkExample.scala](/akka-stream-typed/src/test/scala/docs/akka/stream/typed/ActorSourceSinkExample.scala) { #actor-source-with-backpressure }
+:  @@snip [ActorSourceSinkExample.scala](/akka-stream-typed/src/test/scala/docs/org/apache/pekko/stream/typed/ActorSourceSinkExample.scala) { #actor-source-with-backpressure }
 
 Java
-:  @@snip [snip](/akka-stream-typed/src/test/java/docs/akka/stream/typed/ActorSourceWithBackpressureExample.java) { #sample }
+:  @@snip [snip](/akka-stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceWithBackpressureExample.java) { #sample }
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Broadcast.md b/akka-docs/src/main/paradox/stream/operators/Broadcast.md
index 3a3a1e3c47..ce5d49f9a7 100644
--- a/akka-docs/src/main/paradox/stream/operators/Broadcast.md
+++ b/akka-docs/src/main/paradox/stream/operators/Broadcast.md
@@ -6,7 +6,7 @@ Emit each incoming element each of `n` outputs.
 
 ## Signature
 
-@apidoc[akka.stream.*.Broadcast]
+@apidoc[stream.*.Broadcast]
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Compression/deflate.md b/akka-docs/src/main/paradox/stream/operators/Compression/deflate.md
index d98c69355c..8276e88c8f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Compression/deflate.md
+++ b/akka-docs/src/main/paradox/stream/operators/Compression/deflate.md
@@ -6,12 +6,12 @@ Creates a flow that deflate-compresses a stream of ByteStrings.
 
 ## Signature
 
-@apidoc[Compression.deflate](stream.*.Compression$) { scala="#deflate:akka.stream.scaladsl.Flow[akka.util.ByteString,akka.util.ByteString,akka.NotUsed]" java="#deflate()" }
+@apidoc[Compression.deflate](stream.*.Compression$) { scala="#deflate:org.apache.pekko.stream.scaladsl.Flow[org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.NotUsed]" java="#deflate()" }
 
 ## Description
 
 Creates a flow that deflate-compresses a stream of ByteStrings. Note that the compressor
-will SYNC_FLUSH after every @apidoc[akka.util.ByteString] so that it is guaranteed that every @apidoc[akka.util.ByteString]
+will SYNC_FLUSH after every @apidoc[util.ByteString] so that it is guaranteed that every @apidoc[util.ByteString]
 coming out of the flow can be fully decompressed without waiting for additional data. This may
 come at a compression performance cost for very small chunks.
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Compression/gunzip.md b/akka-docs/src/main/paradox/stream/operators/Compression/gunzip.md
index 2a68e63440..58bca10dc1 100644
--- a/akka-docs/src/main/paradox/stream/operators/Compression/gunzip.md
+++ b/akka-docs/src/main/paradox/stream/operators/Compression/gunzip.md
@@ -6,7 +6,7 @@ Creates a flow that gzip-decompresses a stream of ByteStrings.
 
 ## Signature
 
-@apidoc[Compression.gunzip](stream.*.Compression$) { scala="#gunzip(maxBytesPerChunk:Int):akka.stream.scaladsl.Flow[akka.util.ByteString,akka.util.ByteString,akka.NotUsed]" java="#gunzip(int)" }
+@apidoc[Compression.gunzip](stream.*.Compression$) { scala="#gunzip(maxBytesPerChunk:Int):org.apache.pekko.stream.scaladsl.Flow[org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.NotUsed]" java="#gunzip(int)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Compression/gzip.md b/akka-docs/src/main/paradox/stream/operators/Compression/gzip.md
index a938a8bf84..40958dc4bd 100644
--- a/akka-docs/src/main/paradox/stream/operators/Compression/gzip.md
+++ b/akka-docs/src/main/paradox/stream/operators/Compression/gzip.md
@@ -6,12 +6,12 @@ Creates a flow that gzip-compresses a stream of ByteStrings.
 
 ## Signature
 
-@apidoc[Compression.gzip](stream.*.Compression$) { scala="#gzip:akka.stream.scaladsl.Flow[akka.util.ByteString,akka.util.ByteString,akka.NotUsed]" java="#gzip()" }
+@apidoc[Compression.gzip](stream.*.Compression$) { scala="#gzip:org.apache.pekko.stream.scaladsl.Flow[org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.NotUsed]" java="#gzip()" }
 
 ## Description
 
 Creates a flow that gzip-compresses a stream of ByteStrings. Note that the compressor
-will SYNC_FLUSH after every @apidoc[akka.util.ByteString] so that it is guaranteed that every @apidoc[akka.util.ByteString]
+will SYNC_FLUSH after every @apidoc[util.ByteString] so that it is guaranteed that every @apidoc[util.ByteString]
 coming out of the flow can be fully decompressed without waiting for additional data. This may
 come at a compression performance cost for very small chunks.
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Compression/inflate.md b/akka-docs/src/main/paradox/stream/operators/Compression/inflate.md
index b1360d9c53..843b2184e5 100644
--- a/akka-docs/src/main/paradox/stream/operators/Compression/inflate.md
+++ b/akka-docs/src/main/paradox/stream/operators/Compression/inflate.md
@@ -6,7 +6,7 @@ Creates a flow that deflate-decompresses a stream of ByteStrings.
 
 ## Signature
 
-@apidoc[Compression.indeflate](stream.*.Compression$) { scala="#inflate(maxBytesPerChunk:Int,nowrap:Boolean):akka.stream.scaladsl.Flow[akka.util.ByteString,akka.util.ByteString,akka.NotUsed]" java="#inflate(int,boolean)" }
+@apidoc[Compression.indeflate](stream.*.Compression$) { scala="#inflate(maxBytesPerChunk:Int,nowrap:Boolean):org.apache.pekko.stream.scaladsl.Flow[org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.NotUsed]" java="#inflate(int,boolean)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/FileIO/fromFile.md b/akka-docs/src/main/paradox/stream/operators/FileIO/fromFile.md
index cf4f822b8b..06c5a115cd 100644
--- a/akka-docs/src/main/paradox/stream/operators/FileIO/fromFile.md
+++ b/akka-docs/src/main/paradox/stream/operators/FileIO/fromFile.md
@@ -12,7 +12,7 @@ The `fromFile` operator has been deprecated, use @ref:[fromPath](./fromPath.md)
 
 ## Signature
 
-@apidoc[FileIO.fromFile](FileIO$) { scala="#fromFile(f:java.io.File,chunkSize:Int):akka.stream.scaladsl.Source[akka.util.ByteString,scala.concurrent.Future[akka.stream.IOResult]]" java="#fromFile(java.io.File)" java="#fromFile(java.io.File,int)" }
+@apidoc[FileIO.fromFile](FileIO$) { scala="#fromFile(f:java.io.File,chunkSize:Int):org.apache.pekko.stream.scaladsl.Source[org.apache.pekko.util.ByteString,scala.concurrent.Future[org.apache.pekko.stream.IOResult]]" java="#fromFile(java.io.File)" java="#fromFile(java.io.File,int)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/FileIO/fromPath.md b/akka-docs/src/main/paradox/stream/operators/FileIO/fromPath.md
index a0b178d0a3..eefbff3ab9 100644
--- a/akka-docs/src/main/paradox/stream/operators/FileIO/fromPath.md
+++ b/akka-docs/src/main/paradox/stream/operators/FileIO/fromPath.md
@@ -6,7 +6,7 @@ Emits the contents of a file from the given path.
 
 ## Signature
 
-@apidoc[FileIO.fromPath](FileIO$) { scala="#fromPath(f:java.nio.file.Path,chunkSize:Int,startPosition:Long):akka.stream.scaladsl.Source[akka.util.ByteString,scala.concurrent.Future[akka.stream.IOResult]]" java="#fromPath(java.nio.file.Path,int,long)" }
+@apidoc[FileIO.fromPath](FileIO$) { scala="#fromPath(f:java.nio.file.Path,chunkSize:Int,startPosition:Long):org.apache.pekko.stream.scaladsl.Source[org.apache.pekko.util.ByteString,scala.concurrent.Future[org.apache.pekko.stream.IOResult]]" java="#fromPath(java.nio.file.Path,int,long)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/FileIO/toFile.md b/akka-docs/src/main/paradox/stream/operators/FileIO/toFile.md
index 6d88608364..c75ed1f7d7 100644
--- a/akka-docs/src/main/paradox/stream/operators/FileIO/toFile.md
+++ b/akka-docs/src/main/paradox/stream/operators/FileIO/toFile.md
@@ -12,7 +12,7 @@ The `toFile` operator has been deprecated, use @ref:[toPath](./toPath.md) instea
 
 ## Signature
 
-@apidoc[FileIO.toFile](FileIO$) { scala="#toFile(f:java.io.File,options:Set[java.nio.file.OpenOption]):akka.stream.scaladsl.Sink[akka.util.ByteString,scala.concurrent.Future[akka.stream.IOResult]]" java="#toFile(java.io.File,java.util.Set)" }
+@apidoc[FileIO.toFile](FileIO$) { scala="#toFile(f:java.io.File,options:Set[java.nio.file.OpenOption]):org.apache.pekko.stream.scaladsl.Sink[org.apache.pekko.util.ByteString,scala.concurrent.Future[org.apache.pekko.stream.IOResult]]" java="#toFile(java.io.File,java.util.Set)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/FileIO/toPath.md b/akka-docs/src/main/paradox/stream/operators/FileIO/toPath.md
index 7657c46bf0..092b5d6612 100644
--- a/akka-docs/src/main/paradox/stream/operators/FileIO/toPath.md
+++ b/akka-docs/src/main/paradox/stream/operators/FileIO/toPath.md
@@ -6,7 +6,7 @@ Create a sink which will write incoming `ByteString` s to a given file path.
 
 ## Signature
 
-@apidoc[FileIO.toPath](FileIO$) { scala="#toPath(f:java.nio.file.Path,options:Set[java.nio.file.OpenOption],startPosition:Long):akka.stream.scaladsl.Sink[akka.util.ByteString,scala.concurrent.Future[akka.stream.IOResult]]" java="#toPath(java.nio.file.Path,java.util.Set,long)" }
+@apidoc[FileIO.toPath](FileIO$) { scala="#toPath(f:java.nio.file.Path,options:Set[java.nio.file.OpenOption],startPosition:Long):org.apache.pekko.stream.scaladsl.Sink[org.apache.pekko.util.ByteString,scala.concurrent.Future[org.apache.pekko.stream.IOResult]]" java="#toPath(java.nio.file.Path,java.util.Set,long)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Flow/asFlowWithContext.md b/akka-docs/src/main/paradox/stream/operators/Flow/asFlowWithContext.md
index 9dd496256f..d0d55ab045 100644
--- a/akka-docs/src/main/paradox/stream/operators/Flow/asFlowWithContext.md
+++ b/akka-docs/src/main/paradox/stream/operators/Flow/asFlowWithContext.md
@@ -6,7 +6,7 @@ Extracts context data from the elements of a `Flow` so that it can be turned int
 
 ## Signature
 
-@apidoc[Flow.asFlowWithContext](Flow) { scala="#asFlowWithContext[U,CtxU,CtxOut](collapseContext:(U,CtxU)=>In)(extractContext:Out=>CtxOut):akka.stream.scaladsl.FlowWithContext[U,CtxU,Out,CtxOut,Mat]" java="#asFlowWithContext(akka.japi.function.Function2,akka.japi.function.Function)" }
+@apidoc[Flow.asFlowWithContext](Flow) { scala="#asFlowWithContext[U,CtxU,CtxOut](collapseContext:(U,CtxU)=>In)(extractContext:Out=>CtxOut):org.apache.pekko.stream.scaladsl.FlowWithContext[U,CtxU,Out,CtxOut,Mat]" java="#asFlowWithContext(org.apache.pekko.japi.function.Function2,org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Flow/flattenOptional.md b/akka-docs/src/main/paradox/stream/operators/Flow/flattenOptional.md
index a559189329..72b79d52c7 100644
--- a/akka-docs/src/main/paradox/stream/operators/Flow/flattenOptional.md
+++ b/akka-docs/src/main/paradox/stream/operators/Flow/flattenOptional.md
@@ -6,7 +6,7 @@ Collect the value of `Optional` from all the elements passing through this flow
 
 ## Signature
 
-@apidoc[Flow.flattenOptional](Flow$) { java="#flattenOptional(akka.stream.javadsl.Flow)" }
+@apidoc[Flow.flattenOptional](Flow$) { java="#flattenOptional(org.apache.pekko.stream.javadsl.Flow)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Flow/fromSinkAndSource.md b/akka-docs/src/main/paradox/stream/operators/Flow/fromSinkAndSource.md
index aae3771eaf..f48f33dc41 100644
--- a/akka-docs/src/main/paradox/stream/operators/Flow/fromSinkAndSource.md
+++ b/akka-docs/src/main/paradox/stream/operators/Flow/fromSinkAndSource.md
@@ -6,7 +6,7 @@ Creates a `Flow` from a `Sink` and a `Source` where the Flow's input will be sen
 
 ## Signature
 
-@apidoc[Flow.fromSinkAndSource](Flow$) { scala="#fromSinkAndSource[I,O](sink:akka.stream.Graph[akka.stream.SinkShape[I],_],source:akka.stream.Graph[akka.stream.SourceShape[O],_]):akka.stream.scaladsl.Flow[I,O,akka.NotUsed]" java="#fromSinkAndSource(akka.stream.Graph,akka.stream.Graph)" }
+@apidoc[Flow.fromSinkAndSource](Flow$) { scala="#fromSinkAndSource[I,O](sink:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[I],_],source:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[O],_]):org.apache.pekko.stream.scaladsl.Flow[I,O,org.apache.pekko.NotUsed]" java="#fromSinkAndSource(org.apache.pekko.stream.Graph,org.apache.pekko.stream.Graph)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Flow/fromSinkAndSourceCoupled.md b/akka-docs/src/main/paradox/stream/operators/Flow/fromSinkAndSourceCoupled.md
index 03ce607c68..42a7e35141 100644
--- a/akka-docs/src/main/paradox/stream/operators/Flow/fromSinkAndSourceCoupled.md
+++ b/akka-docs/src/main/paradox/stream/operators/Flow/fromSinkAndSourceCoupled.md
@@ -6,7 +6,7 @@ Allows coupling termination (cancellation, completion, erroring) of Sinks and So
 
 ## Signature
 
-@apidoc[Flow.fromSinkAndSourceCoupled](Flow$) { scala="#fromSinkAndSourceCoupled[I,O](sink:akka.stream.Graph[akka.stream.SinkShape[I],_],source:akka.stream.Graph[akka.stream.SourceShape[O],_]):akka.stream.scaladsl.Flow[I,O,akka.NotUsed]" java="#fromSinkAndSourceCoupled(akka.stream.Graph,akka.stream.Graph)" }
+@apidoc[Flow.fromSinkAndSourceCoupled](Flow$) { scala="#fromSinkAndSourceCoupled[I,O](sink:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[I],_],source:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[O],_]):org.apache.pekko.stream.scaladsl.Flow[I,O,org.apache.pekko.NotUsed]" java="#fromSinkAndSourceCoupled(org.apache.pekko.stream.Graph,org.apache.pekko.stream.Graph)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Flow/futureFlow.md b/akka-docs/src/main/paradox/stream/operators/Flow/futureFlow.md
index 55a2ba4b5f..788a19745b 100644
--- a/akka-docs/src/main/paradox/stream/operators/Flow/futureFlow.md
+++ b/akka-docs/src/main/paradox/stream/operators/Flow/futureFlow.md
@@ -6,7 +6,7 @@ Streams the elements through the given future flow once it successfully complete
 
 ## Signature
 
-@apidoc[Flow.futureFlow](Flow$) { scala="#futureFlow[I,O,M](flow:scala.concurrent.Future[akka.stream.scaladsl.Flow[I,O,M]]):akka.stream.scaladsl.Flow[I,O,scala.concurrent.Future[M]]" }
+@apidoc[Flow.futureFlow](Flow$) { scala="#futureFlow[I,O,M](flow:scala.concurrent.Future[org.apache.pekko.stream.scaladsl.Flow[I,O,M]]):org.apache.pekko.stream.scaladsl.Flow[I,O,scala.concurrent.Future[M]]" }
 
 
 ## Description
@@ -38,7 +38,7 @@ Scala
 
 **cancels** when downstream cancels (keep reading)
     The operator's default behaviour in case of downstream cancellation before nested flow materialization (future completion) is to cancel immediately.
-     This behaviour can be controlled by setting the [[akka.stream.Attributes.NestedMaterializationCancellationPolicy.PropagateToNested]] attribute,
+     This behaviour can be controlled by setting the [[org.apache.pekko.stream.Attributes.NestedMaterializationCancellationPolicy.PropagateToNested]] attribute,
     this will delay downstream cancellation until nested flow's materialization which is then immediately cancelled (with the original cancellation cause).
 @@@
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Flow/lazyCompletionStageFlow.md b/akka-docs/src/main/paradox/stream/operators/Flow/lazyCompletionStageFlow.md
index 8afc8046c7..52b8dcc517 100644
--- a/akka-docs/src/main/paradox/stream/operators/Flow/lazyCompletionStageFlow.md
+++ b/akka-docs/src/main/paradox/stream/operators/Flow/lazyCompletionStageFlow.md
@@ -12,7 +12,7 @@ and inserted in the stream.
 The internal `Flow` will not be created if there are no elements on completion or failure of up or downstream.
 
 The materialized value of the `Flow` will be the materialized value of the created internal flow if it is materialized
-and failed with a `akka.stream.NeverMaterializedException` if the stream fails or completes without the flow being materialized.
+and failed with a `org.apache.pekko.stream.NeverMaterializedException` if the stream fails or completes without the flow being materialized.
 
 See also @ref:[lazyFlow](lazyFlow.md).
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Flow/lazyFlow.md b/akka-docs/src/main/paradox/stream/operators/Flow/lazyFlow.md
index 950ac5d625..369db70721 100644
--- a/akka-docs/src/main/paradox/stream/operators/Flow/lazyFlow.md
+++ b/akka-docs/src/main/paradox/stream/operators/Flow/lazyFlow.md
@@ -6,7 +6,7 @@ Defers creation and materialization of a `Flow` until there is a first element.
 
 ## Signature
 
-@apidoc[Flow.lazyFlow](Flow$) { scala="#lazyFlow[I,O,M](create:()=>akka.stream.scaladsl.Flow[I,O,M]):akka.stream.scaladsl.Flow[I,O,scala.concurrent.Future[M]]" java="#lazyFlow(akka.japi.function.Creator)" }
+@apidoc[Flow.lazyFlow](Flow$) { scala="#lazyFlow[I,O,M](create:()=>org.apache.pekko.stream.scaladsl.Flow[I,O,M]):org.apache.pekko.stream.scaladsl.Flow[I,O,scala.concurrent.Future[M]]" java="#lazyFlow(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
@@ -65,6 +65,6 @@ all materialization and what is even worse, unsafely across threads.
 
 **cancels** when downstream cancels (keep reading)
     The operator's default behaviour in case of downstream cancellation before nested flow materialization (future completion) is to cancel immediately.
-     This behaviour can be controlled by setting the [[akka.stream.Attributes.NestedMaterializationCancellationPolicy.PropagateToNested]] attribute,
+     This behaviour can be controlled by setting the [[org.apache.pekko.stream.Attributes.NestedMaterializationCancellationPolicy.PropagateToNested]] attribute,
     this will delay downstream cancellation until nested flow's materialization which is then immediately cancelled (with the original cancellation cause).
 @@@
diff --git a/akka-docs/src/main/paradox/stream/operators/Flow/lazyFutureFlow.md b/akka-docs/src/main/paradox/stream/operators/Flow/lazyFutureFlow.md
index fe8841464f..9814ced108 100644
--- a/akka-docs/src/main/paradox/stream/operators/Flow/lazyFutureFlow.md
+++ b/akka-docs/src/main/paradox/stream/operators/Flow/lazyFutureFlow.md
@@ -6,7 +6,7 @@ Defers creation and materialization of a `Flow` until there is a first element.
 
 ## Signature
 
-@apidoc[Flow.lazyFutureFlow](Flow$) { scala="#lazyFutureFlow[I,O,M](create:()=>scala.concurrent.Future[akka.stream.scaladsl.Flow[I,O,M]]):akka.stream.scaladsl.Flow[I,O,scala.concurrent.Future[M]]" }
+@apidoc[Flow.lazyFutureFlow](Flow$) { scala="#lazyFutureFlow[I,O,M](create:()=>scala.concurrent.Future[org.apache.pekko.stream.scaladsl.Flow[I,O,M]]):org.apache.pekko.stream.scaladsl.Flow[I,O,scala.concurrent.Future[M]]" }
 
 
 ## Description
@@ -16,7 +16,7 @@ and inserted in the stream.
 The internal `Flow` will not be created if there are no elements on completion or failure of up or downstream.
 
 The materialized value of the `Flow` will be the materialized value of the created internal flow if it is materialized
-and failed with a `akka.stream.NeverMaterializedException` if the stream fails or completes without the flow being materialized.
+and failed with a `org.apache.pekko.stream.NeverMaterializedException` if the stream fails or completes without the flow being materialized.
 
 See also @ref:[lazyFlow](lazyFlow.md).
 
@@ -37,7 +37,7 @@ See @ref:[lazyFlow](lazyFlow.md) for sample.
 
 **cancels** when downstream cancels (keep reading)
     The operator's default behaviour in case of downstream cancellation before nested flow materialization (future completion) is to cancel immediately.
-     This behaviour can be controlled by setting the [[akka.stream.Attributes.NestedMaterializationCancellationPolicy.PropagateToNested]] attribute,
+     This behaviour can be controlled by setting the [[org.apache.pekko.stream.Attributes.NestedMaterializationCancellationPolicy.PropagateToNested]] attribute,
     this will delay downstream cancellation until nested flow's materialization which is then immediately cancelled (with the original cancellation cause).
 @@@
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Flow/lazyInitAsync.md b/akka-docs/src/main/paradox/stream/operators/Flow/lazyInitAsync.md
index 2dd60ca08a..11aaf43b2f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Flow/lazyInitAsync.md
+++ b/akka-docs/src/main/paradox/stream/operators/Flow/lazyInitAsync.md
@@ -6,7 +6,7 @@ Deprecated by @ref:[`Flow.lazyFutureFlow`](lazyFutureFlow.md) in combination wit
 
 ## Signature
 
-@apidoc[Flow.lazyInitAsync](Flow$) { scala="#lazyInitAsync[I,O,M](flowFactory:()=>scala.concurrent.Future[akka.stream.scaladsl.Flow[I,O,M]]):akka.stream.scaladsl.Flow[I,O,scala.concurrent.Future[Option[M]]]" java="#lazyInitAsync(akka.japi.function.Creator)" }
+@apidoc[Flow.lazyInitAsync](Flow$) { scala="#lazyInitAsync[I,O,M](flowFactory:()=>scala.concurrent.Future[org.apache.pekko.stream.scaladsl.Flow[I,O,M]]):org.apache.pekko.stream.scaladsl.Flow[I,O,scala.concurrent.Future[Option[M]]]" java="#lazyInitAsync(org.apache.pekko.japi.function.Creator)" }
 
 ## Description
 
@@ -28,7 +28,7 @@ Defers creation until a first element arrives.
 
 **cancels** when downstream cancels (keep reading)
     The operator's default behaviour in case of downstream cancellation before nested flow materialization (future completion) is to cancel immediately.
-     This behaviour can be controlled by setting the [[akka.stream.Attributes.NestedMaterializationCancellationPolicy.PropagateToNested]] attribute,
+     This behaviour can be controlled by setting the [[org.apache.pekko.stream.Attributes.NestedMaterializationCancellationPolicy.PropagateToNested]] attribute,
     this will delay downstream cancellation until nested flow's materialization which is then immediately cancelled (with the original cancellation cause).
 @@@
 
diff --git a/akka-docs/src/main/paradox/stream/operators/PubSub/sink.md b/akka-docs/src/main/paradox/stream/operators/PubSub/sink.md
index e397906944..18af6233e9 100644
--- a/akka-docs/src/main/paradox/stream/operators/PubSub/sink.md
+++ b/akka-docs/src/main/paradox/stream/operators/PubSub/sink.md
@@ -1,6 +1,6 @@
 # PubSub.sink
 
-A sink that will publish emitted messages to a @apidoc[akka.actor.typed.pubsub.Topic$].
+A sink that will publish emitted messages to a @apidoc[actor.typed.pubsub.Topic$].
 
 @ref[Actor interop operators](../index.md#actor-interop-operators)
 
@@ -24,7 +24,7 @@ version=AkkaVersion
 
 ## Signature
 
-@apidoc[PubSub.sink](akka.stream.typed.*.PubSub$) { scala="#sink[T](topic:akka.actor.typed.Toppic[T]):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#sink(akka.actor.typed.Topic)" }
+@apidoc[PubSub.sink](stream.typed.*.PubSub$) { scala="#sink[T](topic:org.apache.pekko.actor.typed.Toppic[T]):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#sink(org.apache.pekko.actor.typed.Topic)" }
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/PubSub/source.md b/akka-docs/src/main/paradox/stream/operators/PubSub/source.md
index ef3535a7bd..d2b54fd856 100644
--- a/akka-docs/src/main/paradox/stream/operators/PubSub/source.md
+++ b/akka-docs/src/main/paradox/stream/operators/PubSub/source.md
@@ -1,6 +1,6 @@
 # PubSub.source
 
-A source that will subscribe to a @apidoc[akka.actor.typed.pubsub.Topic$] and stream messages published to the topic. 
+A source that will subscribe to a @apidoc[actor.typed.pubsub.Topic$] and stream messages published to the topic. 
 
 @ref[Actor interop operators](../index.md#actor-interop-operators)
 
@@ -27,7 +27,7 @@ version=AkkaVersion
 
 ## Signature
 
-@apidoc[PubSub.source](akka.stream.typed.*.PubSub$) { scala="#source[T](topic:akka.actor.typed.Toppic[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#source(akka.actor.typed.Topic)" }
+@apidoc[PubSub.source](stream.typed.*.PubSub$) { scala="#source[T](topic:org.apache.pekko.actor.typed.Topic[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#source(org.apache.pekko.actor.typed.Topic)" }
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/RestartFlow/onFailuresWithBackoff.md b/akka-docs/src/main/paradox/stream/operators/RestartFlow/onFailuresWithBackoff.md
index d33566b282..02c004517e 100644
--- a/akka-docs/src/main/paradox/stream/operators/RestartFlow/onFailuresWithBackoff.md
+++ b/akka-docs/src/main/paradox/stream/operators/RestartFlow/onFailuresWithBackoff.md
@@ -6,7 +6,7 @@ Wrap the given @apidoc[Flow] with a @apidoc[Flow] that will restart it when it f
 
 ## Signature
 
-@apidoc[RestartFlow.onFailuresWithBackoff](RestartFlow$) { scala="#onFailuresWithBackoff[In,Out](settings:akka.stream.RestartSettings)(flowFactory:()=>akka.stream.scaladsl.Flow[In,Out,_]):akka.stream.scaladsl.Flow[In,Out,akka.NotUsed]" java="#onFailuresWithBackoff(akka.stream.RestartSettings,akka.japi.function.Creator)" }
+@apidoc[RestartFlow.onFailuresWithBackoff](RestartFlow$) { scala="#onFailuresWithBackoff[In,Out](settings:org.apache.pekko.stream.RestartSettings)(flowFactory:()=>org.apache.pekko.stream.scaladsl.Flow[In,Out,_]):org.apache.pekko.stream.scaladsl.Flow[In,Out,org.apache.pekko.NotUsed]" java="#onFailuresWithBackoff(org.apache.pekko.stream.RestartSettings,org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/RestartFlow/withBackoff.md b/akka-docs/src/main/paradox/stream/operators/RestartFlow/withBackoff.md
index e25e4a51a8..325703972d 100644
--- a/akka-docs/src/main/paradox/stream/operators/RestartFlow/withBackoff.md
+++ b/akka-docs/src/main/paradox/stream/operators/RestartFlow/withBackoff.md
@@ -6,7 +6,7 @@ Wrap the given @apidoc[Flow] with a @apidoc[Flow] that will restart it when it f
 
 ## Signature
 
-@apidoc[RestartFlow.withBackoff](RestartFlow$) { scala="#withBackoff[In,Out](settings:akka.stream.RestartSettings)(flowFactory:()=>akka.stream.scaladsl.Flow[In,Out,_]):akka.stream.scaladsl.Flow[In,Out,akka.NotUsed]" java="#withBackoff(akka.stream.RestartSettings,akka.japi.function.Creator)" }
+@apidoc[RestartFlow.withBackoff](RestartFlow$) { scala="#withBackoff[In,Out](settings:org.apache.pekko.stream.RestartSettings)(flowFactory:()=>org.apache.pekko.stream.scaladsl.Flow[In,Out,_]):org.apache.pekko.stream.scaladsl.Flow[In,Out,org.apache.pekko.NotUsed]" java="#withBackoff(org.apache.pekko.stream.RestartSettings,org.apache.pekko.japi.function.Creator)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/RestartSink/withBackoff.md b/akka-docs/src/main/paradox/stream/operators/RestartSink/withBackoff.md
index 5de0ce1f49..107e454d6b 100644
--- a/akka-docs/src/main/paradox/stream/operators/RestartSink/withBackoff.md
+++ b/akka-docs/src/main/paradox/stream/operators/RestartSink/withBackoff.md
@@ -6,7 +6,7 @@ Wrap the given @apidoc[Sink] with a @apidoc[Sink] that will restart it when it f
 
 ## Signature
 
-@apidoc[RestartSink.withBackoff](RestartSink$) { scala="#withBackoff[T](settings:akka.stream.RestartSettings)(sinkFactory:()=>akka.stream.scaladsl.Sink[T,_]):akka.stream.scaladsl.Sink[T,akka.NotUsed]"  java="#withBackoff(akka.stream.RestartSettings,akka.japi.function.Creator)" }
+@apidoc[RestartSink.withBackoff](RestartSink$) { scala="#withBackoff[T](settings:org.apache.pekko.stream.RestartSettings)(sinkFactory:()=>org.apache.pekko.stream.scaladsl.Sink[T,_]):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]"  java="#withBackoff(org.apache.pekko.stream.RestartSettings,org.apache.pekko.japi.function.Creator)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/RestartSource/onFailuresWithBackoff.md b/akka-docs/src/main/paradox/stream/operators/RestartSource/onFailuresWithBackoff.md
index eea0f23158..7d3aa5b713 100644
--- a/akka-docs/src/main/paradox/stream/operators/RestartSource/onFailuresWithBackoff.md
+++ b/akka-docs/src/main/paradox/stream/operators/RestartSource/onFailuresWithBackoff.md
@@ -6,7 +6,7 @@ Wrap the given @apidoc[Source] with a @apidoc[Source] that will restart it when
 
 ## Signature
 
-@apidoc[RestartSource.onFailuresWithBackoff](RestartSource$) { scala="#onFailuresWithBackoff[T](settings:akka.stream.RestartSettings)(sourceFactory:()=>akka.stream.scaladsl.Source[T,_]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#onFailuresWithBackoff(akka.stream.RestartSettings,akka.japi.function.Creator)" }
+@apidoc[RestartSource.onFailuresWithBackoff](RestartSource$) { scala="#onFailuresWithBackoff[T](settings:org.apache.pekko.stream.RestartSettings)(sourceFactory:()=>org.apache.pekko.stream.scaladsl.Source[T,_]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#onFailuresWithBackoff(org.apache.pekko.stream.RestartSettings,org.apache.pekko.japi.function.Creator)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/RestartSource/withBackoff.md b/akka-docs/src/main/paradox/stream/operators/RestartSource/withBackoff.md
index de038f6a0d..8cd64af8c1 100644
--- a/akka-docs/src/main/paradox/stream/operators/RestartSource/withBackoff.md
+++ b/akka-docs/src/main/paradox/stream/operators/RestartSource/withBackoff.md
@@ -6,7 +6,7 @@ Wrap the given @apidoc[Source] with a @apidoc[Source] that will restart it when
 
 ## Signature
 
-@apidoc[RestartSource.withBackoff](RestartSource$) { scala="#withBackoff[T](settings:akka.stream.RestartSettings)(sourceFactory:()=>akka.stream.scaladsl.Source[T,_]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#withBackoff(akka.stream.RestartSettings,akka.japi.function.Creator)" }
+@apidoc[RestartSource.withBackoff](RestartSource$) { scala="#withBackoff[T](settings:org.apache.pekko.stream.RestartSettings)(sourceFactory:()=>org.apache.pekko.stream.scaladsl.Source[T,_]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#withBackoff(org.apache.pekko.stream.RestartSettings,org.apache.pekko.japi.function.Creator)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/RetryFlow/withBackoff.md b/akka-docs/src/main/paradox/stream/operators/RetryFlow/withBackoff.md
index 285b328228..2ae20ac65b 100644
--- a/akka-docs/src/main/paradox/stream/operators/RetryFlow/withBackoff.md
+++ b/akka-docs/src/main/paradox/stream/operators/RetryFlow/withBackoff.md
@@ -6,7 +6,7 @@ Wrap the given @apidoc[Flow] and retry individual elements in that stream with a
 
 ## Signature
 
-@apidoc[RetryFlow.withBackoff](RetryFlow$) { scala="#withBackoff[In,Out,Mat](minBackoff:scala.concurrent.duration.FiniteDuration,maxBackoff:scala.concurrent.duration.FiniteDuration,randomFactor:Double,maxRetries:Int,flow:akka.stream.scaladsl.Flow[In,Out,Mat])(decideRetry:(In,Out)=>Option[In]):akka.stream.scaladsl.Flow[In,Out,Mat]" java="#withBackoff(java.time.Duration,java.time.Duration,double,int,akka.stream.javadsl.Flow,akka.japi.function.Function2)" }
+@apidoc[RetryFlow.withBackoff](RetryFlow$) { scala="#withBackoff[In,Out,Mat](minBackoff:scala.concurrent.duration.FiniteDuration,maxBackoff:scala.concurrent.duration.FiniteDuration,randomFactor:Double,maxRetries:Int,flow:org.apache.pekko.stream.scaladsl.Flow[In,Out,Mat])(decideRetry:(In,Out)=>Option[In]):org.apache.pekko.stream.scaladsl.Flow[In,Out,Mat]" java="#withBackoff(java.time.Duration,java.time.Duration,double,int,org.apache.pekko.stream.javadsl.Flow,org.apache.pekko.japi.function.Function2)" }
 
 ## Description
 
@@ -29,10 +29,10 @@ This API was added in Akka 2.6.0 and @ref:[may be changed](../../../common/may-c
 This example wraps a `flow` handling @scala[`Int`s]@java[`Integer`s], and retries elements unless the result is 0 or negative, or `maxRetries` is hit.
 
 Scala
-:   @@snip [RetryFlowSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RetryFlowSpec.scala) { #withBackoff-demo }
+:   @@snip [RetryFlowSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/RetryFlowSpec.scala) { #withBackoff-demo }
 
 Java
-:   @@snip [RetryFlowTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/RetryFlowTest.java) { #withBackoff-demo }
+:   @@snip [RetryFlowTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RetryFlowTest.java) { #withBackoff-demo }
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/RetryFlow/withBackoffAndContext.md b/akka-docs/src/main/paradox/stream/operators/RetryFlow/withBackoffAndContext.md
index c6133adfae..b9696a524c 100644
--- a/akka-docs/src/main/paradox/stream/operators/RetryFlow/withBackoffAndContext.md
+++ b/akka-docs/src/main/paradox/stream/operators/RetryFlow/withBackoffAndContext.md
@@ -6,7 +6,7 @@ Wrap the given @apidoc[FlowWithContext] and retry individual elements in that st
 
 ## Signature
 
-@apidoc[RetryFlow.withBackoffAndContext](RetryFlow$) { scala="#withBackoffAndContext[In,CtxIn,Out,CtxOut,Mat](minBackoff:scala.concurrent.duration.FiniteDuration,maxBackoff:scala.concurrent.duration.FiniteDuration,randomFactor:Double,maxRetries:Int,flow:akka.stream.scaladsl.FlowWithContext[In,CtxIn,Out,CtxOut,Mat])(decideRetry:((In,CtxIn),(Out,CtxOut))=>Option[(In,CtxIn)]):akka.stream.scaladsl.FlowWithContext[In,CtxIn,Out,CtxOut,Mat]" java="#withBackoffAndContext(java.time.Duration,java.time.Duration,double,int,akka.stream.javadsl.FlowWithContext,akka.japi.function.Function2)" }
+@apidoc[RetryFlow.withBackoffAndContext](RetryFlow$) { scala="#withBackoffAndContext[In,CtxIn,Out,CtxOut,Mat](minBackoff:scala.concurrent.duration.FiniteDuration,maxBackoff:scala.concurrent.duration.FiniteDuration,randomFactor:Double,maxRetries:Int,flow:org.apache.pekko.stream.scaladsl.FlowWithContext[In,CtxIn,Out,CtxOut,Mat])(decideRetry:((In,CtxIn),(Out,CtxOut))=>Option[(In,CtxIn)]):org.apache.pekko.stream.scaladsl.FlowWithContext[In,CtxIn,Out,CtxOut,Mat]" java="#withBackoffAndContext(java.time.Duration,java.time.Duration,double,int,org.apache.pekko.stream.javadsl.FlowWithContext,org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
@@ -18,7 +18,7 @@ At most `maxRetries` will be made after the initial try.
 
 The wrapped `flow` must have **one-in one-out semantics**. It may not filter, nor duplicate elements. The `RetryFlow` will fail if two elements are emitted from the `flow`, it will be stuck "forever" if nothing is emitted. Just one element will be emitted into the `flow` at any time. The `flow` needs to emit an element before the next will be emitted to it. 
 
-Elements are retried as long as `maxRetries` is not reached and the `decideRetry` function returns a new element to be sent to `flow`. The `decideRetry` function gets passed in the original element sent to the `flow` and the element emitted by it together with their contexts as @scala[tuples]@java[`akka.japi.Pair`s].
+Elements are retried as long as `maxRetries` is not reached and the `decideRetry` function returns a new element to be sent to `flow`. The `decideRetry` function gets passed in the original element sent to the `flow` and the element emitted by it together with their contexts as @scala[tuples]@java[`org.apache.pekko.japi.Pair`s].
 When `decideRetry` returns @scala[`None`]@java[`Optional.empty`], no retries will be issued, and the response will be emitted downstream.
 
 @@@ note
@@ -30,10 +30,10 @@ This API was added in Akka 2.6.0 and @ref:[may be changed](../../../common/may-c
 This example wraps a `flow` handling @scala[`Int`s]@java[`Integer`s] with `SomeContext` in context, and retries elements unless the result is 0 or negative, or `maxRetries` is hit.
 
 Scala
-:   @@snip [RetryFlowSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RetryFlowSpec.scala) { #retry-success }
+:   @@snip [RetryFlowSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/RetryFlowSpec.scala) { #retry-success }
 
 Java
-:   @@snip [RetryFlowTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/RetryFlowTest.java) { #retry-success }
+:   @@snip [RetryFlowTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RetryFlowTest.java) { #retry-success }
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/actorRef.md b/akka-docs/src/main/paradox/stream/operators/Sink/actorRef.md
index e31e33490e..05453b8703 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/actorRef.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/actorRef.md
@@ -6,7 +6,7 @@ Send the elements from the stream to an `ActorRef` of the classic actors API.
 
 ## Signature
 
-@apidoc[Sink.actorRef](Sink$) { scala="#actorRef[T](ref:akka.actor.ActorRef,onCompleteMessage:Any,onFailureMessage:Throwable=>Any):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#actorRef(akka.actor.ActorRef,java.lang.Object)" }
+@apidoc[Sink.actorRef](Sink$) { scala="#actorRef[T](ref:org.apache.pekko.actor.ActorRef,onCompleteMessage:Any,onFailureMessage:Throwable=>Any):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#actorRef(org.apache.pekko.actor.ActorRef,java.lang.Object)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/actorRefWithBackpressure.md b/akka-docs/src/main/paradox/stream/operators/Sink/actorRefWithBackpressure.md
index ae90976aa7..32e6835a05 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/actorRefWithBackpressure.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/actorRefWithBackpressure.md
@@ -6,7 +6,7 @@ Send the elements from the stream to an `ActorRef` (of the classic actors API) w
 
 ## Signature
 
-@apidoc[Sink.actorRefWithBackpressure](Sink$) { scala="#actorRefWithBackpressure[T](ref:akka.actor.ActorRef,onInitMessage:Any,ackMessage:Any,onCompleteMessage:Any,onFailureMessage:Throwable=>Any):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#actorRefWithBackpressure(akka.actor.ActorRef,java.lang.Object,java.lang.Object,java.lang.Object,akka.japi.function.Function)" }
+@apidoc[Sink.actorRefWithBackpressure](Sink$) { scala="#actorRefWithBackpressure[T](ref:org.apache.pekko.actor.ActorRef,onInitMessage:Any,ackMessage:Any,onCompleteMessage:Any,onFailureMessage:Throwable=>Any):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#actorRefWithBackpressure(org.apache.pekko.actor.ActorRef,java.lang.Object,java.lang.Object,java.lang.Object,org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/asPublisher.md b/akka-docs/src/main/paradox/stream/operators/Sink/asPublisher.md
index 891f952c83..d065d92173 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/asPublisher.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/asPublisher.md
@@ -6,7 +6,7 @@ Integration with Reactive Streams, materializes into a `org.reactivestreams.Publ
 
 ## Signature
 
-@apidoc[Sink.asPublisher](Sink$) { scala="#asPublisher[T](fanout:Boolean):akka.stream.scaladsl.Sink[T,org.reactivestreams.Publisher[T]]" java="#asPublisher(akka.stream.javadsl.AsPublisher)" }
+@apidoc[Sink.asPublisher](Sink$) { scala="#asPublisher[T](fanout:Boolean):org.apache.pekko.stream.scaladsl.Sink[T,org.reactivestreams.Publisher[T]]" java="#asPublisher(org.apache.pekko.stream.javadsl.AsPublisher)" }
 
 
 
@@ -17,7 +17,7 @@ Generally, in Akka Streams a `Sink` is considered a subscriber, which consumes t
 Now, the data from this publisher can be consumed by subscribing to it. We can control if we allow more than one downstream subscriber from the single running Akka stream through the `fanout` parameter.
 In Java 9, the Reactive Stream API was included in the JDK, and `Publisher` is available through [Flow.Publisher](https://docs.oracle.com/javase/9/docs/api/java/util/concurrent/Flow.Publisher.html).
 Since those APIs are identical but exist at different package namespaces and does not depend on the Reactive Streams package a separate publisher sink for those is available 
-through @scala[`akka.stream.scaladsl.JavaFlowSupport.Sink#asPublisher`]@java[`akka.stream.javadsl.JavaFlowSupport.Sink#asPublisher`].
+through @scala[`org.apache.pekko.stream.scaladsl.JavaFlowSupport.Sink#asPublisher`]@java[`org.apache.pekko.stream.javadsl.JavaFlowSupport.Sink#asPublisher`].
 
 
 ## Example
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/cancelled.md b/akka-docs/src/main/paradox/stream/operators/Sink/cancelled.md
index c3efa374a0..57efff920f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/cancelled.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/cancelled.md
@@ -6,7 +6,7 @@ Immediately cancel the stream
 
 ## Signature
 
-@apidoc[Sink.cancelled](Sink$) { scala="#cancelled[T]:akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#cancelled()" }
+@apidoc[Sink.cancelled](Sink$) { scala="#cancelled[T]:org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#cancelled()" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/collect.md b/akka-docs/src/main/paradox/stream/operators/Sink/collect.md
index f1493a0433..b8595645e4 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/collect.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/collect.md
@@ -10,7 +10,7 @@ Collect all input elements using a Java @javadoc[Collector](java.util.stream.Col
 
 ## Description
 
-A @javadoc[Sink](akka.stream.javadsl.Sink) which materializes into a @javadoc[CompletionStage](java.util.concurrent.CompletionStage) 
+A @javadoc[Sink](pekko.stream.javadsl.Sink) which materializes into a @javadoc[CompletionStage](java.util.concurrent.CompletionStage) 
 which will be completed with a result of the Java @javadoc[Collector](java.util.stream.Collector) transformation and reduction operations.
 
 ## Example
@@ -18,7 +18,7 @@ which will be completed with a result of the Java @javadoc[Collector](java.util.
 Given a stream of numbers we can collect the numbers into a collection with the `seq` operator
 
 Java
-:   @@snip [SinkTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/SinkTest.java) { #collect-to-list }
+:   @@snip [SinkTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SinkTest.java) { #collect-to-list }
 
 
 ## Reactive Streams semantics
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/collection.md b/akka-docs/src/main/paradox/stream/operators/Sink/collection.md
index aa5e39e734..93e28f8788 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/collection.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/collection.md
@@ -8,7 +8,7 @@
 
 ## Signature
 
-@apidoc[Sink.collection](Sink$) { scala="#collection[T,That](implicitcbf:akka.util.ccompat.Factory[T,Thatwithscala.collection.immutable.Iterable[_]]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[That]]" }
+@apidoc[Sink.collection](Sink$) { scala="#collection[T,That](implicitcbf:org.apache.pekko.util.ccompat.Factory[T,Thatwithscala.collection.immutable.Iterable[_]]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[That]]" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/combine.md b/akka-docs/src/main/paradox/stream/operators/Sink/combine.md
index dcae7614ef..416a10f09d 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/combine.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/combine.md
@@ -6,7 +6,7 @@ Combine several sinks into one using a user specified strategy
 
 ## Signature
 
-@apidoc[Sink.combine](Sink$) { scala="#combine[T,U](first:akka.stream.scaladsl.Sink[U,_],second:akka.stream.scaladsl.Sink[U,_],rest:akka.stream.scaladsl.Sink[U,_]*)(strategy:Int=>akka.stream.Graph[akka.stream.UniformFanOutShape[T,U],akka.NotUsed]):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#combine(akka.stream.javadsl.Sink,akka.stream.javadsl.Sink,java.util.List,akka.japi.function.Function)" }
+@apidoc[Sink.combine](Sink$) { scala="#combine[T,U](first:org.apache.pekko.stream.scaladsl.Sink[U,_],second:org.apache.pekko.stream.scaladsl.Sink[U,_],rest:org.apache.pekko.stream.scaladsl.Sink[U,_]*)(strategy:Int=>org.apache.pekko.stream.Graph[org.apache.pekko.stream.UniformFanOutShape[T,U],org.apache.pekko.NotUsed]):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#combine(org.apache.pekko.stream.javadsl.Sink,org.apache.pekko.stream.javadsl.Sink,java.util.List,org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/fold.md b/akka-docs/src/main/paradox/stream/operators/Sink/fold.md
index 089a86f8f8..a0425b95f8 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/fold.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/fold.md
@@ -6,7 +6,7 @@ Fold over emitted element with a function, where each invocation will get the ne
 
 ## Signature
 
-@apidoc[Sink.fold](Sink$) { scala="#fold[U,T](zero:U)(f:(U,T)=>U):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[U]]" java="#fold(java.lang.Object,akka.japi.function.Function2)" }
+@apidoc[Sink.fold](Sink$) { scala="#fold[U,T](zero:U)(f:(U,T)=>U):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[U]]" java="#fold(java.lang.Object,org.apache.pekko.japi.function.Function2)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/foreach.md b/akka-docs/src/main/paradox/stream/operators/Sink/foreach.md
index e0970e3e6b..e37ad67926 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/foreach.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/foreach.md
@@ -6,7 +6,7 @@ Invoke a given procedure for each element received.
 
 ## Signature
 
-@apidoc[Sink.foreach](Sink$) { java="#foreach(akka.japi.function.Procedure)" scala="#foreach[T](f:T=%3EUnit):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[akka.Done]]" }
+@apidoc[Sink.foreach](Sink$) { java="#foreach(org.apache.pekko.japi.function.Procedure)" scala="#foreach[T](f:T=%3EUnit):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[org.apache.pekko.Done]]" }
 
 ## Description
 
@@ -27,10 +27,10 @@ See also:
 This prints out every element to standard out.
 
 Scala
-:   @@snip [snip](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala) { #foreach }
+:   @@snip [snip](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/SinkSpec.scala) { #foreach }
 
 Java
-:   @@snip [snip](/akka-stream-tests/src/test/java/akka/stream/javadsl/SinkTest.java) { #foreach }
+:   @@snip [snip](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SinkTest.java) { #foreach }
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/foreachAsync.md b/akka-docs/src/main/paradox/stream/operators/Sink/foreachAsync.md
index aadb562331..b7e82cd49a 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/foreachAsync.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/foreachAsync.md
@@ -6,7 +6,7 @@ Invoke a given procedure asynchronously for each element received.
 
 ## Signature
 
-@apidoc[Sink.foreachAsync](Sink$) { scala="#foreachAsync[T](parallelism:Int)(f:T=>scala.concurrent.Future[Unit]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[akka.Done]]" java="#foreachAsync(int,akka.japi.function.Function)" }
+@apidoc[Sink.foreachAsync](Sink$) { scala="#foreachAsync[T](parallelism:Int)(f:T=>scala.concurrent.Future[Unit]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[org.apache.pekko.Done]]" java="#foreachAsync(int,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/fromMaterializer.md b/akka-docs/src/main/paradox/stream/operators/Sink/fromMaterializer.md
index 7485e657b8..91cdef4746 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/fromMaterializer.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/fromMaterializer.md
@@ -6,7 +6,7 @@ Defer the creation of a `Sink` until materialization and access `Materializer` a
 
 ## Signature
 
-@apidoc[Sink.fromMaterializer](Sink$) { scala="#fromMaterializer[T,M](factory:(akka.stream.Materializer,akka.stream.Attributes)=>akka.stream.scaladsl.Sink[T,M]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" java="#fromMaterializer(java.util.function.BiFunction)" }
+@apidoc[Sink.fromMaterializer](Sink$) { scala="#fromMaterializer[T,M](factory:(org.apache.pekko.stream.Materializer,org.apache.pekko.stream.Attributes)=>org.apache.pekko.stream.scaladsl.Sink[T,M]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" java="#fromMaterializer(java.util.function.BiFunction)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/fromSubscriber.md b/akka-docs/src/main/paradox/stream/operators/Sink/fromSubscriber.md
index b49c10ac8e..637b0d4e27 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/fromSubscriber.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/fromSubscriber.md
@@ -6,7 +6,7 @@ Integration with Reactive Streams, wraps a `org.reactivestreams.Subscriber` as a
 
 ## Signature
 
-@apidoc[Sink.fromSubscriber](Sink$) { scala="#fromSubscriber[T](subscriber:org.reactivestreams.Subscriber[T]):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#fromSubscriber(org.reactivestreams.Subscriber)" }
+@apidoc[Sink.fromSubscriber](Sink$) { scala="#fromSubscriber[T](subscriber:org.reactivestreams.Subscriber[T]):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#fromSubscriber(org.reactivestreams.Subscriber)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/futureSink.md b/akka-docs/src/main/paradox/stream/operators/Sink/futureSink.md
index 512e08cdfc..59b50afeb3 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/futureSink.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/futureSink.md
@@ -6,7 +6,7 @@ Streams the elements to the given future sink once it successfully completes.
 
 ## Signature
 
-@apidoc[Sink.futureSink](Sink$) { scala="#futureSink[T,M](future:scala.concurrent.Future[akka.stream.scaladsl.Sink[T,M]]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" }
+@apidoc[Sink.futureSink](Sink$) { scala="#futureSink[T,M](future:scala.concurrent.Future[org.apache.pekko.stream.scaladsl.Sink[T,M]]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/head.md b/akka-docs/src/main/paradox/stream/operators/Sink/head.md
index eb2dc3c503..af728a1899 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/head.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/head.md
@@ -6,7 +6,7 @@ Materializes into a @scala[`Future`] @java[`CompletionStage`] which completes wi
 
 ## Signature
 
-@apidoc[Sink.head](Sink$) { scala="#head[T]:akka.stream.scaladsl.Sink[T,scala.concurrent.Future[T]]" java="#head()" }
+@apidoc[Sink.head](Sink$) { scala="#head[T]:org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[T]]" java="#head()" }
 
 
 ## Description
@@ -17,7 +17,7 @@ after this the stream is canceled. If no element is emitted, the @scala[`Future`
 ## Example
 
 Scala
-:   @@snip [HeadSinkSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala) { #head-operator-example }
+:   @@snip [HeadSinkSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/HeadSinkSpec.scala) { #head-operator-example }
 
 Java
 :   @@snip [SinkDocExamples.java](/akka-docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java) { #head-operator-example }
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/headOption.md b/akka-docs/src/main/paradox/stream/operators/Sink/headOption.md
index 10e1539818..63f5344214 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/headOption.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/headOption.md
@@ -6,7 +6,7 @@ Materializes into a @scala[`Future[Option[T]]`] @java[`CompletionStage>`]
 
 ## Signature
 
-@apidoc[Sink.lastOption](Sink$) { scala="#lastOption[T]:akka.stream.scaladsl.Sink[T,scala.concurrent.Future[Option[T]]]" java="#lastOption()" }
+@apidoc[Sink.lastOption](Sink$) { scala="#lastOption[T]:org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[Option[T]]]" java="#lastOption()" }
 
 
 ## Description
@@ -18,7 +18,7 @@ completed with @scala[`None`] @java[an empty `Optional`].
 ## Example
 
 Scala
-:   @@snip [LastSinkSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala) { #lastOption-operator-example }
+:   @@snip [LastSinkSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/LastSinkSpec.scala) { #lastOption-operator-example }
 
 Java
 :   @@snip [SinkDocExamples.java](/akka-docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java) { #lastOption-operator-example }
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/lazyCompletionStageSink.md b/akka-docs/src/main/paradox/stream/operators/Sink/lazyCompletionStageSink.md
index 9deb5452e8..5931ab4d25 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/lazyCompletionStageSink.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/lazyCompletionStageSink.md
@@ -12,7 +12,7 @@ that is materialized and inserted in the stream.
 The internal `Sink` will not be created if the stream completes of fails before any element got through.
 
 The materialized value of the `Sink` will be the materialized value of the created internal flow if it is materialized
-and failed with a `akka.stream.NeverMaterializedException` if the stream fails or completes without the flow being materialized.
+and failed with a `org.apache.pekko.stream.NeverMaterializedException` if the stream fails or completes without the flow being materialized.
 
 Can be combined with @ref:[prefixAndTail](../Source-or-Flow/prefixAndTail.md) to base the sink on the first element.
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/lazyFutureSink.md b/akka-docs/src/main/paradox/stream/operators/Sink/lazyFutureSink.md
index 54ca625de8..b905c28672 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/lazyFutureSink.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/lazyFutureSink.md
@@ -6,7 +6,7 @@ Defers creation and materialization of a `Sink` until there is a first element.
 
 ## Signature
 
-@apidoc[Sink.lazyFutureSink](Sink$) { scala="#lazyFutureSink[T,M](create:()=>scala.concurrent.Future[akka.stream.scaladsl.Sink[T,M]]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" }
+@apidoc[Sink.lazyFutureSink](Sink$) { scala="#lazyFutureSink[T,M](create:()=>scala.concurrent.Future[org.apache.pekko.stream.scaladsl.Sink[T,M]]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" }
 
 
 ## Description
@@ -16,7 +16,7 @@ that is materialized and inserted in the stream.
 The internal `Sink` will not be created if the stream completes of fails before any element got through.
 
 The materialized value of the `Sink` will be the materialized value of the created internal flow if it is materialized
-and failed with a `akka.stream.NeverMaterializedException` if the stream fails or completes without the flow being materialized.
+and failed with a `org.apache.pekko.stream.NeverMaterializedException` if the stream fails or completes without the flow being materialized.
 
 Can be combined with @ref:[prefixAndTail](../Source-or-Flow/prefixAndTail.md) to base the sink on the first element.
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/lazyInitAsync.md b/akka-docs/src/main/paradox/stream/operators/Sink/lazyInitAsync.md
index 9b171f3563..f49741eb56 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/lazyInitAsync.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/lazyInitAsync.md
@@ -6,8 +6,8 @@ Deprecated by @ref:[`Sink.lazyFutureSink`](lazyFutureSink.md).
 
 ## Signature
 
-@apidoc[Flow.lazyInitAsync](Flow$) { scala="#lazyInitAsync[I,O,M](flowFactory:()=>scala.concurrent.Future[akka.stream.scaladsl.Flow[I,O,M]]):akka.stream.scaladsl.Flow[I,O,scala.concurrent.Future[Option[M]]]" java="#lazyInitAsync(akka.japi.function.Creator)" }
-@apidoc[Sink.lazyInitAsync](Sink$) { scala="#lazyInitAsync[T,M](sinkFactory:()=>scala.concurrent.Future[akka.stream.scaladsl.Sink[T,M]]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[Option[M]]]" java="#lazyInitAsync(akka.japi.function.Creator)" }
+@apidoc[Flow.lazyInitAsync](Flow$) { scala="#lazyInitAsync[I,O,M](flowFactory:()=>scala.concurrent.Future[org.apache.pekko.stream.scaladsl.Flow[I,O,M]]):org.apache.pekko.stream.scaladsl.Flow[I,O,scala.concurrent.Future[Option[M]]]" java="#lazyInitAsync(org.apache.pekko.japi.function.Creator)" }
+@apidoc[Sink.lazyInitAsync](Sink$) { scala="#lazyInitAsync[T,M](sinkFactory:()=>scala.concurrent.Future[org.apache.pekko.stream.scaladsl.Sink[T,M]]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[Option[M]]]" java="#lazyInitAsync(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/lazySink.md b/akka-docs/src/main/paradox/stream/operators/Sink/lazySink.md
index 7639b3c675..87c137c4bb 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/lazySink.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/lazySink.md
@@ -6,7 +6,7 @@ Defers creation and materialization of a `Sink` until there is a first element.
 
 ## Signature
 
-@apidoc[Sink.lazySink](Sink$) { scala="#lazySink[T,M](create:()=>akka.stream.scaladsl.Sink[T,M]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" java="#lazySink(akka.japi.function.Creator)" }
+@apidoc[Sink.lazySink](Sink$) { scala="#lazySink[T,M](create:()=>org.apache.pekko.stream.scaladsl.Sink[T,M]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" java="#lazySink(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/onComplete.md b/akka-docs/src/main/paradox/stream/operators/Sink/onComplete.md
index 61869a6708..837d03e8f2 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/onComplete.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/onComplete.md
@@ -6,7 +6,7 @@ Invoke a callback when the stream has completed or failed.
 
 ## Signature
 
-@apidoc[Sink.onComplete](Sink$) { scala="#onComplete[T](callback:scala.util.Try[akka.Done]=>Unit):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#onComplete(akka.japi.function.Procedure)" }
+@apidoc[Sink.onComplete](Sink$) { scala="#onComplete[T](callback:scala.util.Try[org.apache.pekko.Done]=>Unit):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#onComplete(org.apache.pekko.japi.function.Procedure)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/preMaterialize.md b/akka-docs/src/main/paradox/stream/operators/Sink/preMaterialize.md
index 2b749796b4..e7b9790915 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/preMaterialize.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/preMaterialize.md
@@ -6,7 +6,7 @@ Materializes this Sink, immediately returning (1) its materialized value, and (2
 
 ## Signature
 
-@apidoc[Sink.preMaterialize](Sink) { scala="#preMaterialize()(implicitmaterializer:akka.stream.Materializer):(Mat,akka.stream.scaladsl.Sink[In,akka.NotUsed])" java="#preMaterialize(akka.actor.ClassicActorSystemProvider)" java="#preMaterialize(akka.stream.Materializer)" }
+@apidoc[Sink.preMaterialize](Sink) { scala="#preMaterialize()(implicitmaterializer:org.apache.pekko.stream.Materializer):(Mat,org.apache.pekko.stream.scaladsl.Sink[In,org.apache.pekko.NotUsed])" java="#preMaterialize(org.apache.pekko.actor.ClassicActorSystemProvider)" java="#preMaterialize(org.apache.pekko.stream.Materializer)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/queue.md b/akka-docs/src/main/paradox/stream/operators/Sink/queue.md
index 8e48ebe3b0..4531d56073 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/queue.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/queue.md
@@ -6,7 +6,7 @@ Materialize a `SinkQueue` that can be pulled to trigger demand through the sink.
 
 ## Signature
 
-@apidoc[Sink.queue](Sink$) { scala="#queue[T](maxConcurrentPulls:Int):akka.stream.scaladsl.Sink[T,akka.stream.scaladsl.SinkQueueWithCancel[T]]" java="#queue(int)" }
+@apidoc[Sink.queue](Sink$) { scala="#queue[T](maxConcurrentPulls:Int):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.stream.scaladsl.SinkQueueWithCancel[T]]" java="#queue(int)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/reduce.md b/akka-docs/src/main/paradox/stream/operators/Sink/reduce.md
index f5ce8a3536..b04b4f0602 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/reduce.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/reduce.md
@@ -6,7 +6,7 @@ Apply a reduction function on the incoming elements and pass the result to the n
 
 ## Signature
 
-@apidoc[Sink.reduce](Sink$) { scala="#reduce[T](f:(T,T)=>T):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[T]]" java="#reduce(akka.japi.function.Function2)" }
+@apidoc[Sink.reduce](Sink$) { scala="#reduce[T](f:(T,T)=>T):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[T]]" java="#reduce(org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
@@ -19,7 +19,7 @@ Materializes into a @scala[`Future`] @java[`CompletionStage`] that will be compl
 ## Example
 
 Scala
-:   @@snip [SinkReduceSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala) { #reduce-operator-example }
+:   @@snip [SinkReduceSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/SinkSpec.scala) { #reduce-operator-example }
 
 Java
 :   @@snip [SinkDocExamples.java](/akka-docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java) { #reduce-operator-example }
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/seq.md b/akka-docs/src/main/paradox/stream/operators/Sink/seq.md
index 7f89f0f160..5f5a6d3032 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/seq.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/seq.md
@@ -6,7 +6,7 @@ Collect values emitted from the stream into a collection.
 
 ## Signature
 
-@apidoc[Sink.seq](Sink$) { scala="#seq[T]:akka.stream.scaladsl.Sink[T,scala.concurrent.Future[scala.collection.immutable.Seq[T]]]" java="#seq()" }
+@apidoc[Sink.seq](Sink$) { scala="#seq[T]:org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[scala.collection.immutable.Seq[T]]]" java="#seq()" }
 
 
 ## Description
@@ -20,7 +20,7 @@ if more element are emitted the sink will cancel the stream
 Given a stream of numbers we can collect the numbers into a collection with the `seq` operator
 
 Scala
-:   @@snip [SinkSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala) { #seq-operator-example }
+:   @@snip [SinkSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/SinkSpec.scala) { #seq-operator-example }
 
 Java
 :   @@snip [SinkDocExamples.java](/akka-docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java) { #seq-operator-example }
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/setup.md b/akka-docs/src/main/paradox/stream/operators/Sink/setup.md
index d6bb76a37c..fd39076945 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/setup.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/setup.md
@@ -12,7 +12,7 @@ The `setup` operator has been deprecated, use @ref:[fromMaterializer](./fromMate
 
 ## Signature
 
-@apidoc[Sink.setup](Sink$) { scala="#setup[T,M](factory:(akka.stream.ActorMaterializer,akka.stream.Attributes)=>akka.stream.scaladsl.Sink[T,M]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" java="#setup(java.util.function.BiFunction)" }
+@apidoc[Sink.setup](Sink$) { scala="#setup[T,M](factory:(org.apache.pekko.stream.ActorMaterializer,org.apache.pekko.stream.Attributes)=>org.apache.pekko.stream.scaladsl.Sink[T,M]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[M]]" java="#setup(java.util.function.BiFunction)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Sink/takeLast.md b/akka-docs/src/main/paradox/stream/operators/Sink/takeLast.md
index cd8ed89586..1ef7794722 100644
--- a/akka-docs/src/main/paradox/stream/operators/Sink/takeLast.md
+++ b/akka-docs/src/main/paradox/stream/operators/Sink/takeLast.md
@@ -6,7 +6,7 @@ Collect the last `n` values emitted from the stream into a collection.
 
 ## Signature
 
-@apidoc[Sink.takeLast](Sink$) { scala="#takeLast[T](n:Int):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[scala.collection.immutable.Seq[T]]]" java="#takeLast(int)" }
+@apidoc[Sink.takeLast](Sink$) { scala="#takeLast[T](n:Int):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[scala.collection.immutable.Seq[T]]]" java="#takeLast(int)" }
 
 
 ## Description
@@ -20,7 +20,7 @@ If there is a failure signaled in the stream the @scala[`Future`] @java[`Complet
 ## Example
 
 Scala
-:   @@snip [TakeLastSinkSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TakeLastSinkSpec.scala) { #takeLast-operator-example }
+:   @@snip [TakeLastSinkSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/TakeLastSinkSpec.scala) { #takeLast-operator-example }
 
 Java
 :   @@snip [SinkDocExamples.java](/akka-docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java) { #takeLast-operator-example }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/aggregateWithBoundary.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/aggregateWithBoundary.md
index d2d91614df..d6e8959bdc 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/aggregateWithBoundary.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/aggregateWithBoundary.md
@@ -8,8 +8,8 @@ Aggregate and emit until custom boundary condition met.
 
 ## Signature
 
-@apidoc[Source.aggregateWithBoundary](Source) { scala="#aggregateWithBoundary[Agg,Emit](allocate:()=%3EAgg)(aggregate:(Agg,Out)=%3E(Agg,Boolean),harvest:Agg=%3EEmit,emitOnTimer:Option[(Agg=%3EBoolean,scala.concurrent.duration.FiniteDuration)]):FlowOps.this.Repr[Emit]" java="#aggregateWithBoundary(java.util.function.Supplier,akka.japi.function.Function2,akka.japi.function.Function,akka.japi.Pair)"}
-@apidoc[Flow.aggregateWithBoundary](Flow) { scala="#aggregateWithBoundary[Agg,Emit](allocate:()=%3EAgg)(aggregate:(Agg,Out)=%3E(Agg,Boolean),harvest:Agg=%3EEmit,emitOnTimer:Option[(Agg=%3EBoolean,scala.concurrent.duration.FiniteDuration)]):FlowOps.this.Repr[Emit]" java="#aggregateWithBoundary(java.util.function.Supplier,akka.japi.function.Function2,akka.japi.function.Function,akka.japi.Pair)" }
+@apidoc[Source.aggregateWithBoundary](Source) { scala="#aggregateWithBoundary[Agg,Emit](allocate:()=%3EAgg)(aggregate:(Agg,Out)=%3E(Agg,Boolean),harvest:Agg=%3EEmit,emitOnTimer:Option[(Agg=%3EBoolean,scala.concurrent.duration.FiniteDuration)]):FlowOps.this.Repr[Emit]" java="#aggregateWithBoundary(java.util.function.Supplier,org.apache.pekko.japi.function.Function2,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.Pair)"}
+@apidoc[Flow.aggregateWithBoundary](Flow) { scala="#aggregateWithBoundary[Agg,Emit](allocate:()=%3EAgg)(aggregate:(Agg,Out)=%3E(Agg,Boolean),harvest:Agg=%3EEmit,emitOnTimer:Option[(Agg=%3EBoolean,scala.concurrent.duration.FiniteDuration)]):FlowOps.this.Repr[Emit]" java="#aggregateWithBoundary(java.util.function.Supplier,org.apache.pekko.japi.function.Function2,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.Pair)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/alsoTo.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/alsoTo.md
index 281a8e9329..452e012235 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/alsoTo.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/alsoTo.md
@@ -6,8 +6,8 @@ Attaches the given `Sink` to this `Flow`, meaning that elements that pass throug
 
 ## Signature
 
-@apidoc[Source.alsoTo](Source) { scala="#alsoTo(that:akka.stream.Graph[akka.stream.SinkShape[Out],_]):FlowOps.this.Repr[Out]" java="#alsoTo(akka.stream.Graph)" }
-@apidoc[Flow.alsoTo](Flow) { scala="#alsoTo(that:akka.stream.Graph[akka.stream.SinkShape[Out],_]):FlowOps.this.Repr[Out]" java="#alsoTo(akka.stream.Graph)" }
+@apidoc[Source.alsoTo](Source) { scala="#alsoTo(that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[Out],_]):FlowOps.this.Repr[Out]" java="#alsoTo(org.apache.pekko.stream.Graph)" }
+@apidoc[Flow.alsoTo](Flow) { scala="#alsoTo(that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[Out],_]):FlowOps.this.Repr[Out]" java="#alsoTo(org.apache.pekko.stream.Graph)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/alsoToAll.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/alsoToAll.md
index 273437f80e..29951f9ed6 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/alsoToAll.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/alsoToAll.md
@@ -6,8 +6,8 @@ Attaches the given @apidoc[Source]s to this @apidoc[Flow], meaning that elements
 
 ## Signature
 
-@apidoc[Source.alsoToAll](Source) { scala="#alsoToAll(that:akka.stream.Graph[akka.stream.SinkShape[Out],_]*):FlowOps.this.Repr[Out]" java="#alsoToAll(akka.stream.Graph*)" }
-@apidoc[Flow.alsoToAll](Flow) { scala="#alsoToAll(that:akka.stream.Graph[akka.stream.SinkShape[Out],_]*):FlowOps.this.Repr[Out]" java="#alsoToAll(akka.stream.Graph*)" }
+@apidoc[Source.alsoToAll](Source) { scala="#alsoToAll(that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[Out],_]*):FlowOps.this.Repr[Out]" java="#alsoToAll(org.apache.pekko.stream.Graph*)" }
+@apidoc[Flow.alsoToAll](Flow) { scala="#alsoToAll(that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[Out],_]*):FlowOps.this.Repr[Out]" java="#alsoToAll(org.apache.pekko.stream.Graph*)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/ask.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/ask.md
index abdf060481..d8eaa1336e 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/ask.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/ask.md
@@ -6,8 +6,8 @@ Use the "Ask Pattern" to send a request-reply message to the target `ref` actor
 
 ## Signature
 
-@apidoc[Source.ask](Source) {scala="#ask[S](ref:akka.actor.ActorRef)(implicittimeout:akka.util.Timeout,implicittag:scala.reflect.ClassTag[S]):FlowOps.this.Repr[S]" java="#ask(akka.actor.ActorRef,java.lang.Class,akka.util.Timeout)" }
-@apidoc[Flow.ask](Flow$) { scala="#ask%5BS](ref:akka.actor.ActorRef)(implicittimeout:akka.util.Timeout,implicittag:scala.reflect.ClassTag%5BS]):FlowOps.this.Repr%5BS]" java="#ask(akka.actor.ActorRef,java.lang.Class,akka.util.Timeout)" }
+@apidoc[Source.ask](Source) {scala="#ask[S](ref:org.apache.pekko.actor.ActorRef)(implicittimeout:org.apache.pekko.util.Timeout,implicittag:scala.reflect.ClassTag[S]):FlowOps.this.Repr[S]" java="#ask(org.apache.pekko.actor.ActorRef,java.lang.Class,org.apache.pekko.util.Timeout)" }
+@apidoc[Flow.ask](Flow$) { scala="#ask%5BS](ref:org.apache.pekko.actor.ActorRef)(implicittimeout:org.apache.pekko.util.Timeout,implicittag:scala.reflect.ClassTag%5BS]):FlowOps.this.Repr%5BS]" java="#ask(org.apache.pekko.actor.ActorRef,java.lang.Class,org.apache.pekko.util.Timeout)" }
 
 ## Description
 
@@ -16,14 +16,14 @@ If any of the asks times out it will fail the stream with a @apidoc[AskTimeoutEx
 
 The @java[`mapTo` class]@scala[`S` generic] parameter is used to cast the responses from the actor to the expected outgoing flow type.
 
-Similar to the plain ask pattern, the target actor is allowed to reply with @apidoc[akka.actor.Status$].
-An @apidoc[akka.actor.Status.Failure] will cause the operator to fail with the cause carried in the `Failure` message.
+Similar to the plain ask pattern, the target actor is allowed to reply with @apidoc[actor.Status$].
+An @apidoc[actor.Status.Failure] will cause the operator to fail with the cause carried in the `Failure` message.
 
 Adheres to the @apidoc[ActorAttributes.SupervisionStrategy] attribute.
 
 See also:
 
-* @ref[ActorFlow.ask](../ActorFlow/ask.md) for the `akka.actor.typed.ActorRef[_]` variant
+* @ref[ActorFlow.ask](../ActorFlow/ask.md) for the `org.apache.pekko.actor.typed.ActorRef[_]` variant
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/batch.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/batch.md
index 264d79dfd3..79c862a8ec 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/batch.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/batch.md
@@ -6,8 +6,8 @@ Allow for a slower downstream by passing incoming elements and a summary into an
 
 ## Signature
 
-@apidoc[Source.batch](Source) { scala="#batch[S](max:Long,seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#batch(long,akka.japi.function.Function,akka.japi.function.Function2)" }
-@apidoc[Flow.batch](Flow) { scala="#batch[S](max:Long,seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#batch(long,akka.japi.function.Function,akka.japi.function.Function2)" }
+@apidoc[Source.batch](Source) { scala="#batch[S](max:Long,seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#batch(long,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.batch](Flow) { scala="#batch[S](max:Long,seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#batch(long,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function2)" }
 
 
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/batchWeighted.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/batchWeighted.md
index 54986246b9..6db2f37f9f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/batchWeighted.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/batchWeighted.md
@@ -6,8 +6,8 @@ Allow for a slower downstream by passing incoming elements and a summary into an
 
 ## Signature
 
-@apidoc[Source.batchWeighted](Source) { scala="#batchWeighted[S](max:Long,costFn:Out=>Long,seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#batchWeighted(long,akka.japi.function.Function,akka.japi.function.Function,akka.japi.function.Function2)" }
-@apidoc[Flow.batchWeighted](Flow) { scala="#batchWeighted[S](max:Long,costFn:Out=>Long,seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#batchWeighted(long,akka.japi.function.Function,akka.japi.function.Function,akka.japi.function.Function2)" }
+@apidoc[Source.batchWeighted](Source) { scala="#batchWeighted[S](max:Long,costFn:Out=>Long,seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#batchWeighted(long,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.batchWeighted](Flow) { scala="#batchWeighted[S](max:Long,costFn:Out=>Long,seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#batchWeighted(long,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function2)" }
 
 
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/buffer.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/buffer.md
index c6957147e2..d95f85569c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/buffer.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/buffer.md
@@ -6,8 +6,8 @@ Allow for a temporarily faster upstream events by buffering `size` elements.
 
 ## Signature
 
-@apidoc[Source.buffer](Source) { scala="#buffer(size:Int,overflowStrategy:akka.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,akka.stream.OverflowStrategy)" }
-@apidoc[Flow.buffer](Flow) { scala="#buffer(size:Int,overflowStrategy:akka.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,akka.stream.OverflowStrategy)" }
+@apidoc[Source.buffer](Source) { scala="#buffer(size:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,org.apache.pekko.stream.OverflowStrategy)" }
+@apidoc[Flow.buffer](Flow) { scala="#buffer(size:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,org.apache.pekko.stream.OverflowStrategy)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/collect.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/collect.md
index 631c71b3a2..d1c05dbb29 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/collect.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/collect.md
@@ -14,7 +14,7 @@ Apply a partial function to each incoming element, if the partial function is de
 Apply a partial function to each incoming element, if the partial function is defined for a value the returned
 value is passed downstream. This can often replace `filter` followed by `map` to achieve the same in one single operator.
 
-@java[`collect` is supposed to be used with @apidoc[akka.japi.pf.PFBuilder] to construct the partial function.
+@java[`collect` is supposed to be used with @apidoc[japi.pf.PFBuilder] to construct the partial function.
 There is also a @ref:[collectType](collectType.md) that often can be easier to use than the `PFBuilder` and
 then combine with ordinary `filter` and `map` operators.]
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concat.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concat.md
index d05439eb2e..cd4ca52e6c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concat.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concat.md
@@ -6,8 +6,8 @@ After completion of the original upstream the elements of the given source will
 
 ## Signature
 
-@apidoc[Source.concat](Source) { scala="#concat[U>:Out,Mat2](that:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#concat(akka.stream.Graph)" }
-@apidoc[Flow.concat](Flow) { scala="#concat[U>:Out,Mat2](that:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#concat(akka.stream.Graph)" }
+@apidoc[Source.concat](Source) { scala="#concat[U>:Out,Mat2](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#concat(org.apache.pekko.stream.Graph)" }
+@apidoc[Flow.concat](Flow) { scala="#concat[U>:Out,Mat2](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#concat(org.apache.pekko.stream.Graph)" }
 
 
 ## Description
@@ -27,7 +27,7 @@ Both streams will be materialized together.
 
 ## Example
 Scala
-:   @@snip [FlowConcatSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala) { #concat }
+:   @@snip [FlowConcatSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowConcatSpec.scala) { #concat }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #concat }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concatAllLazy.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concatAllLazy.md
index 2ea476b4b2..6f914c5d03 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concatAllLazy.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concatAllLazy.md
@@ -6,8 +6,8 @@ After completion of the original upstream the elements of the given sources will
 
 ## Signature
 
-@apidoc[Source.concatAllLazy](Source) { scala="#concatAllLazy[U>:Out](those:akka.stream.Graph[akka.stream.SourceShape[U],_]*):FlowOps.this.Repr[U]" java="#concatAllLazy(akka.stream.Graph*)" }
-@apidoc[Flow.concatAllLazy](Flow) { scala="#concatAllLazy[U>:Out](those:akka.stream.Graph[akka.stream.SourceShape[U],_]*):FlowOps.this.Repr[U]" java="#concatAllLazy(akka.stream.Graph*)" }
+@apidoc[Source.concatAllLazy](Source) { scala="#concatAllLazy[U>:Out](those:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_]*):FlowOps.this.Repr[U]" java="#concatAllLazy(org.apache.pekko.stream.Graph*)" }
+@apidoc[Flow.concatAllLazy](Flow) { scala="#concatAllLazy[U>:Out](those:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_]*):FlowOps.this.Repr[U]" java="#concatAllLazy(org.apache.pekko.stream.Graph*)" }
 
 
 ## Description
@@ -20,7 +20,7 @@ To defer the materialization of the given sources (or to completely avoid its ma
 
 ## Example
 Scala
-:   @@snip [FlowConcatSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllLazySpec.scala) { #concatAllLazy }
+:   @@snip [FlowConcatSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowConcatAllLazySpec.scala) { #concatAllLazy }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #concatAllLazy }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concatLazy.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concatLazy.md
index 8b8aa983fb..5a54697c01 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concatLazy.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/concatLazy.md
@@ -6,8 +6,8 @@ After completion of the original upstream the elements of the given source will
 
 ## Signature
 
-@apidoc[Source.concat](Source) { scala="#concatLazy[U>:Out,Mat2](that:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#concatLazy(akka.stream.Graph)" }
-@apidoc[Flow.concat](Flow) { scala="#concatLazy[U>:Out,Mat2](that:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#concatLazy(akka.stream.Graph)" }
+@apidoc[Source.concat](Source) { scala="#concatLazy[U>:Out,Mat2](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#concatLazy(org.apache.pekko.stream.Graph)" }
+@apidoc[Flow.concat](Flow) { scala="#concatLazy[U>:Out,Mat2](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#concatLazy(org.apache.pekko.stream.Graph)" }
 
 
 ## Description
@@ -22,7 +22,7 @@ If materialized values needs to be collected `concatLazyMat` is available.
 
 ## Example
 Scala
-:   @@snip [FlowConcatSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala) { #concatLazy }
+:   @@snip [FlowConcatSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowConcatSpec.scala) { #concatLazy }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #concatLazy }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/conflate.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/conflate.md
index 845db40df4..e4eabd389a 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/conflate.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/conflate.md
@@ -6,8 +6,8 @@ Allow for a slower downstream by passing incoming elements and a summary into an
 
 ## Signature
 
-@apidoc[Source.conflate](Source) { scala="#conflate[O2>:Out](aggregate:(O2,O2)=>O2):FlowOps.this.Repr[O2]" java="#conflate(akka.japi.function.Function2)" }
-@apidoc[Flow.conflate](Flow) { scala="#conflate[O2>:Out](aggregate:(O2,O2)=>O2):FlowOps.this.Repr[O2]" java="#conflate(akka.japi.function.Function2)" }
+@apidoc[Source.conflate](Source) { scala="#conflate[O2>:Out](aggregate:(O2,O2)=>O2):FlowOps.this.Repr[O2]" java="#conflate(org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.conflate](Flow) { scala="#conflate[O2>:Out](aggregate:(O2,O2)=>O2):FlowOps.this.Repr[O2]" java="#conflate(org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/conflateWithSeed.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/conflateWithSeed.md
index 7ff00f1fff..ea8b121241 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/conflateWithSeed.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/conflateWithSeed.md
@@ -6,8 +6,8 @@ Allow for a slower downstream by passing incoming elements and a summary into an
 
 ## Signature
 
-@apidoc[Source.conflateWithSeed](Source) { scala="#conflateWithSeed[S](seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#conflateWithSeed(akka.japi.function.Function,akka.japi.function.Function2)" }
-@apidoc[Flow.conflateWithSeed](Flow) { scala="#conflateWithSeed[S](seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#conflateWithSeed(akka.japi.function.Function,akka.japi.function.Function2)" }
+@apidoc[Source.conflateWithSeed](Source) { scala="#conflateWithSeed[S](seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#conflateWithSeed(org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.conflateWithSeed](Flow) { scala="#conflateWithSeed[S](seed:Out=>S)(aggregate:(S,Out)=>S):FlowOps.this.Repr[S]" java="#conflateWithSeed(org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/delay.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/delay.md
index b445f7c796..9b1043e1a7 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/delay.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/delay.md
@@ -6,8 +6,8 @@ Delay every element passed through with a specific duration.
 
 ## Signature
 
-@apidoc[Source.delay](Source) { scala="#delay(of:scala.concurrent.duration.FiniteDuration,strategy:akka.stream.DelayOverflowStrategy):FlowOps.this.Repr[Out]" java="#delay(java.time.Duration,akka.stream.DelayOverflowStrategy)" }
-@apidoc[Flow.delay](Flow) { scala="#delay(of:scala.concurrent.duration.FiniteDuration,strategy:akka.stream.DelayOverflowStrategy):FlowOps.this.Repr[Out]" java="#delay(java.time.Duration,akka.stream.DelayOverflowStrategy)" }
+@apidoc[Source.delay](Source) { scala="#delay(of:scala.concurrent.duration.FiniteDuration,strategy:org.apache.pekko.stream.DelayOverflowStrategy):FlowOps.this.Repr[Out]" java="#delay(java.time.Duration,org.apache.pekko.stream.DelayOverflowStrategy)" }
+@apidoc[Flow.delay](Flow) { scala="#delay(of:scala.concurrent.duration.FiniteDuration,strategy:org.apache.pekko.stream.DelayOverflowStrategy):FlowOps.this.Repr[Out]" java="#delay(java.time.Duration,org.apache.pekko.stream.DelayOverflowStrategy)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/delayWith.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/delayWith.md
index baadcd9a88..75f7fccd2e 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/delayWith.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/delayWith.md
@@ -6,8 +6,8 @@ Delay every element passed through with a duration that can be controlled dynami
 
 ## Signature
 
-@apidoc[Source.delayWith](Source) { scala="#delayWith(delayStrategySupplier:()=>akka.stream.scaladsl.DelayStrategy[Out],overFlowStrategy:akka.stream.DelayOverflowStrategy):FlowOps.this.Repr[Out]" java="#delayWith(java.util.function.Supplier,akka.stream.DelayOverflowStrategy)" }
-@apidoc[Flow.delayWith](Flow) { scala="#delayWith(delayStrategySupplier:()=>akka.stream.scaladsl.DelayStrategy[Out],overFlowStrategy:akka.stream.DelayOverflowStrategy):FlowOps.this.Repr[Out]" java="#delayWith(java.util.function.Supplier,akka.stream.DelayOverflowStrategy)" }
+@apidoc[Source.delayWith](Source) { scala="#delayWith(delayStrategySupplier:()=>org.apache.pekko.stream.scaladsl.DelayStrategy[Out],overFlowStrategy:org.apache.pekko.stream.DelayOverflowStrategy):FlowOps.this.Repr[Out]" java="#delayWith(java.util.function.Supplier,org.apache.pekko.stream.DelayOverflowStrategy)" }
+@apidoc[Flow.delayWith](Flow) { scala="#delayWith(delayStrategySupplier:()=>org.apache.pekko.stream.scaladsl.DelayStrategy[Out],overFlowStrategy:org.apache.pekko.stream.DelayOverflowStrategy):FlowOps.this.Repr[Out]" java="#delayWith(java.util.function.Supplier,org.apache.pekko.stream.DelayOverflowStrategy)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/divertTo.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/divertTo.md
index 175ba7e6b3..4f4187b88d 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/divertTo.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/divertTo.md
@@ -6,8 +6,8 @@ Each upstream element will either be diverted to the given sink, or the downstre
 
 ## Signature
 
-@apidoc[Source.divertTo](Source) { scala="#divertTo(that:akka.stream.Graph[akka.stream.SinkShape[Out],_],when:Out=>Boolean):FlowOps.this.Repr[Out]" java="#divertTo(akka.stream.Graph,akka.japi.function.Predicate)" }
-@apidoc[Flow.divertTo](Flow) { scala="#divertTo(that:akka.stream.Graph[akka.stream.SinkShape[Out],_],when:Out=>Boolean):FlowOps.this.Repr[Out]" java="#divertTo(akka.stream.Graph,akka.japi.function.Predicate)" }
+@apidoc[Source.divertTo](Source) { scala="#divertTo(that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[Out],_],when:Out=>Boolean):FlowOps.this.Repr[Out]" java="#divertTo(org.apache.pekko.stream.Graph,org.apache.pekko.japi.function.Predicate)" }
+@apidoc[Flow.divertTo](Flow) { scala="#divertTo(that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[Out],_],when:Out=>Boolean):FlowOps.this.Repr[Out]" java="#divertTo(org.apache.pekko.stream.Graph,org.apache.pekko.japi.function.Predicate)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/dropWhile.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/dropWhile.md
index b19a445e15..ba0c96745c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/dropWhile.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/dropWhile.md
@@ -6,8 +6,8 @@ Drop elements as long as a predicate function return true for the element
 
 ## Signature
 
-@apidoc[Source.dropWhile](Source) { scala="#dropWhile(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#dropWhile(akka.japi.function.Predicate)" }
-@apidoc[Flow.dropWhile](Flow) { scala="#dropWhile(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#dropWhile(akka.japi.function.Predicate)" }
+@apidoc[Source.dropWhile](Source) { scala="#dropWhile(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#dropWhile(org.apache.pekko.japi.function.Predicate)" }
+@apidoc[Flow.dropWhile](Flow) { scala="#dropWhile(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#dropWhile(org.apache.pekko.japi.function.Predicate)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/expand.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/expand.md
index b081eecef3..baac1dcf70 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/expand.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/expand.md
@@ -6,8 +6,8 @@ Like `extrapolate`, but does not have the `initial` argument, and the `Iterator`
 
 ## Signature
 
-@apidoc[Source.expand](Source) { scala="#expand[U](expander:Out=>Iterator[U]):FlowOps.this.Repr[U]" java="#expand(akka.japi.function.Function)" }
-@apidoc[Flow.expand](Flow) { scala="#expand[U](expander:Out=>Iterator[U]):FlowOps.this.Repr[U]" java="#expand(akka.japi.function.Function)" }
+@apidoc[Source.expand](Source) { scala="#expand[U](expander:Out=>Iterator[U]):FlowOps.this.Repr[U]" java="#expand(org.apache.pekko.japi.function.Function)" }
+@apidoc[Flow.expand](Flow) { scala="#expand[U](expander:Out=>Iterator[U]):FlowOps.this.Repr[U]" java="#expand(org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/extrapolate.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/extrapolate.md
index cb5b38b6f4..72df691f48 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/extrapolate.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/extrapolate.md
@@ -6,8 +6,8 @@ Allow for a faster downstream by expanding the last emitted element to an `Itera
 
 ## Signature
 
-@apidoc[Source.extrapolate](Source) { scala="#extrapolate[U>:Out](extrapolator:U=>Iterator[U],initial:Option[U]):FlowOps.this.Repr[U]" java="#extrapolate(akka.japi.function.Function,java.lang.Object)" }
-@apidoc[Flow.extrapolate](Flow) { scala="#extrapolate[U>:Out](extrapolator:U=>Iterator[U],initial:Option[U]):FlowOps.this.Repr[U]" java="#extrapolate(akka.japi.function.Function,java.lang.Object)" }
+@apidoc[Source.extrapolate](Source) { scala="#extrapolate[U>:Out](extrapolator:U=>Iterator[U],initial:Option[U]):FlowOps.this.Repr[U]" java="#extrapolate(org.apache.pekko.japi.function.Function,java.lang.Object)" }
+@apidoc[Flow.extrapolate](Flow) { scala="#extrapolate[U>:Out](extrapolator:U=>Iterator[U],initial:Option[U]):FlowOps.this.Repr[U]" java="#extrapolate(org.apache.pekko.japi.function.Function,java.lang.Object)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/filter.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/filter.md
index 8e3d06e864..8598aba244 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/filter.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/filter.md
@@ -6,8 +6,8 @@ Filter the incoming elements using a predicate.
 
 ## Signature
 
-@apidoc[Source.filter](Source) { scala="#filter(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#filter(akka.japi.function.Predicate)" }
-@apidoc[Flow.filter](Flow) { scala="#filter(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#filter(akka.japi.function.Predicate)" }
+@apidoc[Source.filter](Source) { scala="#filter(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#filter(org.apache.pekko.japi.function.Predicate)" }
+@apidoc[Flow.filter](Flow) { scala="#filter(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#filter(org.apache.pekko.japi.function.Predicate)" }
 
 
 ## Description
@@ -41,4 +41,4 @@ Java
 
 ## API docs
 
-@apidoc[Flow.filter](Flow) { scala="#filter(p:Out=%3EBoolean):FlowOps.this.Repr[Out]" java="#filter(akka.japi.function.Predicate)" }
+@apidoc[Flow.filter](Flow) { scala="#filter(p:Out=%3EBoolean):FlowOps.this.Repr[Out]" java="#filter(org.apache.pekko.japi.function.Predicate)" }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/filterNot.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/filterNot.md
index 8b22f92e22..4d8da800a2 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/filterNot.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/filterNot.md
@@ -6,8 +6,8 @@ Filter the incoming elements using a predicate.
 
 ## Signature
 
-@apidoc[Source.filterNot](Source) { scala="#filterNot(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#filterNot(akka.japi.function.Predicate)" }
-@apidoc[Flow.filterNot](Flow) { scala="#filterNot(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#filterNot(akka.japi.function.Predicate)" }
+@apidoc[Source.filterNot](Source) { scala="#filterNot(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#filterNot(org.apache.pekko.japi.function.Predicate)" }
+@apidoc[Flow.filterNot](Flow) { scala="#filterNot(p:Out=>Boolean):FlowOps.this.Repr[Out]" java="#filterNot(org.apache.pekko.japi.function.Predicate)" }
 
 
 ## Description
@@ -41,4 +41,4 @@ Java
 
 ## API docs
 
-@apidoc[Flow.filterNot](Flow) { scala="#filterNot(p:Out=%3EBoolean):FlowOps.this.Repr[Out]" java="#filterNot(akka.japi.function.Predicate)" }
+@apidoc[Flow.filterNot](Flow) { scala="#filterNot(p:Out=%3EBoolean):FlowOps.this.Repr[Out]" java="#filterNot(org.apache.pekko.japi.function.Predicate)" }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapConcat.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapConcat.md
index 782f9eaf78..e647dfc36f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapConcat.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapConcat.md
@@ -7,7 +7,7 @@ Transform each input element into a `Source` whose elements are then flattened i
 
 ## Signature
 
-@apidoc[Flow.flatMapConcat](Flow) { scala="#flatMapConcat[T,M](f:Out=%3akka.stream.Graph[akka.stream.SourceShape[T],M]):FlowOps.this.Repr[T]" java="#flatMapConcat(akka.japi.function.Function)" } 
+@apidoc[Flow.flatMapConcat](Flow) { scala="#flatMapConcat[T,M](f:Out=%3Eorg.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],M]):FlowOps.this.Repr[T]" java="#flatMapConcat(org.apache.pekko.japi.function.Function)" } 
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapMerge.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapMerge.md
index b10ee88edc..44a4c78527 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapMerge.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapMerge.md
@@ -6,7 +6,7 @@ Transform each input element into a `Source` whose elements are then flattened i
 
 ## Signature
 
-@apidoc[Flow.flatMapMerge](Flow) { scala="#flatMapMerge[T,M](breadth:Int,f:Out=%3Eakka.stream.Graph[akka.stream.SourceShape[T],M]):FlowOps.this.Repr[T]" java="#flatMapMerge(int,akka.japi.function.Function)" } 
+@apidoc[Flow.flatMapMerge](Flow) { scala="#flatMapMerge[T,M](breadth:Int,f:Out=%3Eorg.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],M]):FlowOps.this.Repr[T]" java="#flatMapMerge(int,org.apache.pekko.japi.function.Function)" } 
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapPrefix.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapPrefix.md
index a064b1243e..a8d1d88d00 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapPrefix.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/flatMapPrefix.md
@@ -6,8 +6,8 @@ Use the first `n` elements from the stream to determine how to process the rest.
 
 ## Signature
 
-@apidoc[Source.flatMapPrefix](Source) { scala="#flatMapPrefix[Out2,Mat2](n:Int)(f:scala.collection.immutable.Seq[Out]=>akka.stream.scaladsl.Flow[Out,Out2,Mat2]):FlowOps.this.Repr[Out2]" java="#flatMapPrefix(int,akka.japi.function.Function)" }
-@apidoc[Flow.flatMapPrefix](Flow) { scala="#flatMapPrefix[Out2,Mat2](n:Int)(f:scala.collection.immutable.Seq[Out]=>akka.stream.scaladsl.Flow[Out,Out2,Mat2]):FlowOps.this.Repr[Out2]" java="#flatMapPrefix(int,akka.japi.function.Function)" }
+@apidoc[Source.flatMapPrefix](Source) { scala="#flatMapPrefix[Out2,Mat2](n:Int)(f:scala.collection.immutable.Seq[Out]=>org.apache.pekko.stream.scaladsl.Flow[Out,Out2,Mat2]):FlowOps.this.Repr[Out2]" java="#flatMapPrefix(int,org.apache.pekko.japi.function.Function)" }
+@apidoc[Flow.flatMapPrefix](Flow) { scala="#flatMapPrefix[Out2,Mat2](n:Int)(f:scala.collection.immutable.Seq[Out]=>org.apache.pekko.stream.scaladsl.Flow[Out,Out2,Mat2]):FlowOps.this.Repr[Out2]" java="#flatMapPrefix(int,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/fold.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/fold.md
index 7724eb4ff6..d4729f43c9 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/fold.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/fold.md
@@ -6,8 +6,8 @@ Start with current value `zero` and then apply the current and next value to the
 
 ## Signature
 
-@apidoc[Source.fold](Source) { scala="#fold[T](zero:T)(f:(T,Out)=>T):FlowOps.this.Repr[T]" java="#fold(java.lang.Object,akka.japi.function.Function2)" }
-@apidoc[Flow.fold](Flow) { scala="#fold[T](zero:T)(f:(T,Out)=>T):FlowOps.this.Repr[T]" java="#fold(java.lang.Object,akka.japi.function.Function2)" }
+@apidoc[Source.fold](Source) { scala="#fold[T](zero:T)(f:(T,Out)=>T):FlowOps.this.Repr[T]" java="#fold(java.lang.Object,org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.fold](Flow) { scala="#fold[T](zero:T)(f:(T,Out)=>T):FlowOps.this.Repr[T]" java="#fold(java.lang.Object,org.apache.pekko.japi.function.Function2)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/foldAsync.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/foldAsync.md
index 9955b4518c..7e25884943 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/foldAsync.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/foldAsync.md
@@ -6,8 +6,8 @@ Just like `fold` but receives a function that results in a @scala[`Future`] @jav
 
 ## Signature
 
-@apidoc[Source.foldAsync](Source) { scala="#foldAsync[T](zero:T)(f:(T,Out)=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#foldAsync(java.lang.Object,akka.japi.function.Function2)" }
-@apidoc[Flow.foldAsync](Flow) { scala="#foldAsync[T](zero:T)(f:(T,Out)=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#foldAsync(java.lang.Object,akka.japi.function.Function2)" }
+@apidoc[Source.foldAsync](Source) { scala="#foldAsync[T](zero:T)(f:(T,Out)=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#foldAsync(java.lang.Object,org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.foldAsync](Flow) { scala="#foldAsync[T](zero:T)(f:(T,Out)=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#foldAsync(java.lang.Object,org.apache.pekko.japi.function.Function2)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/fromMaterializer.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/fromMaterializer.md
index ecfdeeee3e..9fe8b8b740 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/fromMaterializer.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/fromMaterializer.md
@@ -6,8 +6,8 @@ Defer the creation of a `Source/Flow` until materialization and access `Material
 
 ## Signature
 
-@apidoc[Source.fromMaterializer](Source$) { scala="#fromMaterializer[T,M](factory:(akka.stream.Materializer,akka.stream.Attributes)=>akka.stream.scaladsl.Source[T,M]):akka.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" java="#fromMaterializer(java.util.function.BiFunction)" }
-@apidoc[Flow.fromMaterializer](Flow$) { scala="#fromMaterializer[T,U,M](factory:(akka.stream.Materializer,akka.stream.Attributes)=>akka.stream.scaladsl.Flow[T,U,M]):akka.stream.scaladsl.Flow[T,U,scala.concurrent.Future[M]]" java="#fromMaterializer(java.util.function.BiFunction)" }
+@apidoc[Source.fromMaterializer](Source$) { scala="#fromMaterializer[T,M](factory:(org.apache.pekko.stream.Materializer,org.apache.pekko.stream.Attributes)=>org.apache.pekko.stream.scaladsl.Source[T,M]):org.apache.pekko.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" java="#fromMaterializer(java.util.function.BiFunction)" }
+@apidoc[Flow.fromMaterializer](Flow$) { scala="#fromMaterializer[T,U,M](factory:(org.apache.pekko.stream.Materializer,org.apache.pekko.stream.Attributes)=>org.apache.pekko.stream.scaladsl.Flow[T,U,M]):org.apache.pekko.stream.scaladsl.Flow[T,U,scala.concurrent.Future[M]]" java="#fromMaterializer(java.util.function.BiFunction)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupBy.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupBy.md
index daa481ce74..93532e60b0 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupBy.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupBy.md
@@ -6,8 +6,8 @@ Demultiplex the incoming stream into separate output streams.
 
 ## Signature
 
-@apidoc[Source.groupBy](Source) { scala="#groupBy[K](maxSubstreams:Int,f:Out=>K):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,akka.japi.function.Function,boolean)" }
-@apidoc[Flow.groupBy](Flow) { scala="#groupBy[K](maxSubstreams:Int,f:Out=>K):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,akka.japi.function.Function,boolean)" }
+@apidoc[Source.groupBy](Source) { scala="#groupBy[K](maxSubstreams:Int,f:Out=>K):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,org.apache.pekko.japi.function.Function,boolean)" }
+@apidoc[Flow.groupBy](Flow) { scala="#groupBy[K](maxSubstreams:Int,f:Out=>K):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,org.apache.pekko.japi.function.Function,boolean)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupedWeighted.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupedWeighted.md
index 21d2416025..b6787e5af5 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupedWeighted.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupedWeighted.md
@@ -6,8 +6,8 @@ Accumulate incoming events until the combined weight of elements is greater than
 
 ## Signature
 
-@apidoc[Source.groupedWeighted](Source) { scala="#groupedWeighted(minWeight:Long)(costFn:Out=>Long):FlowOps.this.Repr[scala.collection.immutable.Seq[Out]]" java="#groupedWeighted(long,akka.japi.function.Function)" }
-@apidoc[Flow.groupedWeighted](Flow) { scala="#groupedWeighted(minWeight:Long)(costFn:Out=>Long):FlowOps.this.Repr[scala.collection.immutable.Seq[Out]]" java="#groupedWeighted(long,akka.japi.function.Function)" }
+@apidoc[Source.groupedWeighted](Source) { scala="#groupedWeighted(minWeight:Long)(costFn:Out=>Long):FlowOps.this.Repr[scala.collection.immutable.Seq[Out]]" java="#groupedWeighted(long,org.apache.pekko.japi.function.Function)" }
+@apidoc[Flow.groupedWeighted](Flow) { scala="#groupedWeighted(minWeight:Long)(costFn:Out=>Long):FlowOps.this.Repr[scala.collection.immutable.Seq[Out]]" java="#groupedWeighted(long,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupedWeightedWithin.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupedWeightedWithin.md
index 0ddc48dc5a..bbf9a94d18 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupedWeightedWithin.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/groupedWeightedWithin.md
@@ -6,8 +6,8 @@ Chunk up this stream into groups of elements received within a time window, or l
 
 ## Signature
 
-@apidoc[Source.groupedWeightedWithin](Source) { scala="#groupedWeightedWithin(maxWeight:Long,d:scala.concurrent.duration.FiniteDuration)(costFn:Out=>Long):FlowOps.this.Repr[scala.collection.immutable.Seq[Out]]" java="#groupedWeightedWithin(long,akka.japi.function.Function,java.time.Duration)" }
-@apidoc[Flow.groupedWeightedWithin](Flow) { scala="#groupedWeightedWithin(maxWeight:Long,d:scala.concurrent.duration.FiniteDuration)(costFn:Out=>Long):FlowOps.this.Repr[scala.collection.immutable.Seq[Out]]" java="#groupedWeightedWithin(long,akka.japi.function.Function,java.time.Duration)" }
+@apidoc[Source.groupedWeightedWithin](Source) { scala="#groupedWeightedWithin(maxWeight:Long,d:scala.concurrent.duration.FiniteDuration)(costFn:Out=>Long):FlowOps.this.Repr[scala.collection.immutable.Seq[Out]]" java="#groupedWeightedWithin(long,org.apache.pekko.japi.function.Function,java.time.Duration)" }
+@apidoc[Flow.groupedWeightedWithin](Flow) { scala="#groupedWeightedWithin(maxWeight:Long,d:scala.concurrent.duration.FiniteDuration)(costFn:Out=>Long):FlowOps.this.Repr[scala.collection.immutable.Seq[Out]]" java="#groupedWeightedWithin(long,org.apache.pekko.japi.function.Function,java.time.Duration)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/interleave.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/interleave.md
index 18983af6a7..cab930e577 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/interleave.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/interleave.md
@@ -6,8 +6,8 @@ Emits a specifiable number of elements from the original source, then from the p
 
 ## Signature
 
-@apidoc[Source.interleave](Source) { scala="#interleave[U>:Out](that:akka.stream.Graph[akka.stream.SourceShape[U],_],segmentSize:Int,eagerClose:Boolean):FlowOps.this.Repr[U]" java="#interleave(akka.stream.Graph,int,boolean)" }
-@apidoc[Flow.interleave](Flow) { scala="#interleave[U>:Out](that:akka.stream.Graph[akka.stream.SourceShape[U],_],segmentSize:Int,eagerClose:Boolean):FlowOps.this.Repr[U]" java="#interleave(akka.stream.Graph,int,boolean)" }
+@apidoc[Source.interleave](Source) { scala="#interleave[U>:Out](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_],segmentSize:Int,eagerClose:Boolean):FlowOps.this.Repr[U]" java="#interleave(org.apache.pekko.stream.Graph,int,boolean)" }
+@apidoc[Flow.interleave](Flow) { scala="#interleave[U>:Out](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_],segmentSize:Int,eagerClose:Boolean):FlowOps.this.Repr[U]" java="#interleave(org.apache.pekko.stream.Graph,int,boolean)" }
 
 
 ## Description
@@ -17,7 +17,7 @@ source completes the rest of the other stream will be emitted.
 
 ## Example
 Scala
-:   @@snip [FlowInterleaveSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveSpec.scala) { #interleave }
+:   @@snip [FlowInterleaveSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowInterleaveSpec.scala) { #interleave }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #interleave }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/interleaveAll.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/interleaveAll.md
index a96c8879d4..407442008d 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/interleaveAll.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/interleaveAll.md
@@ -6,8 +6,8 @@ Emits a specifiable number of elements from the original source, then from the p
 
 ## Signature
 
-@apidoc[Source.interleaveAll](Source) { scala="#interleaveAll[U>:Out](that:List[akka.stream.Graph[akka.stream.SourceShape[U],_]],segmentSize:Int,eagerClose:Boolean):FlowOps.this.Repr[U]" java="#interleaveAll(java.util.List[akka.stream.Graph],int,boolean)" }
-@apidoc[Flow.interleaveAll](Flow) { scala="#interleaveAll[U>:Out](that:List[akka.stream.Graph[akka.stream.SourceShape[U],_]],segmentSize:Int,eagerClose:Boolean):FlowOps.this.Repr[U]" java="#interleaveAll(java.util.List[akka.stream.Graph],int,boolean)" }
+@apidoc[Source.interleaveAll](Source) { scala="#interleaveAll[U>:Out](that:List[org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_]],segmentSize:Int,eagerClose:Boolean):FlowOps.this.Repr[U]" java="#interleaveAll(java.util.List[org.apache.pekko.stream.Graph],int,boolean)" }
+@apidoc[Flow.interleaveAll](Flow) { scala="#interleaveAll[U>:Out](that:List[org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_]],segmentSize:Int,eagerClose:Boolean):FlowOps.this.Repr[U]" java="#interleaveAll(java.util.List[org.apache.pekko.stream.Graph],int,boolean)" }
 
 
 ## Description
@@ -18,7 +18,7 @@ the flow is complete.
 
 ## Example
 Scala
-:   @@snip [FlowInterleaveSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveAllSpec.scala) { #interleaveAll }
+:   @@snip [FlowInterleaveSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowInterleaveAllSpec.scala) { #interleaveAll }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #interleaveAll }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/keepAlive.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/keepAlive.md
index 974a9025d3..4d767457d9 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/keepAlive.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/keepAlive.md
@@ -6,8 +6,8 @@ Injects additional (configured) elements if upstream does not emit for a configu
 
 ## Signature
 
-@apidoc[Source.keepAlive](Source) { scala="#keepAlive[U>:Out](maxIdle:scala.concurrent.duration.FiniteDuration,injectedElem:()=>U):FlowOps.this.Repr[U]" java="#keepAlive(java.time.Duration,akka.japi.function.Creator)" }
-@apidoc[Flow.keepAlive](Flow) { scala="#keepAlive[U>:Out](maxIdle:scala.concurrent.duration.FiniteDuration,injectedElem:()=>U):FlowOps.this.Repr[U]" java="#keepAlive(java.time.Duration,akka.japi.function.Creator)" }
+@apidoc[Source.keepAlive](Source) { scala="#keepAlive[U>:Out](maxIdle:scala.concurrent.duration.FiniteDuration,injectedElem:()=>U):FlowOps.this.Repr[U]" java="#keepAlive(java.time.Duration,org.apache.pekko.japi.function.Creator)" }
+@apidoc[Flow.keepAlive](Flow) { scala="#keepAlive[U>:Out](maxIdle:scala.concurrent.duration.FiniteDuration,injectedElem:()=>U):FlowOps.this.Repr[U]" java="#keepAlive(java.time.Duration,org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/limitWeighted.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/limitWeighted.md
index b12199f5b1..e4bdcb9c35 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/limitWeighted.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/limitWeighted.md
@@ -6,7 +6,7 @@ Limit the total weight of incoming elements
 
 ## Signature
 
-@apidoc[Flow.limitWeighted](Flow) { scala="#limitWeighted[T](max:Long)(costFn:Out=>Long):FlowOps.this.Repr[Out]" java="#limitWeighted(long,akka.japi.function.Function)" } 
+@apidoc[Flow.limitWeighted](Flow) { scala="#limitWeighted[T](max:Long)(costFn:Out=>Long):FlowOps.this.Repr[Out]" java="#limitWeighted(long,org.apache.pekko.japi.function.Function)" } 
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/log.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/log.md
index f0233810cf..82b9df8e1e 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/log.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/log.md
@@ -6,8 +6,8 @@ Log elements flowing through the stream as well as completion and erroring.
 
 ## Signature
 
-@apidoc[Source.log](Source) { scala="#log(name:String,extract:Out=>Any)(implicitlog:akka.event.LoggingAdapter):FlowOps.this.Repr[Out]" java="#log(java.lang.String)" }
-@apidoc[Flow.log](Flow) { scala="#log(name:String,extract:Out=>Any)(implicitlog:akka.event.LoggingAdapter):FlowOps.this.Repr[Out]" java="#log(java.lang.String)" }
+@apidoc[Source.log](Source) { scala="#log(name:String,extract:Out=>Any)(implicitlog:org.apache.pekko.event.LoggingAdapter):FlowOps.this.Repr[Out]" java="#log(java.lang.String)" }
+@apidoc[Flow.log](Flow) { scala="#log(name:String,extract:Out=>Any)(implicitlog:org.apache.pekko.event.LoggingAdapter):FlowOps.this.Repr[Out]" java="#log(java.lang.String)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/logWithMarker.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/logWithMarker.md
index 7364bbd4d3..1efb911aa5 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/logWithMarker.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/logWithMarker.md
@@ -6,8 +6,8 @@ Log elements flowing through the stream as well as completion and erroring.
 
 ## Signature
 
-@apidoc[Source.logWithMarker](Source) { scala="#logWithMarker(name:String,marker:Out=>akka.event.LogMarker,extract:Out=>Any)(implicitlog:akka.event.MarkerLoggingAdapter):FlowOps.this.Repr[Out]" java="#logWithMarker(java.lang.String,akka.japi.function.Function)" }
-@apidoc[Flow.logWithMarker](Flow) { scala="#logWithMarker(name:String,marker:Out=>akka.event.LogMarker,extract:Out=>Any)(implicitlog:akka.event.MarkerLoggingAdapter):FlowOps.this.Repr[Out]" java="#logWithMarker(java.lang.String,akka.japi.function.Function)" }
+@apidoc[Source.logWithMarker](Source) { scala="#logWithMarker(name:String,marker:Out=>org.apache.pekko.event.LogMarker,extract:Out=>Any)(implicitlog:org.apache.pekko.event.MarkerLoggingAdapter):FlowOps.this.Repr[Out]" java="#logWithMarker(java.lang.String,org.apache.pekko.japi.function.Function)" }
+@apidoc[Flow.logWithMarker](Flow) { scala="#logWithMarker(name:String,marker:Out=>org.apache.pekko.event.LogMarker,extract:Out=>Any)(implicitlog:org.apache.pekko.event.MarkerLoggingAdapter):FlowOps.this.Repr[Out]" java="#logWithMarker(java.lang.String,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/map.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/map.md
index d1001d8ab7..1cef352005 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/map.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/map.md
@@ -6,8 +6,8 @@ Transform each element in the stream by calling a mapping function with it and p
 
 ## Signature
 
-@apidoc[Source.map](Source) { scala="#map[T](f:Out=>T):FlowOps.this.Repr[T]" java="#map(akka.japi.function.Function)" }
-@apidoc[Flow.map](Flow) { scala="#map[T](f:Out=>T):FlowOps.this.Repr[T]" java="#map(akka.japi.function.Function)" }
+@apidoc[Source.map](Source) { scala="#map[T](f:Out=>T):FlowOps.this.Repr[T]" java="#map(org.apache.pekko.japi.function.Function)" }
+@apidoc[Flow.map](Flow) { scala="#map[T](f:Out=>T):FlowOps.this.Repr[T]" java="#map(org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapAsync.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapAsync.md
index 561b9e7f4a..859abaca97 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapAsync.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapAsync.md
@@ -6,8 +6,8 @@ Pass incoming elements to a function that return a @scala[`Future`] @java[`Compl
 
 ## Signature
 
-@apidoc[Source.mapAsync](Source) { scala="#mapAsync[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,akka.japi.function.Function)" }
-@apidoc[Flow.mapAsync](Flow) { scala="#mapAsync[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,akka.japi.function.Function)" }
+@apidoc[Source.mapAsync](Source) { scala="#mapAsync[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,org.apache.pekko.japi.function.Function)" }
+@apidoc[Flow.mapAsync](Flow) { scala="#mapAsync[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapAsyncUnordered.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapAsyncUnordered.md
index 6e72daf62a..35420bcc8f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapAsyncUnordered.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapAsyncUnordered.md
@@ -6,8 +6,8 @@ Like `mapAsync` but @scala[`Future`] @java[`CompletionStage`] results are passed
 
 ## Signature
 
-@apidoc[Source.mapAsyncUnordered](Source) { scala="#mapAsyncUnordered[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsyncUnordered(int,akka.japi.function.Function)" }
-@apidoc[Flow.mapAsyncUnordered](Flow) { scala="#mapAsyncUnordered[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsyncUnordered(int,akka.japi.function.Function)" }
+@apidoc[Source.mapAsyncUnordered](Source) { scala="#mapAsyncUnordered[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsyncUnordered(int,org.apache.pekko.japi.function.Function)" }
+@apidoc[Flow.mapAsyncUnordered](Flow) { scala="#mapAsyncUnordered[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsyncUnordered(int,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapConcat.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapConcat.md
index dbb1ca83d9..01bd12a43d 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapConcat.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapConcat.md
@@ -6,8 +6,8 @@ Transform each element into zero or more elements that are individually passed d
 
 ## Signature
 
-@apidoc[Source.mapConcat](Source) { scala="#mapConcat[T](f:Out=>scala.collection.immutable.Iterable[T]):FlowOps.this.Repr[T]" java="#mapConcat(akka.japi.function.Function)" }
-@apidoc[Flow.mapConcat](Flow) { scala="#mapConcat[T](f:Out=>scala.collection.immutable.Iterable[T]):FlowOps.this.Repr[T]" java="#mapConcat(akka.japi.function.Function)" }
+@apidoc[Source.mapConcat](Source) { scala="#mapConcat[T](f:Out=>scala.collection.immutable.Iterable[T]):FlowOps.this.Repr[T]" java="#mapConcat(org.apache.pekko.japi.function.Function)" }
+@apidoc[Flow.mapConcat](Flow) { scala="#mapConcat[T](f:Out=>scala.collection.immutable.Iterable[T]):FlowOps.this.Repr[T]" java="#mapConcat(org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapError.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapError.md
index 735e20df9b..207e194b50 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapError.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mapError.md
@@ -6,8 +6,8 @@ While similar to `recover` this operators can be used to transform an error sign
 
 ## Signature
 
-@apidoc[Source.mapError](Source) { scala="#mapError(pf:PartialFunction[Throwable,Throwable]):FlowOps.this.Repr[Out]" java="#mapError(java.lang.Class,akka.japi.function.Function)" }
-@apidoc[Flow.mapError](Flow) { scala="#mapError(pf:PartialFunction[Throwable,Throwable]):FlowOps.this.Repr[Out]" java="#mapError(java.lang.Class,akka.japi.function.Function)" }
+@apidoc[Source.mapError](Source) { scala="#mapError(pf:PartialFunction[Throwable,Throwable]):FlowOps.this.Repr[Out]" java="#mapError(java.lang.Class,org.apache.pekko.japi.function.Function)" }
+@apidoc[Flow.mapError](Flow) { scala="#mapError(pf:PartialFunction[Throwable,Throwable]):FlowOps.this.Repr[Out]" java="#mapError(java.lang.Class,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/merge.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/merge.md
index 93a56600fb..64e45a4008 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/merge.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/merge.md
@@ -6,8 +6,8 @@ Merge multiple sources.
 
 ## Signature
 
-@apidoc[Source.merge](Source) { scala="#merge[U>:Out,M](that:akka.stream.Graph[akka.stream.SourceShape[U],M],eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#merge(akka.stream.Graph)" java="#merge(akka.stream.Graph,boolean)" }
-@apidoc[Flow.merge](Flow) { scala="#merge[U>:Out,M](that:akka.stream.Graph[akka.stream.SourceShape[U],M],eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#merge(akka.stream.Graph)" java="#merge(akka.stream.Graph,boolean)" }
+@apidoc[Source.merge](Source) { scala="#merge[U>:Out,M](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M],eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#merge(org.apache.pekko.stream.Graph)" java="#merge(org.apache.pekko.stream.Graph,boolean)" }
+@apidoc[Flow.merge](Flow) { scala="#merge[U>:Out,M](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M],eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#merge(org.apache.pekko.stream.Graph)" java="#merge(org.apache.pekko.stream.Graph,boolean)" }
 
 
 ## Description
@@ -16,7 +16,7 @@ Merge multiple sources. Picks elements randomly if all sources has elements read
 
 ## Example
 Scala
-:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala) { #merge }
+:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMergeSpec.scala) { #merge }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #merge }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeAll.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeAll.md
index bd2d4257ca..1faee893e8 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeAll.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeAll.md
@@ -6,8 +6,8 @@ Merge multiple sources.
 
 ## Signature
 
-@apidoc[Source.mergeAll](Source) { scala="#mergeAll[U>:Out,M](those:immutable.Seq[akka.stream.Graph[akka.stream.SourceShape[U],M]],eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergeAll(java.util.List,boolean)" }
-@apidoc[Flow.mergeAll](Flow) { scala="#mergeAll[U>:Out,M](those:immutable.Seq[akka.stream.Graph[akka.stream.SourceShape[U],M]],eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergeAll(java.util.List,boolean)" }
+@apidoc[Source.mergeAll](Source) { scala="#mergeAll[U>:Out,M](those:immutable.Seq[org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M]],eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergeAll(java.util.List,boolean)" }
+@apidoc[Flow.mergeAll](Flow) { scala="#mergeAll[U>:Out,M](those:immutable.Seq[org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M]],eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergeAll(java.util.List,boolean)" }
 
 ## Description
 
@@ -15,7 +15,7 @@ Merge multiple sources. Picks elements randomly if all sources has elements read
 
 ## Example
 Scala
-:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeAllSpec.scala) { #merge-all }
+:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMergeAllSpec.scala) { #merge-all }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #merge-all }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeLatest.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeLatest.md
index 28af71722f..616f221de5 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeLatest.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeLatest.md
@@ -6,7 +6,7 @@ Merge multiple sources.
 
 ## Signature
 
-@apidoc[Flow.mergeLatest](Flow) { scala="#mergeLatest[U%3E:Out,M](that:akka.stream.Graph[akka.stream.SourceShape[U],M],eagerComplete:Boolean):FlowOps.this.Repr[scala.collection.immutable.Seq[U]]" java="#mergeLatest(akka.stream.Graph,boolean)" } 
+@apidoc[Flow.mergeLatest](Flow) { scala="#mergeLatest[U%3E:Out,M](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M],eagerComplete:Boolean):FlowOps.this.Repr[scala.collection.immutable.Seq[U]]" java="#mergeLatest(org.apache.pekko.stream.Graph,boolean)" } 
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergePreferred.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergePreferred.md
index 7882e61bf7..5cb2778544 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergePreferred.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergePreferred.md
@@ -6,8 +6,8 @@ Merge multiple sources.
 
 ## Signature
 
-@apidoc[Source.mergePreferred](Source) { scala="#mergePreferred[U>:Out,M](that:akka.stream.Graph[akka.stream.SourceShape[U],M],preferred:Boolean,eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergePreferred(akka.stream.Graph,boolean,boolean)" }
-@apidoc[Flow.mergePreferred](Flow) { scala="#mergePreferred[U>:Out,M](that:akka.stream.Graph[akka.stream.SourceShape[U],M],preferred:Boolean,eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergePreferred(akka.stream.Graph,boolean,boolean)" }
+@apidoc[Source.mergePreferred](Source) { scala="#mergePreferred[U>:Out,M](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M],preferred:Boolean,eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergePreferred(org.apache.pekko.stream.Graph,boolean,boolean)" }
+@apidoc[Flow.mergePreferred](Flow) { scala="#mergePreferred[U>:Out,M](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M],preferred:Boolean,eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergePreferred(org.apache.pekko.stream.Graph,boolean,boolean)" }
 
 ## Description
 
@@ -18,7 +18,7 @@ prefer the left source (see examples).
 
 ## Example
 Scala
-:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala) { #mergePreferred }
+:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMergeSpec.scala) { #mergePreferred }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #mergePreferred }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergePrioritized.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergePrioritized.md
index ed9df82abb..d015091bc5 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergePrioritized.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergePrioritized.md
@@ -6,8 +6,8 @@ Merge multiple sources.
 
 ## Signature
 
-@apidoc[Source.mergePrioritized](Source) { scala="#mergePrioritized[U>:Out,M](that:akka.stream.Graph[akka.stream.SourceShape[U],M],leftPriority:Int,rightPriority:Int,eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergePrioritized(akka.stream.Graph,int,int,boolean)" }
-@apidoc[Flow.mergePrioritized](Flow) { scala="#mergePrioritized[U>:Out,M](that:akka.stream.Graph[akka.stream.SourceShape[U],M],leftPriority:Int,rightPriority:Int,eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergePrioritized(akka.stream.Graph,int,int,boolean)" }
+@apidoc[Source.mergePrioritized](Source) { scala="#mergePrioritized[U>:Out,M](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M],leftPriority:Int,rightPriority:Int,eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergePrioritized(org.apache.pekko.stream.Graph,int,int,boolean)" }
+@apidoc[Flow.mergePrioritized](Flow) { scala="#mergePrioritized[U>:Out,M](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M],leftPriority:Int,rightPriority:Int,eagerComplete:Boolean):FlowOps.this.Repr[U]" java="#mergePrioritized(org.apache.pekko.stream.Graph,int,int,boolean)" }
 
 ## Description
 
@@ -18,7 +18,7 @@ prioritized and similarly for the right source. The priorities for each source m
 
 ## Example
 Scala
-:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala) { #mergePrioritized }
+:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMergeSpec.scala) { #mergePrioritized }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #mergePrioritized }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeSorted.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeSorted.md
index 0856a004b5..c4e9ed1829 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeSorted.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/mergeSorted.md
@@ -6,8 +6,8 @@ Merge multiple sources.
 
 ## Signature
 
-@apidoc[Source.mergeSorted](Source) { scala="#mergeSorted[U>:Out,M](that:akka.stream.Graph[akka.stream.SourceShape[U],M])(implicitord:Ordering[U]):FlowOps.this.Repr[U]" java="#mergeSorted(akka.stream.Graph,java.util.Comparator)" }
-@apidoc[Flow.mergeSorted](Flow) { scala="#mergeSorted[U>:Out,M](that:akka.stream.Graph[akka.stream.SourceShape[U],M])(implicitord:Ordering[U]):FlowOps.this.Repr[U]" java="#mergeSorted(akka.stream.Graph,java.util.Comparator)" }
+@apidoc[Source.mergeSorted](Source) { scala="#mergeSorted[U>:Out,M](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M])(implicitord:Ordering[U]):FlowOps.this.Repr[U]" java="#mergeSorted(org.apache.pekko.stream.Graph,java.util.Comparator)" }
+@apidoc[Flow.mergeSorted](Flow) { scala="#mergeSorted[U>:Out,M](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],M])(implicitord:Ordering[U]):FlowOps.this.Repr[U]" java="#mergeSorted(org.apache.pekko.stream.Graph,java.util.Comparator)" }
 
 
 ## Description
@@ -17,7 +17,7 @@ smallest element.
 
 ## Example
 Scala
-:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala) { #merge-sorted }
+:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMergeSpec.scala) { #merge-sorted }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #merge-sorted }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/monitor.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/monitor.md
index f116989cf6..cee12a57d2 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/monitor.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/monitor.md
@@ -6,8 +6,8 @@ Materializes to a `FlowMonitor` that monitors messages flowing through or comple
 
 ## Signature
 
-@apidoc[Source.monitor](Source) { scala="#monitor[Mat2]()(combine:(Mat,akka.stream.FlowMonitor[Out])=>Mat2):FlowOpsMat.this.ReprMat[Out,Mat2]" java="#monitor()" }
-@apidoc[Flow.monitor](Flow) { scala="#monitor[Mat2]()(combine:(Mat,akka.stream.FlowMonitor[Out])=>Mat2):FlowOpsMat.this.ReprMat[Out,Mat2]" java="#monitor()" }
+@apidoc[Source.monitor](Source) { scala="#monitor[Mat2]()(combine:(Mat,org.apache.pekko.stream.FlowMonitor[Out])=>Mat2):FlowOpsMat.this.ReprMat[Out,Mat2]" java="#monitor()" }
+@apidoc[Flow.monitor](Flow) { scala="#monitor[Mat2]()(combine:(Mat,org.apache.pekko.stream.FlowMonitor[Out])=>Mat2):FlowOpsMat.this.ReprMat[Out,Mat2]" java="#monitor()" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/orElse.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/orElse.md
index a60805e105..caf6ba089f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/orElse.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/orElse.md
@@ -6,8 +6,8 @@ If the primary source completes without emitting any elements, the elements from
 
 ## Signature
 
-@apidoc[Source.orElse](Source) { scala="#orElse[U>:Out,Mat2](secondary:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#orElse(akka.stream.Graph)" }
-@apidoc[Flow.orElse](Flow) { scala="#orElse[U>:Out,Mat2](secondary:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#orElse(akka.stream.Graph)" }
+@apidoc[Source.orElse](Source) { scala="#orElse[U>:Out,Mat2](secondary:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#orElse(org.apache.pekko.stream.Graph)" }
+@apidoc[Flow.orElse](Flow) { scala="#orElse[U>:Out,Mat2](secondary:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#orElse(org.apache.pekko.stream.Graph)" }
 
 
 ## Description
@@ -22,7 +22,7 @@ Signal errors downstream, regardless which of the two sources emitted the error.
 
 ## Example
 Scala
-:   @@snip [FlowOrElseSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOrElseSpec.scala) { #or-else }
+:   @@snip [FlowOrElseSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowOrElseSpec.scala) { #or-else }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #or-else }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/preMaterialize.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/preMaterialize.md
index dfa3a8496a..a06eed6c9d 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/preMaterialize.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/preMaterialize.md
@@ -6,8 +6,8 @@ Materializes this Graph, immediately returning (1) its materialized value, and (
 
 ## Signature
 
-@apidoc[Source.preMaterialize](Source) { scala="#preMaterialize()(implicitmaterializer:akka.stream.Materializer):(Mat,akka.stream.scaladsl.Source[Out,akka.NotUsed])" java="#preMaterialize(akka.actor.ClassicActorSystemProvider)" java="#preMaterialize(akka.stream.Materializer)" }
-@apidoc[Flow.preMaterialize](Flow) { scala="#preMaterialize()(implicitmaterializer:akka.stream.Materializer):(Mat,akka.stream.scaladsl.Flow[Int,Out,akka.NotUsed])" java="#preMaterialize(akka.actor.ClassicActorSystemProvider)" java="#preMaterialize(akka.stream.Materializer)" }
+@apidoc[Source.preMaterialize](Source) { scala="#preMaterialize()(implicitmaterializer:org.apache.pekko.stream.Materializer):(Mat,org.apache.pekko.stream.scaladsl.Source[Out,org.apache.pekko.NotUsed])" java="#preMaterialize(org.apache.pekko.actor.ClassicActorSystemProvider)" java="#preMaterialize(org.apache.pekko.stream.Materializer)" }
+@apidoc[Flow.preMaterialize](Flow) { scala="#preMaterialize()(implicitmaterializer:org.apache.pekko.stream.Materializer):(Mat,org.apache.pekko.stream.scaladsl.Flow[Int,Out,org.apache.pekko.NotUsed])" java="#preMaterialize(org.apache.pekko.actor.ClassicActorSystemProvider)" java="#preMaterialize(org.apache.pekko.stream.Materializer)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prefixAndTail.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prefixAndTail.md
index b68beb770c..9ab2ea900c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prefixAndTail.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prefixAndTail.md
@@ -6,8 +6,8 @@ Take up to *n* elements from the stream (less than *n* only if the upstream comp
 
 ## Signature
 
-@apidoc[Source.prefixAndTail](Source) { scala="#prefixAndTail[U>:Out](n:Int):FlowOps.this.Repr[(scala.collection.immutable.Seq[Out],akka.stream.scaladsl.Source[U,akka.NotUsed])]" java="#prefixAndTail(int)" }
-@apidoc[Flow.prefixAndTail](Flow) { scala="#prefixAndTail[U>:Out](n:Int):FlowOps.this.Repr[(scala.collection.immutable.Seq[Out],akka.stream.scaladsl.Source[U,akka.NotUsed])]" java="#prefixAndTail(int)" }
+@apidoc[Source.prefixAndTail](Source) { scala="#prefixAndTail[U>:Out](n:Int):FlowOps.this.Repr[(scala.collection.immutable.Seq[Out],org.apache.pekko.stream.scaladsl.Source[U,org.apache.pekko.NotUsed])]" java="#prefixAndTail(int)" }
+@apidoc[Flow.prefixAndTail](Flow) { scala="#prefixAndTail[U>:Out](n:Int):FlowOps.this.Repr[(scala.collection.immutable.Seq[Out],org.apache.pekko.stream.scaladsl.Source[U,org.apache.pekko.NotUsed])]" java="#prefixAndTail(int)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prepend.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prepend.md
index 7d6b61c9ca..253cc51dbc 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prepend.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prepend.md
@@ -6,8 +6,8 @@ Prepends the given source to the flow, consuming it until completion before the
 
 ## Signature
 
-@apidoc[Source.prepend](Source) { scala="#prepend[U>:Out,Mat2](that:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#prepend(akka.stream.Graph)" }
-@apidoc[Flow.prepend](Flow) { scala="#prepend[U>:Out,Mat2](that:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#prepend(akka.stream.Graph)" }
+@apidoc[Source.prepend](Source) { scala="#prepend[U>:Out,Mat2](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#prepend(org.apache.pekko.stream.Graph)" }
+@apidoc[Flow.prepend](Flow) { scala="#prepend[U>:Out,Mat2](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#prepend(org.apache.pekko.stream.Graph)" }
 
 
 ## Description
@@ -36,7 +36,7 @@ use @ref(prependLazy)[prependLazy.md]
 
 ## Example
 Scala
-:   @@snip [FlowOrElseSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrependSpec.scala) { #prepend }
+:   @@snip [FlowOrElseSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowPrependSpec.scala) { #prepend }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #prepend }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prependLazy.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prependLazy.md
index 9b6ec504fb..4cfa7d8aae 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prependLazy.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/prependLazy.md
@@ -6,8 +6,8 @@ Prepends the given source to the flow, consuming it until completion before the
 
 ## Signature
 
-@apidoc[Source.prepend](Source) { scala="#prepend[U>:Out,Mat2](that:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#prepend(akka.stream.Graph)" }
-@apidoc[Flow.prepend](Flow) { scala="#prepend[U>:Out,Mat2](that:akka.stream.Graph[akka.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#prepend(akka.stream.Graph)" }
+@apidoc[Source.prepend](Source) { scala="#prepend[U>:Out,Mat2](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#prepend(org.apache.pekko.stream.Graph)" }
+@apidoc[Flow.prepend](Flow) { scala="#prepend[U>:Out,Mat2](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],Mat2]):FlowOps.this.Repr[U]" java="#prepend(org.apache.pekko.stream.Graph)" }
 
 
 ## Description
@@ -22,7 +22,7 @@ See also @ref[prepend](prepend.md) which is detached.
 
 ## Example
 Scala
-:   @@snip [FlowPrependSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrependSpec.scala) { #prependLazy }
+:   @@snip [FlowPrependSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowPrependSpec.scala) { #prependLazy }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #prependLazy }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/recoverWith.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/recoverWith.md
index 64efe0e5d8..4d62c22c05 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/recoverWith.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/recoverWith.md
@@ -6,8 +6,8 @@ Allow switching to alternative Source when a failure has happened upstream.
 
 ## Signature
 
-@apidoc[Source.recoverWith](Source) { scala="#recoverWith[T>:Out](pf:PartialFunction[Throwable,akka.stream.Graph[akka.stream.SourceShape[T],akka.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWith(java.lang.Class,java.util.function.Supplier)" }
-@apidoc[Flow.recoverWith](Flow) { scala="#recoverWith[T>:Out](pf:PartialFunction[Throwable,akka.stream.Graph[akka.stream.SourceShape[T],akka.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWith(java.lang.Class,java.util.function.Supplier)" }
+@apidoc[Source.recoverWith](Source) { scala="#recoverWith[T>:Out](pf:PartialFunction[Throwable,org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],org.apache.pekko.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWith(java.lang.Class,java.util.function.Supplier)" }
+@apidoc[Flow.recoverWith](Flow) { scala="#recoverWith[T>:Out](pf:PartialFunction[Throwable,org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],org.apache.pekko.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWith(java.lang.Class,java.util.function.Supplier)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/recoverWithRetries.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/recoverWithRetries.md
index 2a70b5d848..666794a1ee 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/recoverWithRetries.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/recoverWithRetries.md
@@ -6,8 +6,8 @@ RecoverWithRetries allows to switch to alternative Source on flow failure.
 
 ## Signature
 
-@apidoc[Source.recoverWithRetries](Source) { scala="#recoverWithRetries[T>:Out](attempts:Int,pf:PartialFunction[Throwable,akka.stream.Graph[akka.stream.SourceShape[T],akka.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWithRetries(int,java.lang.Class,java.util.function.Supplier)" }
-@apidoc[Flow.recoverWithRetries](Flow) { scala="#recoverWithRetries[T>:Out](attempts:Int,pf:PartialFunction[Throwable,akka.stream.Graph[akka.stream.SourceShape[T],akka.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWithRetries(int,java.lang.Class,java.util.function.Supplier)" }
+@apidoc[Source.recoverWithRetries](Source) { scala="#recoverWithRetries[T>:Out](attempts:Int,pf:PartialFunction[Throwable,org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],org.apache.pekko.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWithRetries(int,java.lang.Class,java.util.function.Supplier)" }
+@apidoc[Flow.recoverWithRetries](Flow) { scala="#recoverWithRetries[T>:Out](attempts:Int,pf:PartialFunction[Throwable,org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],org.apache.pekko.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWithRetries(int,java.lang.Class,java.util.function.Supplier)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/reduce.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/reduce.md
index a5e35d1a65..a714940547 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/reduce.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/reduce.md
@@ -6,8 +6,8 @@ Start with first element and then apply the current and next value to the given
 
 ## Signature
 
-@apidoc[Source.reduce](Source) { scala="#reduce[T>:Out](f:(T,T)=>T):FlowOps.this.Repr[T]" java="#reduce(akka.japi.function.Function2)" }
-@apidoc[Flow.reduce](Flow) { scala="#reduce[T>:Out](f:(T,T)=>T):FlowOps.this.Repr[T]" java="#reduce(akka.japi.function.Function2)" }
+@apidoc[Source.reduce](Source) { scala="#reduce[T>:Out](f:(T,T)=>T):FlowOps.this.Repr[T]" java="#reduce(org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.reduce](Flow) { scala="#reduce[T>:Out](f:(T,T)=>T):FlowOps.this.Repr[T]" java="#reduce(org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/scan.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/scan.md
index 9d94ececf0..20f0703c8c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/scan.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/scan.md
@@ -6,8 +6,8 @@ Emit its current value, which starts at `zero`, and then apply the current and n
 
 ## Signature
 
-@apidoc[Source.scan](Source) { scala="#scan[T](zero:T)(f:(T,Out)=>T):FlowOps.this.Repr[T]" java="#scan(java.lang.Object,akka.japi.function.Function2)" }
-@apidoc[Flow.scan](Flow) { scala="#scan[T](zero:T)(f:(T,Out)=>T):FlowOps.this.Repr[T]" java="#scan(java.lang.Object,akka.japi.function.Function2)" }
+@apidoc[Source.scan](Source) { scala="#scan[T](zero:T)(f:(T,Out)=>T):FlowOps.this.Repr[T]" java="#scan(java.lang.Object,org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.scan](Flow) { scala="#scan[T](zero:T)(f:(T,Out)=>T):FlowOps.this.Repr[T]" java="#scan(java.lang.Object,org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/scanAsync.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/scanAsync.md
index c1d7e18686..4fcfe907d6 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/scanAsync.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/scanAsync.md
@@ -6,8 +6,8 @@ Just like @ref[`scan`](./scan.md) but receives a function that results in a @sca
 
 ## Signature
 
-@apidoc[Source.scanAsync](Source) { scala="#scanAsync[T](zero:T)(f:(T,Out)=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#scanAsync(java.lang.Object,akka.japi.function.Function2)" }
-@apidoc[Flow.scanAsync](Flow) { scala="#scanAsync[T](zero:T)(f:(T,Out)=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#scanAsync(java.lang.Object,akka.japi.function.Function2)" }
+@apidoc[Source.scanAsync](Source) { scala="#scanAsync[T](zero:T)(f:(T,Out)=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#scanAsync(java.lang.Object,org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.scanAsync](Flow) { scala="#scanAsync[T](zero:T)(f:(T,Out)=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#scanAsync(java.lang.Object,org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/setup.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/setup.md
index 32d8e7f042..7a65e68c80 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/setup.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/setup.md
@@ -12,8 +12,8 @@ The `setup` operator has been deprecated, use @ref:[fromMaterializer](./fromMate
 
 ## Signature
 
-@apidoc[Source.setup](Source$) { scala="#setup[T,M](factory:(akka.stream.ActorMaterializer,akka.stream.Attributes)=>akka.stream.scaladsl.Source[T,M]):akka.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" java="#setup(java.util.function.BiFunction)" }
-@apidoc[Flow.setup](Flow$) { scala="#setup[T,U,M](factory:(akka.stream.ActorMaterializer,akka.stream.Attributes)=>akka.stream.scaladsl.Flow[T,U,M]):akka.stream.scaladsl.Flow[T,U,scala.concurrent.Future[M]]" java="#setup(java.util.function.BiFunction)" }
+@apidoc[Source.setup](Source$) { scala="#setup[T,M](factory:(org.apache.pekko.stream.ActorMaterializer,org.apache.pekko.stream.Attributes)=>org.apache.pekko.stream.scaladsl.Source[T,M]):org.apache.pekko.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" java="#setup(java.util.function.BiFunction)" }
+@apidoc[Flow.setup](Flow$) { scala="#setup[T,U,M](factory:(org.apache.pekko.stream.ActorMaterializer,org.apache.pekko.stream.Attributes)=>org.apache.pekko.stream.scaladsl.Flow[T,U,M]):org.apache.pekko.stream.scaladsl.Flow[T,U,scala.concurrent.Future[M]]" java="#setup(java.util.function.BiFunction)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/splitAfter.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/splitAfter.md
index 31ecedc25f..90dea0d571 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/splitAfter.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/splitAfter.md
@@ -6,8 +6,8 @@ End the current substream whenever a predicate returns `true`, starting a new su
 
 ## Signature
 
-@apidoc[Source.splitAfter](Source) { scala="#splitAfter(substreamCancelStrategy:akka.stream.SubstreamCancelStrategy)(p:Out=>Boolean):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitAfter(akka.stream.SubstreamCancelStrategy,akka.japi.function.Predicate)" }
-@apidoc[Flow.splitAfter](Flow) { scala="#splitAfter(substreamCancelStrategy:akka.stream.SubstreamCancelStrategy)(p:Out=>Boolean):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitAfter(akka.stream.SubstreamCancelStrategy,akka.japi.function.Predicate)" }
+@apidoc[Source.splitAfter](Source) { scala="#splitAfter(substreamCancelStrategy:org.apache.pekko.stream.SubstreamCancelStrategy)(p:Out=>Boolean):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitAfter(org.apache.pekko.stream.SubstreamCancelStrategy,org.apache.pekko.japi.function.Predicate)" }
+@apidoc[Flow.splitAfter](Flow) { scala="#splitAfter(substreamCancelStrategy:org.apache.pekko.stream.SubstreamCancelStrategy)(p:Out=>Boolean):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitAfter(org.apache.pekko.stream.SubstreamCancelStrategy,org.apache.pekko.japi.function.Predicate)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/splitWhen.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/splitWhen.md
index 27345b68f4..01fd16cd6f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/splitWhen.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/splitWhen.md
@@ -6,8 +6,8 @@ Split off elements into a new substream whenever a predicate function return `tr
 
 ## Signature
 
-@apidoc[Source.splitWhen](Source) { scala="#splitWhen(substreamCancelStrategy:akka.stream.SubstreamCancelStrategy)(p:Out=>Boolean):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitWhen(akka.stream.SubstreamCancelStrategy,akka.japi.function.Predicate)" }
-@apidoc[Flow.splitWhen](Flow) { scala="#splitWhen(substreamCancelStrategy:akka.stream.SubstreamCancelStrategy)(p:Out=>Boolean):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitWhen(akka.stream.SubstreamCancelStrategy,akka.japi.function.Predicate)" }
+@apidoc[Source.splitWhen](Source) { scala="#splitWhen(substreamCancelStrategy:org.apache.pekko.stream.SubstreamCancelStrategy)(p:Out=>Boolean):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitWhen(org.apache.pekko.stream.SubstreamCancelStrategy,org.apache.pekko.japi.function.Predicate)" }
+@apidoc[Flow.splitWhen](Flow) { scala="#splitWhen(substreamCancelStrategy:org.apache.pekko.stream.SubstreamCancelStrategy)(p:Out=>Boolean):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitWhen(org.apache.pekko.stream.SubstreamCancelStrategy,org.apache.pekko.japi.function.Predicate)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/statefulMap.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/statefulMap.md
index 6f4d1870ff..95a31c63dd 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/statefulMap.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/statefulMap.md
@@ -6,7 +6,7 @@ Transform each stream element with the help of a state.
 
 ## Signature
 
-@apidoc[Flow.statefulMap](Flow) { scala="#statefulMap%5BS%2CT%5D%28create%3A%28%29%3D%3ES%29%28f%3A%28S%2COut%29%20%3D%3E%28S%2CT%29%2ConComplete%3AS%3D%3EOption%5BT%5D%29%3ARepr%5BT%5D" java="#statefulMap(akka.japi.function.Creator,akka.japi.function.Function2,akka.japi.function.Function)" }
+@apidoc[Flow.statefulMap](Flow) { scala="#statefulMap%5BS%2CT%5D%28create%3A%28%29%3D%3ES%29%28f%3A%28S%2COut%29%20%3D%3E%28S%2CT%29%2ConComplete%3AS%3D%3EOption%5BT%5D%29%3ARepr%5BT%5D" java="#statefulMap(org.apache.pekko.japi.function.Creator,org.apache.pekko.japi.function.Function2,org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/statefulMapConcat.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/statefulMapConcat.md
index 60642fc069..1b01a2be19 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/statefulMapConcat.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/statefulMapConcat.md
@@ -6,7 +6,7 @@ Transform each element into zero or more elements that are individually passed d
 
 ## Signature
 
-@apidoc[Flow.statefulMapConcat](Flow) { scala="#statefulMapConcat[T](f:()=>Out=>scala.collection.immutable.Iterable[T]):FlowOps.this.Repr[T]" java="#statefulMapConcat(akka.japi.function.Creator)" } 
+@apidoc[Flow.statefulMapConcat](Flow) { scala="#statefulMapConcat[T](f:()=>Out=>scala.collection.immutable.Iterable[T]):FlowOps.this.Repr[T]" java="#statefulMapConcat(org.apache.pekko.japi.function.Creator)" } 
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/takeWhile.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/takeWhile.md
index ac2660bdd5..8b922bb01c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/takeWhile.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/takeWhile.md
@@ -6,8 +6,8 @@ Pass elements downstream as long as a predicate function returns true and then c
 
 ## Signature
 
-@apidoc[Source.takeWhile](Source) { scala="#takeWhile(p:Out=>Boolean,inclusive:Boolean):FlowOps.this.Repr[Out]" java="#takeWhile(akka.japi.function.Predicate)" }
-@apidoc[Flow.takeWhile](Flow) { scala="#takeWhile(p:Out=>Boolean,inclusive:Boolean):FlowOps.this.Repr[Out]" java="#takeWhile(akka.japi.function.Predicate)" }
+@apidoc[Source.takeWhile](Source) { scala="#takeWhile(p:Out=>Boolean,inclusive:Boolean):FlowOps.this.Repr[Out]" java="#takeWhile(org.apache.pekko.japi.function.Predicate)" }
+@apidoc[Flow.takeWhile](Flow) { scala="#takeWhile(p:Out=>Boolean,inclusive:Boolean):FlowOps.this.Repr[Out]" java="#takeWhile(org.apache.pekko.japi.function.Predicate)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/throttle.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/throttle.md
index 56f195bb8e..021d5fdd2b 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/throttle.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/throttle.md
@@ -6,8 +6,8 @@ Limit the throughput to a specific number of elements per time unit, or a specif
 
 ## Signature
 
-@apidoc[Source.throttle](Source) { scala="#throttle(cost:Int,per:scala.concurrent.duration.FiniteDuration,maximumBurst:Int,costCalculation:Out=>Int,mode:akka.stream.ThrottleMode):FlowOps.this.Repr[Out]" java="#throttle(int,java.time.Duration,int,akka.japi.function.Function,akka.stream.ThrottleMode)" }
-@apidoc[Flow.throttle](Flow) { scala="#throttle(cost:Int,per:scala.concurrent.duration.FiniteDuration,maximumBurst:Int,costCalculation:Out=>Int,mode:akka.stream.ThrottleMode):FlowOps.this.Repr[Out]" java="#throttle(int,java.time.Duration,int,akka.japi.function.Function,akka.stream.ThrottleMode)" }
+@apidoc[Source.throttle](Source) { scala="#throttle(cost:Int,per:scala.concurrent.duration.FiniteDuration,maximumBurst:Int,costCalculation:Out=>Int,mode:org.apache.pekko.stream.ThrottleMode):FlowOps.this.Repr[Out]" java="#throttle(int,java.time.Duration,int,org.apache.pekko.japi.function.Function,org.apache.pekko.stream.ThrottleMode)" }
+@apidoc[Flow.throttle](Flow) { scala="#throttle(cost:Int,per:scala.concurrent.duration.FiniteDuration,maximumBurst:Int,costCalculation:Out=>Int,mode:org.apache.pekko.stream.ThrottleMode):FlowOps.this.Repr[Out]" java="#throttle(int,java.time.Duration,int,org.apache.pekko.japi.function.Function,org.apache.pekko.stream.ThrottleMode)" }
 
 ## Description
 
@@ -46,7 +46,7 @@ the maximum rate. Alternatively we could set the throttling mode to cause a stre
 than the throttle rate.   
 
 The examples above don't cover all the parameters supported by `throttle` (e.g. `cost`-based throttling). See the 
-@apidoc[api documentation](Flow) { scala="#throttle(cost:Int,per:scala.concurrent.duration.FiniteDuration,maximumBurst:Int,costCalculation:Out=>Int,mode:akka.stream.ThrottleMode):FlowOps.this.Repr[Out]" java="#throttle(int,java.time.Duration,int,akka.japi.function.Function,akka.stream.ThrottleMode)" }
+@apidoc[api documentation](Flow) { scala="#throttle(cost:Int,per:scala.concurrent.duration.FiniteDuration,maximumBurst:Int,costCalculation:Out=>Int,mode:org.apache.pekko.stream.ThrottleMode):FlowOps.this.Repr[Out]" java="#throttle(int,java.time.Duration,int,org.apache.pekko.japi.function.Function,org.apache.pekko.stream.ThrottleMode)" }
 for all the details.
 
 ## Reactive Streams semantics
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/watch.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/watch.md
index 63f06c5851..afc4f18bf9 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/watch.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/watch.md
@@ -6,14 +6,14 @@ Watch a specific `ActorRef` and signal a failure downstream once the actor termi
 
 ## Signature
 
-@apidoc[Source.watch](Source) { scala="#watch(ref:akka.actor.ActorRef):FlowOps.this.Repr[Out]" java="#watch(akka.actor.ActorRef)" }
-@apidoc[Flow.watch](Flow) { scala="#watch(ref:akka.actor.ActorRef):FlowOps.this.Repr[Out]" java="#watch(akka.actor.ActorRef)" }
+@apidoc[Source.watch](Source) { scala="#watch(ref:org.apache.pekko.actor.ActorRef):FlowOps.this.Repr[Out]" java="#watch(org.apache.pekko.actor.ActorRef)" }
+@apidoc[Flow.watch](Flow) { scala="#watch(ref:org.apache.pekko.actor.ActorRef):FlowOps.this.Repr[Out]" java="#watch(org.apache.pekko.actor.ActorRef)" }
 
 ## Description
 
 Watch a specific `ActorRef` and signal a failure downstream once the actor terminates.
-The signaled failure will be an @java[@javadoc:[WatchedActorTerminatedException](akka.stream.WatchedActorTerminatedException)]
-@scala[@scaladoc[WatchedActorTerminatedException](akka.stream.WatchedActorTerminatedException)].
+The signaled failure will be an @java[@javadoc:[WatchedActorTerminatedException](pekko.stream.WatchedActorTerminatedException)]
+@scala[@scaladoc[WatchedActorTerminatedException](pekko.stream.WatchedActorTerminatedException)].
 
 ## Example
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/watchTermination.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/watchTermination.md
index 1ce0835b40..e9edaa2038 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/watchTermination.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/watchTermination.md
@@ -6,8 +6,8 @@ Materializes to a @scala[`Future`] @java[`CompletionStage`] that will be complet
 
 ## Signature
 
-@apidoc[Source.watchTermination](Source) { scala="#watchTermination[Mat2]()(matF:(Mat,scala.concurrent.Future[akka.Done])=>Mat2):FlowOpsMat.this.ReprMat[Out,Mat2]" java="#watchTermination(akka.japi.function.Function2)" }
-@apidoc[Flow.watchTermination](Flow) { scala="#watchTermination[Mat2]()(matF:(Mat,scala.concurrent.Future[akka.Done])=>Mat2):FlowOpsMat.this.ReprMat[Out,Mat2]" java="#watchTermination(akka.japi.function.Function2)" }
+@apidoc[Source.watchTermination](Source) { scala="#watchTermination[Mat2]()(matF:(Mat,scala.concurrent.Future[org.apache.pekko.Done])=>Mat2):FlowOpsMat.this.ReprMat[Out,Mat2]" java="#watchTermination(org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.watchTermination](Flow) { scala="#watchTermination[Mat2]()(matF:(Mat,scala.concurrent.Future[org.apache.pekko.Done])=>Mat2):FlowOpsMat.this.ReprMat[Out,Mat2]" java="#watchTermination(org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/wireTap.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/wireTap.md
index 9d9b92d094..3533119c8a 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/wireTap.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/wireTap.md
@@ -6,8 +6,8 @@ Attaches the given `Sink` to this `Flow` as a wire tap, meaning that elements th
 
 ## Signature
 
-@apidoc[Source.wireTap](Source) { scala="#wireTap(f:Out=>Unit):FlowOps.this.Repr[Out]" java="#wireTap(akka.japi.function.Procedure)" }
-@apidoc[Flow.wireTap](Flow) { scala="#wireTap(f:Out=>Unit):FlowOps.this.Repr[Out]" java="#wireTap(akka.japi.function.Procedure)" }
+@apidoc[Source.wireTap](Source) { scala="#wireTap(f:Out=>Unit):FlowOps.this.Repr[Out]" java="#wireTap(org.apache.pekko.japi.function.Procedure)" }
+@apidoc[Flow.wireTap](Flow) { scala="#wireTap(f:Out=>Unit):FlowOps.this.Repr[Out]" java="#wireTap(org.apache.pekko.japi.function.Procedure)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zip.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zip.md
index bbb76837ed..e290f63096 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zip.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zip.md
@@ -6,8 +6,8 @@ Combines elements from each of multiple sources into @scala[tuples] @java[*Pair*
 
 ## Signature
 
-@apidoc[Source.zip](Source$) { scala="#zip[U](that:akka.stream.Graph[akka.stream.SourceShape[U],_]):FlowOps.this.Repr[(Out,U)]" java="#zip(akka.stream.Graph)" }
-@apidoc[Flow.zip](Flow) { scala="#zip[U](that:akka.stream.Graph[akka.stream.SourceShape[U],_]):FlowOps.this.Repr[(Out,U)]" java="#zip(akka.stream.Graph)" }
+@apidoc[Source.zip](Source$) { scala="#zip[U](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_]):FlowOps.this.Repr[(Out,U)]" java="#zip(org.apache.pekko.stream.Graph)" }
+@apidoc[Flow.zip](Flow) { scala="#zip[U](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_]):FlowOps.this.Repr[(Out,U)]" java="#zip(org.apache.pekko.stream.Graph)" }
 
 ## Description
 
@@ -22,7 +22,7 @@ See also:
 ## Examples
 
 Scala
-:   @@snip [FlowZipSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipSpec.scala) { #zip }
+:   @@snip [FlowZipSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowZipSpec.scala) { #zip }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #zip }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipAll.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipAll.md
index f78cfdc9a9..119b15fc62 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipAll.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipAll.md
@@ -6,8 +6,8 @@ Combines elements from two sources into @scala[tuples] @java[*Pair*] handling ea
 
 ## Signature
 
-@apidoc[Source.zipAll](Source) { scala="#zipAll[U,A>:Out](that:akka.stream.Graph[akka.stream.SourceShape[U],_],thisElem:A,thatElem:U):FlowOps.this.Repr[(A,U)]" java="#zipAll(akka.stream.Graph,java.lang.Object,java.lang.Object)" }
-@apidoc[Flow.zipAll](Flow) { scala="#zipAll[U,A>:Out](that:akka.stream.Graph[akka.stream.SourceShape[U],_],thisElem:A,thatElem:U):FlowOps.this.Repr[(A,U)]" java="#zipAll(akka.stream.Graph,java.lang.Object,java.lang.Object)" }
+@apidoc[Source.zipAll](Source) { scala="#zipAll[U,A>:Out](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_],thisElem:A,thatElem:U):FlowOps.this.Repr[(A,U)]" java="#zipAll(org.apache.pekko.stream.Graph,java.lang.Object,java.lang.Object)" }
+@apidoc[Flow.zipAll](Flow) { scala="#zipAll[U,A>:Out](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_],thisElem:A,thatElem:U):FlowOps.this.Repr[(A,U)]" java="#zipAll(org.apache.pekko.stream.Graph,java.lang.Object,java.lang.Object)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipLatest.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipLatest.md
index 9db446a6d1..ca03c15874 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipLatest.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipLatest.md
@@ -6,8 +6,8 @@ Combines elements from each of multiple sources into @scala[tuples] @java[*Pair*
 
 ## Signature
 
-@apidoc[Source.zipLatest](Source) { scala="#zipLatest[U](that:akka.stream.Graph[akka.stream.SourceShape[U],_]):FlowOps.this.Repr[(Out,U)]" java="#zipLatest(akka.stream.Graph)" }
-@apidoc[Flow.zipLatest](Flow) { scala="#zipLatest[U](that:akka.stream.Graph[akka.stream.SourceShape[U],_]):FlowOps.this.Repr[(Out,U)]" java="#zipLatest(akka.stream.Graph)" }
+@apidoc[Source.zipLatest](Source) { scala="#zipLatest[U](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_]):FlowOps.this.Repr[(Out,U)]" java="#zipLatest(org.apache.pekko.stream.Graph)" }
+@apidoc[Flow.zipLatest](Flow) { scala="#zipLatest[U](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[U],_]):FlowOps.this.Repr[(Out,U)]" java="#zipLatest(org.apache.pekko.stream.Graph)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipLatestWith.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipLatestWith.md
index 678c67c812..975ee80de0 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipLatestWith.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipLatestWith.md
@@ -6,8 +6,8 @@ Combines elements from multiple sources through a `combine` function and passes
 
 ## Signature
 
-@apidoc[Source.zipLatestWith](Source) { scala="#zipLatestWith[Out2,Out3](that:akka.stream.Graph[akka.stream.SourceShape[Out2],_])(combine:(Out,Out2)=>Out3):FlowOps.this.Repr[Out3]" java="#zipLatestWith(akka.stream.Graph,akka.japi.function.Function2)" }
-@apidoc[Flow.zipLatestWith](Flow) { scala="#zipLatestWith[Out2,Out3](that:akka.stream.Graph[akka.stream.SourceShape[Out2],_])(combine:(Out,Out2)=>Out3):FlowOps.this.Repr[Out3]" java="#zipLatestWith(akka.stream.Graph,akka.japi.function.Function2)" }
+@apidoc[Source.zipLatestWith](Source) { scala="#zipLatestWith[Out2,Out3](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[Out2],_])(combine:(Out,Out2)=>Out3):FlowOps.this.Repr[Out3]" java="#zipLatestWith(org.apache.pekko.stream.Graph,org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.zipLatestWith](Flow) { scala="#zipLatestWith[Out2,Out3](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[Out2],_])(combine:(Out,Out2)=>Out3):FlowOps.this.Repr[Out3]" java="#zipLatestWith(org.apache.pekko.stream.Graph,org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipWith.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipWith.md
index 9995f36383..b2970c8386 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipWith.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipWith.md
@@ -6,8 +6,8 @@ Combines elements from multiple sources through a `combine` function and passes
 
 ## Signature
 
-@apidoc[Source.zipWith](Source) { scala="#zipWith[Out2,Out3](that:akka.stream.Graph[akka.stream.SourceShape[Out2],_])(combine:(Out,Out2)=>Out3):FlowOps.this.Repr[Out3]" java="#zipWith(akka.stream.Graph,akka.japi.function.Function2)" }
-@apidoc[Flow.zipWith](Flow) { scala="#zipWith[Out2,Out3](that:akka.stream.Graph[akka.stream.SourceShape[Out2],_])(combine:(Out,Out2)=>Out3):FlowOps.this.Repr[Out3]" java="#zipWith(akka.stream.Graph,akka.japi.function.Function2)" }
+@apidoc[Source.zipWith](Source) { scala="#zipWith[Out2,Out3](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[Out2],_])(combine:(Out,Out2)=>Out3):FlowOps.this.Repr[Out3]" java="#zipWith(org.apache.pekko.stream.Graph,org.apache.pekko.japi.function.Function2)" }
+@apidoc[Flow.zipWith](Flow) { scala="#zipWith[Out2,Out3](that:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[Out2],_])(combine:(Out,Out2)=>Out3):FlowOps.this.Repr[Out3]" java="#zipWith(org.apache.pekko.stream.Graph,org.apache.pekko.japi.function.Function2)" }
 
 
 ## Description
@@ -24,7 +24,7 @@ See also:
 ## Examples
 
 Scala
-:   @@snip [FlowZipWithSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipWithSpec.scala) { #zip-with }
+:   @@snip [FlowZipWithSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowZipWithSpec.scala) { #zip-with }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #zip-with }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipWithIndex.md b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipWithIndex.md
index 5a6e27dc77..40cd22b0b2 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipWithIndex.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source-or-Flow/zipWithIndex.md
@@ -22,7 +22,7 @@ See also:
 ## Example
 
 Scala
-:   @@snip [FlowZipWithIndexSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipWithIndexSpec.scala) { #zip-with-index }
+:   @@snip [FlowZipWithIndexSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowZipWithIndexSpec.scala) { #zip-with-index }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #zip-with-index }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/actorRef.md b/akka-docs/src/main/paradox/stream/operators/Source/actorRef.md
index f374c402e1..107d2b6858 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/actorRef.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/actorRef.md
@@ -6,7 +6,7 @@ Materialize an `ActorRef` of the classic actors API; sending messages to it will
 
 ## Signature
 
-@apidoc[Source.actorRef](Source$) { scala="#actorRef[T](completionMatcher:PartialFunction[Any,akka.stream.CompletionStrategy],failureMatcher:PartialFunction[Any,Throwable],bufferSize:Int,overflowStrategy:akka.stream.OverflowStrategy):akka.stream.scaladsl.Source[T,akka.actor.ActorRef]" java="#actorRef(akka.japi.function.Function,akka.japi.function.Function,int,akka.stream.OverflowStrategy)" }
+@apidoc[Source.actorRef](Source$) { scala="#actorRef[T](completionMatcher:PartialFunction[Any,org.apache.pekko.stream.CompletionStrategy],failureMatcher:PartialFunction[Any,Throwable],bufferSize:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.actor.ActorRef]" java="#actorRef(org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function,int,org.apache.pekko.stream.OverflowStrategy)" }
 
 ## Description
 
@@ -14,12 +14,12 @@ Materialize an `ActorRef`, sending messages to it will emit them on the stream.
 a buffer but since communication is one way, there is no back pressure. Handling overflow is done by either dropping
 elements or failing the stream; the strategy is chosen by the user.
 
-The stream can be completed successfully by sending the actor reference a `akka.actor.Status.Success`.
-If the content is `akka.stream.CompletionStrategy.immediately` the completion will be signaled immediately.
-Otherwise, if the content is `akka.stream.CompletionStrategy.draining` (or anything else)
+The stream can be completed successfully by sending the actor reference a `org.apache.pekko.actor.Status.Success`.
+If the content is `org.apache.pekko.stream.CompletionStrategy.immediately` the completion will be signaled immediately.
+Otherwise, if the content is `org.apache.pekko.stream.CompletionStrategy.draining` (or anything else)
 already buffered elements will be sent out before signaling completion.
-Sending `akka.actor.PoisonPill` will signal completion immediately but this behavior is deprecated and scheduled to be removed.
-Using `akka.actor.ActorSystem.stop` to stop the actor and complete the stream is *not supported*.
+Sending `org.apache.pekko.actor.PoisonPill` will signal completion immediately but this behavior is deprecated and scheduled to be removed.
+Using `org.apache.pekko.actor.ActorSystem.stop` to stop the actor and complete the stream is *not supported*.
 
 See also:
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/actorRefWithBackpressure.md b/akka-docs/src/main/paradox/stream/operators/Source/actorRefWithBackpressure.md
index dff90ae9cf..a1731b8bd7 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/actorRefWithBackpressure.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/actorRefWithBackpressure.md
@@ -6,7 +6,7 @@ Materialize an `ActorRef` of the classic actors API; sending messages to it will
 
 ## Signature
 
-@apidoc[Source.actorRefWithBackpressure](Source$) { scala="#actorRefWithBackpressure[T](ackMessage:Any,completionMatcher:PartialFunction[Any,akka.stream.CompletionStrategy],failureMatcher:PartialFunction[Any,Throwable]):akka.stream.scaladsl.Source[T,akka.actor.ActorRef]" java="#actorRefWithBackpressure(java.lang.Object,akka.japi.function.Function,akka.japi.function.Function)" }
+@apidoc[Source.actorRefWithBackpressure](Source$) { scala="#actorRefWithBackpressure[T](ackMessage:Any,completionMatcher:PartialFunction[Any,org.apache.pekko.stream.CompletionStrategy],failureMatcher:PartialFunction[Any,Throwable]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.actor.ActorRef]" java="#actorRefWithBackpressure(java.lang.Object,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/asSourceWithContext.md b/akka-docs/src/main/paradox/stream/operators/Source/asSourceWithContext.md
index 50dcc53b7b..020af22403 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/asSourceWithContext.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/asSourceWithContext.md
@@ -6,7 +6,7 @@ Extracts context data from the elements of a `Source` so that it can be turned i
 
 ## Signature
 
-@apidoc[Source.asSourceWithContext](Source) { scala="#asSourceWithContext[Ctx](f:Out=>Ctx):akka.stream.scaladsl.SourceWithContext[Out,Ctx,Mat]" java="#asSourceWithContext(akka.japi.function.Function)" }
+@apidoc[Source.asSourceWithContext](Source) { scala="#asSourceWithContext[Ctx](f:Out=>Ctx):org.apache.pekko.stream.scaladsl.SourceWithContext[Out,Ctx,Mat]" java="#asSourceWithContext(org.apache.pekko.japi.function.Function)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/asSubscriber.md b/akka-docs/src/main/paradox/stream/operators/Source/asSubscriber.md
index 59c803c2cb..56d0ef7f9f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/asSubscriber.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/asSubscriber.md
@@ -27,7 +27,7 @@ If the API you want to consume elements from provides a @javadoc[Publisher](java
 @@@ note
 
 For JDK 8 users: since @javadoc[java.util.concurrent.Flow](java.util.concurrent.Flow) was introduced in JDK version 9,
-if you are still on version 8 you may use the [org.reactivestreams](https://github.com/reactive-streams/reactive-streams-jvm#reactive-streams) library with @apidoc[Source.asSubscriber](Source$) { scala="#asSubscriber[T]:akka.stream.scaladsl.Source[T,org.reactivestreams.Subscriber[T]]" java="#asSubscriber()" }.
+if you are still on version 8 you may use the [org.reactivestreams](https://github.com/reactive-streams/reactive-streams-jvm#reactive-streams) library with @apidoc[Source.asSubscriber](Source$) { scala="#asSubscriber[T]:org.apache.pekko.stream.scaladsl.Source[T,org.reactivestreams.Subscriber[T]]" java="#asSubscriber()" }.
 
 @@@
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/combine.md b/akka-docs/src/main/paradox/stream/operators/Source/combine.md
index 599508f40e..2c337b1d7c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/combine.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/combine.md
@@ -6,7 +6,7 @@ Combine several sources, using a given strategy such as merge or concat, into on
 
 ## Signature
 
-@apidoc[Source.combine](Source$) { scala="#combine[T,U](first:akka.stream.scaladsl.Source[T,_],second:akka.stream.scaladsl.Source[T,_],rest:akka.stream.scaladsl.Source[T,_]*)(strategy:Int=>akka.stream.Graph[akka.stream.UniformFanInShape[T,U],akka.NotUsed]):akka.stream.scaladsl.Source[U,akka.NotUsed]" java="#combine(akka.stream.javadsl.Source,akka.stream.javadsl.Source,java.util.List,akka.japi.function.Function)" }
+@apidoc[Source.combine](Source$) { scala="#combine[T,U](first:org.apache.pekko.stream.scaladsl.Source[T,_],second:org.apache.pekko.stream.scaladsl.Source[T,_],rest:org.apache.pekko.stream.scaladsl.Source[T,_]*)(strategy:Int=>org.apache.pekko.stream.Graph[org.apache.pekko.stream.UniformFanInShape[T,U],org.apache.pekko.NotUsed]):org.apache.pekko.stream.scaladsl.Source[U,org.apache.pekko.NotUsed]" java="#combine(org.apache.pekko.stream.javadsl.Source,org.apache.pekko.stream.javadsl.Source,java.util.List,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
@@ -25,8 +25,8 @@ operators for 2-source @ref:[concat](../Source-or-Flow/concat.md) and @ref:[merg
 
 Some of the built-in operators that can be used as strategy are:
  
- * @apidoc[akka.stream.*.Merge] 
- * @apidoc[akka.stream.(javadsl|scaladsl).Concat] 
+ * @apidoc[stream.*.Merge] 
+ * @apidoc[stream.(javadsl|scaladsl).Concat] 
  * @apidoc[MergePrioritized]
  * @apidoc[MergeLatest]
  * @apidoc[ZipN]
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/completionStage.md b/akka-docs/src/main/paradox/stream/operators/Source/completionStage.md
index 10d0d65bc5..04a61a0363 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/completionStage.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/completionStage.md
@@ -6,7 +6,7 @@ Send the single value of the `CompletionStage` when it completes and there is de
 
 ## Signature
 
-@apidoc[Source.completionStage](Source$) { scala="#completionStage[T](completionStage:java.util.concurrent.CompletionStage[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#completionStage(java.util.concurrent.CompletionStage)" }
+@apidoc[Source.completionStage](Source$) { scala="#completionStage[T](completionStage:java.util.concurrent.CompletionStage[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#completionStage(java.util.concurrent.CompletionStage)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/cycle.md b/akka-docs/src/main/paradox/stream/operators/Source/cycle.md
index 57698ddbcf..563d343f77 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/cycle.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/cycle.md
@@ -6,7 +6,7 @@ Stream iterator in cycled manner.
 
 ## Signature
 
-@apidoc[Source.cycle](Source$) { scala="#cycle[T](f:()=>Iterator[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#cycle(akka.japi.function.Creator)" }
+@apidoc[Source.cycle](Source$) { scala="#cycle[T](f:()=>Iterator[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#cycle(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
@@ -19,19 +19,19 @@ terminated with an exception.
 ## Examples
 
 Scala
-:  @@snip [cycle.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala) { #cycle }
+:  @@snip [cycle.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/SourceSpec.scala) { #cycle }
 
 Java
-:  @@snip [cycle.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java) { #cycle }
+:  @@snip [cycle.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceTest.java) { #cycle }
 
 
 When iterator is empty the stream will be terminated with _IllegalArgumentException_
 
 Scala
-:  @@snip [cycleError.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala) { #cycle-error }
+:  @@snip [cycleError.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/SourceSpec.scala) { #cycle-error }
 
 Java
-:  @@snip [cycle.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java) { #cycle-error }
+:  @@snip [cycle.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceTest.java) { #cycle-error }
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/empty.md b/akka-docs/src/main/paradox/stream/operators/Source/empty.md
index 59f3c643cb..b0af24fa25 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/empty.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/empty.md
@@ -8,7 +8,7 @@ Complete right away without ever emitting any elements.
 
 ## Signature
 
-@apidoc[Source.empty](Source$) { scala="#empty[T]:akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#empty()" java="#empty(java.lang.Class)" }
+@apidoc[Source.empty](Source$) { scala="#empty[T]:org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#empty()" java="#empty(java.lang.Class)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/failed.md b/akka-docs/src/main/paradox/stream/operators/Source/failed.md
index a1e8e10419..49a309109e 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/failed.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/failed.md
@@ -6,7 +6,7 @@ Fail directly with a user specified exception.
 
 ## Signature
 
-@apidoc[Source.failed](Source$) { scala="#failed[T](cause:Throwable):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#failed(java.lang.Throwable)" }
+@apidoc[Source.failed](Source$) { scala="#failed[T](cause:Throwable):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#failed(java.lang.Throwable)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/from.md b/akka-docs/src/main/paradox/stream/operators/Source/from.md
index b546e1b70a..c75e33cc34 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/from.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/from.md
@@ -8,7 +8,7 @@ Stream the values of an @scala[`immutable.Seq`]@java[`Iterable`].
 
 @@@div { .group-scala }
 
-@apidoc[Source.apply](Source$) { scala="#apply[T](iterable:scala.collection.immutable.Iterable[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]"  }
+@apidoc[Source.apply](Source$) { scala="#apply[T](iterable:scala.collection.immutable.Iterable[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]"  }
 
 @@@ 
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/fromCompletionStage.md b/akka-docs/src/main/paradox/stream/operators/Source/fromCompletionStage.md
index adb811316f..0e1f24e28c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/fromCompletionStage.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/fromCompletionStage.md
@@ -6,7 +6,7 @@ Deprecated by @ref:[`Source.completionStage`](completionStage.md).
 
 ## Signature
 
-@apidoc[Source.fromCompletionStage](Source$) { scala="#fromCompletionStage[T](future:java.util.concurrent.CompletionStage[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#fromCompletionStage(java.util.concurrent.CompletionStage)" }
+@apidoc[Source.fromCompletionStage](Source$) { scala="#fromCompletionStage[T](future:java.util.concurrent.CompletionStage[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#fromCompletionStage(java.util.concurrent.CompletionStage)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/fromFuture.md b/akka-docs/src/main/paradox/stream/operators/Source/fromFuture.md
index 76b9da58c6..bac58f7219 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/fromFuture.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/fromFuture.md
@@ -6,7 +6,7 @@ Deprecated by @ref[`Source.future`](future.md).
 
 ## Signature
 
-@apidoc[Source.fromFuture](Source$) { scala="#fromFuture[T](future:scala.concurrent.Future[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]" }
+@apidoc[Source.fromFuture](Source$) { scala="#fromFuture[T](future:scala.concurrent.Future[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/fromFutureSource.md b/akka-docs/src/main/paradox/stream/operators/Source/fromFutureSource.md
index 06a2434df8..39df3a3cbe 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/fromFutureSource.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/fromFutureSource.md
@@ -6,7 +6,7 @@ Deprecated by @ref:[`Source.futureSource`](futureSource.md).
 
 ## Signature
 
-@apidoc[Source.fromFutureSource](Source$) { scala="#fromFutureSource[T,M](future:scala.concurrent.Future[akka.stream.Graph[akka.stream.SourceShape[T],M]]):akka.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" }
+@apidoc[Source.fromFutureSource](Source$) { scala="#fromFutureSource[T,M](future:scala.concurrent.Future[org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],M]]):org.apache.pekko.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/fromIterator.md b/akka-docs/src/main/paradox/stream/operators/Source/fromIterator.md
index a4730669be..3abfc5602b 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/fromIterator.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/fromIterator.md
@@ -6,7 +6,7 @@ Stream the values from an `Iterator`, requesting the next value when there is de
 
 ## Signature
 
-@apidoc[Source.fromIterator](Source$) { scala="#fromIterator[T](f:()=>Iterator[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#fromIterator(akka.japi.function.Creator)" }
+@apidoc[Source.fromIterator](Source$) { scala="#fromIterator[T](f:()=>Iterator[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#fromIterator(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/fromJavaStream.md b/akka-docs/src/main/paradox/stream/operators/Source/fromJavaStream.md
index fd13b33ead..4d55987105 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/fromJavaStream.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/fromJavaStream.md
@@ -6,7 +6,7 @@ Stream the values from a Java 8 `Stream`, requesting the next value when there i
 
 ## Signature
 
-@apidoc[StreamConverters.fromJavaStream](StreamConverters$) { scala="#fromJavaStream[T,S<:java.util.stream.BaseStream[T,S]](stream:()=>java.util.stream.BaseStream[T,S]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#fromJavaStream(akka.japi.function.Creator)" }
+@apidoc[StreamConverters.fromJavaStream](StreamConverters$) { scala="#fromJavaStream[T,S<:java.util.stream.BaseStream[T,S]](stream:()=>java.util.stream.BaseStream[T,S]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#fromJavaStream(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/fromPublisher.md b/akka-docs/src/main/paradox/stream/operators/Source/fromPublisher.md
index 701ae47511..859a32eef3 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/fromPublisher.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/fromPublisher.md
@@ -25,7 +25,7 @@ If the API you want to consume elements from accepts a @javadoc[Subscriber](java
 @@@ note
 
 For JDK 8 users: since @javadoc[java.util.concurrent.Flow](java.util.concurrent.Flow) was introduced in JDK version 9,
-if you are still on version 8 you may use the [org.reactivestreams](https://github.com/reactive-streams/reactive-streams-jvm#reactive-streams) library with @apidoc[Source.fromPublisher](Source$) { scala="#fromPublisher[T](publisher:org.reactivestreams.Publisher[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#fromPublisher(org.reactivestreams.Publisher)" }.
+if you are still on version 8 you may use the [org.reactivestreams](https://github.com/reactive-streams/reactive-streams-jvm#reactive-streams) library with @apidoc[Source.fromPublisher](Source$) { scala="#fromPublisher[T](publisher:org.reactivestreams.Publisher[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#fromPublisher(org.reactivestreams.Publisher)" }.
 
 @@@
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/future.md b/akka-docs/src/main/paradox/stream/operators/Source/future.md
index 2e6b9d94fc..25b63c4a1b 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/future.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/future.md
@@ -6,7 +6,7 @@ Send the single value of the `Future` when it completes and there is demand.
 
 ## Signature
 
-@apidoc[Source.future](Source$) { scala="#future[T](futureElement:scala.concurrent.Future[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]" }
+@apidoc[Source.future](Source$) { scala="#future[T](futureElement:scala.concurrent.Future[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/futureSource.md b/akka-docs/src/main/paradox/stream/operators/Source/futureSource.md
index ddf35d324c..d5ba295e99 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/futureSource.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/futureSource.md
@@ -6,7 +6,7 @@ Streams the elements of the given future source once it successfully completes.
 
 ## Signature
 
-@apidoc[Source.futureSource](Source$) { scala="#futureSource[T,M](futureSource:scala.concurrent.Future[akka.stream.scaladsl.Source[T,M]]):akka.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" }
+@apidoc[Source.futureSource](Source$) { scala="#futureSource[T,M](futureSource:scala.concurrent.Future[org.apache.pekko.stream.scaladsl.Source[T,M]]):org.apache.pekko.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/lazily.md b/akka-docs/src/main/paradox/stream/operators/Source/lazily.md
index 8a5bfdedbd..74391e12d5 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/lazily.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/lazily.md
@@ -6,7 +6,7 @@ Deprecated by @ref:[`Source.lazySource`](lazySource.md).
 
 ## Signature
 
-@apidoc[Source.lazily](Source$) { scala="#lazily[T,M](create:()=>akka.stream.scaladsl.Source[T,M]):akka.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" java="#lazily(akka.japi.function.Creator)" }
+@apidoc[Source.lazily](Source$) { scala="#lazily[T,M](create:()=>org.apache.pekko.stream.scaladsl.Source[T,M]):org.apache.pekko.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" java="#lazily(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/lazyFuture.md b/akka-docs/src/main/paradox/stream/operators/Source/lazyFuture.md
index 39cea31791..b8c36288bb 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/lazyFuture.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/lazyFuture.md
@@ -6,7 +6,7 @@ Defers creation of a future of a single element source until there is demand.
 
 ## Signature
 
-@apidoc[Source.lazyFuture](Source$) { scala="#lazyFuture[T](create:()=>scala.concurrent.Future[T]):akka.stream.scaladsl.Source[T,akka.NotUsed]" }
+@apidoc[Source.lazyFuture](Source$) { scala="#lazyFuture[T](create:()=>scala.concurrent.Future[T]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/lazyFutureSource.md b/akka-docs/src/main/paradox/stream/operators/Source/lazyFutureSource.md
index f08bac4cd4..e7b14eb089 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/lazyFutureSource.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/lazyFutureSource.md
@@ -6,7 +6,7 @@ Defers creation and materialization of a `Source` until there is demand.
 
 ## Signature
 
-@apidoc[Source.lazyFutureSource](Source$) { scala="#lazyFutureSource[T,M](create:()=>scala.concurrent.Future[akka.stream.scaladsl.Source[T,M]]):akka.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" }
+@apidoc[Source.lazyFutureSource](Source$) { scala="#lazyFutureSource[T,M](create:()=>scala.concurrent.Future[org.apache.pekko.stream.scaladsl.Source[T,M]]):org.apache.pekko.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/lazySingle.md b/akka-docs/src/main/paradox/stream/operators/Source/lazySingle.md
index 7a7f24c248..b450f4a3c9 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/lazySingle.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/lazySingle.md
@@ -6,7 +6,7 @@ Defers creation of a single element source until there is demand.
 
 ## Signature
 
-@apidoc[Source.lazySingle](Source$) { scala="#lazySingle[T](create:()=>T):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#lazySingle(akka.japi.function.Creator)" }
+@apidoc[Source.lazySingle](Source$) { scala="#lazySingle[T](create:()=>T):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#lazySingle(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/lazySource.md b/akka-docs/src/main/paradox/stream/operators/Source/lazySource.md
index 42585bb5a3..5bdf03fd1f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/lazySource.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/lazySource.md
@@ -6,7 +6,7 @@ Defers creation and materialization of a `Source` until there is demand.
 
 ## Signature
 
-@apidoc[Source.lazySource](Source$) { scala="#lazySource[T,M](create:()=>akka.stream.scaladsl.Source[T,M]):akka.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" java="#lazySource(akka.japi.function.Creator)" }
+@apidoc[Source.lazySource](Source$) { scala="#lazySource[T,M](create:()=>org.apache.pekko.stream.scaladsl.Source[T,M]):org.apache.pekko.stream.scaladsl.Source[T,scala.concurrent.Future[M]]" java="#lazySource(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/maybe.md b/akka-docs/src/main/paradox/stream/operators/Source/maybe.md
index ea26848388..aabd344007 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/maybe.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/maybe.md
@@ -6,7 +6,7 @@ Create a source that emits once the materialized @scala[`Promise`] @java[`Comple
 
 ## Signature
 
-@apidoc[Source.maybe](Source$) { scala="#maybe[T]:akka.stream.scaladsl.Source[T,scala.concurrent.Promise[Option[T]]]" java="#maybe()" }
+@apidoc[Source.maybe](Source$) { scala="#maybe[T]:org.apache.pekko.stream.scaladsl.Source[T,scala.concurrent.Promise[Option[T]]]" java="#maybe()" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/mergePrioritizedN.md b/akka-docs/src/main/paradox/stream/operators/Source/mergePrioritizedN.md
index 5ae97289df..b01ed97b25 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/mergePrioritizedN.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/mergePrioritizedN.md
@@ -6,7 +6,7 @@ Merge multiple sources with priorities.
 
 ## Signature
 
-@@signature [Source.scala](/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala) { #mergePrioritized }
+@@signature [Source.scala](/akka-stream/src/main/scala/org/apache/pekko/stream/scaladsl/Source.scala) { #mergePrioritized }
 
 ## Description
 
@@ -17,7 +17,7 @@ prioritized and similarly for the rest of the sources. The priorities for each s
 
 ## Example
 Scala
-:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala) { #mergePrioritizedN }
+:   @@snip [FlowMergeSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowMergeSpec.scala) { #mergePrioritizedN }
 
 Java
 :   @@snip [SourceOrFlow.java](/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java) { #mergePrioritizedN }
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/never.md b/akka-docs/src/main/paradox/stream/operators/Source/never.md
index b3533444a4..b1fa68b1ac 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/never.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/never.md
@@ -8,7 +8,7 @@ Never emit any elements, never complete and never fail.
 
 ## Signature
 
-@apidoc[Source.never](Source$) { scala="#never[T]:akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#never()" }
+@apidoc[Source.never](Source$) { scala="#never[T]:org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#never()" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/queue.md b/akka-docs/src/main/paradox/stream/operators/Source/queue.md
index edbee84149..f88a2315ff 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/queue.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/queue.md
@@ -6,7 +6,7 @@ Materialize a `BoundedSourceQueue` or `SourceQueue` onto which elements can be p
 
 ## Signature (`BoundedSourceQueue`)
 
-@apidoc[Source.queue](Source$) { scala="#queue[T](bufferSize:Int):akka.stream.scaladsl.Source[T,akka.stream.scaladsl.BoundedSourceQueue[T]]" java="#queue(int)" }
+@apidoc[Source.queue](Source$) { scala="#queue[T](bufferSize:Int):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.stream.scaladsl.BoundedSourceQueue[T]]" java="#queue(int)" }
 
 ## Description (`BoundedSourceQueue`)
 
@@ -35,8 +35,8 @@ Java
 
 ## Signature (`SourceQueue`)
 
-@apidoc[Source.queue](Source$) { scala="#queue[T](bufferSize:Int,overflowStrategy:akka.stream.OverflowStrategy):akka.stream.scaladsl.Source[T,akka.stream.scaladsl.SourceQueueWithComplete[T]]" java="#queue(int,akka.stream.OverflowStrategy)" }
-@apidoc[Source.queue](Source$) { scala="#queue[T](bufferSize:Int,overflowStrategy:akka.stream.OverflowStrategy,maxConcurrentOffers:Int):akka.stream.scaladsl.Source[T,akka.stream.scaladsl.SourceQueueWithComplete[T]]" java="#queue(int,akka.stream.OverflowStrategy,int)" }
+@apidoc[Source.queue](Source$) { scala="#queue[T](bufferSize:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.stream.scaladsl.SourceQueueWithComplete[T]]" java="#queue(int,org.apache.pekko.stream.OverflowStrategy)" }
+@apidoc[Source.queue](Source$) { scala="#queue[T](bufferSize:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy,maxConcurrentOffers:Int):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.stream.scaladsl.SourceQueueWithComplete[T]]" java="#queue(int,org.apache.pekko.stream.OverflowStrategy,int)" }
 
 ## Description (`SourceQueue`)
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/repeat.md b/akka-docs/src/main/paradox/stream/operators/Source/repeat.md
index ba87b3f9f1..b2b717d622 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/repeat.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/repeat.md
@@ -6,7 +6,7 @@ Stream a single object repeatedly.
 
 ## Signature
 
-@apidoc[Source.repeat](Source$) { scala="#repeat[T](element:T):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#repeat(T)" }
+@apidoc[Source.repeat](Source$) { scala="#repeat[T](element:T):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#repeat(T)" }
 
 ## Description
 
@@ -23,10 +23,10 @@ See also:
 This example prints the first 4 elements emitted by `Source.repeat`.
 
 Scala
-:  @@snip [snip](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala) { #repeat }
+:  @@snip [snip](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/SourceSpec.scala) { #repeat }
 
 Java
-:  @@snip [snip](/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java) { #repeat }
+:  @@snip [snip](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceTest.java) { #repeat }
 
 
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/single.md b/akka-docs/src/main/paradox/stream/operators/Source/single.md
index d25d55e247..697fcb1b8c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/single.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/single.md
@@ -6,7 +6,7 @@ Stream a single object once.
 
 ## Signature
 
-@apidoc[Source.single](Source$) { scala="#single[T](element:T):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#single(T)" }
+@apidoc[Source.single](Source$) { scala="#single[T](element:T):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#single(T)" }
 
 ## Description
 
@@ -21,10 +21,10 @@ See also:
 ## Examples
 
 Scala
-:  @@snip [source.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala) { #imports #source-single }
+:  @@snip [source.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/SourceSpec.scala) { #imports #source-single }
 
 Java
-:   @@snip [source.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java) { #imports #source-single }
+:   @@snip [source.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceTest.java) { #imports #source-single }
 
 ## Reactive Streams semantics
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/tick.md b/akka-docs/src/main/paradox/stream/operators/Source/tick.md
index 56f52c03ce..40598c386f 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/tick.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/tick.md
@@ -6,7 +6,7 @@ A periodical repetition of an arbitrary object.
 
 ## Signature
 
-@apidoc[Source.tick](Source$) { scala="#tick[T](initialDelay:scala.concurrent.duration.FiniteDuration,interval:scala.concurrent.duration.FiniteDuration,tick:T):akka.stream.scaladsl.Source[T,akka.actor.Cancellable]" java="#tick(java.time.Duration,java.time.Duration,java.lang.Object)" }
+@apidoc[Source.tick](Source$) { scala="#tick[T](initialDelay:scala.concurrent.duration.FiniteDuration,interval:scala.concurrent.duration.FiniteDuration,tick:T):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.actor.Cancellable]" java="#tick(java.time.Duration,java.time.Duration,java.lang.Object)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/unfold.md b/akka-docs/src/main/paradox/stream/operators/Source/unfold.md
index 083399c7a6..4a1c092faa 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/unfold.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/unfold.md
@@ -6,7 +6,7 @@ Stream the result of a function as long as it returns a @scala[`Some`] @java[non
 
 ## Signature
 
-@apidoc[Source.unfold](Source$) { scala="#unfold[S,E](s:S)(f:S=>Option[(S,E)]):akka.stream.scaladsl.Source[E,akka.NotUsed]" java="#unfold(java.lang.Object,akka.japi.function.Function)" }
+@apidoc[Source.unfold](Source$) { scala="#unfold[S,E](s:S)(f:S=>Option[(S,E)]):org.apache.pekko.stream.scaladsl.Source[E,org.apache.pekko.NotUsed]" java="#unfold(java.lang.Object,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/unfoldAsync.md b/akka-docs/src/main/paradox/stream/operators/Source/unfoldAsync.md
index 631d98932d..8f4408713b 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/unfoldAsync.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/unfoldAsync.md
@@ -6,7 +6,7 @@ Just like `unfold` but the fold function returns a @scala[`Future`] @java[`Compl
 
 ## Signature
 
-@apidoc[Source.unfoldAsync](Source$) { scala="#unfoldAsync[S,E](s:S)(f:S=>scala.concurrent.Future[Option[(S,E)]]):akka.stream.scaladsl.Source[E,akka.NotUsed]" java="#unfoldAsync(java.lang.Object,akka.japi.function.Function)" }
+@apidoc[Source.unfoldAsync](Source$) { scala="#unfoldAsync[S,E](s:S)(f:S=>scala.concurrent.Future[Option[(S,E)]]):org.apache.pekko.stream.scaladsl.Source[E,org.apache.pekko.NotUsed]" java="#unfoldAsync(java.lang.Object,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/unfoldResource.md b/akka-docs/src/main/paradox/stream/operators/Source/unfoldResource.md
index b56659bc79..52702c98bf 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/unfoldResource.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/unfoldResource.md
@@ -6,7 +6,7 @@ Wrap any resource that can be opened, queried for next element (in a blocking wa
 
 ## Signature
 
-@apidoc[Source.unfoldResource](Source$) { scala="#unfoldResource[T,S](create:()=>S,read:S=>Option[T],close:S=>Unit):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#unfoldResource(akka.japi.function.Creator,akka.japi.function.Function,akka.japi.function.Procedure)" }
+@apidoc[Source.unfoldResource](Source$) { scala="#unfoldResource[T,S](create:()=>S,read:S=>Option[T],close:S=>Unit):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#unfoldResource(org.apache.pekko.japi.function.Creator,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Procedure)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/unfoldResourceAsync.md b/akka-docs/src/main/paradox/stream/operators/Source/unfoldResourceAsync.md
index ec31ae624a..622cd3d95d 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/unfoldResourceAsync.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/unfoldResourceAsync.md
@@ -6,7 +6,7 @@ Wrap any resource that can be opened, queried for next element and closed in an
 
 ## Signature
 
-@apidoc[Source.unfoldResourceAsync](Source$) { scala="#unfoldResourceAsync[T,S](create:()=>scala.concurrent.Future[S],read:S=>scala.concurrent.Future[Option[T]],close:S=>scala.concurrent.Future[akka.Done]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#unfoldResourceAsync(akka.japi.function.Creator,akka.japi.function.Function,akka.japi.function.Function)" }
+@apidoc[Source.unfoldResourceAsync](Source$) { scala="#unfoldResourceAsync[T,S](create:()=>scala.concurrent.Future[S],read:S=>scala.concurrent.Future[Option[T]],close:S=>scala.concurrent.Future[org.apache.pekko.Done]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#unfoldResourceAsync(org.apache.pekko.japi.function.Creator,org.apache.pekko.japi.function.Function,org.apache.pekko.japi.function.Function)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/zipN.md b/akka-docs/src/main/paradox/stream/operators/Source/zipN.md
index 335f163f8c..e9e67015fb 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/zipN.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/zipN.md
@@ -6,7 +6,7 @@ Combine the elements of multiple sources into a source of sequences of value.
 
 ## Signature
 
-@apidoc[Source.zipN](Source$) { scala="#zipN[T](sources:scala.collection.immutable.Seq[akka.stream.scaladsl.Source[T,_]]):akka.stream.scaladsl.Source[scala.collection.immutable.Seq[T],akka.NotUsed]" java="#zipN(java.util.List)" } 
+@apidoc[Source.zipN](Source$) { scala="#zipN[T](sources:scala.collection.immutable.Seq[org.apache.pekko.stream.scaladsl.Source[T,_]]):org.apache.pekko.stream.scaladsl.Source[scala.collection.immutable.Seq[T],org.apache.pekko.NotUsed]" java="#zipN(java.util.List)" } 
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/Source/zipWithN.md b/akka-docs/src/main/paradox/stream/operators/Source/zipWithN.md
index 64efeca65f..352c0b5a62 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/zipWithN.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/zipWithN.md
@@ -6,7 +6,7 @@ Combine the elements of multiple streams into a stream of sequences using a comb
 
 ## Signature
 
-@apidoc[Source.zipWithN](Source$) { scala="#zipWithN[T,O](zipper:scala.collection.immutable.Seq[T]=>O)(sources:scala.collection.immutable.Seq[akka.stream.scaladsl.Source[T,_]]):akka.stream.scaladsl.Source[O,akka.NotUsed]" java="#zipWithN(akka.japi.function.Function,java.util.List)" }
+@apidoc[Source.zipWithN](Source$) { scala="#zipWithN[T,O](zipper:scala.collection.immutable.Seq[T]=>O)(sources:scala.collection.immutable.Seq[org.apache.pekko.stream.scaladsl.Source[T,_]]):org.apache.pekko.stream.scaladsl.Source[O,org.apache.pekko.NotUsed]" java="#zipWithN(org.apache.pekko.japi.function.Function,java.util.List)" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/StreamConverters/asInputStream.md b/akka-docs/src/main/paradox/stream/operators/StreamConverters/asInputStream.md
index 291cddabbd..0ea651a8f5 100644
--- a/akka-docs/src/main/paradox/stream/operators/StreamConverters/asInputStream.md
+++ b/akka-docs/src/main/paradox/stream/operators/StreamConverters/asInputStream.md
@@ -6,7 +6,7 @@ Create a sink which materializes into an `InputStream` that can be read to trigg
 
 ## Signature
 
-@apidoc[StreamConverters.asInputStream](StreamConverters$) { scala="#asInputStream(readTimeout:scala.concurrent.duration.FiniteDuration):akka.stream.scaladsl.Sink[akka.util.ByteString,java.io.InputStream]" java="#asInputStream()" }
+@apidoc[StreamConverters.asInputStream](StreamConverters$) { scala="#asInputStream(readTimeout:scala.concurrent.duration.FiniteDuration):org.apache.pekko.stream.scaladsl.Sink[org.apache.pekko.util.ByteString,java.io.InputStream]" java="#asInputStream()" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/StreamConverters/asJavaStream.md b/akka-docs/src/main/paradox/stream/operators/StreamConverters/asJavaStream.md
index 29612a594a..2aa8b0260f 100644
--- a/akka-docs/src/main/paradox/stream/operators/StreamConverters/asJavaStream.md
+++ b/akka-docs/src/main/paradox/stream/operators/StreamConverters/asJavaStream.md
@@ -6,7 +6,7 @@ Create a sink which materializes into Java 8 `Stream` that can be run to trigger
 
 ## Signature
 
-@apidoc[StreamConverters](StreamConverters$) { scala="#asJavaStream[T]():akka.stream.scaladsl.Sink[T,java.util.stream.Stream[T]]" java="#asJavaStream()" }
+@apidoc[StreamConverters](StreamConverters$) { scala="#asJavaStream[T]():org.apache.pekko.stream.scaladsl.Sink[T,java.util.stream.Stream[T]]" java="#asJavaStream()" }
 
 ## Description
 
diff --git a/akka-docs/src/main/paradox/stream/operators/StreamConverters/asOutputStream.md b/akka-docs/src/main/paradox/stream/operators/StreamConverters/asOutputStream.md
index c985b445c6..d14473645a 100644
--- a/akka-docs/src/main/paradox/stream/operators/StreamConverters/asOutputStream.md
+++ b/akka-docs/src/main/paradox/stream/operators/StreamConverters/asOutputStream.md
@@ -6,7 +6,7 @@ Create a source that materializes into an `OutputStream`.
 
 ## Signature
 
-@apidoc[StreamConverters.asOutputStream](StreamConverters$) { scala="#asOutputStream(writeTimeout:scala.concurrent.duration.FiniteDuration):akka.stream.scaladsl.Source[akka.util.ByteString,java.io.OutputStream]" java="#asOutputStream(java.time.Duration)" }
+@apidoc[StreamConverters.asOutputStream](StreamConverters$) { scala="#asOutputStream(writeTimeout:scala.concurrent.duration.FiniteDuration):org.apache.pekko.stream.scaladsl.Source[org.apache.pekko.util.ByteString,java.io.OutputStream]" java="#asOutputStream(java.time.Duration)" }
 
 ## Description
 
@@ -25,7 +25,7 @@ closing the `OutputStream` will complete the `Source`.
 @@@
 
 ## Example
-Here is an example of a @apidoc[Source] that materializes into a @javadoc[java.io.OutputStream](java.io.OutputStream), and is connected to a Sink which concatenates the incoming @apidoc[akka.util.ByteString]s
+Here is an example of a @apidoc[Source] that materializes into a @javadoc[java.io.OutputStream](java.io.OutputStream), and is connected to a Sink which concatenates the incoming @apidoc[util.ByteString]s
 
 Scala
 :   @@snip [ToFromJavaIOStreams.scala](/akka-docs/src/test/scala/docs/stream/operators/converters/ToFromJavaIOStreams.scala) { #asJavaOutputStream }
diff --git a/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromInputStream.md b/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromInputStream.md
index b475bf0f06..dcdca392db 100644
--- a/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromInputStream.md
+++ b/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromInputStream.md
@@ -6,18 +6,18 @@ Create a source that wraps an `InputStream`.
 
 ## Signature
 
-@apidoc[StreamConverters.fromInputStream](StreamConverters$) { scala="#fromInputStream(in:()=%3Ejava.io.InputStream,chunkSize:Int):akka.stream.scaladsl.Source[akka.util.ByteString,scala.concurrent.Future[akka.stream.IOResult]]" java="#fromInputStream(akka.japi.function.Creator)" }
+@apidoc[StreamConverters.fromInputStream](StreamConverters$) { scala="#fromInputStream(in:()=%3Ejava.io.InputStream,chunkSize:Int):org.apache.pekko.stream.scaladsl.Source[org.apache.pekko.util.ByteString,scala.concurrent.Future[org.apache.pekko.stream.IOResult]]" java="#fromInputStream(org.apache.pekko.japi.function.Creator)" }
 
 ## Description
 
 Creates a Source from a `java.io.InputStream` created by the given function.  Emitted elements are up to `chunkSize` 
-sized @apidoc[akka.util.ByteString]s elements.  The actual size of the emitted elements depends on how much data the 
+sized @apidoc[util.ByteString]s elements.  The actual size of the emitted elements depends on how much data the 
 underlying `java.io.InputStream` returns on each read invocation. Such chunks will  never be larger 
 than `chunkSize` though.
 
 You can configure the default dispatcher for this Source by changing 
 the `akka.stream.materializer.blocking-io-dispatcher` or set it for a given Source by 
-using `akka.stream.ActorAttributes`.
+using `org.apache.pekko.stream.ActorAttributes`.
 
 It materializes a @java[`CompletionStage`]@scala[`Future`] of `IOResult` containing the number of bytes read from the source file 
 upon completion,  and a possible exception if IO operation was not completed successfully. Note that bytes having
diff --git a/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromJavaStream.md b/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromJavaStream.md
index 170aabdf08..9fa4cca814 100644
--- a/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromJavaStream.md
+++ b/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromJavaStream.md
@@ -6,7 +6,7 @@ Create a source that wraps a Java 8 `java.util.stream.Stream`.
 
 ## Signature
 
-@apidoc[StreamConverters](StreamConverters$) { scala="#fromJavaStream%5BT,S%3C:java.util.stream.BaseStream[T,S]](stream:()=%3Ejava.util.stream.BaseStream[T,S]):akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#fromJavaStream(akka.japi.function.Creator)" }
+@apidoc[StreamConverters](StreamConverters$) { scala="#fromJavaStream%5BT,S%3C:java.util.stream.BaseStream[T,S]](stream:()=%3Ejava.util.stream.BaseStream[T,S]):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#fromJavaStream(org.apache.pekko.japi.function.Creator)" }
 
 ## Example
 
diff --git a/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromOutputStream.md b/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromOutputStream.md
index 3ac7e1fb60..3b244fc804 100644
--- a/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromOutputStream.md
+++ b/akka-docs/src/main/paradox/stream/operators/StreamConverters/fromOutputStream.md
@@ -6,17 +6,17 @@ Create a sink that wraps an `OutputStream`.
 
 ## Signature
 
-@apidoc[StreamConverters.fromOutputStream](StreamConverters$) { scala="#fromOutputStream(out:()=%3Cjava.io.OutputStream,autoFlush:Boolean):akka.stream.scaladsl.Sink[akka.util.ByteString,scala.concurrent.Future[akka.stream.IOResult]]" java="#fromOutputStream(akka.japi.function.Creator)" }
+@apidoc[StreamConverters.fromOutputStream](StreamConverters$) { scala="#fromOutputStream(out:()=%3Cjava.io.OutputStream,autoFlush:Boolean):org.apache.pekko.stream.scaladsl.Sink[org.apache.pekko.util.ByteString,scala.concurrent.Future[org.apache.pekko.stream.IOResult]]" java="#fromOutputStream(org.apache.pekko.japi.function.Creator)" }
 
 ## Description
 
-Creates a Sink which writes incoming @apidoc[akka.util.ByteString]s to a `java.io.OutputStream` created by the given function.
+Creates a Sink which writes incoming @apidoc[util.ByteString]s to a `java.io.OutputStream` created by the given function.
 
 Materializes a @java[`CompletionStage`]@scala[`Future`] of `IOResult` that will be completed with the size of the file (in bytes) on completion,
 and a possible exception if IO operation was not completed successfully.
 
-You can configure the default dispatcher for this Source by changing the `akka.stream.materializer.blocking-io-dispatcher` or
-set it for a given Source by using `akka.stream.ActorAttributes`.
+You can configure the default dispatcher for this Source by changing the `org.apache.pekko.stream.materializer.blocking-io-dispatcher` or
+set it for a given Source by using `org.apache.pekko.stream.ActorAttributes`.
 
 If `autoFlush` is true the OutputStream will be flushed whenever a byte array is written, defaults to false.
 The `OutputStream` will be closed when the stream flowing into this `Sink` is completed. The `Sink`
diff --git a/akka-docs/src/main/paradox/stream/operators/StreamConverters/javaCollector.md b/akka-docs/src/main/paradox/stream/operators/StreamConverters/javaCollector.md
index 2930c4769c..c4ac8615e7 100644
--- a/akka-docs/src/main/paradox/stream/operators/StreamConverters/javaCollector.md
+++ b/akka-docs/src/main/paradox/stream/operators/StreamConverters/javaCollector.md
@@ -6,7 +6,7 @@ Create a sink which materializes into a @scala[`Future`] @java[`CompletionStage`
 
 ## Signature
 
-@apidoc[StreamConverters.javaCollector](StreamConverters$) { scala="#javaCollector[T,R](collectorFactory:()=>java.util.stream.Collector[T,_,R]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[R]]" java="#javaCollector(akka.japi.function.Creator)" }
+@apidoc[StreamConverters.javaCollector](StreamConverters$) { scala="#javaCollector[T,R](collectorFactory:()=>java.util.stream.Collector[T,_,R]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[R]]" java="#javaCollector(org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/StreamConverters/javaCollectorParallelUnordered.md b/akka-docs/src/main/paradox/stream/operators/StreamConverters/javaCollectorParallelUnordered.md
index 089d64754f..54aa469944 100644
--- a/akka-docs/src/main/paradox/stream/operators/StreamConverters/javaCollectorParallelUnordered.md
+++ b/akka-docs/src/main/paradox/stream/operators/StreamConverters/javaCollectorParallelUnordered.md
@@ -6,7 +6,7 @@ Create a sink which materializes into a @scala[`Future`] @java[`CompletionStage`
 
 ## Signature
 
-@apidoc[StreamConverters.javaCollectorParallelUnordered](StreamConverters$) { scala="#javaCollectorParallelUnordered[T,R](parallelism:Int)(collectorFactory:()=>java.util.stream.Collector[T,_,R]):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[R]]" java="#javaCollectorParallelUnordered(int,akka.japi.function.Creator)" }
+@apidoc[StreamConverters.javaCollectorParallelUnordered](StreamConverters$) { scala="#javaCollectorParallelUnordered[T,R](parallelism:Int)(collectorFactory:()=>java.util.stream.Collector[T,_,R]):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[R]]" java="#javaCollectorParallelUnordered(int,org.apache.pekko.japi.function.Creator)" }
 
 
 ## Description
diff --git a/akka-docs/src/main/paradox/stream/operators/index.md b/akka-docs/src/main/paradox/stream/operators/index.md
index 81cadb5d2e..41a24c31a2 100644
--- a/akka-docs/src/main/paradox/stream/operators/index.md
+++ b/akka-docs/src/main/paradox/stream/operators/index.md
@@ -3,7 +3,7 @@
 
 ## Source operators
 
-These built-in sources are available from @scala[`akka.stream.scaladsl.Source`] @java[`akka.stream.javadsl.Source`]:
+These built-in sources are available from @scala[`org.apache.pekko.stream.scaladsl.Source`] @java[`org.apache.pekko.stream.javadsl.Source`]:
 
 | |Operator|Description|
 |--|--|--|
@@ -49,7 +49,7 @@ These built-in sources are available from @scala[`akka.stream.scaladsl.Source`]
 
 ## Sink operators
 
-These built-in sinks are available from @scala[`akka.stream.scaladsl.Sink`] @java[`akka.stream.javadsl.Sink`]:
+These built-in sinks are available from @scala[`org.apache.pekko.stream.scaladsl.Sink`] @java[`org.apache.pekko.stream.javadsl.Sink`]:
 
 
 | |Operator|Description|
@@ -338,8 +338,8 @@ Operators meant for inter-operating between Akka Streams and Actors:
 |ActorFlow|@ref[askWithContext](ActorFlow/askWithContext.md)|Use the "Ask Pattern" to send each stream element (without the context) as an `ask` to the target actor (of the new actors API), and expect a reply that will be emitted downstream.|
 |ActorFlow|@ref[askWithStatus](ActorFlow/askWithStatus.md)|Use the "Ask Pattern" to send each stream element as an `ask` to the target actor (of the new actors API),  and expect a reply of Type @scala[`StatusReply[T]`]@java[`StatusReply`] where the T will be unwrapped and emitted downstream.|
 |ActorFlow|@ref[askWithStatusAndContext](ActorFlow/askWithStatusAndContext.md)|Use the "Ask Pattern" to send each stream element (without the context) as an `ask` to the target actor (of the new actors API), and expect a reply of Type @scala[`StatusReply[T]`]@java[`StatusReply`] where the T will be unwrapped and emitted downstream.|
-|PubSub|@ref[sink](PubSub/sink.md)|A sink that will publish emitted messages to a @apidoc[akka.actor.typed.pubsub.Topic$].|
-|PubSub|@ref[source](PubSub/source.md)|A source that will subscribe to a @apidoc[akka.actor.typed.pubsub.Topic$] and stream messages published to the topic. |
+|PubSub|@ref[sink](PubSub/sink.md)|A sink that will publish emitted messages to a @apidoc[actor.typed.pubsub.Topic$].|
+|PubSub|@ref[source](PubSub/source.md)|A source that will subscribe to a @apidoc[actor.typed.pubsub.Topic$] and stream messages published to the topic. |
 |Source/Flow|@ref[watch](Source-or-Flow/watch.md)|Watch a specific `ActorRef` and signal a failure downstream once the actor terminates.|
 
 ## Compression operators
diff --git a/akka-docs/src/main/paradox/stream/reactive-streams-interop.md b/akka-docs/src/main/paradox/stream/reactive-streams-interop.md
index 37c67c14bb..5c96444ad1 100644
--- a/akka-docs/src/main/paradox/stream/reactive-streams-interop.md
+++ b/akka-docs/src/main/paradox/stream/reactive-streams-interop.md
@@ -24,7 +24,7 @@ namespace. For Java 8 there is instead a separate Reactive Streams artifact with
 
 Akka streams provides interoperability for both these two API versions, the Reactive Streams interfaces directly through factories on the
 regular `Source` and `Sink` APIs. For the Java 9 and later built in interfaces there is a separate set of factories in 
-@scala[`akka.stream.scaladsl.JavaFlowSupport`]@java[`akka.stream.javadsl.JavaFlowSupport`].
+@scala[`org.apache.pekko.stream.scaladsl.JavaFlowSupport`]@java[`org.apache.pekko.stream.javadsl.JavaFlowSupport`].
 
 In the following samples the standalone Reactive Stream API factories has been used but each such call can be replaced with the
 corresponding method from `JavaFlowSupport` and the JDK @scala[`java.util.concurrent.Flow._`]@java[`java.util.concurrent.Flow.*`] interfaces.
diff --git a/akka-docs/src/main/paradox/stream/stream-customize.md b/akka-docs/src/main/paradox/stream/stream-customize.md
index a86f37157b..23866aacf9 100644
--- a/akka-docs/src/main/paradox/stream/stream-customize.md
+++ b/akka-docs/src/main/paradox/stream/stream-customize.md
@@ -32,7 +32,7 @@ might be easy to make with a custom @ref[`GraphStage`](stream-customize.md)
 ## Custom processing with GraphStage
 
 The @apidoc[stage.GraphStage] abstraction can be used to create arbitrary operators with any number of input
-or output ports. It is a counterpart of the @apidoc[GraphDSL.create()](stream.*.GraphDSL$) {scala="#create%5BS%3C:akka.stream.Shape,IS%3C:akka.stream.Shape,Mat](graphs:Seq%5Bakka.stream.Graph%5BIS,Mat]])(buildBlock:akka.stream.scaladsl.GraphDSL.Builder%5BSeq%5BMat]]=%3E(Seq%5BIS]=%3ES)):akka.stream.Graph%5BS,Seq%5BMat]]" java="#create(java.util.List,akka.japi.function.Function2)"} method which creates new stream processing
+or output ports. It is a counterpart of the @apidoc[GraphDSL.create()](stream.*.GraphDSL$) {scala="#create%5BS%3C:org.apache.pekko.stream.Shape,IS%3C:org.apache.pekko.stream.Shape,Mat](graphs:Seq%5Borg.apache.pekko.stream.Graph%5BIS,Mat]])(buildBlock:org.apache.pekko.stream.scaladsl.GraphDSL.Builder%5BSeq%5BMat]]=%3E(Seq%5BIS]=%3ES)):org.apache.pekko.stream.Graph%5BS,Seq%5BMat]]" java="#create(java.util.List,org.apache.pekko.japi.function.Function2)"} method which creates new stream processing
 operators by composing others. Where `GraphStage` differs is that it creates an operator that is itself not divisible into
 smaller ones, and allows state to be maintained inside it in a safe way.
 
@@ -47,7 +47,7 @@ Java
 :   @@snip [GraphStageDocTest.java](/akka-docs/src/test/java/jdocs/stream/GraphStageDocTest.java) { #simple-source }
 
 As you see, in itself the `GraphStage` only defines the ports of this operator and a shape that contains the ports.
-It also has, a currently unimplemented method called @apidoc[createLogic](stage.GraphStage) {scala="#createLogic(inheritedAttributes:akka.stream.Attributes):akka.stream.stage.GraphStageLogic" java="#createLogic(akka.stream.Attributes)"}. If you recall, operators are reusable in multiple
+It also has, a currently unimplemented method called @apidoc[createLogic](stage.GraphStage) {scala="#createLogic(inheritedAttributes:org.apache.pekko.stream.Attributes):org.apache.pekko.stream.stage.GraphStageLogic" java="#createLogic(org.apache.pekko.stream.Attributes)"}. If you recall, operators are reusable in multiple
 materializations, each resulting in a different executing entity. In the case of `GraphStage` the actual running
 logic is modeled as an instance of a @apidoc[stage.GraphStageLogic] which will be created by the materializer by calling
 the `createLogic` method. In other words, all we need to do is to create a suitable logic that will emit the
@@ -61,7 +61,7 @@ confined to the GraphStageLogic that is created for every materialization.
 @@@
 
 In order to emit from a @apidoc[stream.*.Source] in a backpressured stream one needs first to have demand from downstream.
-To receive the necessary events one needs to register a subclass of @scala[@scaladoc[OutHandler](akka.stream.stage.OutHandler)] @java[@javadoc[AbstractOutHandler](akka.stream.stage.AbstractOutHandler)] with the output port
+To receive the necessary events one needs to register a subclass of @scala[@scaladoc[OutHandler](pekko.stream.stage.OutHandler)] @java[@javadoc[AbstractOutHandler](pekko.stream.stage.AbstractOutHandler)] with the output port
 (@apidoc[stream.Outlet]). This handler will receive events related to the lifecycle of the port. In our case we need to
 override `onPull()` which indicates that we are free to emit a single element. There is another callback,
 `onDownstreamFinish()` which is called if the downstream cancelled. Since the default behavior of that callback is
@@ -109,17 +109,17 @@ From the @apidoc[stage.GraphStageLogic] the following operations are available o
  * `complete(out)` closes the output port normally.
  * `fail(out,exception)` closes the port with a failure signal.
 
-The events corresponding to an *output* port can be received in an @scala[@scaladoc[OutHandler](akka.stream.stage.OutHandler)]@java[@javadoc[AbstractOutHandler](akka.stream.stage.AbstractOutHandler)] instance registered to the
+The events corresponding to an *output* port can be received in an @scala[@scaladoc[OutHandler](pekko.stream.stage.OutHandler)]@java[@javadoc[AbstractOutHandler](pekko.stream.stage.AbstractOutHandler)] instance registered to the
 output port using `setHandler(out,handler)`. This handler has two callbacks:
 
- * @apidoc[onPull()](akka.stream.stage.OutHandler) {scala="#onPull():Unit" java="#onPull()"] is called when the output port is ready to emit the next element, `push(out, elem)` is now allowed
+ * @apidoc[onPull()](stream.stage.OutHandler) {scala="#onPull():Unit" java="#onPull()"] is called when the output port is ready to emit the next element, `push(out, elem)` is now allowed
 to be called on this port.
- * @apidoc[onDownstreamFinish()](akka.stream.stage.OutHandler) {scala="#onDownstreamFinish(cause:Throwable):Unit" java="#onDownstreamFinish(java.lang.Throwable)"} is called once the downstream has cancelled and no longer allows messages to be pushed to it.
+ * @apidoc[onDownstreamFinish()](stream.stage.OutHandler) {scala="#onDownstreamFinish(cause:Throwable):Unit" java="#onDownstreamFinish(java.lang.Throwable)"} is called once the downstream has cancelled and no longer allows messages to be pushed to it.
 No more `onPull()` will arrive after this event. If not overridden this will default to stopping the operator.
 
 Also, there are two query methods available for output ports:
 
- * @apidoc[isAvailable(out)](stage.GraphStageLogic) {scala="#isAvailable[T](out:akka.stream.Outlet[T]):Boolean" java="#isAvailable(akka.stream.Outlet)"} returns true if the port can be pushed
+ * @apidoc[isAvailable(out)](stage.GraphStageLogic) {scala="#isAvailable[T](out:org.apache.pekko.stream.Outlet[T]):Boolean" java="#isAvailable(org.apache.pekko.stream.Outlet)"} returns true if the port can be pushed
  * `isClosed(out)` returns true if the port is closed. At this point the port can not be pushed and will not be pulled anymore.
 
 The relationship of the above operations, events and queries are summarized in the state machine below. Green shows
@@ -138,7 +138,7 @@ The following operations are available for *input* ports:
 port is pushed again by the upstream.
  * `cancel(in)` closes the input port.
 
-The events corresponding to an *input* port can be received in an @scala[@scaladoc[InHandler](akka.stream.stage.InHandler)] @java[@javadoc[AbstractInHandler](akka.stream.stage.AbstractInHandler)] instance registered to the
+The events corresponding to an *input* port can be received in an @scala[@scaladoc[InHandler](pekko.stream.stage.InHandler)] @java[@javadoc[AbstractInHandler](pekko.stream.stage.AbstractInHandler)] instance registered to the
 input port using `setHandler(in, handler)`. This handler has three callbacks:
 
  * `onPush()` is called when the input port has now a new element. Now it is possible to acquire this element using
@@ -254,7 +254,7 @@ In this case a pull from downstream might be consumed by the operator itself rat
 than passed along upstream as the operator might contain an element it wants to
 push. Note that we also need to handle the case where the upstream closes while
 the operator still has elements it wants to push downstream. This is done by
-overriding `onUpstreamFinish` in the @scala[@scaladoc[InHandler](akka.stream.stage.InHandler)]@java[@javadoc[AbstractInHandler](akka.stream.stage.AbstractInHandler)] and provide custom logic
+overriding `onUpstreamFinish` in the @scala[@scaladoc[InHandler](pekko.stream.stage.InHandler)]@java[@javadoc[AbstractInHandler](pekko.stream.stage.AbstractInHandler)] and provide custom logic
 that should happen when the upstream has been finished.
 
 This example can be simplified by replacing the usage of a mutable state with calls to
@@ -272,7 +272,7 @@ which conceptually would correspond to the following structure:
 
 ![graph_stage_chain.png](../images/graph_stage_chain.png)
 
-In code this is only a few lines, using the @apidoc[via](stream.*.Source) {scala="#via[T,Mat2](flow:akka.stream.Graph[akka.stream.FlowShape[Out,T],Mat2]):Source.this.Repr[T]" java="#via(akka.stream.Graph)"} use our custom operators in a stream:
+In code this is only a few lines, using the @apidoc[via](stream.*.Source) {scala="#via[T,Mat2](flow:org.apache.pekko.stream.Graph[org.apache.pekko.stream.FlowShape[Out,T],Mat2]):Source.this.Repr[T]" java="#via(org.apache.pekko.stream.Graph)"} use our custom operators in a stream:
 
 Scala
 :   @@snip [GraphStageDocSpec.scala](/akka-docs/src/test/scala/docs/stream/GraphStageDocSpec.scala) { #graph-operator-chain }
@@ -290,7 +290,7 @@ in circulation in a potential chain of operators, just like our conceptual "rail
 Completion handling usually (but not exclusively) comes into the picture when operators need to emit
 a few more elements after their upstream source has been completed. We have seen an example of this in our
 first `Duplicator` implementation where the last element needs to be doubled even after the upstream neighbor
-operator has been completed. This can be done by overriding the `onUpstreamFinish` method in @scala[@scaladoc[InHandler](akka.stream.stage.InHandler)]@java[@javadoc[AbstractInHandler](akka.stream.stage.AbstractInHandler)].
+operator has been completed. This can be done by overriding the `onUpstreamFinish` method in @scala[@scaladoc[InHandler](pekko.stream.stage.InHandler)]@java[@javadoc[AbstractInHandler](pekko.stream.stage.AbstractInHandler)].
 
 Operators by default automatically stop once all of their ports (input and output) have been closed externally or internally.
 It is possible to opt out from this behavior by invoking `setKeepGoing(true)` (which is not supported from the operator’s
@@ -305,7 +305,7 @@ more advanced operators which may need to be debugged at some point.
 
 @@@ div { .group-scala }
 
-The helper trait @scaladoc[akka.stream.stage.StageLogging](StageLogging) is provided to enable you to obtain a @apidoc[akka.event.LoggingAdapter]
+The helper trait @scaladoc[stream.stage.StageLogging](StageLogging) is provided to enable you to obtain a @apidoc[event.LoggingAdapter]
 inside of a @apidoc[stage.GraphStage] as long as the @apidoc[stream.Materializer] you're using is able to provide you with a logger.
 In that sense, it serves a very similar purpose as @apidoc[actor.ActorLogging] does for Actors. 
 
@@ -314,7 +314,7 @@ In that sense, it serves a very similar purpose as @apidoc[actor.ActorLogging] d
 @@@ div { .group-java }
 
 You can extend the @apidoc[GraphStageLogicWithLogging] or @apidoc[TimerGraphStageLogicWithLogging] classes
-instead of the usual @apidoc[stage.GraphStageLogic] to enable you to obtain a @apidoc[akka.event.LoggingAdapter] inside your operator as long as 
+instead of the usual @apidoc[stage.GraphStageLogic] to enable you to obtain a @apidoc[event.LoggingAdapter] inside your operator as long as 
 the @apidoc[stream.Materializer] you're using is able to provide you with a logger.
 
 @@@
@@ -367,7 +367,7 @@ Java
 ### Using asynchronous side-channels
 
 In order to receive asynchronous events that are not arriving as stream elements (for example a completion of a future
-or a callback from a 3rd party API) one must acquire a @apidoc[stage.AsyncCallback] by calling @apidoc[getAsyncCallback()](stage.GraphStageLogic) {scala="#getAsyncCallback[T](handler:T=%3EUnit):akka.stream.stage.AsyncCallback[T]" java="#getAsyncCallback(scala.Function1)"} from the
+or a callback from a 3rd party API) one must acquire a @apidoc[stage.AsyncCallback] by calling @apidoc[getAsyncCallback()](stage.GraphStageLogic) {scala="#getAsyncCallback[T](handler:T=%3EUnit):org.apache.pekko.stream.stage.AsyncCallback[T]" java="#getAsyncCallback(scala.Function1)"} from the
 operator logic. The method `getAsyncCallback` takes as a parameter a callback that will be called once the asynchronous
 event fires. It is important to **not call the callback directly**, instead, the external API must call the
 `invoke(event)` method on the returned `AsyncCallback`. The execution engine will take care of calling the
@@ -394,7 +394,7 @@ Java
 It is possible to acquire an ActorRef that can be addressed from the outside of the operator, similarly how
 @apidoc[stage.AsyncCallback] allows injecting asynchronous events into an operator logic. This reference can be obtained
 by calling `getStageActor(receive)` passing in a function that takes a `Pair` of the sender
-@apidoc[akka.actor.ActorRef] and the received message. This reference can be used to watch other actors by calling its `watch(ref)`
+@apidoc[actor.ActorRef] and the received message. This reference can be used to watch other actors by calling its `watch(ref)`
 or `unwatch(ref)` methods. The reference can be also watched by external actors. The current limitations of this
 `ActorRef` are:
 
@@ -405,9 +405,9 @@ or `unwatch(ref)` methods. The reference can be also watched by external actors.
 
 ### Custom materialized values
 
-Custom operators can return materialized values instead of @apidoc[akka.NotUsed] by inheriting from @scala[@scaladoc[GraphStageWithMaterializedValue](akka.stream.stage.GraphStageWithMaterializedValue)]@java[@javadoc[AbstractGraphStageWithMaterializedValue](akka.stream.stage.AbstractGraphStageWithMaterializedValue)]
+Custom operators can return materialized values instead of @apidoc[NotUsed] by inheriting from @scala[@scaladoc[GraphStageWithMaterializedValue](pekko.stream.stage.GraphStageWithMaterializedValue)]@java[@javadoc[AbstractGraphStageWithMaterializedValue](pekko.stream.stage.AbstractGraphStageWithMaterializedValue)]
 instead of the simpler `GraphStage`. The difference is that in this case the method
-@scala[@scaladoc[createLogicAndMaterializedValue(inheritedAttributes)](akka.stream.stage.GraphStageWithMaterializedValue#createLogicAndMaterializedValue(inheritedAttributes:akka.stream.Attributes):(akka.stream.stage.GraphStageLogic,M))]@java[@javadoc[createLogicAndMaterializedValue(inheritedAttributes](akka.stream.stage.AbstractGraphStageWithMaterializedValue#createLogicAndMaterializedValue(akka.stream.Attributes))] needs to be overridden, and in addition to the
+@scala[@scaladoc[createLogicAndMaterializedValue(inheritedAttributes)](pekko.stream.stage.GraphStageWithMaterializedValue#createLogicAndMaterializedValue(inheritedAttributes:org.apache.pekko.stream.Attributes):(org.apache.pekko.stream.stage.GraphStageLogic,M))]@java[@javadoc[createLogicAndMaterializedValue(inheritedAttributes](pekko.stream.stage.AbstractGraphStageWithMaterializedValue#createLogicAndMaterializedValue(org.apache.pekko.stream.Attributes))] needs to be overridden, and in addition to the
 operator logic the materialized value must be provided
 
 @@@ warning
@@ -430,7 +430,7 @@ Java
 
 **This section is a stub and will be extended in the next release**
 
-Operators can access the @apidoc[akka.stream.Attributes] object created by the materializer. This contains all the applied (inherited)
+Operators can access the @apidoc[stream.Attributes] object created by the materializer. This contains all the applied (inherited)
 attributes applying to the operator, ordered from least specific (outermost) towards the most specific (innermost)
 attribute. It is the responsibility of the operator to decide how to reconcile this inheritance chain to a final effective
 decision.
@@ -499,10 +499,10 @@ behavior.
 If an operator manages a resource with a lifecycle, for example objects that need to be shutdown when they are not
 used anymore it is important to make sure this will happen in all circumstances when the operator shuts down.
 
-Cleaning up resources should be done in @apidoc[GraphStageLogic.postStop](stage.GraphStageLogic) {scala="#postStop():Unit" java="#postStop()"} and not in the @scala[@scaladoc[InHandler](akka.stream.stage.InHandler)]@java[@javadoc[AbstractInHandler](akka.stream.stage.AbstractInHandler)] and @scala[@scaladoc[OutHandler](akka.stream.stage.OutHandler)] @java[@javadoc[AbstractOutHandler](akka.stream.stage.AbstractOutHandler)]
+Cleaning up resources should be done in @apidoc[GraphStageLogic.postStop](stage.GraphStageLogic) {scala="#postStop():Unit" java="#postStop()"} and not in the @scala[@scaladoc[InHandler](pekko.stream.stage.InHandler)]@java[@javadoc[AbstractInHandler](pekko.stream.stage.AbstractInHandler)] and @scala[@scaladoc[OutHandler](pekko.stream.stage.OutHandler)] @java[@javadoc[AbstractOutHandler](pekko.stream.stage.AbstractOutHandler)]
 callbacks. The reason for this is that when the operator itself completes or is failed there is no signal from the upstreams
 or the downstreams. Even for operators that do not complete or fail in this manner, this can happen when the
-@apidoc[akka.stream.Materializer] is shutdown or the @apidoc[akka.actor.ActorSystem] is terminated while a stream is still running, what is called an
+@apidoc[stream.Materializer] is shutdown or the @apidoc[actor.ActorSystem] is terminated while a stream is still running, what is called an
 "abrupt termination".
 
 @@@ div { .group-scala }
@@ -510,8 +510,8 @@ or the downstreams. Even for operators that do not complete or fail in this mann
 ## Extending Flow Operators with Custom Operators
 
 The most general way of extending any @apidoc[Source], @apidoc[Flow] or @apidoc[SubFlow](stream.*.SubFlow) (e.g. from `groupBy`) is
-demonstrated above: create an operator of flow-shape like the `Duplicator` example given above and use the @apidoc[.via(...)](stream.*.Source) {scala="#via[T,Mat2](flow:akka.stream.Graph[akka.stream.FlowShape[Out,T],Mat2]):Source.this.Repr[T]" java="#via(akka.stream.Graph)"}
-operator to integrate it into your stream topology. This works with all @scaladoc[FlowOps](akka.stream.scaladsl.FlowOps) sub-types, including the
+demonstrated above: create an operator of flow-shape like the `Duplicator` example given above and use the @apidoc[.via(...)](stream.*.Source) {scala="#via[T,Mat2](flow:org.apache.pekko.stream.Graph[org.apache.pekko.stream.FlowShape[Out,T],Mat2]):Source.this.Repr[T]" java="#via(org.apache.pekko.stream.Graph)"}
+operator to integrate it into your stream topology. This works with all @scaladoc[FlowOps](pekko.stream.scaladsl.FlowOps) sub-types, including the
 ports that you connect with the graph DSL.
 
 Advanced Scala users may wonder whether it is possible to write extension methods that enrich `FlowOps` to
diff --git a/akka-docs/src/main/paradox/stream/stream-dynamic.md b/akka-docs/src/main/paradox/stream/stream-dynamic.md
index 00034f9203..059abff719 100644
--- a/akka-docs/src/main/paradox/stream/stream-dynamic.md
+++ b/akka-docs/src/main/paradox/stream/stream-dynamic.md
@@ -18,16 +18,16 @@ To use Akka Streams, add the module to your project:
 
 ## Controlling stream completion with KillSwitch
 
-A @apidoc[akka.stream.KillSwitch] allows the completion of operators of @apidoc[akka.stream.FlowShape] from the outside. It consists of a flow element that
+A @apidoc[stream.KillSwitch] allows the completion of operators of @apidoc[stream.FlowShape] from the outside. It consists of a flow element that
 can be linked to an operator of `FlowShape` needing completion control.
 The `KillSwitch` @scala[trait] @java[interface] allows to:
  
- * complete the stream(s) via @apidoc[shutdown()](akka.stream.KillSwitch) {scala="#shutdown():Unit" java="#shutdown()"}
- * fail the stream(s) via @apidoc[abort(Throwable error)](akka.stream.KillSwitch) {scala="#abort(ex:Throwable):Unit" java="#abort(java.lang.Throwable)"}
+ * complete the stream(s) via @apidoc[shutdown()](stream.KillSwitch) {scala="#shutdown():Unit" java="#shutdown()"}
+ * fail the stream(s) via @apidoc[abort(Throwable error)](stream.KillSwitch) {scala="#abort(ex:Throwable):Unit" java="#abort(java.lang.Throwable)"}
 
 
 Scala
-:   @@snip [KillSwitch.scala](/akka-stream/src/main/scala/akka/stream/KillSwitch.scala) { #kill-switch }
+:   @@snip [KillSwitch.scala](/akka-stream/src/main/scala/org/apache/pekko/stream/KillSwitch.scala) { #kill-switch }
 
 After the first call to either `shutdown` or `abort`, all subsequent calls to any of these methods will be ignored.
 Stream completion is performed by both
@@ -40,7 +40,7 @@ A `KillSwitch` can control the completion of one or multiple streams, and theref
 
 ### UniqueKillSwitch
 
-@apidoc[akka.stream.UniqueKillSwitch] allows to control the completion of **one** materialized @apidoc[akka.stream.Graph] of @apidoc[akka.stream.FlowShape]. Refer to the
+@apidoc[stream.UniqueKillSwitch] allows to control the completion of **one** materialized @apidoc[stream.Graph] of @apidoc[stream.FlowShape]. Refer to the
 below for usage examples.
 
  * **Shutdown**
@@ -62,8 +62,8 @@ Java
 
 ### SharedKillSwitch
 
-A @apidoc[akka.stream.SharedKillSwitch] allows to control the completion of an arbitrary number operators of @apidoc[akka.stream.FlowShape]. It can be
-materialized multiple times via its @apidoc[flow](akka.stream.SharedKillSwitch) {scala="#flow[T]:akka.stream.Graph[akka.stream.FlowShape[T,T],akka.stream.SharedKillSwitch]" java="#flow()"} method, and all materialized operators linked to it are controlled by the switch.
+A @apidoc[stream.SharedKillSwitch] allows to control the completion of an arbitrary number operators of @apidoc[stream.FlowShape]. It can be
+materialized multiple times via its @apidoc[flow](stream.SharedKillSwitch) {scala="#flow[T]:org.apache.pekko.stream.Graph[org.apache.pekko.stream.FlowShape[T,T],org.apache.pekko.stream.SharedKillSwitch]" java="#flow()"} method, and all materialized operators linked to it are controlled by the switch.
 Refer to the below for usage examples.
 
  * **Shutdown**
@@ -84,7 +84,7 @@ Java
 
 @@@ note
 
-A @apidoc[akka.stream.UniqueKillSwitch] is always a result of a materialization, whilst @apidoc[akka.stream.SharedKillSwitch] needs to be constructed
+A @apidoc[stream.UniqueKillSwitch] is always a result of a materialization, whilst @apidoc[stream.SharedKillSwitch] needs to be constructed
 before any materialization takes place.
 
 @@@
@@ -94,16 +94,16 @@ before any materialization takes place.
 There are many cases when consumers or producers of a certain service (represented as a Sink, Source, or possibly Flow)
 are dynamic and not known in advance. The Graph DSL does not allow to represent this, all connections of the graph
 must be known in advance and must be connected upfront. To allow dynamic fan-in and fan-out streaming, the Hubs
-should be used. They provide means to construct @apidoc[akka.stream.*.Sink] and @apidoc[akka.stream.*.Source] pairs that are "attached" to each
+should be used. They provide means to construct @apidoc[stream.*.Sink] and @apidoc[stream.*.Source] pairs that are "attached" to each
 other, but one of them can be materialized multiple times to implement dynamic fan-in or fan-out.
 
 ### Using the MergeHub
 
-A @apidoc[akka.stream.*.MergeHub$] allows to implement a dynamic fan-in junction point in a graph where elements coming from
+A @apidoc[stream.*.MergeHub$] allows to implement a dynamic fan-in junction point in a graph where elements coming from
 different producers are emitted in a First-Comes-First-Served fashion. If the consumer cannot keep up then *all* of the
-producers are backpressured. The hub itself comes as a @apidoc[akka.stream.*.Source] to which the single consumer can be attached.
+producers are backpressured. The hub itself comes as a @apidoc[stream.*.Source] to which the single consumer can be attached.
 It is not possible to attach any producers until this `Source` has been materialized (started). This is ensured
-by the fact that we only get the corresponding @apidoc[akka.stream.*.Sink] as a materialized value. Usage might look like this:
+by the fact that we only get the corresponding @apidoc[stream.*.Sink] as a materialized value. Usage might look like this:
 
 Scala
 :   @@snip [HubsDocSpec.scala](/akka-docs/src/test/scala/docs/stream/HubsDocSpec.scala) { #merge-hub }
@@ -117,8 +117,8 @@ previously until it cancels.
 
 ### Using the BroadcastHub
 
-A @apidoc[akka.stream.*.BroadcastHub$] can be used to consume elements from a common producer by a dynamic set of consumers. The
-rate of the producer will be automatically adapted to the slowest consumer. In this case, the hub is a @apidoc[akka.stream.*.Sink]
+A @apidoc[stream.*.BroadcastHub$] can be used to consume elements from a common producer by a dynamic set of consumers. The
+rate of the producer will be automatically adapted to the slowest consumer. In this case, the hub is a @apidoc[stream.*.Sink]
 to which the single producer must be attached first. Consumers can only be attached once the `Sink` has
 been materialized (i.e. the producer has been started). One example of using the `BroadcastHub`:
 
@@ -128,10 +128,10 @@ Scala
 Java
 :   @@snip [HubDocTest.java](/akka-docs/src/test/java/jdocs/stream/HubDocTest.java) { #broadcast-hub }
 
-The resulting @apidoc[akka.stream.*.Source] can be materialized any number of times, each materialization effectively attaching
+The resulting @apidoc[stream.*.Source] can be materialized any number of times, each materialization effectively attaching
 a new subscriber. If there are no subscribers attached to this hub then it will not drop any elements but instead
 backpressure the upstream producer until subscribers arrive. This behavior can be tweaked by using the operators
-@apidoc[.buffer](akka.stream.*.Source) {scala="#buffer(size:Int,overflowStrategy:akka.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,akka.stream.OverflowStrategy)"} for example with a drop strategy, or attaching a subscriber that drops all messages. If there
+@apidoc[.buffer](stream.*.Source) {scala="#buffer(size:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,org.apache.pekko.stream.OverflowStrategy)"} for example with a drop strategy, or attaching a subscriber that drops all messages. If there
 are no other subscribers, this will ensure that the producer is kept drained (dropping all elements) and once a new
 subscriber arrives it will adaptively slow down, ensuring no more messages are dropped.
 
@@ -139,11 +139,11 @@ subscriber arrives it will adaptively slow down, ensuring no more messages are d
 
 The features provided by the Hub implementations are limited by default. This is by design, as various combinations
 can be used to express additional features like unsubscribing producers or consumers externally. We show here
-an example that builds a @apidoc[akka.stream.*.Flow] representing a publish-subscribe channel. The input of the `Flow` is
+an example that builds a @apidoc[stream.*.Flow] representing a publish-subscribe channel. The input of the `Flow` is
 published to all subscribers while the output streams all the elements published.
 
-First, we connect a @apidoc[akka.stream.*.MergeHub$] and a @apidoc[akka.stream.*.BroadcastHub$] together to form a publish-subscribe channel. Once
-we materialize this small stream, we get back a pair of @apidoc[akka.stream.*.Source] and @apidoc[akka.stream.*.Sink] that together define
+First, we connect a @apidoc[stream.*.MergeHub$] and a @apidoc[stream.*.BroadcastHub$] together to form a publish-subscribe channel. Once
+we materialize this small stream, we get back a pair of @apidoc[stream.*.Source] and @apidoc[stream.*.Sink] that together define
 the publish and subscribe sides of our channel.
 
 Scala
@@ -152,7 +152,7 @@ Scala
 Java
 :   @@snip [HubDocTest.java](/akka-docs/src/test/java/jdocs/stream/HubDocTest.java) { #pub-sub-1 }
 
-We now use a few tricks to add more features. First of all, we attach a @apidoc[Sink.ignore](akka.stream.*.Sink$) {scala="#ignore:akka.stream.scaladsl.Sink[Any,scala.concurrent.Future[akka.Done]]" java="#ignore()"}
+We now use a few tricks to add more features. First of all, we attach a @apidoc[Sink.ignore](stream.*.Sink$) {scala="#ignore:org.apache.pekko.stream.scaladsl.Sink[Any,scala.concurrent.Future[org.apache.pekko.Done]]" java="#ignore()"}
 at the broadcast side of the channel to keep it drained when there are no subscribers. If this behavior is not the
 desired one this line can be dropped.
 
@@ -162,9 +162,9 @@ Scala
 Java
 :   @@snip [HubDocTest.java](/akka-docs/src/test/java/jdocs/stream/HubDocTest.java) { #pub-sub-2 }
 
-We now wrap the @apidoc[akka.stream.*.Sink] and @apidoc[akka.stream.*.Source] in a @apidoc[akka.stream.*.Flow] using @apidoc[Flow.fromSinkAndSource](akka.stream.*.Flow$) {scala="#fromSinkAndSource[I,O](sink:akka.stream.Graph[akka.stream.SinkShape[I],_],source:akka.stream.Graph[akka.stream.SourceShape[O],_]):akka.stream.scaladsl.Flow[I,O,akka.NotUsed]" java="#fromSinkAndSource(akka.stream.Graph,akka.stream.Graph)"}. This bundles
+We now wrap the @apidoc[stream.*.Sink] and @apidoc[stream.*.Source] in a @apidoc[stream.*.Flow] using @apidoc[Flow.fromSinkAndSource](stream.*.Flow$) {scala="#fromSinkAndSource[I,O](sink:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[I],_],source:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[O],_]):org.apache.pekko.stream.scaladsl.Flow[I,O,org.apache.pekko.NotUsed]" java="#fromSinkAndSource(org.apache.pekko.stream.Graph,org.apache.pekko.stream.Graph)"}. This bundles
 up the two sides of the channel into one and forces users of it to always define a publisher and subscriber side
-(even if the subscriber side is dropping). It also allows us to attach a @apidoc[akka.stream.KillSwitch] as
+(even if the subscriber side is dropping). It also allows us to attach a @apidoc[stream.KillSwitch] as
 a `BidiStage` which in turn makes it possible to close both the original `Sink` and `Source` at the
 same time.
 Finally, we add `backpressureTimeout` on the consumer side to ensure that subscribers that block the channel for more
@@ -190,10 +190,10 @@ Java
 
 **This is a @ref:[may change](../common/may-change.md) feature***
 
-A @apidoc[akka.stream.*.PartitionHub$] can be used to route elements from a common producer to a dynamic set of consumers.
+A @apidoc[stream.*.PartitionHub$] can be used to route elements from a common producer to a dynamic set of consumers.
 The selection of consumer is done with a function. Each element can be routed to only one consumer. 
 
-The rate of the producer will be automatically adapted to the slowest consumer. In this case, the hub is a @apidoc[akka.stream.*.Sink]
+The rate of the producer will be automatically adapted to the slowest consumer. In this case, the hub is a @apidoc[stream.*.Sink]
 to which the single producer must be attached first. Consumers can only be attached once the `Sink` has
 been materialized (i.e. the producer has been started). One example of using the `PartitionHub`:
 
@@ -207,10 +207,10 @@ The `partitioner` function takes two parameters; the first is the number of acti
 is the stream element. The function should return the index of the selected consumer for the given element, 
 i.e. `int` greater than or equal to 0 and less than number of consumers.
 
-The resulting @apidoc[akka.stream.*.Source] can be materialized any number of times, each materialization effectively attaching
+The resulting @apidoc[stream.*.Source] can be materialized any number of times, each materialization effectively attaching
 a new consumer. If there are no consumers attached to this hub then it will not drop any elements but instead
 backpressure the upstream producer until consumers arrive. This behavior can be tweaked by using an operator,
-for example @apidoc[.buffer](akka.stream.*.Source) {scala="#buffer(size:Int,overflowStrategy:akka.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,akka.stream.OverflowStrategy)"} with a drop strategy, or attaching a consumer that drops all messages. If there
+for example @apidoc[.buffer](stream.*.Source) {scala="#buffer(size:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,org.apache.pekko.stream.OverflowStrategy)"} with a drop strategy, or attaching a consumer that drops all messages. If there
 are no other consumers, this will ensure that the producer is kept drained (dropping all elements) and once a new
 consumer arrives and messages are routed to the new consumer it will adaptively slow down, ensuring no more messages
 are dropped.
@@ -219,8 +219,8 @@ It is possible to define how many initial consumers that are required before it
 to the attached consumers. While not enough consumers have been attached messages are buffered and when the
 buffer is full the upstream producer is backpressured. No messages are dropped.
 
-The above example illustrate a stateless partition function. For more advanced stateful routing the @java[@javadoc[ofStateful](akka.stream.javadsl.PartitionHub$#ofStateful(java.lang.Class,java.util.function.Supplier,int))]
-@scala[@scaladoc[statefulSink](akka.stream.scaladsl.PartitionHub$#statefulSink[T](partitioner:()=%3E(akka.stream.scaladsl.PartitionHub.ConsumerInfo,T)=%3ELong,startAfterNrOfConsumers:Int,bufferSize:Int):akka.stream.scaladsl.Sink[T,akka.stream.scaladsl.Source[T,akka.NotUsed]])] can be used. Here is an example of a stateful round-robin function:
+The above example illustrate a stateless partition function. For more advanced stateful routing the @java[@javadoc[ofStateful](pekko.stream.javadsl.PartitionHub$#ofStateful(java.lang.Class,java.util.function.Supplier,int))]
+@scala[@scaladoc[statefulSink](pekko.stream.scaladsl.PartitionHub$#statefulSink[T](partitioner:()=%3E(org.apache.pekko.stream.scaladsl.PartitionHub.ConsumerInfo,T)=%3ELong,startAfterNrOfConsumers:Int,bufferSize:Int):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]])] can be used. Here is an example of a stateful round-robin function:
 
 Scala
 :   @@snip [HubsDocSpec.scala](/akka-docs/src/test/scala/docs/stream/HubsDocSpec.scala) { #partition-hub-stateful }
@@ -241,7 +241,7 @@ consumer identifiers and the second is the stream element. The function should r
 identifier for the given element. The function will never be called when there are no active consumers, i.e. 
 there is always at least one element in the array of identifiers.
 
-Another interesting type of routing is to prefer routing to the fastest consumers. The @apidoc[ConsumerInfo](akka.stream.*.PartitionHub.ConsumerInfo)
+Another interesting type of routing is to prefer routing to the fastest consumers. The @apidoc[ConsumerInfo](stream.*.PartitionHub.ConsumerInfo)
 has an accessor `queueSize` that is approximate number of buffered elements for a consumer.
 Larger value than other consumers could be an indication of that the consumer is slow.
 Note that this is a moving target since the elements are consumed concurrently. Here is an example of
diff --git a/akka-docs/src/main/paradox/stream/stream-error.md b/akka-docs/src/main/paradox/stream/stream-error.md
index 72c9e347f2..5304bcd2e3 100644
--- a/akka-docs/src/main/paradox/stream/stream-error.md
+++ b/akka-docs/src/main/paradox/stream/stream-error.md
@@ -20,8 +20,8 @@ Each of the operators downstream gets informed about the failure and each upstre
 
 In many cases you may want to avoid complete stream failure, this can be done in a few different ways:
 
- * @apidoc[recover](akka.stream.*.Source) {scala="#recover[T>:Out](pf:PartialFunction[Throwable,T]):FlowOps.this.Repr[T]" java="#recover(java.lang.Class,java.util.function.Supplier)"} to emit a final element then complete the stream normally on upstream failure 
- * @apidoc[recoverWithRetries](akka.stream.*.Source) {scala="#recoverWithRetries[T>:Out](attempts:Int,pf:PartialFunction[Throwable,akka.stream.Graph[akka.stream.SourceShape[T],akka.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWithRetries(int,java.lang.Class,java.util.function.Supplier)"} to create a new upstream and start consuming from that on failure
+ * @apidoc[recover](stream.*.Source) {scala="#recover[T>:Out](pf:PartialFunction[Throwable,T]):FlowOps.this.Repr[T]" java="#recover(java.lang.Class,java.util.function.Supplier)"} to emit a final element then complete the stream normally on upstream failure 
+ * @apidoc[recoverWithRetries](stream.*.Source) {scala="#recoverWithRetries[T>:Out](attempts:Int,pf:PartialFunction[Throwable,org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],org.apache.pekko.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWithRetries(int,java.lang.Class,java.util.function.Supplier)"} to create a new upstream and start consuming from that on failure
  * Restarting sections of the stream after a backoff
  * Using a supervision strategy for operators that support it
  
@@ -30,8 +30,8 @@ inside an actor, and have the actor restart the entire stream on failure.
  
 ## Logging errors
 
-@apidoc[log()](akka.stream.*.Source) {scala="#log(name:String,extract:Out=%3EAny)(implicitlog:akka.event.LoggingAdapter):FlowOps.this.Repr[Out]" java="#log(java.lang.String,akka.japi.function.Function)"} enables logging of a stream, which is typically useful for error logging. 
-The below stream fails with @javadoc[ArithmeticException](java.lang.ArithmeticException) when the element `0` goes through the @apidoc[map](akka.stream.*.Source) {scala="#map[T](f:Out=%3ET):FlowOps.this.Repr[T]" java="#map(akka.japi.function.Function)"} operator, 
+@apidoc[log()](stream.*.Source) {scala="#log(name:String,extract:Out=%3EAny)(implicitlog:org.apache.pekko.event.LoggingAdapter):FlowOps.this.Repr[Out]" java="#log(java.lang.String,org.apache.pekko.japi.function.Function)"} enables logging of a stream, which is typically useful for error logging. 
+The below stream fails with @javadoc[ArithmeticException](java.lang.ArithmeticException) when the element `0` goes through the @apidoc[map](stream.*.Source) {scala="#map[T](f:Out=%3ET):FlowOps.this.Repr[T]" java="#map(org.apache.pekko.japi.function.Function)"} operator, 
 
 Scala
 :   @@snip [RecipeLoggingElements.scala](/akka-docs/src/test/scala/docs/stream/cookbook/RecipeLoggingElements.scala) { #log-error }
@@ -52,7 +52,7 @@ in @ref:[Logging in streams](stream-cookbook.md#logging-in-streams).
 
 ## Recover
 
-@apidoc[recover](akka.stream.*.Source) {scala="#recover[T>:Out](pf:PartialFunction[Throwable,T]):FlowOps.this.Repr[T]" java="#recover(java.lang.Class,java.util.function.Supplier)"} allows you to emit a final element and then complete the stream on an upstream failure.
+@apidoc[recover](stream.*.Source) {scala="#recover[T>:Out](pf:PartialFunction[Throwable,T]):FlowOps.this.Repr[T]" java="#recover(java.lang.Class,java.util.function.Supplier)"} allows you to emit a final element and then complete the stream on an upstream failure.
 Deciding which exceptions should be recovered is done through a @scaladoc[PartialFunction](scala.PartialFunction). If an exception
 does not have a @scala[matching case] @java[match defined] the stream is failed. 
 
@@ -80,7 +80,7 @@ Java
 
 ## Recover with retries
 
-@apidoc[recoverWithRetries](akka.stream.*.Source) {scala="#recoverWithRetries[T>:Out](attempts:Int,pf:PartialFunction[Throwable,akka.stream.Graph[akka.stream.SourceShape[T],akka.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWithRetries(int,java.lang.Class,java.util.function.Supplier)"} allows you to put a new upstream in place of the failed one, recovering 
+@apidoc[recoverWithRetries](stream.*.Source) {scala="#recoverWithRetries[T>:Out](attempts:Int,pf:PartialFunction[Throwable,org.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],org.apache.pekko.NotUsed]]):FlowOps.this.Repr[T]" java="#recoverWithRetries(int,java.lang.Class,java.util.function.Supplier)"} allows you to put a new upstream in place of the failed one, recovering 
 stream failures up to a specified maximum number of times. 
 
 Deciding which exceptions should be recovered is done through a @scaladoc[PartialFunction](scala.PartialFunction). If an exception
@@ -106,7 +106,7 @@ Java
 
 ## Delayed restarts with a backoff operator
 
-Akka streams provides a @apidoc[akka.stream.*.RestartSource$], @apidoc[akka.stream.*.RestartSink$] and @apidoc[akka.stream.*.RestartFlow$] for implementing the so-called *exponential backoff 
+Akka streams provides a @apidoc[stream.*.RestartSource$], @apidoc[stream.*.RestartSink$] and @apidoc[stream.*.RestartFlow$] for implementing the so-called *exponential backoff 
 supervision strategy*, starting an operator again when it fails or completes, each time with a growing time delay between restarts.
 
 This pattern is useful when the operator fails or completes because some external resource is not available
@@ -115,7 +115,7 @@ when a WebSocket connection fails due to the HTTP server it's running on going d
 By using an exponential backoff, we avoid going into a tight reconnect loop, which both gives the HTTP server some time
 to recover, and it avoids using needless resources on the client side.
 
-The various restart shapes mentioned all expect an @apidoc[akka.stream.RestartSettings] which configures the restart behaviour.
+The various restart shapes mentioned all expect an @apidoc[stream.RestartSettings] which configures the restart behaviour.
 Configurable parameters are:
 
 * `minBackoff` is the initial duration until the underlying stream is restarted
@@ -124,8 +124,8 @@ Configurable parameters are:
 * `maxRestarts` caps the total number of restarts
 * `maxRestartsWithin` sets a timeframe during which restarts are counted towards the same total for `maxRestarts`
 
-The following snippet shows how to create a backoff supervisor using @apidoc[akka.stream.*.RestartSource$] 
-which will supervise the given @apidoc[akka.stream.*.Source]. The `Source` in this case is a 
+The following snippet shows how to create a backoff supervisor using @apidoc[stream.*.RestartSource$] 
+which will supervise the given @apidoc[stream.*.Source]. The `Source` in this case is a 
 stream of Server Sent Events, produced by akka-http. If the stream fails or completes at any point, the request will
 be made again, in increasing intervals of 3, 6, 12, 24 and finally 30 seconds (at which point it will remain capped due
 to the `maxBackoff` parameter):
@@ -143,7 +143,7 @@ and re-starting after the same configured interval. By adding additional randomn
 re-start intervals the streams will start in slightly different points in time, thus avoiding
 large spikes of traffic hitting the recovering server or other resource that they all need to contact.
 
-The above `RestartSource` will never terminate unless the @apidoc[akka.stream.*.Sink] it's fed into cancels. It will often be handy to use
+The above `RestartSource` will never terminate unless the @apidoc[stream.*.Sink] it's fed into cancels. It will often be handy to use
 it in combination with a @ref:[`KillSwitch`](stream-dynamic.md#kill-switch), so that you can terminate it when needed:
 
 Scala
@@ -152,16 +152,16 @@ Scala
 Java
 :   @@snip [RestartDocTest.java](/akka-docs/src/test/java/jdocs/stream/RestartDocTest.java) { #with-kill-switch }
 
-Sinks and flows can also be supervised, using @apidoc[akka.stream.*.RestartSink$] and @apidoc[akka.stream.*.RestartFlow$]. The `RestartSink` is restarted when
+Sinks and flows can also be supervised, using @apidoc[stream.*.RestartSink$] and @apidoc[stream.*.RestartFlow$]. The `RestartSink` is restarted when
 it cancels, while the `RestartFlow` is restarted when either the in port cancels, the out port completes, or the out
  port sends an error.
 
 @@@ note
 
 Care should be taken when using @ref[`GraphStage`s](stream-customize.md) that conditionally propagate termination signals inside a
-@apidoc[akka.stream.*.RestartSource$], @apidoc[akka.stream.*.RestartSink$] or @apidoc[akka.stream.*.RestartFlow$].  
+@apidoc[stream.*.RestartSource$], @apidoc[stream.*.RestartSink$] or @apidoc[stream.*.RestartFlow$].  
 
-An example is a @scaladoc[Broadcast](akka.stream.scaladsl.Broadcast) operator with the default `eagerCancel = false` where 
+An example is a @scaladoc[Broadcast](pekko.stream.scaladsl.Broadcast) operator with the default `eagerCancel = false` where 
 some of the outlets are for side-effecting branches (that do not re-join e.g. via a `Merge`). 
 A failure on a side branch will not terminate the supervised stream which will 
 not be restarted. Conversely, a failure on the main branch can trigger a restart but leave behind old
@@ -197,9 +197,9 @@ processing stream elements can be selected when materializing the stream through
 
 There are three ways to handle exceptions from application code:
 
- * @scala[@scaladoc[Stop](akka.stream.Supervision$$Stop$)]@java[@javadoc[Supervision.stop()](akka.stream.Supervision#stop())] - The stream is completed with failure.
- * @scala[@scaladoc[Resume](akka.stream.Supervision$$Resume$)]@java[@javadoc[Supervision.resume()](akka.stream.Supervision#resume())] - The element is dropped and the stream continues.
- * @scala[@scaladoc[Restart](akka.stream.Supervision$$Restart$)]@java[@javadoc[Supervision.restart()](akka.stream.Supervision#restart())] - The element is dropped and the stream continues after restarting the operator.
+ * @scala[@scaladoc[Stop](pekko.stream.Supervision$$Stop$)]@java[@javadoc[Supervision.stop()](pekko.stream.Supervision#stop())] - The stream is completed with failure.
+ * @scala[@scaladoc[Resume](pekko.stream.Supervision$$Resume$)]@java[@javadoc[Supervision.resume()](pekko.stream.Supervision#resume())] - The element is dropped and the stream continues.
+ * @scala[@scaladoc[Restart](pekko.stream.Supervision$$Restart$)]@java[@javadoc[Supervision.restart()](pekko.stream.Supervision#restart())] - The element is dropped and the stream continues after restarting the operator.
 Restarting an operator means that any accumulated state is cleared. This is typically
 performed by creating a new instance of the operator.
 
@@ -212,7 +212,7 @@ Scala
 Java
 :   @@snip [FlowErrorDocTest.java](/akka-docs/src/test/java/jdocs/stream/FlowErrorDocTest.java) { #stop }
 
-The default supervision strategy for a stream can be defined on the complete @apidoc[akka.stream.*.RunnableGraph].
+The default supervision strategy for a stream can be defined on the complete @apidoc[stream.*.RunnableGraph].
 
 Scala
 :   @@snip [FlowErrorDocSpec.scala](/akka-docs/src/test/scala/docs/stream/FlowErrorDocSpec.scala) { #resume }
@@ -238,7 +238,7 @@ Scala
 Java
 :   @@snip [FlowErrorDocTest.java](/akka-docs/src/test/java/jdocs/stream/FlowErrorDocTest.java) { #resume-section }
 
-@scala[@scaladoc[Restart](akka.stream.Supervision$$Restart$)]@java[@javadoc[Supervision.restart()](akka.stream.Supervision#restart())] works in a similar way as @scala[@scaladoc[Resume](akka.stream.Supervision$$Resume$)]@java[@javadoc[Supervision.resume()](akka.stream.Supervision#resume())] with the addition that accumulated state,
+@scala[@scaladoc[Restart](pekko.stream.Supervision$$Restart$)]@java[@javadoc[Supervision.restart()](pekko.stream.Supervision#restart())] works in a similar way as @scala[@scaladoc[Resume](pekko.stream.Supervision$$Resume$)]@java[@javadoc[Supervision.resume()](pekko.stream.Supervision#resume())] with the addition that accumulated state,
 if any, of the failing processing operator will be reset.
 
 Scala
@@ -249,7 +249,7 @@ Java
 
 ### Errors from mapAsync
 
-Stream supervision can also be applied to the futures of @apidoc[mapAsync](akka.stream.*.Source) {scala="#mapAsync[T](parallelism:Int)(f:Out=%3Escala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,akka.japi.function.Function)"} and @apidoc[mapAsyncUnordered](akka.stream.*.Source) {scala="#mapAsyncUnordered[T](parallelism:Int)(f:Out=%3Escala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsyncUnordered(int,akka.japi.function.Function)"} even if such
+Stream supervision can also be applied to the futures of @apidoc[mapAsync](stream.*.Source) {scala="#mapAsync[T](parallelism:Int)(f:Out=%3Escala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,org.apache.pekko.japi.function.Function)"} and @apidoc[mapAsyncUnordered](stream.*.Source) {scala="#mapAsyncUnordered[T](parallelism:Int)(f:Out=%3Escala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsyncUnordered(int,org.apache.pekko.japi.function.Function)"} even if such
 failures happen in the future rather than inside the operator itself.
 
 Let's say that we use an external service to lookup email addresses and we would like to
@@ -274,7 +274,7 @@ Java
 The @scala[@scaladoc[Future](scala.concurrent.Future)] @java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] is completed @scala[with `Failure`] @java[normally] if the email is not found.
 
 Transforming the stream of authors to a stream of email addresses by using the `lookupEmail`
-service can be done with @apidoc[mapAsync](akka.stream.*.Source) {scala="#mapAsync[T](parallelism:Int)(f:Out=%3Escala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,akka.japi.function.Function)"} and we use @scala[@scaladoc[Supervision.resumingDecider](akka.stream.Supervision$#resumingDecider:akka.stream.Supervision.Deciderwithakka.japi.function.Function[Throwable,akka.stream.Supervision.Directive])] @java[@javadoc[Supervision.getResumingDecider()](akka.stream.Supervision#getResumingDecider())] to drop
+service can be done with @apidoc[mapAsync](stream.*.Source) {scala="#mapAsync[T](parallelism:Int)(f:Out=%3Escala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,org.apache.pekko.japi.function.Function)"} and we use @scala[@scaladoc[Supervision.resumingDecider](pekko.stream.Supervision$#resumingDecider:org.apache.pekko.stream.Supervision.Deciderwithorg.apache.pekko.japi.function.Function[Throwable,org.apache.pekko.stream.Supervision.Directive])] @java[@javadoc[Supervision.getResumingDecider()](pekko.stream.Supervision#getResumingDecider())] to drop
 unknown email addresses:
 
 Scala
@@ -283,6 +283,6 @@ Scala
 Java
 :   @@snip [IntegrationDocTest.java](/akka-docs/src/test/java/jdocs/stream/IntegrationDocTest.java) { #email-addresses-mapAsync-supervision }
 
-If we would not use @scala[@scaladoc[Resume](akka.stream.Supervision$$Resume$)]@java[@javadoc[Supervision.resume()](akka.stream.Supervision#resume())] the default stopping strategy would complete the stream
+If we would not use @scala[@scaladoc[Resume](pekko.stream.Supervision$$Resume$)]@java[@javadoc[Supervision.resume()](pekko.stream.Supervision#resume())] the default stopping strategy would complete the stream
 with failure on the first @scala[`Future`] @java[`CompletionStage`] that was completed @scala[with `Failure`]@java[exceptionally].
 
diff --git a/akka-docs/src/main/paradox/stream/stream-flows-and-basics.md b/akka-docs/src/main/paradox/stream/stream-flows-and-basics.md
index a5f4ddbae8..72371ac089 100644
--- a/akka-docs/src/main/paradox/stream/stream-flows-and-basics.md
+++ b/akka-docs/src/main/paradox/stream/stream-flows-and-basics.md
@@ -100,14 +100,14 @@ Java
 
 After running (materializing) the `RunnableGraph[T]` we get back the materialized value of type T. Every stream
 operator can produce a materialized value, and it is the responsibility of the user to combine them to a new type.
-In the above example, we used @scaladoc[toMat](akka.stream.scaladsl.Source#toMat[Mat2,Mat3](sink:akka.stream.Graph[akka.stream.SinkShape[Out],Mat2])(combine:(Mat,Mat2)=%3EMat3):akka.stream.scaladsl.RunnableGraph[Mat3]) to indicate that we want to transform the materialized value of the source and
-sink, and we used the convenience function @scaladoc[Keep.right](akka.stream.scaladsl.Keep$#right[L,R]:(L,R)=%3ER) to say that we are only interested in the materialized value
+In the above example, we used @scaladoc[toMat](pekko.stream.scaladsl.Source#toMat[Mat2,Mat3](sink:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[Out],Mat2])(combine:(Mat,Mat2)=%3EMat3):org.apache.pekko.stream.scaladsl.RunnableGraph[Mat3]) to indicate that we want to transform the materialized value of the source and
+sink, and we used the convenience function @scaladoc[Keep.right](pekko.stream.scaladsl.Keep$#right[L,R]:(L,R)=%3ER) to say that we are only interested in the materialized value
 of the sink.
 
-In our example, the @scaladoc[Sink.fold](akka.stream.scaladsl.Sink$#fold[U,T](zero:U)(f:(U,T)=>U):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[U]]) materializes a value of type @scaladoc[Future](scala.concurrent.Future) which will represent the result
+In our example, the @scaladoc[Sink.fold](pekko.stream.scaladsl.Sink$#fold[U,T](zero:U)(f:(U,T)=>U):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[U]]) materializes a value of type @scaladoc[Future](scala.concurrent.Future) which will represent the result
 of the folding process over the stream.  In general, a stream can expose multiple materialized values,
 but it is quite common to be interested in only the value of the Source or the Sink in the stream. For this reason
-there is a convenience method called `runWith()` available for @scaladoc[Sink](akka.stream.scaladsl.Sink), @scaladoc[Source](akka.stream.scaladsl.Source) or @scaladoc[Flow](akka.stream.scaladsl.Flow) requiring, respectively,
+there is a convenience method called `runWith()` available for @scaladoc[Sink](pekko.stream.scaladsl.Sink), @scaladoc[Source](pekko.stream.scaladsl.Source) or @scaladoc[Flow](pekko.stream.scaladsl.Flow) requiring, respectively,
 a supplied `Source` (in order to run a `Sink`), a `Sink` (in order to run a `Source`) or
 both a `Source` and a `Sink` (in order to run a `Flow`, since it has neither attached yet).
 
@@ -115,14 +115,14 @@ both a `Source` and a `Sink` (in order to run a `Flow`, since it has neither att
 
 @@@ div { .group-java }
 
-After running (materializing) the @javadoc[RunnableGraph](akka.stream.javadsl.RunnableGraph) we get a special container object, the `MaterializedMap`. Both
+After running (materializing) the @javadoc[RunnableGraph](pekko.stream.javadsl.RunnableGraph) we get a special container object, the `MaterializedMap`. Both
 sources and sinks are able to put specific objects into this map. Whether they put something in or not is implementation
 dependent. 
 
-For example, a @javadoc[Sink.fold](akka.stream.javadsl.Sink$#fold(java.lang.Object,akka.japi.function.Function2)) will make a @javadoc[CompletionStage](java.util.concurrent.CompletionStage) available in this map which will represent the result
+For example, a @javadoc[Sink.fold](pekko.stream.javadsl.Sink$#fold(java.lang.Object,org.apache.pekko.japi.function.Function2)) will make a @javadoc[CompletionStage](java.util.concurrent.CompletionStage) available in this map which will represent the result
 of the folding process over the stream.  In general, a stream can expose multiple materialized values,
 but it is quite common to be interested in only the value of the Source or the Sink in the stream. For this reason
-there is a convenience method called `runWith()` available for @javadoc[Sink](akka.stream.javadsl.Sink), @javadoc[Source](akka.stream.javadsl.Source) or @javadoc[Flow](akka.stream.javadsl.Flow) requiring, respectively,
+there is a convenience method called `runWith()` available for @javadoc[Sink](pekko.stream.javadsl.Sink), @javadoc[Source](pekko.stream.javadsl.Source) or @javadoc[Flow](pekko.stream.javadsl.Flow) requiring, respectively,
 a supplied `Source` (in order to run a `Sink`), a `Sink` (in order to run a `Source`) or
 both a `Source` and a `Sink` (in order to run a `Flow`, since it has neither attached yet).
 @@@
@@ -292,7 +292,7 @@ operators due to avoiding the asynchronous messaging overhead
 only up to one CPU core is used for each fused part
 
 To allow for parallel processing you will have to insert asynchronous boundaries manually into your flows and
-operators by way of adding @apidoc[Attributes.asyncBoundary](stream.Attributes$) {scala="#asyncBoundary:akka.stream.Attributes" java="#asyncBoundary()"} using the method `async` on @apidoc[stream.*.Source], @apidoc[stream.*.Sink] and @apidoc[stream.*.Flow]
+operators by way of adding @apidoc[Attributes.asyncBoundary](stream.Attributes$) {scala="#asyncBoundary:org.apache.pekko.stream.Attributes" java="#asyncBoundary()"} using the method `async` on @apidoc[stream.*.Source], @apidoc[stream.*.Sink] and @apidoc[stream.*.Flow]
 to operators that shall communicate with the downstream of the graph in an asynchronous fashion.
 
 Scala
@@ -349,7 +349,7 @@ In Graphs it is possible to access the materialized value from inside the stream
 There are situations in which you require a @apidoc[stream.*.Source] materialized value **before** the `Source` gets hooked up to the rest of the graph.
 This is particularly useful in the case of "materialized value powered" `Source`s, like `Source.queue`, `Source.actorRef` or `Source.maybe`.
 
-By using the @apidoc[preMaterialize](stream.*.Source) {scala="#preMaterialize()(implicitmaterializer:akka.stream.Materializer):(Mat,Source.this.ReprMat[Out,akka.NotUsed])" java="#preMaterialize(akka.stream.Materializer)"} operator on a `Source`, you can obtain its materialized value and another `Source`. The latter can be used
+By using the @apidoc[preMaterialize](stream.*.Source) {scala="#preMaterialize()(implicitmaterializer:org.apache.pekko.stream.Materializer):(Mat,Source.this.ReprMat[Out,org.apache.pekko.NotUsed])" java="#preMaterialize(org.apache.pekko.stream.Materializer)"} operator on a `Source`, you can obtain its materialized value and another `Source`. The latter can be used
 to consume messages from the original `Source`. Note that this can be materialized multiple times.
 
 Scala
@@ -364,8 +364,8 @@ In Akka Streams almost all computation operators *preserve input order* of eleme
 "cause" outputs `{OA1,OA2,...,OAk}` and inputs `{IB1,IB2,...,IBm}` "cause" outputs `{OB1,OB2,...,OBl}` and all of
 `IAi` happened before all `IBi` then `OAi` happens before `OBi`.
 
-This property is even upheld by async operations such as @apidoc[mapAsync](stream.*.Source) { scala="#mapAsync[T](parallelism:Int)(f:Out=%3Escala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,akka.japi.function.Function)" }, however an unordered version exists
-called @apidoc[mapAsyncUnordered](stream.*.Source) { scala="#mapAsyncUnordered[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsyncUnordered(int,akka.japi.function.Function)" } which does not preserve this ordering.
+This property is even upheld by async operations such as @apidoc[mapAsync](stream.*.Source) { scala="#mapAsync[T](parallelism:Int)(f:Out=%3Escala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsync(int,org.apache.pekko.japi.function.Function)" }, however an unordered version exists
+called @apidoc[mapAsyncUnordered](stream.*.Source) { scala="#mapAsyncUnordered[T](parallelism:Int)(f:Out=>scala.concurrent.Future[T]):FlowOps.this.Repr[T]" java="#mapAsyncUnordered(int,org.apache.pekko.japi.function.Function)" } which does not preserve this ordering.
 
 However, in the case of Junctions which handle multiple input streams (e.g. `Merge`) the output order is,
 in general, *not defined* for elements arriving on different input ports. That is a merge-like operation may emit `Ai`
@@ -379,23 +379,23 @@ merge is performed.
 
 ## Actor Materializer Lifecycle
 
-The @apidoc[akka.stream.Materializer] is a component that is responsible for turning the stream blueprint into a running stream
-and emitting the "materialized value". An @apidoc[akka.actor.ActorSystem] wide `Materializer` is provided by the Akka `Extension` 
+The @apidoc[stream.Materializer] is a component that is responsible for turning the stream blueprint into a running stream
+and emitting the "materialized value". An @apidoc[actor.ActorSystem] wide `Materializer` is provided by the Akka `Extension` 
 @apidoc[SystemMaterializer] by @scala[having an implicit `ActorSystem` in scope]@java[passing the `ActorSystem` to the 
 various `run` methods] this way there is no need to worry about the `Materializer` unless there are special requirements.
 
 The use case that may require a custom instance of `Materializer` is when all streams materialized in an actor should be tied to the Actor lifecycle and stop if the Actor stops or crashes. 
 
 An important aspect of working with streams and actors is understanding a `Materializer`'s life-cycle.
-The materializer is bound to the lifecycle of the @apidoc[akka.actor.ActorRefFactory] it is created from, which in practice will
-be either an @apidoc[akka.actor.ActorSystem] or @apidoc[ActorContext](akka.actor.ActorContext) (when the materializer is created within an @apidoc[akka.actor.Actor]). 
+The materializer is bound to the lifecycle of the @apidoc[actor.ActorRefFactory] it is created from, which in practice will
+be either an @apidoc[actor.ActorSystem] or @apidoc[ActorContext](actor.ActorContext) (when the materializer is created within an @apidoc[actor.Actor]). 
 
 Tying it to the `ActorSystem` should be replaced with using the system materializer from Akka 2.6 and on.
 
 When run by the system materializer the streams will run until the `ActorSystem` is shut down. When the materializer is shut down
 *before* the streams have run to completion, they will be terminated abruptly. This is a little different than the
 usual way to terminate streams, which is by cancelling/completing them. The stream lifecycles are bound to the materializer
-like this to prevent leaks, and in normal operations you should not rely on the mechanism and rather use @apidoc[akka.stream.KillSwitch] or
+like this to prevent leaks, and in normal operations you should not rely on the mechanism and rather use @apidoc[stream.KillSwitch] or
 normal completion signals to manage the lifecycles of your streams.  
 
 If we look at the following example, where we create the `Materializer` within an `Actor`:
@@ -406,10 +406,10 @@ Scala
 Java
 :   @@snip [FlowDocTest.java](/akka-docs/src/test/java/jdocs/stream/FlowDocTest.java) { #materializer-from-actor-context }
 
-In the above example we used the @apidoc[akka.actor.ActorContext] to create the materializer. This binds its lifecycle to the surrounding @apidoc[akka.actor.Actor]. In other words, while the stream we started there would under normal circumstances run forever, if we stop the Actor it would terminate the stream as well. We have *bound the stream's lifecycle to the surrounding actor's lifecycle*.
+In the above example we used the @apidoc[actor.ActorContext] to create the materializer. This binds its lifecycle to the surrounding @apidoc[actor.Actor]. In other words, while the stream we started there would under normal circumstances run forever, if we stop the Actor it would terminate the stream as well. We have *bound the stream's lifecycle to the surrounding actor's lifecycle*.
 This is a very useful technique if the stream is closely related to the actor, e.g. when the actor represents a user or other entity, that we continuously query using the created stream -- and it would not make sense to keep the stream alive when the actor has terminated already. The streams termination will be signalled by an "Abrupt termination exception" signaled by the stream.
 
-You may also cause a `Materializer` to shut down by explicitly calling @apidoc[shutdown()](akka.stream.Materializer) {scala="#shutdown():Unit" java="#shutdown()"} on it, resulting in abruptly terminating all of the streams it has been running then. 
+You may also cause a `Materializer` to shut down by explicitly calling @apidoc[shutdown()](stream.Materializer) {scala="#shutdown():Unit" java="#shutdown()"} on it, resulting in abruptly terminating all of the streams it has been running then. 
 
 Sometimes, however, you may want to explicitly create a stream that will out-last the actor's life.
 For example, you are using an Akka stream to push some large stream of data to an external service.
@@ -421,13 +421,13 @@ Scala
 Java
 :   @@snip [FlowDocTest.java](/akka-docs/src/test/java/jdocs/stream/FlowDocTest.java) { #materializer-from-system-in-actor }
 
-In the above example we pass in a materializer to the Actor, which results in binding its lifecycle to the entire @apidoc[akka.actor.ActorSystem] rather than the single enclosing actor. This can be useful if you want to share a materializer or group streams into specific materializers,
+In the above example we pass in a materializer to the Actor, which results in binding its lifecycle to the entire @apidoc[actor.ActorSystem] rather than the single enclosing actor. This can be useful if you want to share a materializer or group streams into specific materializers,
 for example because of the materializer's settings etc.
 
 @@@ warning
 
-Do not create new actor materializers inside actors by passing the @scala[@scaladoc[context.system](akka.actor.ActorContext#system:akka.actor.ActorSystem)]@java[@javadoc[context.system()](akka.actor.ActorContext#system())] to it. 
-This will cause a new @apidoc[akka.stream.Materializer] to be created and potentially leaked (unless you shut it down explicitly) for each such actor.
+Do not create new actor materializers inside actors by passing the @scala[@scaladoc[context.system](pekko.actor.ActorContext#system:org.apache.pekko.actor.ActorSystem)]@java[@javadoc[context.system()](pekko.actor.ActorContext#system())] to it. 
+This will cause a new @apidoc[stream.Materializer] to be created and potentially leaked (unless you shut it down explicitly) for each such actor.
 It is instead recommended to either pass-in the Materializer or create one using the actor's `context`.
 
 @@@
diff --git a/akka-docs/src/main/paradox/stream/stream-graphs.md b/akka-docs/src/main/paradox/stream/stream-graphs.md
index 5aead50d37..bbb4af7c3c 100644
--- a/akka-docs/src/main/paradox/stream/stream-graphs.md
+++ b/akka-docs/src/main/paradox/stream/stream-graphs.md
@@ -68,7 +68,7 @@ Scala
 :   @@snip [GraphDSLDocSpec.scala](/akka-docs/src/test/scala/docs/stream/GraphDSLDocSpec.scala) { #simple-graph-dsl }
 
 Java
-:   @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/GraphDslTest.java) { #simple-graph-dsl }
+:   @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/GraphDslTest.java) { #simple-graph-dsl }
 
 @@@ note
 
@@ -103,16 +103,16 @@ Scala
 :   @@snip [GraphDSLDocSpec.scala](/akka-docs/src/test/scala/docs/stream/GraphDSLDocSpec.scala) { #graph-dsl-reusing-a-flow }
 
 Java
-:   @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/GraphDslTest.java) { #graph-dsl-reusing-a-flow }
+:   @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/GraphDslTest.java) { #graph-dsl-reusing-a-flow }
 
 In some cases we may have a list of graph elements, for example if they are dynamically created. 
 If these graphs have similar signatures, we can construct a graph collecting all their materialized values as a collection:
 
 Scala
-:   @@snip [GraphOpsIntegrationSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala) { #graph-from-list }
+:   @@snip [GraphOpsIntegrationSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/GraphOpsIntegrationSpec.scala) { #graph-from-list }
 
 Java
-:   @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/GraphDslTest.java) { #graph-from-list }
+:   @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/GraphDslTest.java) { #graph-from-list }
 
 
 
@@ -303,7 +303,7 @@ this purpose exists the special type `BidiFlow` which is a graph that
 has exactly two open inlets and two open outlets. The corresponding shape is
 called `BidiShape` and is defined like this:
 
-@@snip [Shape.scala](/akka-stream/src/main/scala/akka/stream/Shape.scala) { #bidi-shape }   
+@@snip [Shape.scala](/akka-stream/src/main/scala/org/apache/pekko/stream/Shape.scala) { #bidi-shape }   
 
 
 A bidirectional flow is defined just like a unidirectional `Flow` as
@@ -370,7 +370,7 @@ Scala
 :   @@snip [GraphDSLDocSpec.scala](/akka-docs/src/test/scala/docs/stream/GraphDSLDocSpec.scala) { #graph-dsl-matvalue }
 
 Java
-:   @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/GraphDslTest.java) { #graph-dsl-matvalue }
+:   @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/GraphDslTest.java) { #graph-dsl-matvalue }
 
 
 Be careful not to introduce a cycle where the materialized value actually contributes to the materialized value.
@@ -380,7 +380,7 @@ Scala
 :  @@snip [GraphDSLDocSpec.scala](/akka-docs/src/test/scala/docs/stream/GraphDSLDocSpec.scala) { #graph-dsl-matvalue-cycle }
 
 Java
-:  @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/GraphDslTest.java) { #graph-dsl-matvalue-cycle }
+:  @@snip [GraphDSLTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/GraphDslTest.java) { #graph-dsl-matvalue-cycle }
 
 
 
diff --git a/akka-docs/src/main/paradox/stream/stream-io.md b/akka-docs/src/main/paradox/stream/stream-io.md
index bc0a9275db..c1b36ae1c3 100644
--- a/akka-docs/src/main/paradox/stream/stream-io.md
+++ b/akka-docs/src/main/paradox/stream/stream-io.md
@@ -24,7 +24,7 @@ as the library does it transparently for you.
 
 ### Accepting connections: Echo Server
 
-In order to implement a simple EchoServer we `bind` to a given address, which returns a @scala[@apidoc[stream.*.Source]\[@apidoc[IncomingConnection](akka.stream.*.Tcp.IncomingConnection), @scaladoc[Future](scala.concurrent.Future)\[@apidoc[ServerBinding](akka.stream.*.Tcp.ServerBinding)\]]@java[@apidoc[stream.*.Source]<@apidoc[IncomingConnection](akka.stream.*.Tcp.IncomingConnection), @javadoc[CompletionStage](java.util.concurrent.CompletionStage)<@apidoc[ServerBinding](akka.stream.*.Tcp.ServerBinding)>>],
+In order to implement a simple EchoServer we `bind` to a given address, which returns a @scala[@apidoc[stream.*.Source]\[@apidoc[IncomingConnection](stream.*.Tcp.IncomingConnection), @scaladoc[Future](scala.concurrent.Future)\[@apidoc[ServerBinding](stream.*.Tcp.ServerBinding)\]]@java[@apidoc[stream.*.Source]<@apidoc[IncomingConnection](stream.*.Tcp.IncomingConnection), @javadoc[CompletionStage](java.util.concurrent.CompletionStage)<@apidoc[ServerBinding](stream.*.Tcp.ServerBinding)>>],
 which will emit an `IncomingConnection` element for each new connection that the Server should handle:
 
 Scala
@@ -36,8 +36,8 @@ Java
 ![tcp-stream-bind.png](../images/tcp-stream-bind.png)
 
 Next, we handle *each* incoming connection using a @apidoc[stream.*.Flow] which will be used as the operator
-to handle and emit @apidoc[akka.util.ByteString] s from and to the TCP Socket. Since one `ByteString` does not have to necessarily
-correspond to exactly one line of text (the client might be sending the line in chunks) we use the @apidoc[Framing.delimiter](akka.stream.*.Framing$) {scala="#delimiter(delimiter:akka.util.ByteString,maximumFrameLength:Int,allowTruncation:Boolean):akka.stream.scaladsl.Flow[akka.util.ByteString,akka.util.ByteString,akka.NotUsed]" java="#delimiter(akka.util.ByteString,int,akka.stream.javadsl.FramingTruncation)"}
+to handle and emit @apidoc[util.ByteString] s from and to the TCP Socket. Since one `ByteString` does not have to necessarily
+correspond to exactly one line of text (the client might be sending the line in chunks) we use the @apidoc[Framing.delimiter](stream.*.Framing$) {scala="#delimiter(delimiter:org.apache.pekko.util.ByteString,maximumFrameLength:Int,allowTruncation:Boolean):org.apache.pekko.stream.scaladsl.Flow[org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.NotUsed]" java="#delimiter(org.apache.pekko.util.ByteString,int,org.apache.pekko.stream.javadsl.FramingTruncation)"}
 helper Flow to chunk the inputs up into actual lines of text. The last boolean
 argument indicates that we require an explicit line ending even for the last message before the connection is closed.
 In this example we add exclamation marks to each incoming text message and push it through the flow:
@@ -55,8 +55,8 @@ incoming connection Flow, since it directly corresponds to an existing, already
 only ever be materialized *once*.
 
 Closing connections is possible by cancelling the *incoming connection* @apidoc[stream.*.Flow] from your server logic (e.g. by
-connecting its downstream to a @apidoc[Sink.cancelled](akka.stream.*.Sink$) {scala="#cancelled[T]:akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#cancelled()"} and its upstream to a @apidoc[Source.empty](akka.stream.*.Source$) {scala="#empty[T]:akka.stream.scaladsl.Source[T,akka.NotUsed]" java="#empty()"}.
-It is also possible to shut down the server's socket by cancelling the @apidoc[IncomingConnection](akka.stream.*.Tcp.IncomingConnection) source `connections`.
+connecting its downstream to a @apidoc[Sink.cancelled](stream.*.Sink$) {scala="#cancelled[T]:org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#cancelled()"} and its upstream to a @apidoc[Source.empty](stream.*.Source$) {scala="#empty[T]:org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.NotUsed]" java="#empty()"}.
+It is also possible to shut down the server's socket by cancelling the @apidoc[IncomingConnection](stream.*.Tcp.IncomingConnection) source `connections`.
 
 We can then test the TCP server by sending data to the TCP Socket using `netcat`:
 
@@ -80,7 +80,7 @@ Java
 
 The `repl` flow we use to handle the server interaction first prints the servers response, then awaits on input from
 the command line (this blocking call is used here for the sake of simplicity) and converts it to a
-@apidoc[akka.util.ByteString] which is then sent over the wire to the server. Then we connect the TCP pipeline to this
+@apidoc[util.ByteString] which is then sent over the wire to the server. Then we connect the TCP pipeline to this
 operator–at this point it will be materialized and start processing data once the server responds with
 an *initial message*.
 
@@ -117,8 +117,8 @@ Scala
 Java
 :   @@snip [StreamTcpDocTest.java](/akka-docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java) { #welcome-banner-chat-server }
 
-To emit the initial message we merge a @apidoc[akka.stream.*.Source] with a single element, after the command processing but before the
-framing and transformation to @apidoc[akka.util.ByteString] s this way we do not have to repeat such logic.
+To emit the initial message we merge a @apidoc[stream.*.Source] with a single element, after the command processing but before the
+framing and transformation to @apidoc[util.ByteString] s this way we do not have to repeat such logic.
 
 In this example both client and server may need to close the stream based on a parsed command - `BYE` in the case
 of the server, and `q` in the case of the client. This is implemented by @scala[taking from the stream until `q` and
@@ -130,38 +130,38 @@ which completes the stream once it encounters such command].
 Streaming transport protocols like TCP only pass streams of bytes, and does not know what is a logical chunk of bytes from the
 application's point of view. Often when implementing network protocols you will want to introduce your own framing.
 This can be done in two ways:
-An end-of-frame marker, e.g. end line `\n`, can do framing via @apidoc[Framing.delimiter](akka.stream.*.Framing$) {scala="#delimiter(delimiter:akka.util.ByteString,maximumFrameLength:Int,allowTruncation:Boolean):akka.stream.scaladsl.Flow[akka.util.ByteString,akka.util.ByteString,akka.NotUsed]" java="#delimiter(akka.util.ByteString,int,akka.stream.javadsl.FramingTruncation)"}.
+An end-of-frame marker, e.g. end line `\n`, can do framing via @apidoc[Framing.delimiter](stream.*.Framing$) {scala="#delimiter(delimiter:org.apache.pekko.util.ByteString,maximumFrameLength:Int,allowTruncation:Boolean):org.apache.pekko.stream.scaladsl.Flow[org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.NotUsed]" java="#delimiter(org.apache.pekko.util.ByteString,int,org.apache.pekko.stream.javadsl.FramingTruncation)"}.
 Or a length-field can be used to build a framing protocol.
-There is a bidi implementing this protocol provided by @apidoc[Framing.simpleFramingProtocol](akka.stream.*.Framing$) {scala="#simpleFramingProtocol(maximumMessageLength:Int):akka.stream.scaladsl.BidiFlow[akka.util.ByteString,akka.util.ByteString,akka.util.ByteString,akka.util.ByteString,akka.NotUsed]" java="#simpleFramingProtocol(int)"}.
+There is a bidi implementing this protocol provided by @apidoc[Framing.simpleFramingProtocol](stream.*.Framing$) {scala="#simpleFramingProtocol(maximumMessageLength:Int):org.apache.pekko.stream.scaladsl.BidiFlow[org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.NotUsed]" java="#simpleFramingProtocol(int)"}.
 
-@scala[@scaladoc[JsonFraming](akka.stream.scaladsl.JsonFraming$#objectScanner(maximumObjectLength:Int):akka.stream.scaladsl.Flow[akka.util.ByteString,akka.util.ByteString,akka.NotUsed])]@java[@javadoc[JsonFraming](akka.stream.javadsl.JsonFraming#objectScanner(int))] separates valid JSON objects from incoming @apidoc[akka.util.ByteString] objects:
+@scala[@scaladoc[JsonFraming](pekko.stream.scaladsl.JsonFraming$#objectScanner(maximumObjectLength:Int):org.apache.pekko.stream.scaladsl.Flow[org.apache.pekko.util.ByteString,org.apache.pekko.util.ByteString,org.apache.pekko.NotUsed])]@java[@javadoc[JsonFraming](pekko.stream.javadsl.JsonFraming#objectScanner(int))] separates valid JSON objects from incoming @apidoc[util.ByteString] objects:
 
 Scala
-:  @@snip [JsonFramingSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/scaladsl/JsonFramingSpec.scala) { #using-json-framing }
+:  @@snip [JsonFramingSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/JsonFramingSpec.scala) { #using-json-framing }
 
 Java
-:  @@snip [JsonFramingTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/JsonFramingTest.java) { #using-json-framing }
+:  @@snip [JsonFramingTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/JsonFramingTest.java) { #using-json-framing }
 
 ### TLS
 
 Similar factories as shown above for raw TCP but where the data is encrypted using TLS are available from `Tcp`
 through `outgoingConnectionWithTls`, `bindWithTls` and `bindAndHandleWithTls`,
-see the @scala[@scaladoc[`Tcp Scaladoc`](akka.stream.scaladsl.Tcp)]@java[@javadoc[`Tcp Javadoc`](akka.stream.javadsl.Tcp)]  for details.
+see the @scala[@scaladoc[`Tcp Scaladoc`](pekko.stream.scaladsl.Tcp)]@java[@javadoc[`Tcp Javadoc`](pekko.stream.javadsl.Tcp)]  for details.
 
 Using TLS requires a keystore and a truststore and then a somewhat involved dance of configuring the SSLEngine and the details for how the session should be negotiated:
 
 Scala
-:  @@snip [TcpSpec.scala](/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala) { #setting-up-ssl-engine }
+:  @@snip [TcpSpec.scala](/akka-stream-tests/src/test/scala/org/apache/pekko/stream/io/TcpSpec.scala) { #setting-up-ssl-engine }
 
 Java
-:  @@snip [TcpTest.java](/akka-stream-tests/src/test/java/akka/stream/javadsl/TcpTest.java) { #setting-up-ssl-engine }
+:  @@snip [TcpTest.java](/akka-stream-tests/src/test/java/org/apache/pekko/stream/javadsl/TcpTest.java) { #setting-up-ssl-engine }
 
 
 The `SSLEngine` instance can then be used with the binding or outgoing connection factory methods.
 
 ## Streaming File IO
 
-Akka Streams provide simple Sources and Sinks that can work with @apidoc[akka.util.ByteString] instances to perform IO operations
+Akka Streams provide simple Sources and Sinks that can work with @apidoc[util.ByteString] instances to perform IO operations
 on files.
 
 Streaming data from a file is as easy as creating a *FileIO.fromPath* given a target path, and an optional
diff --git a/akka-docs/src/main/paradox/stream/stream-parallelism.md b/akka-docs/src/main/paradox/stream/stream-parallelism.md
index d2f611c705..96320c7f29 100644
--- a/akka-docs/src/main/paradox/stream/stream-parallelism.md
+++ b/akka-docs/src/main/paradox/stream/stream-parallelism.md
@@ -84,7 +84,7 @@ it is easy to add a third frying pan with Patrik's method, but Roland cannot add
 since that would require a third processing step, which is not practically possible in the case of frying pancakes.
 
 One drawback of the example code above is it does not preserve the ordering of pancakes. This might be a problem
-if children like to track their "own" pancakes. In those cases the @apidoc[akka.stream.*.Balance$] and @apidoc[akka.stream.*.Merge$] operators should be replaced
+if children like to track their "own" pancakes. In those cases the @apidoc[stream.*.Balance$] and @apidoc[stream.*.Merge$] operators should be replaced
 by round-robin balancing and merging operators which put in and take out pancakes in a strict order.
 
 A more detailed example of creating a worker pool can be found in the cookbook: @ref:[Balancing jobs to a fixed pool of workers](stream-cookbook.md#cookbook-balance)
diff --git a/akka-docs/src/main/paradox/stream/stream-quickstart.md b/akka-docs/src/main/paradox/stream/stream-quickstart.md
index be7c9add3c..55a43d66d6 100644
--- a/akka-docs/src/main/paradox/stream/stream-quickstart.md
+++ b/akka-docs/src/main/paradox/stream/stream-quickstart.md
@@ -38,7 +38,7 @@ Scala
 Java
 :   @@snip [QuickStartDocTest.java](/akka-docs/src/test/java/jdocs/stream/QuickStartDocTest.java) { #other-imports }
 
-And @scala[an object]@java[a class] to start an Akka @apidoc[akka.actor.ActorSystem] and hold your code @scala[. Making the `ActorSystem`
+And @scala[an object]@java[a class] to start an Akka @apidoc[actor.ActorSystem] and hold your code @scala[. Making the `ActorSystem`
 implicit makes it available to the streams without manually passing it when running them]:
 
 Scala
@@ -55,11 +55,11 @@ Scala
 Java
 :   @@snip [QuickStartDocTest.java](/akka-docs/src/test/java/jdocs/stream/QuickStartDocTest.java) { #create-source }
 
-The @apidoc[akka.stream.*.Source] type is parameterized with two types: the first one is the
+The @apidoc[stream.*.Source] type is parameterized with two types: the first one is the
 type of element that this source emits and the second one, the "materialized value", allows
 running the source to produce some auxiliary value (e.g. a network source may
 provide information about the bound port or the peer’s address). Where no
-auxiliary information is produced, the type @apidoc[akka.NotUsed] is used. A
+auxiliary information is produced, the type @apidoc[NotUsed] is used. A
 simple range of integers falls into this category - running our stream produces
 a `NotUsed`.
 
@@ -80,8 +80,8 @@ part of the method name; there are other methods that run Akka Streams, and
 they all follow this pattern.
 
 When running this @scala[source in a `scala.App`]@java[program] you might notice it does not
-terminate, because the @apidoc[akka.actor.ActorSystem] is never terminated. Luckily
-@apidoc[runForeach](akka.stream.*.Source) {scala="#runForeach(f:Out=%3EUnit)(implicitmaterializer:akka.stream.Materializer):scala.concurrent.Future[akka.Done]" java="#runForeach(akka.japi.function.Procedure,akka.stream.Materializer)"} returns a @scala[@scaladoc[Future](scala.concurrent.Future)[@apidoc[akka.Done]]]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)<@apidoc[akka.Done]>] which resolves when the stream finishes:
+terminate, because the @apidoc[actor.ActorSystem] is never terminated. Luckily
+@apidoc[runForeach](stream.*.Source) {scala="#runForeach(f:Out=%3EUnit)(implicitmaterializer:org.apache.pekko.stream.Materializer):scala.concurrent.Future[org.apache.pekko.Done]" java="#runForeach(org.apache.pekko.japi.function.Procedure,org.apache.pekko.stream.Materializer)"} returns a @scala[@scaladoc[Future](scala.concurrent.Future)[@apidoc[org.apache.pekko.Done]]]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)<@apidoc[org.apache.pekko.Done]>] which resolves when the stream finishes:
 
 Scala
 :   @@snip [QuickStartDocSpec.scala](/akka-docs/src/test/scala/docs/stream/QuickStartDocSpec.scala) { #run-source-and-terminate }
@@ -100,17 +100,17 @@ Scala
 Java
 :   @@snip [QuickStartDocTest.java](/akka-docs/src/test/java/jdocs/stream/QuickStartDocTest.java) { #transform-source }
 
-First we use the @apidoc[scan](akka.stream.*.Source) {scala="#scan[T](zero:T)(f:(T,Out)=%3ET):FlowOps.this.Repr[T]" java="#scan(T,akka.japi.function.Function2)"} operator to run a computation over the whole
+First we use the @apidoc[scan](stream.*.Source) {scala="#scan[T](zero:T)(f:(T,Out)=%3ET):FlowOps.this.Repr[T]" java="#scan(T,org.apache.pekko.japi.function.Function2)"} operator to run a computation over the whole
 stream: starting with the number 1 (@scala[`BigInt(1)`]@java[`BigInteger.ONE`]) we multiply by each of
 the incoming numbers, one after the other; the scan operation emits the initial
 value and then every calculation result. This yields the series of factorial
 numbers which we stash away as a `Source` for later reuse—it is
 important to keep in mind that nothing is actually computed yet, this is a
 description of what we want to have computed once we run the stream. Then we
-convert the resulting series of numbers into a stream of @apidoc[akka.util.ByteString]
+convert the resulting series of numbers into a stream of @apidoc[util.ByteString]
 objects describing lines in a text file. This stream is then run by attaching a
 file as the receiver of the data. In the terminology of Akka Streams this is
-called a @apidoc[akka.stream.*.Sink]. @apidoc[akka.stream.IOResult] is a type that IO operations return in
+called a @apidoc[stream.*.Sink]. @apidoc[stream.IOResult] is a type that IO operations return in
 Akka Streams in order to tell you how many bytes or elements were consumed and
 whether the stream terminated normally or exceptionally.
 
@@ -126,12 +126,12 @@ Here is another example that you can edit and run in the browser:
 
 One of the nice parts of Akka Streams—and something that other stream libraries
 do not offer—is that not only sources can be reused like blueprints, all other
-elements can be as well. We can take the file-writing @apidoc[akka.stream.*.Sink], prepend
-the processing steps necessary to get the @apidoc[akka.util.ByteString] elements from
+elements can be as well. We can take the file-writing @apidoc[stream.*.Sink], prepend
+the processing steps necessary to get the @apidoc[util.ByteString] elements from
 incoming strings and package that up as a reusable piece as well. Since the
 language for writing these streams always flows from left to right (just like
 plain English), we need a starting point that is like a source but with an
-“open” input. In Akka Streams this is called a @apidoc[akka.stream.*.Flow]:
+“open” input. In Akka Streams this is called a @apidoc[stream.*.Flow]:
 
 Scala
 :   @@snip [QuickStartDocSpec.scala](/akka-docs/src/test/scala/docs/stream/QuickStartDocSpec.scala) { #transform-sink }
@@ -143,13 +143,13 @@ Starting from a flow of strings we convert each to `ByteString` and then
 feed to the already known file-writing `Sink`. The resulting blueprint
 is a @scala[`Sink[String, Future[IOResult]]`]@java[`Sink>`], which means that it
 accepts strings as its input and when materialized it will create auxiliary
-information of type @scala[@scaladoc[Future](scala.concurrent.Future)[@apidoc[akka.stream.IOResult]]]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)<@apidoc[akka.stream.IOResult]>] (when chaining operations on
+information of type @scala[@scaladoc[Future](scala.concurrent.Future)[@apidoc[stream.IOResult]]]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)<@apidoc[stream.IOResult]>] (when chaining operations on
 a `Source` or `Flow` the type of the auxiliary information—called
 the “materialized value”—is given by the leftmost starting point; since we want
-to retain what the @apidoc[FileIO.toPath](akka.stream.*.FileIO$) {scala="#toPath(f:java.nio.file.Path,options:Set[java.nio.file.OpenOption],startPosition:Long):akka.stream.scaladsl.Sink[akka.util.ByteString,scala.concurrent.Future[akka.stream.IOResult]]" java="#toPath(java.nio.file.Path)"} sink has to offer, we need to say
-@scala[@scaladoc[Keep.right](akka.stream.scaladsl.Keep$#right[L,R]:(L,R)=%3ER)]@java[@javadoc[Keep.right()](akka.stream.javadsl.Keep$#right())].
+to retain what the @apidoc[FileIO.toPath](stream.*.FileIO$) {scala="#toPath(f:java.nio.file.Path,options:Set[java.nio.file.OpenOption],startPosition:Long):org.apache.pekko.stream.scaladsl.Sink[org.apache.pekko.util.ByteString,scala.concurrent.Future[org.apache.pekko.stream.IOResult]]" java="#toPath(java.nio.file.Path)"} sink has to offer, we need to say
+@scala[@scaladoc[Keep.right](pekko.stream.scaladsl.Keep$#right[L,R]:(L,R)=%3ER)]@java[@javadoc[Keep.right()](pekko.stream.javadsl.Keep$#right())].
 
-We can use the new and shiny @apidoc[akka.stream.*.Sink] we just created by
+We can use the new and shiny @apidoc[stream.*.Sink] we just created by
 attaching it to our `factorials` source—after a small adaptation to turn the
 numbers into strings:
 
@@ -164,7 +164,7 @@ Java
 Before we start looking at a more involved example we explore the streaming
 nature of what Akka Streams can do. Starting from the `factorials` source
 we transform the stream by zipping it together with another stream,
-represented by a @apidoc[akka.stream.*.Source] that emits the number 0 to 100: the first
+represented by a @apidoc[stream.*.Source] that emits the number 0 to 100: the first
 number emitted by the `factorials` source is the factorial of zero, the
 second is the factorial of one, and so on. We combine these two by forming
 strings like `"3! = 6"`.
@@ -178,7 +178,7 @@ Java
 All operations so far have been time-independent and could have been performed
 in the same fashion on strict collections of elements. The next line
 demonstrates that we are in fact dealing with streams that can flow at a
-certain speed: we use the @apidoc[throttle](akka.stream.*.Source) {scala="#throttle(elements:Int,per:scala.concurrent.duration.FiniteDuration):FlowOps.this.Repr[Out]" java="#throttle(int,java.time.Duration)"} operator to slow down the stream to 1
+certain speed: we use the @apidoc[throttle](stream.*.Source) {scala="#throttle(elements:Int,per:scala.concurrent.duration.FiniteDuration):FlowOps.this.Repr[Out]" java="#throttle(int,java.time.Duration)"} operator to slow down the stream to 1
 element per second.
 
 If you run this program you will see one line printed per second. One aspect
@@ -230,7 +230,7 @@ sections of the docs, and then come back to this quickstart to see it all pieced
 The example application we will be looking at is a simple Twitter feed stream from which we'll want to extract certain information,
 like for example finding all twitter handles of users who tweet about `#akka`.
 
-In order to prepare our environment by creating an @apidoc[akka.actor.ActorSystem] which will be responsible for running the streams we are about to create:
+In order to prepare our environment by creating an @apidoc[actor.ActorSystem] which will be responsible for running the streams we are about to create:
 
 Scala
 :   @@snip [TwitterStreamQuickstartDocSpec.scala](/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala) { #system-setup }
@@ -267,7 +267,7 @@ Java
 
 Finally in order to @ref:[materialize](stream-flows-and-basics.md#stream-materialization) and run the stream computation we need to attach
 the Flow to a @scala[`Sink`]@java[`Sink`] that will get the Flow running. The simplest way to do this is to call
-@apidoc[runWith(sink)](akka.stream.*.Source) {scala="#runWith[Mat2](sink:akka.stream.Graph[akka.stream.SinkShape[Out],Mat2])(implicitmaterializer:akka.stream.Materializer):Mat2" java="#runWith(akka.stream.Graph,akka.actor.ClassicActorSystemProvider)"} on a @scala[`Source`]@java[`Source`]. For convenience a number of common Sinks are predefined and collected as @java[static] methods on
+@apidoc[runWith(sink)](stream.*.Source) {scala="#runWith[Mat2](sink:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[Out],Mat2])(implicitmaterializer:org.apache.pekko.stream.Materializer):Mat2" java="#runWith(org.apache.pekko.stream.Graph,org.apache.pekko.actor.ClassicActorSystemProvider)"} on a @scala[`Source`]@java[`Source`]. For convenience a number of common Sinks are predefined and collected as @java[static] methods on
 the @scala[`Sink` companion object]@java[`Sink class`].
 For now let's print each author:
 
@@ -277,7 +277,7 @@ Scala
 Java
 :   @@snip [TwitterStreamQuickstartDocTest.java](/akka-docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java) { #authors-foreachsink-println }
 
-or by using the shorthand version (which are defined only for the most popular Sinks such as @apidoc[Sink.fold](akka.stream.*.Sink$) {scala="#fold[U,T](zero:U)(f:(U,T)=%3EU):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[U]]" java="#fold(U,akka.japi.function.Function2)"} and @apidoc[Sink.foreach](akka.stream.*.Sink$) {scala="#foreach[T](f:T=%3EUnit):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[akka.Done]]" java="#foreach(akka.japi.function.Procedure)"}):
+or by using the shorthand version (which are defined only for the most popular Sinks such as @apidoc[Sink.fold](stream.*.Sink$) {scala="#fold[U,T](zero:U)(f:(U,T)=%3EU):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[U]]" java="#fold(U,org.apache.pekko.japi.function.Function2)"} and @apidoc[Sink.foreach](stream.*.Sink$) {scala="#foreach[T](f:T=%3EUnit):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[org.apache.pekko.Done]]" java="#foreach(org.apache.pekko.japi.function.Procedure)"}):
 
 Scala
 :   @@snip [TwitterStreamQuickstartDocSpec.scala](/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala) { #authors-foreach-println }
@@ -286,7 +286,7 @@ Java
 :   @@snip [TwitterStreamQuickstartDocTest.java](/akka-docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java) { #authors-foreach-println }
 
 Materializing and running a stream always requires an `ActorSystem` to be @scala[in implicit scope (or passed in explicitly,
-like this: @scaladoc[.runWith(sink)(system)](akka.stream.scaladsl.Source#runWith[Mat2](sink:akka.stream.Graph[akka.stream.SinkShape[Out],Mat2])(implicitmaterializer:akka.stream.Materializer):Mat2))]@java[passed in explicitly, like this: @javadoc[runWith(sink, system)](akka.stream.javadsl.Source#runWith(akka.stream.Graph,akka.stream.Materializer))].
+like this: @scaladoc[.runWith(sink)(system)](pekko.stream.scaladsl.Source#runWith[Mat2](sink:org.apache.pekko.stream.Graph[org.apache.pekko.stream.SinkShape[Out],Mat2])(implicitmaterializer:org.apache.pekko.stream.Materializer):Mat2))]@java[passed in explicitly, like this: @javadoc[runWith(sink, system)](pekko.stream.javadsl.Source#runWith(org.apache.pekko.stream.Graph,org.apache.pekko.stream.Materializer))].
 
 The complete snippet looks like this:
 
@@ -300,7 +300,7 @@ Java
 
 In the previous section we were working on 1:1 relationships of elements which is the most common case, but sometimes
 we might want to map from one element to a number of elements and receive a "flattened" stream, similarly like `flatMap`
-works on Scala Collections. In order to get a flattened stream of hashtags from our stream of tweets we can use the @apidoc[mapConcat](akka.stream.*.Source) {scala="#mapConcat[T](f:Out=%3EIterableOnce[T]):FlowOps.this.Repr[T]" java="#mapConcat(akka.japi.function.Function)"}
+works on Scala Collections. In order to get a flattened stream of hashtags from our stream of tweets we can use the @apidoc[mapConcat](stream.*.Source) {scala="#mapConcat[T](f:Out=%3EIterableOnce[T]):FlowOps.this.Repr[T]" java="#mapConcat(org.apache.pekko.japi.function.Function)"}
 operator:
 
 Scala
@@ -316,7 +316,7 @@ It is problematic for two reasons: @scala[first]@java[firstly], flattening by co
 due to the risk of deadlock (with merge being the preferred strategy), and @scala[second]@java[secondly], the monad laws would not hold for
 our implementation of flatMap (due to the liveness issues).
 
-Please note that the @apidoc[mapConcat](akka.stream.*.Source) {scala="#mapConcat[T](f:Out=%3EIterableOnce[T]):FlowOps.this.Repr[T]" java="#mapConcat(akka.japi.function.Function)"} requires the supplied function to return @scala[an iterable (`f: Out => immutable.Iterable[T]`]@java[a strict collection (`Out f -> java.util.List`)],
+Please note that the @apidoc[mapConcat](stream.*.Source) {scala="#mapConcat[T](f:Out=%3EIterableOnce[T]):FlowOps.this.Repr[T]" java="#mapConcat(org.apache.pekko.japi.function.Function)"} requires the supplied function to return @scala[an iterable (`f: Out => immutable.Iterable[T]`]@java[a strict collection (`Out f -> java.util.List`)],
 whereas `flatMap` would have to operate on streams all the way through.
 
 @@@
@@ -328,14 +328,14 @@ For example we'd like to write all author handles into one file, and all hashtag
 This means we have to split the source stream into two streams which will handle the writing to these different files.
 
 Elements that can be used to form such "fan-out" (or "fan-in") structures are referred to as "junctions" in Akka Streams.
-One of these that we'll be using in this example is called @apidoc[akka.stream.*.Broadcast$], and it emits elements from its
+One of these that we'll be using in this example is called @apidoc[stream.*.Broadcast$], and it emits elements from its
 input port to all of its output ports.
 
 Akka Streams intentionally separate the linear stream structures (Flows) from the non-linear, branching ones (Graphs)
 in order to offer the most convenient API for both of these cases. Graphs can express arbitrarily complex stream setups
 at the expense of not reading as familiarly as collection transformations.
 
-Graphs are constructed using @apidoc[akka.stream.*.GraphDSL$] like this:
+Graphs are constructed using @apidoc[stream.*.GraphDSL$] like this:
 
 Scala
 :   @@snip [TwitterStreamQuickstartDocSpec.scala](/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala) { #graph-dsl-broadcast }
@@ -345,12 +345,12 @@ Java
 
 As you can see, @scala[inside the `GraphDSL` we use an implicit graph builder `b` to mutably construct the graph
 using the `~>` "edge operator" (also read as "connect" or "via" or "to"). The operator is provided implicitly
-by importing `GraphDSL.Implicits._`]@java[we use graph builder `b` to construct the graph using @apidoc[akka.stream.UniformFanOutShape] and @apidoc[akka.stream.*.Flow] s].
+by importing `GraphDSL.Implicits._`]@java[we use graph builder `b` to construct the graph using @apidoc[stream.UniformFanOutShape] and @apidoc[stream.*.Flow] s].
 
-@apidoc[GraphDSL.create](akka.stream.*.GraphDSL$) {scala="#create[S<:akka.stream.Shape,IS<:akka.stream.Shape,Mat](graphs:Seq[akka.stream.Graph[IS,Mat]])(buildBlock:akka.stream.scaladsl.GraphDSL.Builder[Seq[Mat]]=%3E(Seq[IS]=%3ES)):akka.stream.Graph[S,Seq[Mat]]" java="#create(java.util.List,akka.japi.function.Function2)"} returns a @apidoc[akka.stream.Graph], in this example a @scala[`Graph[ClosedShape, NotUsed]`]@java[`Graph`] where
-@apidoc[akka.stream.ClosedShape] means that it is *a fully connected graph* or "closed" - there are no unconnected inputs or outputs.
-Since it is closed it is possible to transform the graph into a @apidoc[akka.stream.*.RunnableGraph] using @apidoc[RunnableGraph.fromGraph](akka.stream.*.RunnableGraph$) {scala="#fromGraph[Mat](g:akka.stream.Graph[akka.stream.ClosedShape,Mat]):akka.stream.scaladsl.RunnableGraph[Mat]" java="#fromGraph(akka.stream.Graph)"}.
-The `RunnableGraph` can then be @apidoc[run()](akka.stream.*.RunnableGraph) {scala="#run()(implicitmaterializer:akka.stream.Materializer):Mat" java="#run(akka.stream.Materializer)"} to materialize a stream out of it.
+@apidoc[GraphDSL.create](stream.*.GraphDSL$) {scala="#create[S<:org.apache.pekko.stream.Shape,IS<:org.apache.pekko.stream.Shape,Mat](graphs:Seq[org.apache.pekko.stream.Graph[IS,Mat]])(buildBlock:org.apache.pekko.stream.scaladsl.GraphDSL.Builder[Seq[Mat]]=%3E(Seq[IS]=%3ES)):org.apache.pekko.stream.Graph[S,Seq[Mat]]" java="#create(java.util.List,org.apache.pekko.japi.function.Function2)"} returns a @apidoc[stream.Graph], in this example a @scala[`Graph[ClosedShape, NotUsed]`]@java[`Graph`] where
+@apidoc[stream.ClosedShape] means that it is *a fully connected graph* or "closed" - there are no unconnected inputs or outputs.
+Since it is closed it is possible to transform the graph into a @apidoc[stream.*.RunnableGraph] using @apidoc[RunnableGraph.fromGraph](stream.*.RunnableGraph$) {scala="#fromGraph[Mat](g:stream.Graph[org.apache.pekko.stream.ClosedShape,Mat]):org.apache.pekko.stream.scaladsl.RunnableGraph[Mat]" java="#fromGraph(org.apache.pekko.stream.Graph)"}.
+The `RunnableGraph` can then be @apidoc[run()](stream.*.RunnableGraph) {scala="#run()(implicitmaterializer:org.apache.pekko.stream.Materializer):Mat" java="#run(org.apache.pekko.stream.Materializer)"} to materialize a stream out of it.
 
 Both `Graph` and `RunnableGraph` are *immutable, thread-safe, and freely shareable*.
 
@@ -371,7 +371,7 @@ A typical problem applications (not using Akka Streams) like this often face is
 either temporarily or by design, and will start buffering incoming data until there's no more space to buffer, resulting
 in either @javadoc[OutOfMemoryError](java.lang.OutOfMemoryError) s or other severe degradations of service responsiveness. With Akka Streams buffering can
 and must be handled explicitly. For example, if we are only interested in the "*most recent tweets, with a buffer of 10
-elements*" this can be expressed using the @apidoc[buffer](akka.stream.*.Source) {scala="#buffer(size:Int,overflowStrategy:akka.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,akka.stream.OverflowStrategy)"} element:
+elements*" this can be expressed using the @apidoc[buffer](stream.*.Source) {scala="#buffer(size:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy):FlowOps.this.Repr[Out]" java="#buffer(int,org.apache.pekko.stream.OverflowStrategy)"} element:
 
 Scala
 :   @@snip [TwitterStreamQuickstartDocSpec.scala](/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala) { #tweets-slow-consumption-dropHead }
@@ -379,7 +379,7 @@ Scala
 Java
 :  @@snip [TwitterStreamQuickstartDocTest.java](/akka-docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java) { #tweets-slow-consumption-dropHead }
 
-The `buffer` element takes an explicit and required @apidoc[akka.stream.OverflowStrategy], which defines how the buffer should react
+The `buffer` element takes an explicit and required @apidoc[stream.OverflowStrategy], which defines how the buffer should react
 when it receives another element while it is full. Strategies provided include dropping the oldest element (`dropHead`),
 dropping the entire buffer, signalling @scala[errors]@java[failures] etc. Be sure to pick and choose the strategy that fits your use case best.
 
@@ -393,7 +393,7 @@ While this question is not as obvious to give an answer to in case of an infinit
 this question in a streaming setting would be to create a stream of counts described as "*up until now*, we've processed N tweets"),
 but in general it is possible to deal with finite streams and come up with a nice result such as a total count of elements.
 
-First, let's write such an element counter using @scala[@scaladoc[Sink.fold](akka.stream.scaladsl.Sink$#fold[U,T](zero:U)(f:(U,T)=%3EU):akka.stream.scaladsl.Sink[T,scala.concurrent.Future[U]]) and]@java[@javadoc[Flow.of(Class)](akka.stream.javadsl.Flow#of(java.lang.Class)) and @javadoc[Sink.fold](akka.stream.javadsl.Sink$#fold(U,akka.japi.function.Function2)) to]  see how the types look like:
+First, let's write such an element counter using @scala[@scaladoc[Sink.fold](pekko.stream.scaladsl.Sink$#fold[U,T](zero:U)(f:(U,T)=%3EU):org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[U]]) and]@java[@javadoc[Flow.of(Class)](pekko.stream.javadsl.Flow#of(java.lang.Class)) and @javadoc[Sink.fold](pekko.stream.javadsl.Sink$#fold(U,org.apache.pekko.japi.function.Function2)) to]  see how the types look like:
 
 Scala
 :   @@snip [TwitterStreamQuickstartDocSpec.scala](/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala) { #tweets-fold-count }
@@ -408,20 +408,20 @@ prepared Sink using `toMat`]@java[`Sink.fold` will sum all `Integer` elements of
 a `CompletionStage`. Next we use the `map` method of `tweets` `Source` which will change each incoming tweet
 into an integer value `1`.  Finally we connect the Flow to the previously prepared Sink using `toMat`].
 
-Remember those mysterious `Mat` type parameters on @scala[@scaladoc[Source](akka.stream.scaladsl.Source)\[+Out, +Mat\], @scaladoc[Flow](akka.stream.scaladsl.Flow)\[-In, +Out, +Mat\] and @scaladoc[Sink](akka.stream.scaladsl.Sink)\[-In, +Mat\]]@java[@javadoc[Source](akka.stream.javadsl.Source), @javadoc[Flow](akka.stream.javadsl.Flow) and @javadoc[Sink](akka.stream.javadsl.Sink)]?
+Remember those mysterious `Mat` type parameters on @scala[@scaladoc[Source](pekko.stream.scaladsl.Source)\[+Out, +Mat\], @scaladoc[Flow](pekko.stream.scaladsl.Flow)\[-In, +Out, +Mat\] and @scaladoc[Sink](pekko.stream.scaladsl.Sink)\[-In, +Mat\]]@java[@javadoc[Source](pekko.stream.javadsl.Source), @javadoc[Flow](pekko.stream.javadsl.Flow) and @javadoc[Sink](pekko.stream.javadsl.Sink)]?
 They represent the type of values these processing parts return when materialized. When you chain these together,
-you can explicitly combine their materialized values. In our example we used the @scala[@scaladoc[Keep.right](akka.stream.scaladsl.Keep$#right[L,R]:(L,R)=%3ER)]@java[@javadoc[Keep.right()](akka.stream.javadsl.Keep$#right())] predefined function,
+you can explicitly combine their materialized values. In our example we used the @scala[@scaladoc[Keep.right](pekko.stream.scaladsl.Keep$#right[L,R]:(L,R)=%3ER)]@java[@javadoc[Keep.right()](pekko.stream.javadsl.Keep$#right())] predefined function,
 which tells the implementation to only care about the materialized type of the operator currently appended to the right.
-The materialized type of `sumSink` is @scala[@scaladoc[Future](scala.concurrent.Future)\[Int\]]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] and because of using @scala[`Keep.right`]@java[`Keep.right()`], the resulting @apidoc[akka.stream.*.RunnableGraph]
+The materialized type of `sumSink` is @scala[@scaladoc[Future](scala.concurrent.Future)\[Int\]]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] and because of using @scala[`Keep.right`]@java[`Keep.right()`], the resulting @apidoc[stream.*.RunnableGraph]
 has also a type parameter of @scala[`Future[Int]`]@java[`CompletionStage`].
 
 This step does *not* yet materialize the
 processing pipeline, it merely prepares the description of the Flow, which is now connected to a Sink, and therefore can
-be `run()`, as indicated by its type: @scala[`RunnableGraph[Future[Int]]`]@java[`RunnableGraph>`]. Next we call @apidoc[run()](akka.stream.*.RunnableGraph) {scala="#run()(implicitmaterializer:akka.stream.Materializer):Mat" java="#run(akka.stream.Materializer)"} which materializes and runs the Flow. The value returned by calling `run()` on a @scala[`RunnableGraph[T]`]@java[`RunnableGraph`] is of type `T`.
+be `run()`, as indicated by its type: @scala[`RunnableGraph[Future[Int]]`]@java[`RunnableGraph>`]. Next we call @apidoc[run()](stream.*.RunnableGraph) {scala="#run()(implicitmaterializer:org.apache.pekko.stream.Materializer):Mat" java="#run(org.apache.pekko.stream.Materializer)"} which materializes and runs the Flow. The value returned by calling `run()` on a @scala[`RunnableGraph[T]`]@java[`RunnableGraph`] is of type `T`.
 In our case this type is @scala[`Future[Int]`]@java[`CompletionStage`] which, when completed, will contain the total length of our `tweets` stream.
 In case of the stream failing, this future would complete with a Failure.
 
-A @apidoc[akka.stream.*.RunnableGraph] may be reused
+A @apidoc[stream.*.RunnableGraph] may be reused
 and materialized multiple times, because it is only the "blueprint" of the stream. This means that if we materialize a stream,
 for example one that consumes a live stream of tweets within a minute, the materialized values for those two materializations
 will be different, as illustrated by this example:
diff --git a/akka-docs/src/main/paradox/stream/stream-rate.md b/akka-docs/src/main/paradox/stream/stream-rate.md
index ac3198ff52..7fc1c728d1 100644
--- a/akka-docs/src/main/paradox/stream/stream-rate.md
+++ b/akka-docs/src/main/paradox/stream/stream-rate.md
@@ -23,7 +23,7 @@ buffers in a stream. In this chapter we cover how buffers are used in Akka Strea
 
 In this section we will discuss internal buffers that are introduced as an optimization when using asynchronous operators.
 
-To run an operator asynchronously it has to be marked explicitly as such using the @scala[@scaladoc[`.async`](akka.stream.Graph#shape:S)]@java[@javadoc[`.async()`](akka.stream.Graph#async--)] method. Being run
+To run an operator asynchronously it has to be marked explicitly as such using the @scala[@scaladoc[`.async`](pekko.stream.Graph#shape:S)]@java[@javadoc[`.async()`](pekko.stream.Graph#async--)] method. Being run
 asynchronously means that an operator, after handing out an element to its downstream consumer is able to immediately
 process the next message. To demonstrate what we mean by this, let's take a look at the following example:
 
@@ -80,7 +80,7 @@ akka.stream.materializer.max-input-buffer-size = 16
 
 Alternatively they can be set per stream by adding an attribute to the complete `RunnableGraph` or on smaller segments
 of the stream it is possible by defining a separate
-@scala[@scaladoc[`Flow`](akka.stream.scaladsl.Flow)]@java[@javadoc[`Flow`](akka.stream.javadsl.Flow)] with these attributes:
+@scala[@scaladoc[`Flow`](pekko.stream.scaladsl.Flow)]@java[@javadoc[`Flow`](pekko.stream.javadsl.Flow)] with these attributes:
 
 Scala
 :   @@snip [StreamBuffersRateSpec.scala](/akka-docs/src/test/scala/docs/stream/StreamBuffersRateSpec.scala) { #section-buffer }
@@ -97,11 +97,11 @@ Java
 :   @@snip [StreamBuffersRateDocTest.java](/akka-docs/src/test/java/jdocs/stream/StreamBuffersRateDocTest.java) { #buffering-abstraction-leak }
 
 Running the above example one would expect the number *3* to be printed in every 3 seconds (the `conflateWithSeed`
-step here is configured so that it counts the number of elements received before the downstream @scala[@scaladoc[`ZipWith`](akka.stream.scaladsl.ZipWith$)]@java[@javadoc[`ZipWith`](akka.stream.javadsl.ZipWith$)] consumes
+step here is configured so that it counts the number of elements received before the downstream @scala[@scaladoc[`ZipWith`](pekko.stream.scaladsl.ZipWith$)]@java[@javadoc[`ZipWith`](pekko.stream.javadsl.ZipWith$)] consumes
 them). What is being printed is different though, we will see the number *1*. The reason for this is the internal
-buffer which is by default 16 elements large, and prefetches elements before the @scala[@scaladoc[`ZipWith`](akka.stream.scaladsl.ZipWith$)]@java[@javadoc[`ZipWith`](akka.stream.javadsl.ZipWith$)] starts consuming them.
-It is possible to fix this issue by changing the buffer size of @scala[@scaladoc[`ZipWith`](akka.stream.scaladsl.ZipWith$)]@java[@javadoc[`ZipWith`](akka.stream.javadsl.ZipWith$)] (or the whole graph) to 1. We will still see
-a leading 1 though which is caused by an initial prefetch of the @scala[@scaladoc[`ZipWith`](akka.stream.scaladsl.ZipWith$)]@java[@javadoc[`ZipWith`](akka.stream.javadsl.ZipWith$)] element.
+buffer which is by default 16 elements large, and prefetches elements before the @scala[@scaladoc[`ZipWith`](pekko.stream.scaladsl.ZipWith$)]@java[@javadoc[`ZipWith`](pekko.stream.javadsl.ZipWith$)] starts consuming them.
+It is possible to fix this issue by changing the buffer size of @scala[@scaladoc[`ZipWith`](pekko.stream.scaladsl.ZipWith$)]@java[@javadoc[`ZipWith`](pekko.stream.javadsl.ZipWith$)] (or the whole graph) to 1. We will still see
+a leading 1 though which is caused by an initial prefetch of the @scala[@scaladoc[`ZipWith`](pekko.stream.scaladsl.ZipWith$)]@java[@javadoc[`ZipWith`](pekko.stream.javadsl.ZipWith$)] element.
 
 @@@ note
 
diff --git a/akka-docs/src/main/paradox/stream/stream-refs.md b/akka-docs/src/main/paradox/stream/stream-refs.md
index 74834d2fd6..9ace473b99 100644
--- a/akka-docs/src/main/paradox/stream/stream-refs.md
+++ b/akka-docs/src/main/paradox/stream/stream-refs.md
@@ -75,7 +75,7 @@ wording to be rather useful.
 
 ### Source Refs - offering streaming data to a remote system
 
-A @scala[@scaladoc[`SourceRef`](akka.stream.SourceRef)]@java[@javadoc[`SourceRef`](akka.stream.SourceRef)]
+A @scala[@scaladoc[`SourceRef`](pekko.stream.SourceRef)]@java[@javadoc[`SourceRef`](pekko.stream.SourceRef)]
 can be offered to a remote actor system in order for it to consume some source of data that we have prepared
 locally. 
 
@@ -112,7 +112,7 @@ The process of preparing and running a `SourceRef`-powered distributed stream is
 
 ### Sink Refs - offering to receive streaming data from a remote system
 
-The dual of @scala[@scaladoc[`SourceRef`](akka.stream.SinkRef)]@java[@javadoc[`SourceRef`](akka.stream.SinkRef)]s.
+The dual of @scala[@scaladoc[`SourceRef`](pekko.stream.SinkRef)]@java[@javadoc[`SourceRef`](pekko.stream.SinkRef)]s.
 
 They can be used to offer the other side the capability to 
 send to the *origin* side data in a streaming, flow-controlled fashion. The origin here allocates a `Sink`,
@@ -182,7 +182,7 @@ into your own actor message classes.
 When @ref[Akka Jackson](../serialization-jackson.md) is used, serialization of wrapped `SourceRef` and `SinkRef` 
 will work out of the box.
  
-If you are using some other form of serialization you will need to use the @apidoc[akka.stream.StreamRefResolver] extension 
+If you are using some other form of serialization you will need to use the @apidoc[stream.StreamRefResolver] extension 
 from your serializer to get the `SourceRef` and `SinkRef`. The extension provides the methods `toSerializationFormat(sink or source)`
 to transform from refs to string and `resolve{Sink,Source}Ref(String)` to resolve refs from strings.
 
diff --git a/akka-docs/src/main/paradox/stream/stream-substream.md b/akka-docs/src/main/paradox/stream/stream-substream.md
index 9be1676662..fda2bb9e9a 100644
--- a/akka-docs/src/main/paradox/stream/stream-substream.md
+++ b/akka-docs/src/main/paradox/stream/stream-substream.md
@@ -15,7 +15,7 @@ To use Akka Streams, add the module to your project:
 
 ## Introduction
 
-Substreams are represented as @java[@javadoc[SubSource](akka.stream.javadsl.SubSource) or] @apidoc[akka.stream.*.SubFlow] instances, on which you can multiplex a single @java[@apidoc[akka.stream.*.Source] or] @apidoc[akka.stream.*.Flow]
+Substreams are represented as @java[@javadoc[SubSource](pekko.stream.javadsl.SubSource) or] @apidoc[stream.*.SubFlow] instances, on which you can multiplex a single @java[@apidoc[stream.*.Source] or] @apidoc[stream.*.Flow]
 into a stream of streams.
 
 SubFlows cannot contribute to the super-flow’s materialized value since they are materialized later,
@@ -27,7 +27,7 @@ operators that create substreams are listed on @ref[Nesting and flattening opera
 
 ### groupBy
 
-A typical operation that generates substreams is @apidoc[groupBy](akka.stream.*.Source) {scala="#groupBy[K](maxSubstreams:Int,f:Out=%3EK,allowClosedSubstreamRecreation:Boolean):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,akka.japi.function.Function,boolean)"}.
+A typical operation that generates substreams is @apidoc[groupBy](stream.*.Source) {scala="#groupBy[K](maxSubstreams:Int,f:Out=%3EK,allowClosedSubstreamRecreation:Boolean):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,org.apache.pekko.japi.function.Function,boolean)"}.
 
 Scala
 :   @@snip [SubstreamDocSpec.scala](/akka-docs/src/test/scala/docs/stream/SubstreamDocSpec.scala) { #groupBy1 }
@@ -44,7 +44,7 @@ a new substream is opened and subsequently fed with all elements belonging to th
 If `allowClosedSubstreamRecreation` is set to `true` a substream belonging to a specific key
 will be recreated if it was closed before, otherwise elements belonging to that key will be dropped.
 
-If you add a @apidoc[akka.stream.*.Sink] or @apidoc[akka.stream.*.Flow] right after the `groupBy` operator,
+If you add a @apidoc[stream.*.Sink] or @apidoc[stream.*.Flow] right after the `groupBy` operator,
 all transformations are applied to all encountered substreams in the same fashion.
 So, if you add the following `Sink`, that is added to each of the substreams as in the below diagram.
 
@@ -56,10 +56,10 @@ Java
 
 ![stream-substream-groupBy2.png](../../images/stream-substream-groupBy2.png)
 
-Also substreams, more precisely, @apidoc[akka.stream.*.SubFlow] @java[and @javadoc[SubSource](akka.stream.javadsl.SubSource)] have methods that allow you to
+Also substreams, more precisely, @apidoc[stream.*.SubFlow] @java[and @javadoc[SubSource](pekko.stream.javadsl.SubSource)] have methods that allow you to
 merge or concat substreams into the main stream again.
 
-The @apidoc[mergeSubstreams](akka.stream.*.SubFlow) {scala="#mergeSubstreams:F[Out]" java="#mergeSubstreams()"} method merges an unbounded number of substreams back to the main stream.
+The @apidoc[mergeSubstreams](stream.*.SubFlow) {scala="#mergeSubstreams:F[Out]" java="#mergeSubstreams()"} method merges an unbounded number of substreams back to the main stream.
 
 Scala
 :   @@snip [SubstreamDocSpec.scala](/akka-docs/src/test/scala/docs/stream/SubstreamDocSpec.scala) { #groupBy3 }
@@ -70,7 +70,7 @@ Java
 ![stream-substream-groupBy3.png](../../images/stream-substream-groupBy3.png)
 
 You can limit the number of active substreams running and being merged at a time,
-with either the @apidoc[mergeSubstreamsWithParallelism](akka.stream.*.SubFlow) {scala="#mergeSubstreamsWithParallelism(parallelism:Int):F[Out]" java="#mergeSubstreamsWithParallelism(int)"} or @apidoc[concatSubstreams](akka.stream.*.SubFlow) {scala="#concatSubstreams:F[Out]" java="#concatSubstreams()"} method.
+with either the @apidoc[mergeSubstreamsWithParallelism](stream.*.SubFlow) {scala="#mergeSubstreamsWithParallelism(parallelism:Int):F[Out]" java="#mergeSubstreamsWithParallelism(int)"} or @apidoc[concatSubstreams](stream.*.SubFlow) {scala="#concatSubstreams:F[Out]" java="#concatSubstreams()"} method.
 
 Scala
 :   @@snip [SubstreamDocSpec.scala](/akka-docs/src/test/scala/docs/stream/SubstreamDocSpec.scala) { #groupBy4 }
@@ -89,9 +89,9 @@ and this leads to the stream being deadlocked.
 
 ### splitWhen and splitAfter
 
-@apidoc[splitWhen](akka.stream.*.Source) {scala="#splitWhen(p:Out=%3EBoolean):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitWhen(akka.japi.function.Predicate)"} and @apidoc[splitAfter](akka.stream.*.Source) {scala="#splitAfter(p:Out=%3EBoolean):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitAfter(akka.japi.function.Predicate)"} are two other operations which generate substreams.
+@apidoc[splitWhen](stream.*.Source) {scala="#splitWhen(p:Out=%3EBoolean):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitWhen(org.apache.pekko.japi.function.Predicate)"} and @apidoc[splitAfter](stream.*.Source) {scala="#splitAfter(p:Out=%3EBoolean):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#splitAfter(org.apache.pekko.japi.function.Predicate)"} are two other operations which generate substreams.
 
-The difference from @apidoc[groupBy](akka.stream.*.Source) {scala="#groupBy[K](maxSubstreams:Int,f:Out=%3EK,allowClosedSubstreamRecreation:Boolean):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,akka.japi.function.Function,boolean)"} is that, if the predicate for `splitWhen` and `splitAfter` returns true,
+The difference from @apidoc[groupBy](stream.*.Source) {scala="#groupBy[K](maxSubstreams:Int,f:Out=%3EK,allowClosedSubstreamRecreation:Boolean):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,org.apache.pekko.japi.function.Function,boolean)"} is that, if the predicate for `splitWhen` and `splitAfter` returns true,
 a new substream is generated, and the succeeding elements after split will flow into the new substream.
 
 `splitWhen` flows the element on which the predicate returned true to a new substream,
@@ -126,10 +126,10 @@ This prints out the following output.
 
 ### flatMapConcat
 
-@apidoc[flatMapConcat](akka.stream.*.Source) {scala="#flatMapConcat[T,M](f:Out=%3Eakka.stream.Graph[akka.stream.SourceShape[T],M]):FlowOps.this.Repr[T]" java="#flatMapConcat(akka.japi.function.Function)"} and @apidoc[flatMapMerge](akka.stream.*.Source) {scala="#flatMapMerge[T,M](breadth:Int,f:Out=%3Eakka.stream.Graph[akka.stream.SourceShape[T],M]):FlowOps.this.Repr[T]" java="#flatMapMerge(int,akka.japi.function.Function)"} are substream operations different from @apidoc[groupBy](akka.stream.*.Source) {scala="#groupBy[K](maxSubstreams:Int,f:Out=%3EK,allowClosedSubstreamRecreation:Boolean):akka.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,akka.japi.function.Function,boolean)"} and `splitWhen/After`.
+@apidoc[flatMapConcat](stream.*.Source) {scala="#flatMapConcat[T,M](f:Out=%3Eorg.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],M]):FlowOps.this.Repr[T]" java="#flatMapConcat(org.apache.pekko.japi.function.Function)"} and @apidoc[flatMapMerge](stream.*.Source) {scala="#flatMapMerge[T,M](breadth:Int,f:Out=%3Eorg.apache.pekko.stream.Graph[org.apache.pekko.stream.SourceShape[T],M]):FlowOps.this.Repr[T]" java="#flatMapMerge(int,org.apache.pekko.japi.function.Function)"} are substream operations different from @apidoc[groupBy](stream.*.Source) {scala="#groupBy[K](maxSubstreams:Int,f:Out=%3EK,allowClosedSubstreamRecreation:Boolean):org.apache.pekko.stream.scaladsl.SubFlow[Out,Mat,FlowOps.this.Repr,FlowOps.this.Closed]" java="#groupBy(int,org.apache.pekko.japi.function.Function,boolean)"} and `splitWhen/After`.
 
 `flatMapConcat` takes a function, which is `f` in the following diagram.
-The function `f` of `flatMapConcat` transforms each input element into a @apidoc[akka.stream.*.Source] that is then flattened
+The function `f` of `flatMapConcat` transforms each input element into a @apidoc[stream.*.Source] that is then flattened
 into the output stream by concatenation.
 
 Scala
@@ -140,7 +140,7 @@ Java
 
 ![stream-substream-flatMapConcat1.png](../../images/stream-substream-flatMapConcat1.png)
 
-Like the `concat` operation on @apidoc[akka.stream.*.Flow], it fully consumes one @apidoc[akka.stream.*.Source] after the other.
+Like the `concat` operation on @apidoc[stream.*.Flow], it fully consumes one @apidoc[stream.*.Source] after the other.
 So, there is only one substream actively running at a given time.
 
 Then once the active substream is fully consumed, the next substream can start running.
diff --git a/akka-docs/src/main/paradox/stream/stream-testkit.md b/akka-docs/src/main/paradox/stream/stream-testkit.md
index 07b039d25b..7610e47fec 100644
--- a/akka-docs/src/main/paradox/stream/stream-testkit.md
+++ b/akka-docs/src/main/paradox/stream/stream-testkit.md
@@ -21,7 +21,7 @@ various code patterns and libraries. Here we will discuss testing these
 elements using:
 
  * simple sources, sinks and flows;
- * sources and sinks in combination with @apidoc[akka.testkit.TestProbe] from the `akka-testkit` module;
+ * sources and sinks in combination with @apidoc[testkit.TestProbe] from the `akka-testkit` module;
  * sources and sinks specifically crafted for writing tests from the `akka-stream-testkit` module.
 
 It is important to keep your data processing pipeline as separate sources,
@@ -45,7 +45,7 @@ Java
 The same strategy can be applied for sources as well. In the next example we
 have a source that produces an infinite stream of elements. Such source can be
 tested by asserting that first arbitrary number of elements hold some
-condition. Here the @apidoc[take](akka.stream.*.Source) {scala="#take(n:Long):FlowOps.this.Repr[Out]" java="#take(long)"} operator and @apidoc[Sink.seq](akka.stream.*.Sink$) {scala="#seq[T]:akka.stream.scaladsl.Sink[T,scala.concurrent.Future[Seq[T]]]" java="#seq()"} are very useful.
+condition. Here the @apidoc[take](stream.*.Source) {scala="#take(n:Long):FlowOps.this.Repr[Out]" java="#take(long)"} operator and @apidoc[Sink.seq](stream.*.Sink$) {scala="#seq[T]:org.apache.pekko.stream.scaladsl.Sink[T,scala.concurrent.Future[Seq[T]]]" java="#seq()"} are very useful.
 
 Scala
 :   @@snip [StreamTestKitDocSpec.scala](/akka-docs/src/test/scala/docs/stream/StreamTestKitDocSpec.scala) { #grouped-infinite }
@@ -66,11 +66,11 @@ Java
 ## TestKit
 
 Akka Stream offers integration with Actors out of the box. This support can be
-used for writing stream tests that use familiar @apidoc[akka.testkit.TestProbe] from the
+used for writing stream tests that use familiar @apidoc[testkit.TestProbe] from the
 `akka-testkit` API.
 
 One of the more straightforward tests would be to materialize stream to a
-@scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] and then use @scala[@scaladoc[pipe](akka.pattern.PipeToSupport#pipe[T](future:scala.concurrent.Future[T])(implicitexecutionContext:scala.concurrent.ExecutionContext):PipeToSupport.this.PipeableFuture[T])]@java[@scaladoc[Patterns.pipe](akka.pattern.Patterns$#pipe[T](future:java.util.concurrent.CompletionStage[T],context:scala.concurrent.ExecutionContext):akka.pattern.PipeableCompletionStage[T])] pattern to pipe the result of that future
+@scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] and then use @scala[@scaladoc[pipe](pekko.pattern.PipeToSupport#pipe[T](future:scala.concurrent.Future[T])(implicitexecutionContext:scala.concurrent.ExecutionContext):PipeToSupport.this.PipeableFuture[T])]@java[@scaladoc[Patterns.pipe](org.apache.pekko.pattern.Patterns$#pipe[T](future:java.util.concurrent.CompletionStage[T],context:scala.concurrent.ExecutionContext):org.apache.pekko.pattern.PipeableCompletionStage[T])] pattern to pipe the result of that future
 to the probe.
 
 Scala
@@ -79,9 +79,9 @@ Scala
 Java
 :   @@snip [StreamTestKitDocTest.java](/akka-docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java) { #pipeto-testprobe }
 
-Instead of materializing to a future, we can use a @apidoc[Sink.actorRef](akka.stream.*.Sink$) {scala="#actorRef[T](ref:akka.actor.ActorRef,onCompleteMessage:Any,onFailureMessage:Throwable=%3EAny):akka.stream.scaladsl.Sink[T,akka.NotUsed]" java="#actorRef(akka.actor.ActorRef,java.lang.Object)"} that
-sends all incoming elements to the given @apidoc[akka.actor.ActorRef]. Now we can use
-assertion methods on @apidoc[akka.testkit.TestProbe] and expect elements one by one as they
+Instead of materializing to a future, we can use a @apidoc[Sink.actorRef](stream.*.Sink$) {scala="#actorRef[T](ref:org.apache.pekko.actor.ActorRef,onCompleteMessage:Any,onFailureMessage:Throwable=%3EAny):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.NotUsed]" java="#actorRef(org.apache.pekko.actor.ActorRef,java.lang.Object)"} that
+sends all incoming elements to the given @apidoc[actor.ActorRef]. Now we can use
+assertion methods on @apidoc[testkit.TestProbe] and expect elements one by one as they
 arrive. We can also assert stream completion by expecting for
 `onCompleteMessage` which was given to `Sink.actorRef`.
 
@@ -92,7 +92,7 @@ Java
 :   @@snip [StreamTestKitDocTest.java](/akka-docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java) { #sink-actorref }
 
 Similarly to `Sink.actorRef` that provides control over received
-elements, we can use @apidoc[Source.actorRef](akka.stream.*.Source$) {scala="#actorRef[T](completionMatcher:PartialFunction[Any,akka.stream.CompletionStrategy],failureMatcher:PartialFunction[Any,Throwable],bufferSize:Int,overflowStrategy:akka.stream.OverflowStrategy):akka.stream.scaladsl.Source[T,akka.actor.ActorRef]" java="#actorRef(int,akka.stream.OverflowStrategy)"} and have full control over
+elements, we can use @apidoc[Source.actorRef](stream.*.Source$) {scala="#actorRef[T](completionMatcher:PartialFunction[Any,org.apache.pekko.stream.CompletionStrategy],failureMatcher:PartialFunction[Any,Throwable],bufferSize:Int,overflowStrategy:org.apache.pekko.stream.OverflowStrategy):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.actor.ActorRef]" java="#actorRef(int,org.apache.pekko.stream.OverflowStrategy)"} and have full control over
 elements to be sent.
 
 Scala
@@ -106,12 +106,12 @@ Java
 You may have noticed various code patterns that emerge when testing stream
 pipelines. Akka Stream has a separate `akka-stream-testkit` module that
 provides tools specifically for writing stream tests. This module comes with
-two main components that are @apidoc[akka.stream.testkit.*.TestSource$] and @apidoc[akka.stream.testkit.*.TestSink$] which
+two main components that are @apidoc[stream.testkit.*.TestSource$] and @apidoc[stream.testkit.*.TestSink$] which
 provide sources and sinks that materialize to probes that allow fluent API.
 
 ### Using the TestKit
 
-A sink returned by @apidoc[TestSink.probe](akka.stream.testkit.*.TestSink$) {scala="#probe[T](implicitsystem:akka.actor.ActorSystem):akka.stream.scaladsl.Sink[T,akka.stream.testkit.TestSubscriber.Probe[T]]" java="#probe(akka.actor.ActorSystem)"} allows manual control over demand and
+A sink returned by @apidoc[TestSink.probe](stream.testkit.*.TestSink$) {scala="#probe[T](implicitsystem:org.apache.pekko.actor.ActorSystem):org.apache.pekko.stream.scaladsl.Sink[T,org.apache.pekko.stream.testkit.TestSubscriber.Probe[T]]" java="#probe(org.apache.pekko.actor.ActorSystem)"} allows manual control over demand and
 assertions over elements coming downstream.
 
 Scala
@@ -120,7 +120,7 @@ Scala
 Java
 :   @@snip [StreamTestKitDocTest.java](/akka-docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java) { #test-sink-probe }
 
-A source returned by @apidoc[TestSource.probe](akka.stream.testkit.*.TestSource$) {scala="#probe[T](implicitsystem:akka.actor.ActorSystem):akka.stream.scaladsl.Source[T,akka.stream.testkit.TestPublisher.Probe[T]]" java="#probe(akka.actor.ActorSystem)"} can be used for asserting demand or
+A source returned by @apidoc[TestSource.probe](stream.testkit.*.TestSource$) {scala="#probe[T](implicitsystem:org.apache.pekko.actor.ActorSystem):org.apache.pekko.stream.scaladsl.Source[T,org.apache.pekko.stream.testkit.TestPublisher.Probe[T]]" java="#probe(org.apache.pekko.actor.ActorSystem)"} can be used for asserting demand or
 controlling when stream is completed or ended with an error.
 
 Scala
diff --git a/akka-docs/src/main/paradox/testing.md b/akka-docs/src/main/paradox/testing.md
index 0b2514fe87..ad4d0ed121 100644
--- a/akka-docs/src/main/paradox/testing.md
+++ b/akka-docs/src/main/paradox/testing.md
@@ -244,7 +244,7 @@ Be sure to exchange the default logger with the
 function:
 
 ```
-akka.loggers = [akka.testkit.TestEventListener]
+akka.loggers = [org.apache.pekko.testkit.TestEventListener]
 ```
 
 @@@
@@ -457,7 +457,7 @@ This code can be used to forward messages, e.g. in a chain `A --> Probe -->
 B`, as long as a certain protocol is obeyed.
 
 Scala
-:   @@snip [TestProbeSpec.scala](/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala) { #autopilot }
+:   @@snip [TestProbeSpec.scala](/akka-testkit/src/test/scala/org/apache/pekko/testkit/TestProbeSpec.scala) { #autopilot }
 
 Java
 :   @@snip [TestKitDocTest.java](/akka-docs/src/test/java/jdocs/testkit/TestKitDocTest.java) { #test-auto-pilot }
diff --git a/akka-docs/src/main/paradox/typed/actor-discovery.md b/akka-docs/src/main/paradox/typed/actor-discovery.md
index e42a3c2054..ad21076b8e 100644
--- a/akka-docs/src/main/paradox/typed/actor-discovery.md
+++ b/akka-docs/src/main/paradox/typed/actor-discovery.md
@@ -44,37 +44,37 @@ To facilitate this dynamic aspect you can also subscribe to changes with the `Re
 These imports are used in the following example:
 
 Scala
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/ReceptionistExample.scala) { #import }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala) { #import }
 
 Java
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExample.java) { #import }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java) { #import }
 
 First we create a `PingService` actor and register it with the `Receptionist` against a
 @apidoc[receptionist.ServiceKey] that will later be used to lookup the reference:
 
 Scala
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/ReceptionistExample.scala) { #ping-service }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala) { #ping-service }
 
 Java
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExample.java) { #ping-service }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java) { #ping-service }
 
 Then we have another actor that requires a `PingService` to be constructed:
 
 Scala
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/ReceptionistExample.scala) { #pinger }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala) { #pinger }
 
 Java
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExample.java) { #pinger }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java) { #pinger }
 
 Finally in the guardian actor we spawn the service as well as subscribing to any actors registering
 against the @apidoc[receptionist.ServiceKey]. Subscribing means that the guardian actor will be informed of any
 new registrations via a `Listing` message:
 
 Scala
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/ReceptionistExample.scala) { #pinger-guardian }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala) { #pinger-guardian }
 
 Java
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExample.java) { #pinger-guardian }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java) { #pinger-guardian }
 
 Each time a new (which is just a single time in this example) `PingService` is registered the
 guardian actor spawns a `Pinger` for each currently known `PingService`. The `Pinger`
@@ -85,12 +85,12 @@ of the current state without receiving further updates by sending the `Reception
 receptionist. An example of using `Receptionist.Find`:
 
 Scala
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/ReceptionistExample.scala) { #find }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala) { #find }
 
 Java
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExample.java) { #find }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java) { #find }
 
-Also note how a @apidoc[messageAdapter](akka.actor.typed.*.ActorContext) {scala="#messageAdapter[U](f:U=%3ET)(implicitevidence$1:scala.reflect.ClassTag[U]):akka.actor.typed.ActorRef[U]" java="#messageAdapter(java.lang.Class,akka.japi.function.Function)"} is used to convert the `Receptionist.Listing` to a message type that
+Also note how a @apidoc[messageAdapter](actor.typed.*.ActorContext) {scala="#messageAdapter[U](f:U=%3ET)(implicitevidence$1:scala.reflect.ClassTag[U]):org.apache.pekko.actor.typed.ActorRef[U]" java="#messageAdapter(java.lang.Class,org.apache.pekko.japi.function.Function)"} is used to convert the `Receptionist.Listing` to a message type that
 the `PingManager` understands.
 
 If a server no longer wish to be associated with a service key it can deregister using the command `Receptionist.Deregister`
@@ -100,10 +100,10 @@ The command can optionally send an acknowledgement once the local receptionist h
 that all subscribers has seen that the instance has been removed, it may still receive messages from subscribers for some time after this.
 
 Scala
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/ReceptionistExample.scala) { #deregister }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala) { #deregister }
 
 Java
-:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExample.java) { #deregister }
+:  @@snip [ReceptionistExample](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java) { #deregister }
 
 ## Cluster Receptionist
 
@@ -115,7 +115,7 @@ will eventually reach the same set of actors per `ServiceKey`.
 
 `Subscription`s and `Find` queries to a clustered receptionist will keep track of cluster reachability and only list 
 registered actors that are reachable. The full set of actors, including unreachable ones, is available through 
-@scala[@scaladoc[Listing.allServiceInstances](akka.actor.typed.receptionist.Receptionist.Listing#allServiceInstances[T](key:akka.actor.typed.receptionist.ServiceKey[T]):Set[akka.actor.typed.ActorRef[T]])]@java[@javadoc[Listing.getAllServiceInstances](akka.actor.typed.receptionist.Receptionist.Listing#getAllServiceInstances(akka.actor.typed.receptionist.ServiceKey))].
+@scala[@scaladoc[Listing.allServiceInstances](pekko.typed.receptionist.Receptionist.Listing#allServiceInstances[T](key:org.apache.pekko.actor.typed.receptionist.ServiceKey[T]):Set[org.apache.pekko.actor.typed.ActorRef[T]])]@java[@javadoc[Listing.getAllServiceInstances](pekko.actor.typed.receptionist.Receptionist.Listing#getAllServiceInstances(org.apache.pekko.actor.typed.receptionist.ServiceKey))].
 
 One important difference from local only receptions are the serialization concerns, all messages sent to and back from 
 an actor on another node must be serializable, see @ref:[serialization](../serialization.md).
diff --git a/akka-docs/src/main/paradox/typed/actor-lifecycle.md b/akka-docs/src/main/paradox/typed/actor-lifecycle.md
index 7327bc077d..f008619909 100644
--- a/akka-docs/src/main/paradox/typed/actor-lifecycle.md
+++ b/akka-docs/src/main/paradox/typed/actor-lifecycle.md
@@ -36,7 +36,7 @@ so create one per logical application. Typically one `ActorSystem` per JVM proce
 ## Creating Actors
 
 An actor can create, or _spawn_, an arbitrary number of child actors, which in turn can spawn children of their own, thus
-forming an actor hierarchy. @apidoc[akka.actor.typed.ActorSystem] hosts the hierarchy and there can be only one _root actor_,
+forming an actor hierarchy. @apidoc[actor.typed.ActorSystem] hosts the hierarchy and there can be only one _root actor_,
 an actor at the top of the hierarchy of the `ActorSystem`. The lifecycle of a child actor is tied to the parent -- a child
 can stop itself or be stopped at any time but it can never outlive its parent.
 
@@ -49,16 +49,16 @@ The @apidoc[ActorContext](typed.*.ActorContext) can be accessed for many purpose
 * Logging
 * Creating message adapters
 * Request-response interactions (ask) with another actor
-* Access to the @scala[@scaladoc[self](akka.actor.typed.scaladsl.ActorContext#self:akka.actor.typed.ActorRef[T])]@java[@javadoc[getSelf()](akka.actor.typed.javadsl.ActorContext#getSelf())] ActorRef
+* Access to the @scala[@scaladoc[self](pekko.actor.typed.scaladsl.ActorContext#self:org.apache.pekko.actor.typed.ActorRef[T])]@java[@javadoc[getSelf()](pekko.actor.typed.javadsl.ActorContext#getSelf())] ActorRef
 
 If a behavior needs to use the `ActorContext`, for example to spawn child actors, or use
-@scala[`context.self`]@java[`context.getSelf()`], it can be obtained by wrapping construction with @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"}:
+@scala[`context.self`]@java[`context.getSelf()`], it can be obtained by wrapping construction with @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"}:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #hello-world-main }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #hello-world-main }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #hello-world-main-setup }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #hello-world-main-setup }
 
 #### ActorContext Thread Safety
 
@@ -75,10 +75,10 @@ system are directed to the root actor. The root actor is defined by the behavior
 named `HelloWorldMain` in the example below:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #hello-world }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #hello-world }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #hello-world }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #hello-world }
 
 For very simple applications the guardian may contain the actual application logic and handle messages. As soon as the application
 handles more than one concern the guardian should instead just bootstrap the application, spawn the various subsystems as
@@ -91,7 +91,7 @@ stop actors and services in a specific order.
 
 @@@ Note
 
-In the classic counter part, the @apidoc[akka.actor.ActorSystem], the root actor was provided out of the box and you
+In the classic counter part, the @apidoc[actor.ActorSystem], the root actor was provided out of the box and you
 could spawn top-level actors from the outside of the `ActorSystem` using `actorOf`. @ref:[SpawnProtocol](#spawnprotocol)
 is a tool that mimics the old style of starting up actors.
 
@@ -100,25 +100,25 @@ is a tool that mimics the old style of starting up actors.
 
 ### Spawning Children
 
-Child actors are created and started with `ActorContext`'s @apidoc[spawn](typed.*.ActorContext) {scala="#spawn[U](behavior:akka.actor.typed.Behavior[U],name:String,props:akka.actor.typed.Props):akka.actor.typed.ActorRef[U]" java="#spawn(akka.actor.typed.Behavior,java.lang.String)"}.
+Child actors are created and started with `ActorContext`'s @apidoc[spawn](typed.*.ActorContext) {scala="#spawn[U](behavior:org.apache.pekko.actor.typed.Behavior[U],name:String,props:org.apache.pekko.actor.typed.Props):org.apache.pekko.actor.typed.ActorRef[U]" java="#spawn(org.apache.pekko.actor.typed.Behavior,java.lang.String)"}.
 In the example below, when the root actor
 is started, it spawns a child actor described by the `HelloWorld` behavior. Additionally, when the root actor receives a
 `SayHello` message, it creates a child actor defined by the behavior `HelloWorldBot`:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #hello-world-main }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #hello-world-main }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #hello-world-main }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #hello-world-main }
 
 To specify a dispatcher when spawning an actor use @apidoc[DispatcherSelector]. If not specified, the actor will
 use the default dispatcher, see @ref:[Default dispatcher](dispatchers.md#default-dispatcher) for details.
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #hello-world-main-with-dispatchers }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #hello-world-main-with-dispatchers }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #hello-world-main-with-dispatchers }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #hello-world-main-with-dispatchers }
 
 Refer to @ref:[Actors](actors.md#first-example) for a walk-through of the above examples.
 
@@ -130,26 +130,26 @@ per HTTP request.
 
 That is not difficult to implement in your behavior, but since this is a common pattern there is a predefined
 message protocol and implementation of a behavior for this. It can be used as the guardian actor of the @apidoc[ActorSystem](typed.ActorSystem),
-possibly combined with @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"} to start some initial tasks or actors. Child actors can then be started from
-the outside by @apidoc[tell](typed.ActorRef) {scala="#tell(msg:T):Unit" java="#tell(T)"}ing or @scala[@scaladoc[ask](akka.actor.typed.scaladsl.AskPattern.Askable#ask[Res](replyTo:akka.actor.typed.ActorRef[Res]=%3EReq)(implicittimeout:akka.util.Timeout,implicitscheduler:akka.actor.typed.Scheduler):scala.concurrent.Future[Res])]@java[@javadoc[ask](akka.actor.typed.javadsl.AskPattern#ask(akka.actor.typed.RecipientRef,akka.japi.function.Function,java.time.Duration,akka.actor.typed.Scheduler))]ing @apidoc[SpawnProtocol.Spawn] to the actor reference of the system. Using `ask` is
+possibly combined with @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"} to start some initial tasks or actors. Child actors can then be started from
+the outside by @apidoc[tell](typed.ActorRef) {scala="#tell(msg:T):Unit" java="#tell(T)"}ing or @scala[@scaladoc[ask](pekko.actor.typed.scaladsl.AskPattern.Askable#ask[Res](replyTo:org.apache.pekko.actor.typed.ActorRef[Res]=%3EReq)(implicittimeout:org.apache.pekko.util.Timeout,implicitscheduler:org.apache.pekko.actor.typed.Scheduler):scala.concurrent.Future[Res])]@java[@javadoc[ask](pekko.actor.typed.javadsl.AskPattern#ask(org.apache.pekko.actor.typed.RecipientRef,org.apache.pekko.japi.function.Function,java.time.Duration,org.apache.pekko.actor.typed.Scheduler))]ing @apidoc[SpawnProtocol.Spawn] to the actor reference of the system. Using `ask` is
 similar to how `ActorSystem.actorOf` can be used in classic actors with the difference that a
 @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] of the @apidoc[ActorRef](typed.ActorRef) is returned.
 
 The guardian behavior can be defined as:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/SpawnProtocolDocSpec.scala) { #imports1 #main }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/SpawnProtocolDocSpec.scala) { #imports1 #main }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/SpawnProtocolDocTest.java) { #imports1 #main }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/SpawnProtocolDocTest.java) { #imports1 #main }
 
 and the @apidoc[ActorSystem](typed.ActorSystem) can be created with that `main` behavior and asked to spawn other actors:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/SpawnProtocolDocSpec.scala) { #imports2 #system-spawn }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/SpawnProtocolDocSpec.scala) { #imports2 #system-spawn }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/SpawnProtocolDocTest.java) { #imports2 #system-spawn }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/SpawnProtocolDocTest.java) { #imports2 #system-spawn }
 
 The @apidoc[SpawnProtocol$] can also be used at other places in the actor hierarchy. It doesn't have to be the root
 guardian actor.
@@ -158,10 +158,10 @@ A way to find running actors is described in @ref:[Actor discovery](actor-discov
 
 ## Stopping Actors
 
-An actor can stop itself by returning @apidoc[Behaviors.stopped](typed.*.Behaviors$) {scala="#stopped[T]:akka.actor.typed.Behavior[T]" java="#stopped()"} as the next behavior.
+An actor can stop itself by returning @apidoc[Behaviors.stopped](typed.*.Behaviors$) {scala="#stopped[T]:org.apache.pekko.actor.typed.Behavior[T]" java="#stopped()"} as the next behavior.
 
 A child actor can be forced to stop after it finishes processing its current message by using the
-@apidoc[stop](typed.*.ActorContext) {scala="#stop[U](child:akka.actor.typed.ActorRef[U]):Unit" java="#stop(akka.actor.typed.ActorRef)"} method of the `ActorContext` from the parent actor. Only child actors can be stopped in that way.
+@apidoc[stop](typed.*.ActorContext) {scala="#stop[U](child:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#stop(org.apache.pekko.actor.typed.ActorRef)"} method of the `ActorContext` from the parent actor. Only child actors can be stopped in that way.
 
 All child actors will be stopped when their parent is stopped.
 
@@ -170,14 +170,14 @@ When an actor is stopped, it receives the @apidoc[PostStop](typed.PostStop) sign
 Here is an illustrating example:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala) {
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala) {
     #imports
     #master-actor
     #worker-actor
   }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java)  {
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java)  {
    #imports
    #master-actor
    #worker-actor
@@ -190,26 +190,26 @@ is not emitted for a restart.
 ## Watching Actors
 
 In order to be notified when another actor terminates (i.e. stops permanently, not temporary failure and restart),
-an actor can @apidoc[watch](typed.*.ActorContext) {scala="#watch[U](other:akka.actor.typed.ActorRef[U]):Unit" java="#watch(akka.actor.typed.ActorRef)"} another actor. It will receive the @apidoc[akka.actor.typed.Terminated] signal upon
+an actor can @apidoc[watch](typed.*.ActorContext) {scala="#watch[U](other:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#watch(org.apache.pekko.actor.typed.ActorRef)"} another actor. It will receive the @apidoc[actor.typed.Terminated] signal upon
 termination (see @ref:[Stopping Actors](#stopping-actors)) of the watched actor.
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala) { #master-actor-watch }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala) { #master-actor-watch }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java)  { #master-actor-watch }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java)  { #master-actor-watch }
 
-An alternative to @apidoc[watch](typed.*.ActorContext) {scala="#watch[U](other:akka.actor.typed.ActorRef[U]):Unit" java="#watch(akka.actor.typed.ActorRef)"} is @apidoc[watchWith](typed.*.ActorContext) {scala="#watchWith[U](other:akka.actor.typed.ActorRef[U],msg:T):Unit" java="#watchWith(akka.actor.typed.ActorRef,T)"}, which allows specifying a custom message instead of the `Terminated`.
+An alternative to @apidoc[watch](typed.*.ActorContext) {scala="#watch[U](other:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#watch(org.apache.pekko.actor.typed.ActorRef)"} is @apidoc[watchWith](typed.*.ActorContext) {scala="#watchWith[U](other:org.apache.pekko.actor.typed.ActorRef[U],msg:T):Unit" java="#watchWith(org.apache.pekko.actor.typed.ActorRef,T)"}, which allows specifying a custom message instead of the `Terminated`.
 This is often preferred over using `watch` and the `Terminated` signal because additional information can
 be included in the message that can be used later when receiving it.
 
 Similar example as above, but using `watchWith` and replies to the original requestor when the job has finished.
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala) { #master-actor-watchWith }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala) { #master-actor-watchWith }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java)  { #master-actor-watchWith }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java)  { #master-actor-watchWith }
 
 Note how the `replyToWhenDone` is included in the `watchWith` message and then used later when receiving the
 `JobTerminated` message. 
@@ -226,7 +226,7 @@ the message, and another registration is done before this message has been proce
 queued, because registering for monitoring of an already terminated actor leads to the immediate generation of
 the terminated message.
 
-It is also possible to deregister from watching another actor’s liveliness using @apidoc[context.unwatch(target)](typed.*.ActorContext) {scala="#unwatch[U](other:akka.actor.typed.ActorRef[U]):Unit" java="#unwatch(akka.actor.typed.ActorRef)"}.
+It is also possible to deregister from watching another actor’s liveliness using @apidoc[context.unwatch(target)](typed.*.ActorContext) {scala="#unwatch[U](other:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#unwatch(org.apache.pekko.actor.typed.ActorRef)"}.
 This works even if the terminated message has already been enqueued in the mailbox; after calling `unwatch`
 no terminated message for that actor will be processed anymore.
 
diff --git a/akka-docs/src/main/paradox/typed/actors.md b/akka-docs/src/main/paradox/typed/actors.md
index 57d8d36ea3..031e2b2e48 100644
--- a/akka-docs/src/main/paradox/typed/actors.md
+++ b/akka-docs/src/main/paradox/typed/actors.md
@@ -55,10 +55,10 @@ look like?
 In all of the following these imports are assumed:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #imports }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #imports }
 
 Java
-:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #imports }
+:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #imports }
 
 With these in place we can define our first Actor, and it will say
 hello!
@@ -66,10 +66,10 @@ hello!
 ![hello-world1.png](./images/hello-world1.png)
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #hello-world-actor }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #hello-world-actor }
 
 Java
-:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #hello-world-actor }
+:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #hello-world-actor }
 
 This small piece of code defines two message types, one for commanding the
 Actor to greet someone and one that the Actor will use to confirm that it has
@@ -79,10 +79,10 @@ supplies so that the `HelloWorld` Actor can send back the confirmation
 message.
 
 The behavior of the Actor is defined as the `Greeter` with the help
-of the @apidoc[receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(akka.actor.typed.scaladsl.ActorContext[T],T)=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(akka.japi.function.Function2,akka.japi.function.Function2)"} behavior factory. Processing the next message then results
+of the @apidoc[receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(org.apache.pekko.actor.typed.scaladsl.ActorContext[T],T)=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(org.apache.pekko.japi.function.Function2,org.apache.pekko.japi.function.Function2)"} behavior factory. Processing the next message then results
 in a new behavior that can potentially be different from this one. State is
 updated by returning a new behavior that holds the new immutable state. In this
-case we don't need to update any state, so we return @apidoc[same](typed.*.Behaviors$){scala="#same[T]:akka.actor.typed.Behavior[T]" java="#same()"}, which means
+case we don't need to update any state, so we return @apidoc[same](typed.*.Behaviors$){scala="#same[T]:org.apache.pekko.actor.typed.Behavior[T]" java="#same()"}, which means
 the next behavior is "the same as the current one".
 
 The type of the messages handled by this behavior is declared to be of class
@@ -92,7 +92,7 @@ Typically, an actor handles more than one specific message type where all of the
 directly or indirectly @scala[`extend`]@java[`implement`] a common @scala[`trait`]@java[`interface`].
 
 On the last line we see the `HelloWorld` Actor send a message to another
-Actor, which is done using the @scala[@scaladoc[!](akka.actor.typed.ActorRef#tell(msg:T):Unit) operator (pronounced “bang” or “tell”)]@java[@javadoc[tell](akka.actor.typed.ActorRef#tell(T)) method].
+Actor, which is done using the @scala[@scaladoc[!](pekko.actor.typed.ActorRef#tell(msg:T):Unit) operator (pronounced “bang” or “tell”)]@java[@javadoc[tell](pekko.actor.typed.ActorRef#tell(T)) method].
 It is an asynchronous operation that doesn't block the caller's thread.
 
 Since the `replyTo` address is declared to be of type @scala[`ActorRef[Greeted]`]@java[`ActorRef`], the
@@ -114,10 +114,10 @@ of messages have been reached.
 ![hello-world2.png](./images/hello-world2.png)
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #hello-world-bot }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #hello-world-bot }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #hello-world-bot }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #hello-world-bot }
 
 @scala[Note how this Actor manages the counter by changing the behavior for each `Greeted` reply
 rather than using any variables.]@java[Note how this Actor manages the counter with an instance variable.]
@@ -127,18 +127,18 @@ message at a time.
 A third actor spawns the `Greeter` and the `HelloWorldBot` and starts the interaction between those.
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #hello-world-main }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #hello-world-main }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #hello-world-main }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #hello-world-main }
 
 Now we want to try out this Actor, so we must start an ActorSystem to host it:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #hello-world }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #hello-world }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #hello-world }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #hello-world }
 
 We start an Actor system from the defined `HelloWorldMain` behavior and send two `SayHello` messages that
 will kick-off the interaction between two separate `HelloWorldBot` actors and the single `Greeter` actor.
@@ -168,7 +168,7 @@ You will also need to add a @ref:[logging dependency](logging.md) to see that ou
 
 #### Here is another example that you can edit and run in the browser:
 
-@@fiddle [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #fiddle_code template=Akka layout=v75 minheight=400px }
+@@fiddle [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #fiddle_code template=Akka layout=v75 minheight=400px }
 
 @@@
 
@@ -197,10 +197,10 @@ chat room Actor will disseminate all posted messages to all currently connected
 client Actors. The protocol definition could look like the following:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #chatroom-protocol }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #chatroom-protocol }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #chatroom-protocol }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #chatroom-protocol }
 
 Initially the client Actors only get access to an @apidoc[typed.ActorRef[GetSession]]
 which allows them to make the first step. Once a client’s session has been
@@ -217,10 +217,10 @@ full protocol that can involve multiple Actors and that can evolve over
 multiple steps. Here's the implementation of the chat room protocol:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #chatroom-behavior }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #chatroom-behavior }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #chatroom-behavior }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #chatroom-behavior }
 
 
 The state is managed by changing behavior rather than using any variables.
@@ -260,16 +260,16 @@ problematic, so passing an @scala[`ActorRef[PublishSessionMessage]`]@java[`Actor
 In order to see this chat room in action we need to write a client Actor that can use it:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #chatroom-gabbler }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #chatroom-gabbler }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #chatroom-gabbler }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #chatroom-gabbler }
 
 From this behavior we can create an Actor that will accept a chat room session,
 post a message, wait to see it published, and then terminate. The last step
 requires the ability to change behavior, we need to transition from the normal
 running behavior into the terminated state. This is why here we do not return
-@apidoc[same](typed.*.Behaviors$){scala="#same[T]:akka.actor.typed.Behavior[T]" java="#same()"}, as above, but another special value @apidoc[stopped](typed.*.Behaviors$){scala="#stopped[T]:akka.actor.typed.Behavior[T]" java="#stopped()"}.
+@apidoc[same](typed.*.Behaviors$){scala="#same[T]:org.apache.pekko.actor.typed.Behavior[T]" java="#same()"}, as above, but another special value @apidoc[stopped](typed.*.Behaviors$){scala="#stopped[T]:org.apache.pekko.actor.typed.Behavior[T]" java="#stopped()"}.
 
 @@@ div {.group-scala}
 
@@ -288,28 +288,28 @@ nonsensical) or we start both of them from a third Actor—our only sensible
 choice:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala) { #chatroom-main }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala) { #chatroom-main }
 
 Java
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java) { #chatroom-main }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java) { #chatroom-main }
 
 In good tradition we call the `Main` Actor what it is, it directly
 corresponds to the `main` method in a traditional Java application. This
 Actor will perform its job on its own accord, we do not need to send messages
-from the outside, so we declare it to be of type @scala[@scaladoc[NotUsed](akka.NotUsed)]@java[@javadoc[Void](java.lang.Void)]. Actors receive not
+from the outside, so we declare it to be of type @scala[@scaladoc[NotUsed](pekko.NotUsed)]@java[@javadoc[Void](java.lang.Void)]. Actors receive not
 only external messages, they also are notified of certain system events,
 so-called Signals. In order to get access to those we choose to implement this
-particular one using the @apidoc[receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(akka.actor.typed.scaladsl.ActorContext[T],T)=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(akka.japi.function.Function2)"} behavior decorator. The
+particular one using the @apidoc[receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(org.apache.pekko.actor.typed.scaladsl.ActorContext[T],T)=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(org.apache.pekko.japi.function.Function2)"} behavior decorator. The
 provided `onSignal` function will be invoked for signals (subclasses of @apidoc[typed.Signal])
 or the `onMessage` function for user messages.
 
-This particular `Main` Actor is created using @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"}, which is like a factory for a behavior.
-Creation of the behavior instance is deferred until the actor is started, as opposed to @apidoc[Behaviors.receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(akka.actor.typed.scaladsl.ActorContext[T],T)=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(akka.japi.function.Function2)"}
+This particular `Main` Actor is created using @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"}, which is like a factory for a behavior.
+Creation of the behavior instance is deferred until the actor is started, as opposed to @apidoc[Behaviors.receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(org.apache.pekko.actor.typed.scaladsl.ActorContext[T],T)=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(org.apache.pekko.japi.function.Function2)"}
 that creates the behavior instance immediately before the actor is running. The factory function in
 `setup` is passed the @apidoc[typed.*.ActorContext] as parameter and that can for example be used for spawning child actors.
 This `Main` Actor creates the chat room and the gabbler and the session between them is initiated, and when the
 gabbler is finished we will receive the @apidoc[typed.Terminated] event due to having
-called @apidoc[context.watch](typed.*.ActorContext) {scala="#watch[U](other:akka.actor.typed.ActorRef[U]):Unit" java="#watch(akka.actor.typed.ActorRef)"} for it. This allows us to shut down the Actor system: when
+called @apidoc[context.watch](typed.*.ActorContext) {scala="#watch[U](other:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#watch(org.apache.pekko.actor.typed.ActorRef)"} for it. This allows us to shut down the Actor system: when
 the `Main` Actor terminates there is nothing more to do.
 
 Therefore after creating the Actor system with the `Main` Actor’s
@@ -332,17 +332,17 @@ is best for a specific actor. Considerations for the choice is provided in the
 #### AbstractBehavior API
 
 Defining a class based actor behavior starts with extending 
-@apidoc[akka.actor.typed.*.AbstractBehavior]@java[``]@scala[`[T]`] where `T` is the type of messages
+@apidoc[actor.typed.*.AbstractBehavior]@java[``]@scala[`[T]`] where `T` is the type of messages
 the behavior will accept.
 
 Let's repeat the chat room sample from @ref:[A more complex example above](#a-more-complex-example) but implemented
 using `AbstractBehavior`. The protocol for interacting with the actor looks the same:
 
 Scala
-:  @@snip [OOIntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala) {  #chatroom-protocol }
+:  @@snip [OOIntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala) {  #chatroom-protocol }
 
 Java
-:  @@snip [OOIntroTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/OOIntroTest.java) {  #chatroom-protocol }
+:  @@snip [OOIntroTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java) {  #chatroom-protocol }
 
 Initially the client Actors only get access to an @scala[`ActorRef[GetSession]`]@java[`ActorRef`]
 which allows them to make the first step. Once a client’s session has been
@@ -359,15 +359,15 @@ full protocol that can involve multiple Actors and that can evolve over
 multiple steps. Here's the `AbstractBehavior` implementation of the chat room protocol:
 
 Scala
-:  @@snip [OOIntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala) {  #chatroom-behavior }
+:  @@snip [OOIntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala) {  #chatroom-behavior }
 
 Java
-:  @@snip [OOIntroTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/OOIntroTest.java) {  #chatroom-behavior }
+:  @@snip [OOIntroTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java) {  #chatroom-behavior }
 
 The state is managed through fields in the class, just like with a regular object oriented class.
 As the state is mutable, we never return a different behavior from the message logic, but can return
 the `AbstractBehavior` instance itself (`this`) as a behavior to use for processing the next message coming in.
-We could also return @apidoc[Behaviors.same](typed.*.Behaviors$) {scala="#same[T]:akka.actor.typed.Behavior[T]" java="#same()"} to achieve the same.
+We could also return @apidoc[Behaviors.same](typed.*.Behaviors$) {scala="#same[T]:org.apache.pekko.actor.typed.Behavior[T]" java="#same()"} to achieve the same.
 
 @java[In this sample we make separate statements for creating the behavior builder, but it also returns the builder
 itself from each step so a more fluent behavior definition style is also possible. What you should prefer depends on
@@ -386,7 +386,7 @@ screen name.
 
 To implement the logic where we spawn a child for the session we need access 
 to the @apidoc[typed.*.ActorContext]. This is injected as a constructor parameter upon creation 
-of the behavior, note how we combine the @apidoc[typed.*.AbstractBehavior] with  @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"}
+of the behavior, note how we combine the @apidoc[typed.*.AbstractBehavior] with  @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"}
 to do this in the @scala[`apply`]@java[`create`] factory method.
 
 The behavior that we declare here can handle both subtypes of `RoomCommand`.
@@ -404,7 +404,7 @@ If we did not care about securing the correspondence between a session and a
 screen name then we could change the protocol such that `PostMessage` is
 removed and all clients just get an @scala[`ActorRef[PublishSessionMessage]`]@java[`ActorRef`] to
 send to. In this case no session actor would be needed and we could use
-@scala[@scaladoc[context.self](akka.actor.typed.scaladsl.ActorContext#self:akka.actor.typed.ActorRef[T])]@java[@javadoc[context.getSelf()](akka.actor.typed.javadsl.ActorContext#getSelf())]. The type-checks work out in that case because
+@scala[@scaladoc[context.self](pekko.actor.typed.scaladsl.ActorContext#self:org.apache.pekko.actor.typed.ActorRef[T])]@java[@javadoc[context.getSelf()](pekko.actor.typed.javadsl.ActorContext#getSelf())]. The type-checks work out in that case because
 @scala[`ActorRef[-T]`]@java[`ActorRef`] is contravariant in its type parameter, meaning that we
 can use a @scala[`ActorRef[RoomCommand]`]@java[`ActorRef`] wherever an
 @scala[`ActorRef[PublishSessionMessage]`]@java[`ActorRef`] is needed—this makes sense because the
@@ -418,10 +418,10 @@ In order to see this chat room in action we need to write a client Actor that ca
 @scala[, for this stateless actor it doesn't make much sense to use the `AbstractBehavior` so let's just reuse the functional style gabbler from the sample above]:
 
 Scala
-:  @@snip [OOIntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala) {  #chatroom-gabbler }
+:  @@snip [OOIntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala) {  #chatroom-gabbler }
 
 Java
-:  @@snip [OOIntroTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/OOIntroTest.java) {  #chatroom-gabbler }
+:  @@snip [OOIntroTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java) {  #chatroom-gabbler }
 
 Now to try things out we must start both a chat room and a gabbler and of
 course we do this inside an Actor system. Since there can be only one user guardian
@@ -432,28 +432,28 @@ choice:
 
 
 Scala
-:  @@snip [OOIntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala) {  #chatroom-main }
+:  @@snip [OOIntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala) {  #chatroom-main }
 
 Java
-:  @@snip [OOIntroTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/OOIntroTest.java) {  #chatroom-main }
+:  @@snip [OOIntroTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java) {  #chatroom-main }
 
 In good tradition we call the `Main` Actor what it is, it directly
 corresponds to the `main` method in a traditional Java application. This
 Actor will perform its job on its own accord, we do not need to send messages
-from the outside, so we declare it to be of type @scala[@scaladoc[NotUsed](akka.NotUsed)]@java[@javadoc[Void](java.lang.Void)]. Actors receive not
+from the outside, so we declare it to be of type @scala[@scaladoc[NotUsed](pekko.NotUsed)]@java[@javadoc[Void](java.lang.Void)]. Actors receive not
 only external messages, they also are notified of certain system events,
 so-called Signals. In order to get access to those we choose to implement this
-particular one using the @apidoc[receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(akka.actor.typed.scaladsl.ActorContext[T],T)=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(akka.japi.function.Function2)"} behavior decorator. The
+particular one using the @apidoc[receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(org.apache.pekko.actor.typed.scaladsl.ActorContext[T],T)=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(org.apache.pekko.japi.function.Function2)"} behavior decorator. The
 provided `onSignal` function will be invoked for signals (subclasses of @apidoc[typed.Signal])
 or the `onMessage` function for user messages.
 
-This particular `Main` Actor is created using @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"}, which is like a factory for a behavior.
-Creation of the behavior instance is deferred until the actor is started, as opposed to @apidoc[Behaviors.receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(akka.actor.typed.scaladsl.ActorContext[T],T)=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(akka.japi.function.Function2)"}
+This particular `Main` Actor is created using @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"}, which is like a factory for a behavior.
+Creation of the behavior instance is deferred until the actor is started, as opposed to @apidoc[Behaviors.receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(org.apache.pekko.actor.typed.scaladsl.ActorContext[T],T)=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(org.apache.pekko.japi.function.Function2)"}
 that creates the behavior instance immediately before the actor is running. The factory function in
 `setup` is passed the @apidoc[typed.*.ActorContext] as parameter and that can for example be used for spawning child actors.
 This `Main` Actor creates the chat room and the gabbler and the session between them is initiated, and when the
 gabbler is finished we will receive the @apidoc[typed.Terminated] event due to having
-called @apidoc[context.watch](typed.*.ActorContext) {scala="#watch[U](other:akka.actor.typed.ActorRef[U]):Unit" java="#watch(akka.actor.typed.ActorRef)"} for it. This allows us to shut down the Actor system: when
+called @apidoc[context.watch](typed.*.ActorContext) {scala="#watch[U](other:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#watch(org.apache.pekko.actor.typed.ActorRef)"} for it. This allows us to shut down the Actor system: when
 the `Main` Actor terminates there is nothing more to do.
 
 Therefore after creating the Actor system with the `Main` Actor’s
diff --git a/akka-docs/src/main/paradox/typed/cluster-dc.md b/akka-docs/src/main/paradox/typed/cluster-dc.md
index 7858571703..497e5586fa 100644
--- a/akka-docs/src/main/paradox/typed/cluster-dc.md
+++ b/akka-docs/src/main/paradox/typed/cluster-dc.md
@@ -111,10 +111,10 @@ if you see this in log messages.
 You can retrieve information about what data center a member belongs to:
 
 Scala
-:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #dcAccess }
+:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #dcAccess }
 
 Java
-:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java) { #dcAccess }
+:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java) { #dcAccess }
 
 ## Failure Detection
 
@@ -171,10 +171,10 @@ having a global singleton in one data center and accessing it from other data ce
 This is how to create a singleton proxy for a specific data center:
 
 Scala
-:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/SingletonCompileOnlySpec.scala) { #create-singleton-proxy-dc }
+:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala) { #create-singleton-proxy-dc }
 
 Java
-:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/SingletonCompileOnlyTest.java) { #create-singleton-proxy-dc }
+:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java) { #create-singleton-proxy-dc }
 
 If using the own data center as the `withDataCenter` parameter that would be a proxy for the singleton in the own data center, which
 is also the default if `withDataCenter` is not given.
@@ -208,18 +208,18 @@ accessing them from other data centers.
 This is how to create a sharding proxy for a specific data center:
 
 Scala
-:  @@snip [MultiDcClusterShardingSpec.scala](/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala) { #proxy-dc }
+:  @@snip [MultiDcClusterShardingSpec.scala](/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/MultiDcClusterShardingSpec.scala) { #proxy-dc }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #proxy-dc }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #proxy-dc }
 
 and it can also be used with an `EntityRef`:
 
 Scala
-:  @@snip [MultiDcClusterShardingSpec.scala](/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala) { #proxy-dc-entityref }
+:  @@snip [MultiDcClusterShardingSpec.scala](/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/MultiDcClusterShardingSpec.scala) { #proxy-dc-entityref }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #proxy-dc-entityref }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #proxy-dc-entityref }
 
 Another way to manage global entities is to make sure that certain entity ids are located in 
 only one data center by routing the messages to the right region. For example, the routing function
diff --git a/akka-docs/src/main/paradox/typed/cluster-sharded-daemon-process.md b/akka-docs/src/main/paradox/typed/cluster-sharded-daemon-process.md
index b5414910cd..949b9976b5 100644
--- a/akka-docs/src/main/paradox/typed/cluster-sharded-daemon-process.md
+++ b/akka-docs/src/main/paradox/typed/cluster-sharded-daemon-process.md
@@ -34,10 +34,10 @@ To set up a set of actors running with Sharded Daemon process each node in the c
 when starting up:
 
 Scala
-:  @@snip [ShardedDaemonProcessExample.scala](/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala) { #tag-processing }
+:  @@snip [ShardedDaemonProcessExample.scala](/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala) { #tag-processing }
 
 Java
-:  @@snip [ShardedDaemonProcessExample.java](/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java) { #tag-processing }
+:  @@snip [ShardedDaemonProcessExample.java](/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java) { #tag-processing }
 
 An additional factory method is provided for further configurability and providing a graceful stop message for the actor.
 
diff --git a/akka-docs/src/main/paradox/typed/cluster-sharding.md b/akka-docs/src/main/paradox/typed/cluster-sharding.md
index 08496c8c06..246d09cc8a 100644
--- a/akka-docs/src/main/paradox/typed/cluster-sharding.md
+++ b/akka-docs/src/main/paradox/typed/cluster-sharding.md
@@ -61,39 +61,39 @@ See @ref:[Downing](cluster.md#downing).
 Sharding is accessed via the @apidoc[typed.*.ClusterSharding] extension
 
 Scala
-:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #sharding-extension }
+:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #sharding-extension }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #import #sharding-extension }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #import #sharding-extension }
 
 It is common for sharding to be used with persistence however any @apidoc[typed.Behavior] can be used with sharding e.g. a basic counter:
 
 Scala
-:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #counter }
+:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #counter }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #counter }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #counter }
 
 Each Entity type has a key that is then used to retrieve an EntityRef for a given entity identifier. 
 Note in the sample's @scala[`Counter.apply`]@java[`Counter.create`] function that the `entityId` parameter is not
 called, it is included to demonstrate how one can pass it to an entity. Another way to do this is by sending the `entityId` as part of the message if needed.
 
 Scala
-:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #init }
+:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #init }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #init }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #init }
 
 Messages to a specific entity are then sent via an @apidoc[typed.*.EntityRef].  The `entityId` and the name of the Entity's key can be retrieved from the `EntityRef`.
 It is also possible to wrap methods in a @apidoc[typed.ShardingEnvelope] or define extractor functions and send messages directly to the shard region.
 
 Scala
-:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #send }
+:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #send }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #send }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #send }
 
-Cluster sharding @apidoc[init](typed.*.ClusterSharding) {scala="#init[M,E](entity:akka.cluster.sharding.typed.scaladsl.Entity[M,E]):akka.actor.typed.ActorRef[E]" java="#init(akka.cluster.sharding.typed.javadsl.Entity)"} should be called on every node for each entity type. Which nodes entity actors are created on
+Cluster sharding @apidoc[init](typed.*.ClusterSharding) {scala="#init[M,E](entity:org.apache.pekko.cluster.sharding.typed.scaladsl.Entity[M,E]):org.apache.pekko.actor.typed.ActorRef[E]" java="#init(org.apache.pekko.cluster.sharding.typed.javadsl.Entity)"} should be called on every node for each entity type. Which nodes entity actors are created on
 can be controlled with @ref:[roles](cluster.md#node-roles). `init` will create a `ShardRegion` or a proxy depending on whether the node's role matches
 the entity's role. 
 
@@ -102,10 +102,10 @@ The behavior factory lambda passed to the init method is defined on each node an
 Specifying the role:
 
 Scala
-:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #roles }
+:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #roles }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #roles }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #roles }
 
 ### A note about EntityRef and serialization
 
@@ -131,20 +131,20 @@ persistence to ensure that there is only one active entity for each `Persistence
 Here is an example of a persistent actor that is used as a sharded entity:
 
 Scala
-:  @@snip [HelloWorldPersistentEntityExample.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala) { #persistent-entity }
+:  @@snip [HelloWorldPersistentEntityExample.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala) { #persistent-entity }
 
 Java
-:  @@snip [HelloWorldPersistentEntityExample.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.java) { #persistent-entity-import #persistent-entity }
+:  @@snip [HelloWorldPersistentEntityExample.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.java) { #persistent-entity-import #persistent-entity }
 
 To initialize and use the entity:
 
 Scala
-:  @@snip [HelloWorldPersistentEntityExample.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala) { #persistent-entity-usage }
+:  @@snip [HelloWorldPersistentEntityExample.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala) { #persistent-entity-usage }
 
 Java
-:  @@snip [HelloWorldPersistentEntityExample.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldPersistentEntityExample.java) { #persistent-entity-usage-import #persistent-entity-usage }
+:  @@snip [HelloWorldPersistentEntityExample.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.java) { #persistent-entity-usage-import #persistent-entity-usage }
 
-Note how an unique @apidoc[akka.persistence.typed.PersistenceId] can be constructed from the @apidoc[typed.*.EntityTypeKey] and the `entityId`
+Note how an unique @apidoc[persistence.typed.PersistenceId] can be constructed from the @apidoc[typed.*.EntityTypeKey] and the `entityId`
 provided by the @apidoc[typed.*.EntityContext] in the factory function for the @apidoc[typed.Behavior]. This is a typical way
 of defining the `PersistenceId` but other formats are possible, as described in the
 @ref:[PersistenceId section](persistence.md#persistenceid).
@@ -214,23 +214,23 @@ This can be used, for example, to match up Kafka Partition consumption with shar
 To use it set it as the allocation strategy on your @apidoc[typed.*.Entity]:
 
 Scala
-: @@snip [ExternalShardAllocationCompileOnlySpec](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala) { #entity }
+: @@snip [ExternalShardAllocationCompileOnlySpec](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala) { #entity }
 
 Java
-: @@snip [ExternalShardAllocationCompileOnlyTest](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java) { #entity }
+: @@snip [ExternalShardAllocationCompileOnlyTest](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java) { #entity }
 
 For any shardId that has not been allocated it will be allocated to the requesting node. To make explicit allocations:
 
 Scala
-: @@snip [ExternalShardAllocationCompileOnlySpec](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala) { #client }
+: @@snip [ExternalShardAllocationCompileOnlySpec](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala) { #client }
 
 Java
-: @@snip [ExternalShardAllocationCompileOnlyTest](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java) { #client }
+: @@snip [ExternalShardAllocationCompileOnlyTest](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java) { #client }
 
 Any new or moved shard allocations will be moved on the next rebalance.
 
 The communication from the client to the shard allocation strategy is via @ref[Distributed Data](./distributed-data.md).
-It uses a single @apidoc[akka.cluster.ddata.LWWMap] that can support 10s of thousands of shards. Later versions could use multiple keys to 
+It uses a single @apidoc[cluster.ddata.LWWMap] that can support 10s of thousands of shards. Later versions could use multiple keys to 
 support a greater number of shards.
 
 #### Example project for external allocation strategy
@@ -242,8 +242,8 @@ external sharding to co-locate Kafka partition consumption with shards.
 ### Custom shard allocation
 
 An optional custom shard allocation strategy can be passed into the optional parameter when initializing an entity type 
-or explicitly using the @apidoc[withAllocationStrategy](typed.*.Entity) {scala="#withAllocationStrategy(newAllocationStrategy:akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy):akka.cluster.sharding.typed.scaladsl.Entity[M,E]" java="#withAllocationStrategy(akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy)"} function.
-See the API documentation of @scala[@scaladoc[ShardAllocationStrategy](akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy)]@java[@javadoc[AbstractShardAllocationStrategy](akka.cluster.sharding.ShardCoordinator.AbstractShardAllocationStrategy)] for details of how to implement a custom `ShardAllocationStrategy`.
+or explicitly using the @apidoc[withAllocationStrategy](typed.*.Entity) {scala="#withAllocationStrategy(newAllocationStrategy:org.apache.pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy):org.apache.pekko.cluster.sharding.typed.scaladsl.Entity[M,E]" java="#withAllocationStrategy(org.apache.pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy)"} function.
+See the API documentation of @scala[@scaladoc[ShardAllocationStrategy](pekko.cluster.sharding.ShardCoordinator.ShardAllocationStrategy)]@java[@javadoc[AbstractShardAllocationStrategy](pekko.cluster.sharding.ShardCoordinator.AbstractShardAllocationStrategy)] for details of how to implement a custom `ShardAllocationStrategy`.
 
 ## How it works
 
@@ -258,7 +258,7 @@ the entity actors for example by defining receive timeout (@apidoc[context.setRe
 If a message is already enqueued to the entity when it stops itself the enqueued message
 in the mailbox will be dropped. To support graceful passivation without losing such
 messages the entity actor can send @apidoc[typed.*.ClusterSharding.Passivate] to the
-@apidoc[typed.ActorRef]@scala[[@scaladoc[ShardCommand](akka.cluster.sharding.typed.scaladsl.ClusterSharding.ShardCommand)]]@java[<@javadoc[ShardCommand](akka.cluster.sharding.typed.javadsl.ClusterSharding.ShardCommand)>] that was passed in to
+@apidoc[typed.ActorRef]@scala[[@scaladoc[ShardCommand](cluster.sharding.typed.scaladsl.ClusterSharding.ShardCommand)]]@java[<@javadoc[ShardCommand](pekko.cluster.sharding.typed.javadsl.ClusterSharding.ShardCommand)>] that was passed in to
 the factory method when creating the entity. The optional `stopMessage` message
 will be sent back to the entity, which is then supposed to stop itself, otherwise it will
 be stopped automatically. Incoming messages will be buffered by the `Shard` between reception
@@ -266,18 +266,18 @@ of `Passivate` and termination of the entity. Such buffered messages are thereaf
 to a new incarnation of the entity.
 
 Scala
-:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #counter-passivate }
+:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #counter-passivate }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #counter-passivate }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #counter-passivate }
 
 and then initialized with:
 
 Scala
-:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #counter-passivate-init }
+:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #counter-passivate-init }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #counter-passivate-init }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #counter-passivate-init }
 
 Note that in the above example the `stopMessage` is specified as `GoodByeCounter`. That message will be sent to
 the entity when it's supposed to stop itself due to rebalance or passivation. If the `stopMessage` is not defined
@@ -320,9 +320,9 @@ Idle entities can be automatically passivated when they have not received a mess
 This is currently the default strategy, for compatibility, and is enabled automatically with a timeout of 2 minutes.
 Specify a different idle timeout with configuration:
 
-@@snip [passivation idle timeout](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #passivation-idle-timeout type=conf }
+@@snip [passivation idle timeout](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #passivation-idle-timeout type=conf }
 
-Or specify the idle timeout as a duration using the @apidoc[withPassivationStrategy](typed.ClusterShardingSettings) {scala="#withPassivationStrategy(settings:akka.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings):akka.cluster.sharding.typed.ClusterShardingSettings" java="#withPassivationStrategy(akka.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings)"} method on `ClusterShardingSettings`.
+Or specify the idle timeout as a duration using the @apidoc[withPassivationStrategy](typed.ClusterShardingSettings) {scala="#withPassivationStrategy(settings:org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings):org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings" java="#withPassivationStrategy(org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings)"} method on `ClusterShardingSettings`.
 
 Idle entity timeouts can be enabled and configured for any passivation strategy.
 
@@ -335,7 +335,7 @@ The configurable limit is for a whole shard region and is divided evenly among t
 A recommended passivation strategy, which will become the new default passivation strategy in future versions of Akka
 Cluster Sharding, can be enabled with configuration:
 
-@@snip [passivation new default strategy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #passivation-new-default-strategy type=conf }
+@@snip [passivation new default strategy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #passivation-new-default-strategy type=conf }
 
 This default strategy uses a [composite passivation strategy](#composite-passivation-strategies) which combines
 recency-based and frequency-based tracking: the main area is configured with a [segmented least recently used
@@ -345,15 +345,15 @@ enabled.
 
 The active entity limit for the default strategy can be configured:
 
-@@snip [passivation new default strategy configured](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #passivation-new-default-strategy-configured type=conf }
+@@snip [passivation new default strategy configured](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #passivation-new-default-strategy-configured type=conf }
 
-Or using the @apidoc[withActiveEntityLimit](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withActiveEntityLimit(limit:Int):akka.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withActiveEntityLimit(int)"} method on `ClusterShardingSettings.PassivationStrategySettings`.
+Or using the @apidoc[withActiveEntityLimit](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withActiveEntityLimit(limit:Int):org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withActiveEntityLimit(int)"} method on `ClusterShardingSettings.PassivationStrategySettings`.
 
 An [idle entity timeout](#idle-entity-passivation) can also be enabled and configured for this strategy:
 
-@@snip [passivation new default strategy with idle](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #passivation-new-default-strategy-with-idle type=conf }
+@@snip [passivation new default strategy with idle](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #passivation-new-default-strategy-with-idle type=conf }
 
-Or using the @apidoc[withIdleEntityPassivation](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withIdleEntityPassivation(settings:akka.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings.IdleSettings):akka.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withIdleEntityPassivation(akka.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings.IdleSettings)"} method on `ClusterShardingSettings.PassivationStrategySettings`.
+Or using the @apidoc[withIdleEntityPassivation](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withIdleEntityPassivation(settings:org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings.IdleSettings):org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withIdleEntityPassivation(org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings.IdleSettings)"} method on `ClusterShardingSettings.PassivationStrategySettings`.
 
 If the default strategy is not appropriate for particular workloads and access patterns, a [custom passivation
 strategy](#custom-passivation-strategies) can be created with configurable replacement policies, active entity limits,
@@ -367,7 +367,7 @@ _replacement policy_ to be chosen, an _active entity limit_ to be set, and can o
 entities](#idle-entity-passivation). For example, a custom strategy can be configured to use the [least recently used
 policy](#least-recently-used-policy):
 
-@@snip [custom passivation strategy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #custom-passivation-strategy type=conf }
+@@snip [custom passivation strategy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #custom-passivation-strategy type=conf }
 
 The active entity limit and replacement policy can also be configured using the `withPassivationStrategy` method on
 `ClusterShardingSettings`, passing custom `ClusterShardingSettings.PassivationStrategySettings`.
@@ -383,9 +383,9 @@ policy](#segmented-least-recently-used-policy) for a variation that also disting
 
 Configure a passivation strategy to use the least recently used policy:
 
-@@snip [LRU policy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #lru-policy type=conf }
+@@snip [LRU policy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #lru-policy type=conf }
 
-Or using the @apidoc[withLeastRecentlyUsedReplacement](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withLeastRecentlyUsedReplacement():akka.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withLeastRecentlyUsedReplacement()"} method on `ClusterShardingSettings.PassivationStrategySettings`.
+Or using the @apidoc[withLeastRecentlyUsedReplacement](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withLeastRecentlyUsedReplacement():org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withLeastRecentlyUsedReplacement()"} method on `ClusterShardingSettings.PassivationStrategySettings`.
 
 #### Segmented least recently used policy
 
@@ -406,11 +406,11 @@ popular than others, to prioritize those entities that are accessed more frequen
 To configure a segmented least recently used (SLRU) policy, with two levels and a protected segment limited to 80% of
 the total limit:
 
-@@snip [SLRU policy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #slru-policy type=conf }
+@@snip [SLRU policy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #slru-policy type=conf }
 
 Or to configure a 4-level segmented least recently used (S4LRU) policy, with 4 evenly divided levels:
 
-@@snip [S4LRU policy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #s4lru-policy type=conf }
+@@snip [S4LRU policy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #s4lru-policy type=conf }
 
 Or using custom `ClusterShardingSettings.PassivationStrategySettings.LeastRecentlyUsedSettings`.
 
@@ -424,9 +424,9 @@ will be accessed again; as seen in cyclic access patterns.
 
 Configure a passivation strategy to use the most recently used policy:
 
-@@snip [MRU policy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #mru-policy type=conf }
+@@snip [MRU policy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #mru-policy type=conf }
 
-Or using the @apidoc[withMostRecentlyUsedReplacement](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withMostRecentlyUsedReplacement():akka.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withMostRecentlyUsedReplacement()"} method on `ClusterShardingSettings.PassivationStrategySettings`.
+Or using the @apidoc[withMostRecentlyUsedReplacement](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withMostRecentlyUsedReplacement():org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withMostRecentlyUsedReplacement()"} method on `ClusterShardingSettings.PassivationStrategySettings`.
 
 ### Least frequently used policy
 
@@ -439,9 +439,9 @@ policy](#least-frequently-used-with-dynamic-aging-policy) for a variation that a
 
 Configure automatic passivation to use the least frequently used policy:
 
-@@snip [LFU policy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #lfu-policy type=conf }
+@@snip [LFU policy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #lfu-policy type=conf }
 
-Or using the @apidoc[withLeastFrequentlyUsedReplacement](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withLeastFrequentlyUsedReplacement():akka.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withLeastFrequentlyUsedReplacement()"} method on `ClusterShardingSettings.PassivationStrategySettings`.
+Or using the @apidoc[withLeastFrequentlyUsedReplacement](typed.ClusterShardingSettings.PassivationStrategySettings) {scala="#withLeastFrequentlyUsedReplacement():org.apache.pekko.cluster.sharding.typed.ClusterShardingSettings.PassivationStrategySettings" java="#withLeastFrequentlyUsedReplacement()"} method on `ClusterShardingSettings.PassivationStrategySettings`.
 
 #### Least frequently used with dynamic aging policy
 
@@ -457,7 +457,7 @@ popularity can have more impact on a least frequently used policy if the active
 
 Configure dynamic aging with the least frequently used policy:
 
-@@snip [LFUDA policy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #lfuda-policy type=conf }
+@@snip [LFUDA policy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #lfuda-policy type=conf }
 
 Or using custom `ClusterShardingSettings.PassivationStrategySettings.LeastFrequentlyUsedSettings`.
 
@@ -478,11 +478,11 @@ The admission window tracks newly activated entities. When an entity is replaced
 opportunity to enter the main entity tracking area, based on the [admission filter](#admission-filter). The admission
 window can be enabled by selecting a policy (while the regular replacement policy is for the main area):
 
-@@snip [admission window policy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #admission-window-policy type=conf }
+@@snip [admission window policy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #admission-window-policy type=conf }
 
 The proportion of the active entity limit used for the admission window can be configured (the default is 1%):
 
-@@snip [admission window proportion](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #admission-window-proportion type=conf }
+@@snip [admission window proportion](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #admission-window-proportion type=conf }
 
 The proportion for the admission window can also be adapted and optimized dynamically, by enabling an [admission window
 optimizer](#admission-window-optimizer).
@@ -499,7 +499,7 @@ The optimizer currently available uses a simple hill-climbing algorithm, which s
 provides an optimal active rate (where entities are already active when accessed, the _cache hit rate_). Enable
 adaptive window sizing by configuring the `hill-climbing` window optimizer:
 
-@@snip [admission window optimizer](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #admission-window-optimizer type=conf }
+@@snip [admission window optimizer](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #admission-window-optimizer type=conf }
 
 See the `reference.conf` for parameters that can be tuned for the hill climbing admission window optimizer.
 
@@ -514,7 +514,7 @@ the cluster sharding node, selecting the entity that is estimated to be accessed
 automatically ages entries, using the approach from the _TinyLFU_ cache admission algorithm. Enable an admission filter
 by configuring the `frequency-sketch` admission filter:
 
-@@snip [admission policy](/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingSettingsSpec.scala) { #admission-policy type=conf }
+@@snip [admission policy](/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala) { #admission-policy type=conf }
 
 See the `reference.conf` for parameters that can be tuned for the frequency sketch admission filter.
 
@@ -602,7 +602,7 @@ node or recovers after a crash, it will recreate all the entities which were pre
 running in that `Shard`. 
 
 To permanently stop entities send a @apidoc[ClusterSharding.Passivate](typed.*.ClusterSharding.Passivate) to the
-@apidoc[typed.ActorRef]@scala[[@scaladoc[ShardCommand](akka.cluster.sharding.typed.scaladsl.ClusterSharding.ShardCommand)]]@java[<@javadoc[ShardCommand](akka.cluster.sharding.typed.javadsl.ClusterSharding.ShardCommand)>] that was passed in to
+@apidoc[typed.ActorRef]@scala[[@scaladoc[ShardCommand](pekko.cluster.sharding.typed.scaladsl.ClusterSharding.ShardCommand)]]@java[<@javadoc[ShardCommand](pekko.cluster.sharding.typed.javadsl.ClusterSharding.ShardCommand)>] that was passed in to
 the factory method when creating the entity.
 Otherwise, the entity will be automatically restarted after the entity restart backoff specified in the configuration.
 
@@ -666,11 +666,11 @@ In this example `cassandra` is the used journal:
 ```
 akka.persistence.cassandra.journal {
   event-adapters {
-    coordinator-migration = "akka.cluster.sharding.OldCoordinatorStateMigrationEventAdapter"
+    coordinator-migration = "org.apache.pekko.cluster.sharding.OldCoordinatorStateMigrationEventAdapter"
   }
 
   event-adapter-bindings {
-    "akka.cluster.sharding.ShardCoordinator$Internal$DomainEvent" = coordinator-migration
+    "org.apache.pekko.cluster.sharding.ShardCoordinator$Internal$DomainEvent" = coordinator-migration
   }
 }
 ```
@@ -730,25 +730,25 @@ See also additional information about how to make @ref:[smooth rolling updates](
 
 Two requests to inspect the cluster state are available:
 
-@apidoc[akka.cluster.sharding.typed.GetShardRegionState] which will reply with a 
+@apidoc[cluster.sharding.typed.GetShardRegionState] which will reply with a 
 @apidoc[ShardRegion.CurrentShardRegionState] that contains the identifiers of the shards running in
 a Region and what entities are alive for each of them.
 
 Scala
-:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #get-shard-region-state }
+:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #get-shard-region-state }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #get-shard-region-state }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #get-shard-region-state }
 
-@apidoc[akka.cluster.sharding.typed.GetClusterShardingStats] which will query all the regions in the cluster and reply with a
+@apidoc[cluster.sharding.typed.GetClusterShardingStats] which will query all the regions in the cluster and reply with a
 @apidoc[ShardRegion.ClusterShardingStats] containing the identifiers of the shards running in each region and a count
 of entities that are alive in each shard.
 
 Scala
-:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #get-cluster-sharding-stats }
+:  @@snip [ShardingCompileOnlySpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #get-cluster-sharding-stats }
 
 Java
-:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #get-cluster-sharding-stats }
+:  @@snip [ShardingCompileOnlyTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java) { #get-cluster-sharding-stats }
 
 If any shard queries failed, for example due to timeout if a shard was too busy to reply within the configured `akka.cluster.sharding.shard-region-query-timeout`, 
 `ShardRegion.CurrentShardRegionState` and `ShardRegion.ClusterShardingStats` will also include the set of shard identifiers by region that failed.
@@ -783,7 +783,7 @@ The Cluster Sharding `ShardCoordinator` stores locations of the shards.
 This data is safely be removed when restarting the whole Akka Cluster.
 Note that this does not include application data.
 
-There is a utility program @apidoc[akka.cluster.sharding.RemoveInternalClusterShardingData$]
+There is a utility program @apidoc[cluster.sharding.RemoveInternalClusterShardingData$]
 that removes this data.
 
 @@@ warning
@@ -802,7 +802,7 @@ Use this program as a standalone Java main program:
 
 ```
 java -classpath 
-  akka.cluster.sharding.RemoveInternalClusterShardingData
+  org.apache.pekko.cluster.sharding.RemoveInternalClusterShardingData
     -2.3 entityType1 entityType2 entityType3
 ```
 
diff --git a/akka-docs/src/main/paradox/typed/cluster-singleton.md b/akka-docs/src/main/paradox/typed/cluster-singleton.md
index 5976920fbe..5e92d61835 100644
--- a/akka-docs/src/main/paradox/typed/cluster-singleton.md
+++ b/akka-docs/src/main/paradox/typed/cluster-singleton.md
@@ -47,7 +47,7 @@ See @ref:[Downing](cluster.md#downing).
 ### Singleton manager
 
 The cluster singleton pattern manages one singleton actor instance among all cluster nodes or a group of nodes tagged with
-a specific role. The singleton manager is an actor that is supposed to be started with @apidoc[ClusterSingleton.init](ClusterSingleton) {scala="#init[M](singleton:akka.cluster.typed.SingletonActor[M]):akka.actor.typed.ActorRef[M]" java="#init(akka.cluster.typed.SingletonActor)"} as
+a specific role. The singleton manager is an actor that is supposed to be started with @apidoc[ClusterSingleton.init](ClusterSingleton) {scala="#init[M](singleton:org.apache.pekko.cluster.typed.SingletonActor[M]):org.apache.pekko.actor.typed.ActorRef[M]" java="#init(org.apache.pekko.cluster.typed.SingletonActor)"} as
 early as possible on all nodes, or all nodes with specified role, in the cluster. 
 
 The actual singleton actor is
@@ -56,7 +56,7 @@ The actual singleton actor is
 supplied @apidoc[Behavior](typed.Behavior). It makes sure that at most one singleton instance is running at any point in time.
 * Always running on the oldest member with specified role.
 
-The oldest member is determined by @apidoc[akka.cluster.Member#isOlderThan](cluster.Member) {scala="#isOlderThan(other:akka.cluster.Member):Boolean" java="#isOlderThan(akka.cluster.Member)"}
+The oldest member is determined by @apidoc[cluster.Member#isOlderThan](cluster.Member) {scala="#isOlderThan(other:org.apache.pekko.cluster.Member):Boolean" java="#isOlderThan(org.apache.pekko.cluster.Member)"}
 This can change when removing that member from the cluster. Be aware that there is a short time
 period when there is no active singleton during the hand-over process.
 
@@ -72,7 +72,7 @@ cases are eventually resolved by configurable timeouts. Additional safety can be
 ### Singleton proxy
 
 To communicate with a given named singleton in the cluster you can access it though a proxy @apidoc[ActorRef](typed.ActorRef).
-When calling @apidoc[ClusterSingleton.init](ClusterSingleton) {scala="#init[M](singleton:akka.cluster.typed.SingletonActor[M]):akka.actor.typed.ActorRef[M]" java="#init(akka.cluster.typed.SingletonActor)"} for a given `singletonName` on a node an `ActorRef` is returned. It is
+When calling @apidoc[ClusterSingleton.init](ClusterSingleton) {scala="#init[M](singleton:org.apache.pekko.cluster.typed.SingletonActor[M]):org.apache.pekko.actor.typed.ActorRef[M]" java="#init(org.apache.pekko.cluster.typed.SingletonActor)"} for a given `singletonName` on a node an `ActorRef` is returned. It is
 to this `ActorRef` that you can send messages to the singleton instance, independent of which node the singleton
 instance is active. `ClusterSingleton.init` can be called multiple times, if there already is a singleton manager 
 running on this node, no additional manager is started, and if there is one running an `ActorRef` to the proxy
@@ -117,20 +117,20 @@ See @ref:[Downing](cluster.md#downing).
 Any @apidoc[Behavior](typed.Behavior) can be run as a singleton. E.g. a basic counter:
 
 Scala
-:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/SingletonCompileOnlySpec.scala) { #counter }
+:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala) { #counter }
 
 Java
-:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/SingletonCompileOnlyTest.java) { #counter }
+:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java) { #counter }
 
 Then on every node in the cluster, or every node with a given role, use the @apidoc[ClusterSingleton$] extension
 to spawn the singleton. An instance will per data centre of the cluster:
 
 
 Scala
-:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/SingletonCompileOnlySpec.scala) { #singleton }
+:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala) { #singleton }
 
 Java
-:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/SingletonCompileOnlyTest.java) { #import #singleton }
+:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java) { #import #singleton }
 
 ## Supervision
 
@@ -140,10 +140,10 @@ a backoff:
 
 
 Scala
-:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/SingletonCompileOnlySpec.scala) { #backoff}
+:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala) { #backoff}
 
 Java
-:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/SingletonCompileOnlyTest.java) { #backoff}
+:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java) { #backoff}
 
 Be aware that this means there will be times when the singleton won't be running as restart is delayed.
 See @ref[Fault Tolerance](./fault-tolerance.md) for a full list of supervision options.
@@ -157,10 +157,10 @@ singleton actor is terminated.
 If the shutdown logic does not include any asynchronous actions it can be executed in the @apidoc[PostStop$] signal handler.
 
 Scala
-:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/SingletonCompileOnlySpec.scala) { #stop-message }
+:  @@snip [SingletonCompileOnlySpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala) { #stop-message }
 
 Java
-:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/SingletonCompileOnlyTest.java) { #stop-message }
+:  @@snip [SingletonCompileOnlyTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java) { #stop-message }
 
 ## Lease
 
@@ -190,14 +190,14 @@ TODO @github[#27705](#27705)
 The following configuration properties are read by the @apidoc[ClusterSingletonManagerSettings](singleton.ClusterSingletonManagerSettings)
 when created with a @apidoc[ActorSystem](typed.ActorSystem) parameter. It is also possible to amend the `ClusterSingletonManagerSettings`
 or create it from another config section with the same layout as below. `ClusterSingletonManagerSettings` is
-a parameter to the @apidoc[ClusterSingletonManager.props](ClusterSingletonManager$) {scala="#props(singletonProps:akka.actor.Props,terminationMessage:Any,settings:akka.cluster.singleton.ClusterSingletonManagerSettings):akka.actor.Props" java="#props(akka.actor.Props,java.lang.Object,akka.cluster.singleton.ClusterSingletonManagerSettings)"} factory method, i.e. each singleton can be configured
+a parameter to the @apidoc[ClusterSingletonManager.props](ClusterSingletonManager$) {scala="#props(singletonProps:org.apache.pekko.actor.Props,terminationMessage:Any,settings:org.apache.pekko.cluster.singleton.ClusterSingletonManagerSettings):org.apache.pekko.actor.Props" java="#props(org.apache.pekko.actor.Props,java.lang.Object,org.apache.pekko.cluster.singleton.ClusterSingletonManagerSettings)"} factory method, i.e. each singleton can be configured
 with different settings if needed.
 
 @@snip [reference.conf](/akka-cluster-tools/src/main/resources/reference.conf) { #singleton-config }
 
 The following configuration properties are read by the @apidoc[ClusterSingletonSettings](typed.ClusterSingletonSettings)
 when created with a @apidoc[ActorSystem](typed.ActorSystem) parameter. `ClusterSingletonSettings` is an optional parameter in
-@apidoc[ClusterSingleton.init](ClusterSingleton) {scala="#init[M](singleton:akka.cluster.typed.SingletonActor[M]):akka.actor.typed.ActorRef[M]" java="#init(akka.cluster.typed.SingletonActor)"}. It is also possible to amend the @apidoc[ClusterSingletonProxySettings]
+@apidoc[ClusterSingleton.init](ClusterSingleton) {scala="#init[M](singleton:org.apache.pekko.cluster.typed.SingletonActor[M]):org.apache.pekko.actor.typed.ActorRef[M]" java="#init(org.apache.pekko.cluster.typed.SingletonActor)"}. It is also possible to amend the @apidoc[ClusterSingletonProxySettings]
 or create it from another config section with the same layout as below.
 
 @@snip [reference.conf](/akka-cluster-tools/src/main/resources/reference.conf) { #singleton-proxy-config }
diff --git a/akka-docs/src/main/paradox/typed/cluster.md b/akka-docs/src/main/paradox/typed/cluster.md
index fcc4491962..d13b57db71 100644
--- a/akka-docs/src/main/paradox/typed/cluster.md
+++ b/akka-docs/src/main/paradox/typed/cluster.md
@@ -44,30 +44,30 @@ which are exposed as event APIs.
 
 It does this through these references on the @apidoc[typed.Cluster$] extension:
 
-* `manager`: An @scala[@apidoc[typed.ActorRef]\[@apidoc[akka.cluster.typed.ClusterCommand](typed.ClusterCommand)\]]@java[@apidoc[typed.ActorRef]<@apidoc[akka.cluster.typed.ClusterCommand](typed.ClusterCommand)>] where a `ClusterCommand` is a command such as: @apidoc[Join], @apidoc[Leave] and @apidoc[Down]
-* `subscriptions`: An @scala[@apidoc[typed.ActorRef]\[@apidoc[akka.cluster.typed.ClusterStateSubscription](typed.ClusterStateSubscription)\]]@java[@apidoc[typed.ActorRef]<@apidoc[akka.cluster.typed.ClusterStateSubscription](typed.ClusterStateSubscription)>] where a `ClusterStateSubscription` is one of @apidoc[GetCurrentState] or @apidoc[Subscribe] and @apidoc[Unsubscribe] to cluster events like @apidoc[MemberRemoved](ClusterEvent.MemberRemoved)
+* `manager`: An @scala[@apidoc[typed.ActorRef]\[@apidoc[cluster.typed.ClusterCommand](typed.ClusterCommand)\]]@java[@apidoc[typed.ActorRef]<@apidoc[cluster.typed.ClusterCommand](typed.ClusterCommand)>] where a `ClusterCommand` is a command such as: @apidoc[Join], @apidoc[Leave] and @apidoc[Down]
+* `subscriptions`: An @scala[@apidoc[typed.ActorRef]\[@apidoc[cluster.typed.ClusterStateSubscription](typed.ClusterStateSubscription)\]]@java[@apidoc[typed.ActorRef]<@apidoc[cluster.typed.ClusterStateSubscription](typed.ClusterStateSubscription)>] where a `ClusterStateSubscription` is one of @apidoc[GetCurrentState] or @apidoc[Subscribe] and @apidoc[Unsubscribe] to cluster events like @apidoc[MemberRemoved](ClusterEvent.MemberRemoved)
 * `state`: The current @apidoc[CurrentClusterState](ClusterEvent.CurrentClusterState)
 
 All of the examples below assume the following imports:
 
 Scala
-:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-imports }
+:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-imports }
 
 Java
-:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java) { #cluster-imports }
+:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java) { #cluster-imports }
 
 
 The minimum configuration required is to set a host/port for remoting and the `akka.actor.provider = "cluster"`.
 
-@@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #config-seeds }
+@@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #config-seeds }
 
 Accessing the @apidoc[typed.Cluster$] extension on each node:
 
 Scala
-:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-create }
+:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-create }
 
 Java
-:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java) { #cluster-create }
+:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java) { #cluster-create }
 
 @@@ note
   
@@ -77,54 +77,54 @@ Java
 
 ### Joining and Leaving a Cluster 
 
-If not using configuration to specify @ref:[seed nodes to join](#joining), joining the cluster can be done programmatically via the @scala[@scaladoc[manager](akka.cluster.typed.Cluster#manager:akka.actor.typed.ActorRef[akka.cluster.typed.ClusterCommand])]@java[@javadoc[manager()](akka.cluster.typed.Cluster#manager())].
+If not using configuration to specify @ref:[seed nodes to join](#joining), joining the cluster can be done programmatically via the @scala[@scaladoc[manager](pekko.cluster.typed.Cluster#manager:org.apache.pekko.actor.typed.ActorRef[org.apache.pekko.cluster.typed.ClusterCommand])]@java[@javadoc[manager()](pekko.cluster.typed.Cluster#manager())].
 
 Scala
-:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-join }
+:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-join }
 
 Java
-:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java) { #cluster-join }
+:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java) { #cluster-join }
 
 @ref:[Leaving](#leaving) the cluster and @ref:[downing](#downing) a node are similar:
 
 Scala
-:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-leave }
+:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-leave }
 
 Java
-:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java) { #cluster-leave }
+:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java) { #cluster-leave }
 
 ### Cluster Subscriptions
 
-Cluster @scala[@scaladoc[subscriptions](akka.cluster.typed.Cluster#subscriptions:akka.actor.typed.ActorRef[akka.cluster.typed.ClusterStateSubscription])]@java[@javadoc[subscriptions()](akka.cluster.typed.Cluster#subscriptions())] can be used to receive messages when cluster state changes. For example, registering
+Cluster @scala[@scaladoc[subscriptions](pekko.cluster.typed.Cluster#subscriptions:org.apache.pekko.actor.typed.ActorRef[org.apache.pekko.cluster.typed.ClusterStateSubscription])]@java[@javadoc[subscriptions()](pekko.cluster.typed.Cluster#subscriptions())] can be used to receive messages when cluster state changes. For example, registering
 for all @apidoc[MemberEvent](ClusterEvent.MemberEvent)'s, then using the `manager` to have a node leave the cluster will result in events
 for the node going through the @ref:[Membership Lifecycle](cluster-membership.md#membership-lifecycle).
 
 This example subscribes to a @scala[`subscriber: ActorRef[MemberEvent]`]@java[`ActorRef subscriber`]:
 
 Scala
-:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-subscribe }
+:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-subscribe }
 
 Java
-:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java) { #cluster-subscribe }
+:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java) { #cluster-subscribe }
 
 Then asking a node to leave:
 
 Scala
-:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-leave-example }
+:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #cluster-leave-example }
 
 Java
-:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java) { #cluster-leave-example }
+:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java) { #cluster-leave-example }
 
 
 ### Cluster State
 
 Instead of subscribing to cluster events it can sometimes be convenient to only get the full membership state with
-@scala[@scaladoc[Cluster(system).state](akka.cluster.typed.Cluster#state:akka.cluster.ClusterEvent.CurrentClusterState)]@java[@javadoc[Cluster.get(system).state()](akka.cluster.typed.Cluster#state())]. Note that this state is not necessarily in sync with the events published to a
+@scala[@scaladoc[Cluster(system).state](pekko.cluster.typed.Cluster#state:org.apache.pekko.cluster.ClusterEvent.CurrentClusterState)]@java[@javadoc[Cluster.get(system).state()](pekko.cluster.typed.Cluster#state())]. Note that this state is not necessarily in sync with the events published to a
 cluster subscription.
 
 See @ref:[Cluster Membership](cluster-membership.md#member-events) more information on member events specifically.
 There are more types of change events, consult the API documentation
-of classes that extends @apidoc[akka.cluster.ClusterEvent.ClusterDomainEvent](ClusterEvent.ClusterDomainEvent) for details about the events.
+of classes that extends @apidoc[cluster.ClusterEvent.ClusterDomainEvent](ClusterEvent.ClusterDomainEvent) for details about the events.
  
 ## Cluster Membership API
 
@@ -199,10 +199,10 @@ Joining programmatically is useful when **dynamically discovering** other nodes
 at startup through an external tool or API.
 
 Scala
-:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #join-seed-nodes }
+:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #join-seed-nodes }
 
 Java
-:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java) { #join-seed-nodes }
+:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java) { #join-seed-nodes }
 
 The seed node address list has the same semantics as the configured `seed-nodes`, and the the underlying
 implementation of the process is the same, see @ref:[Joining configured seed nodes](#joining-configured-seed-nodes).
@@ -284,7 +284,7 @@ We recommend that you enable the @ref:[Split Brain Resolver](../split-brain-reso
 Akka Cluster module. You enable it with configuration:
 
 ```
-akka.cluster.downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+akka.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
 ```
 
 You should also consider the different available @ref:[downing strategies](../split-brain-resolver.md#strategies).
@@ -317,14 +317,14 @@ The node roles are defined in the configuration property named `akka.cluster.rol
 and typically defined in the start script as a system property or environment variable.
 
 The roles are part of the membership information in @apidoc[MemberEvent](ClusterEvent.MemberEvent) that you can subscribe to. The roles
-of the own node are available from the @scala[@scaladoc[selfMember](akka.cluster.typed.Cluster#selfMember:akka.cluster.Member)]@java[@javadoc[selfMember()](akka.cluster.typed.Cluster#selfMember())] and that can be used for conditionally starting certain
+of the own node are available from the @scala[@scaladoc[selfMember](pekko.cluster.typed.Cluster#selfMember:org.apache.pekko.cluster.Member)]@java[@javadoc[selfMember()](pekko.cluster.typed.Cluster#selfMember())] and that can be used for conditionally starting certain
 actors:
 
 Scala
-:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala) { #hasRole }
+:  @@snip [BasicClusterExampleSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala) { #hasRole }
 
 Java
-:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java) { #hasRole }
+:  @@snip [BasicClusterExampleTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java) { #hasRole }
 
 ## Failure Detector
 
@@ -337,8 +337,8 @@ unreachable from the rest of the cluster. Please see:
  
 ### Using the Failure Detector
  
-Cluster uses the @apidoc[akka.remote.PhiAccrualFailureDetector](PhiAccrualFailureDetector) failure detector by default, or you can provide your by
-implementing the @apidoc[akka.remote.FailureDetector](FailureDetector) and configuring it:
+Cluster uses the @apidoc[remote.PhiAccrualFailureDetector](PhiAccrualFailureDetector) failure detector by default, or you can provide your by
+implementing the @apidoc[remote.FailureDetector](FailureDetector) and configuring it:
 
 ```
 akka.cluster.implementation-class = "com.example.CustomFailureDetector"
@@ -414,7 +414,7 @@ Creating a cluster is about deploying two or more nodes and having them behave a
 
 The Configuration Compatibility Check feature ensures that all nodes in a cluster have a compatible configuration. Whenever a new node is joining an existing cluster, a subset of its configuration settings (only those that are required to be checked) is sent to the nodes in the cluster for verification. Once the configuration is checked on the cluster side, the cluster sends back its own set of required configuration settings. The joining node will then verify if it's compliant with the cluster configuration. The joining node will only proceed if all checks pass, on both sides.   
 
-New custom checkers can be added by extending @apidoc[akka.cluster.JoinConfigCompatChecker](JoinConfigCompatChecker) and including them in the configuration. Each checker must be associated with a unique key:
+New custom checkers can be added by extending @apidoc[cluster.JoinConfigCompatChecker](JoinConfigCompatChecker) and including them in the configuration. Each checker must be associated with a unique key:
 
 ```
 akka.cluster.configuration-compatibility-check.checkers {
diff --git a/akka-docs/src/main/paradox/typed/coexisting.md b/akka-docs/src/main/paradox/typed/coexisting.md
index 2045050823..59187238f3 100644
--- a/akka-docs/src/main/paradox/typed/coexisting.md
+++ b/akka-docs/src/main/paradox/typed/coexisting.md
@@ -18,7 +18,7 @@ To use Akka Actor Typed, you must add the following dependency in your project:
 We believe Akka Typed will be adopted in existing systems gradually and therefore it's important to be able to use typed
 and classic actors together, within the same `ActorSystem`. Also, we will not be able to integrate with all existing modules in one big bang release and that is another reason for why these two ways of writing actors must be able to coexist.
 
-There are two different `ActorSystem`s: @apidoc[akka.actor.ActorSystem](actor.ActorSystem) and @apidoc[akka.actor.typed.ActorSystem](typed.ActorSystem). 
+There are two different `ActorSystem`s: @apidoc[actor.ActorSystem](actor.ActorSystem) and @apidoc[actor.typed.ActorSystem](typed.ActorSystem). 
 
 Currently the typed actor system is implemented using the classic actor system under the hood. This may change in the future.
 
@@ -34,7 +34,7 @@ Typed and classic can interact the following ways:
 In the examples the `akka.actor` package is aliased to `classic`.
 
 Scala
-:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala) { #import-alias }
+:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala) { #import-alias }
 
 @@@
 
@@ -46,57 +46,57 @@ While coexisting your application will likely still have a classic ActorSystem.
 so that new code and migrated parts don't rely on the classic system:
 
 Scala
-:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala) { #adapter-import #convert-classic }
+:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala) { #adapter-import #convert-classic }
 
 Java
-:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/ClassicWatchingTypedTest.java) { #adapter-import #convert-classic }
+:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java) { #adapter-import #convert-classic }
 
 Then for new typed actors here's how you create, watch and send messages to
 it from a classic actor.
 
 Scala
-:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala) { #typed }
+:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala) { #typed }
 
 Java
-:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/ClassicWatchingTypedTest.java) { #typed }
+:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java) { #typed }
 
 The top level classic actor is created in the usual way:
 
 Scala
-:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala) { #create-classic }
+:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala) { #create-classic }
 
 Java
-:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/ClassicWatchingTypedTest.java) { #create-classic }
+:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java) { #create-classic }
 
 Then it can create a typed actor, watch it, and send a message to it:
 
 Scala
-:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala) { #classic-watch }
+:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala) { #classic-watch }
 
 Java
-:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/ClassicWatchingTypedTest.java) { #classic-watch }
+:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java) { #classic-watch }
 
 @scala[There is one `import` that is needed to make that work.] @java[We import the Adapter class and
 call static methods for conversion.]
 
 Scala
-:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/ClassicWatchingTypedSpec.scala) { #adapter-import }
+:  @@snip [ClassicWatchingTypedSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala) { #adapter-import }
 
 Java
-:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/ClassicWatchingTypedTest.java) { #adapter-import }
+:  @@snip [ClassicWatchingTypedTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java) { #adapter-import }
 
 
 @scala[That adds some implicit extension methods that are added to classic and typed `ActorSystem`, `ActorContext` and `ActorRef` in both directions.]
-@java[To convert between typed and classic `ActorSystem`, `ActorContext` and `ActorRef` in both directions there are adapter methods in @javadoc[akka.actor.typed.javadsl.Adapter](akka.actor.typed.javadsl.Adapter).]
+@java[To convert between typed and classic `ActorSystem`, `ActorContext` and `ActorRef` in both directions there are adapter methods in @javadoc[pekko.actor.typed.javadsl.Adapter](pekko.actor.typed.javadsl.Adapter).]
 Note the inline comments in the example above. 
 
-This method of using a top level classic actor is the suggested path for this type of co-existence. However, if you prefer to start with a typed top level actor then you can use the @scala[implicit @scaladoc[spawn](akka.actor.typed.scaladsl.adapter.package$$ClassicActorSystemOps#spawn[T](behavior:akka.actor.typed.Behavior[T],name:String,props:akka.actor.typed.Props):akka.actor.typed.ActorRef[T]) -method]@java[@javadoc[Adapter.spawn](akka.actor.typed.javadsl.Adapter#spawn(akka.actor.ActorSystem,akka.actor.typed.Behavior,java.lang.String,akka.actor.typed.Props))] directly from the typed system:
+This method of using a top level classic actor is the suggested path for this type of co-existence. However, if you prefer to start with a typed top level actor then you can use the @scala[implicit @scaladoc[spawn](pekko.actor.typed.scaladsl.adapter.package$$ClassicActorSystemOps#spawn[T](behavior:org.apache.pekko.actor.typed.Behavior[T],name:String,props:org.apache.pekko.actor.typed.Props):org.apache.pekko.actor.typed.ActorRef[T]) -method]@java[@javadoc[Adapter.spawn](pekko.actor.typed.javadsl.Adapter#spawn(org.apache.pekko.actor.ActorSystem,org.apache.pekko.actor.typed.Behavior,java.lang.String,org.apache.pekko.actor.typed.Props))] directly from the typed system:
 
 Scala
-:  @@snip [TypedWatchingClassicSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala) { #create }
+:  @@snip [TypedWatchingClassicSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala) { #create }
 
 Java
-:  @@snip [TypedWatchingClassicTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingClassicTest.java) { #create }
+:  @@snip [TypedWatchingClassicTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java) { #create }
 
 The above classic-typed difference is further elaborated in @ref:[the `ActorSystem` section](./from-classic.md#actorsystem) of "Learning Akka Typed from Classic". 
 
@@ -108,33 +108,33 @@ The following will show how to create, watch and send messages back and forth fr
 classic actor:
 
 Scala
-:  @@snip [TypedWatchingClassicSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala) { #classic }
+:  @@snip [TypedWatchingClassicSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala) { #classic }
 
 Java
-:  @@snip [TypedWatchingClassicTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingClassicTest.java) { #classic }
+:  @@snip [TypedWatchingClassicTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java) { #classic }
 
 
 
 Creating the actor system and the typed actor:
 
 Scala
-:  @@snip [TypedWatchingClassicSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala) { #create }
+:  @@snip [TypedWatchingClassicSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala) { #create }
 
 Java
-:  @@snip [TypedWatchingClassicTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingClassicTest.java) { #create }
+:  @@snip [TypedWatchingClassicTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java) { #create }
 
 Then the typed actor creates the classic actor, watches it and sends and receives a response:
 
 Scala
-:  @@snip [TypedWatchingClassicSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/coexistence/TypedWatchingClassicSpec.scala) { #typed }
+:  @@snip [TypedWatchingClassicSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala) { #typed }
 
 Java
-:  @@snip [TypedWatchingClassicTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingClassicTest.java) { #typed }
+:  @@snip [TypedWatchingClassicTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java) { #typed }
 
 @@@ div { .group-scala }
 
 Note that when sending from a typed actor to a classic @apidoc[actor.ActorRef] there is no sender in scope as in classic.
-The typed sender should use its own @scaladoc[ActorContext[T].self](akka.actor.typed.scaladsl.ActorContext#self:akka.actor.typed.ActorRef[T]) explicitly, as shown in the snippet.
+The typed sender should use its own @scaladoc[ActorContext[T].self](pekko.actor.typed.scaladsl.ActorContext#self:org.apache.pekko.actor.typed.ActorRef[T]) explicitly, as shown in the snippet.
 
 @@@
 
diff --git a/akka-docs/src/main/paradox/typed/dispatchers.md b/akka-docs/src/main/paradox/typed/dispatchers.md
index 8d74b14804..eaeb96af22 100644
--- a/akka-docs/src/main/paradox/typed/dispatchers.md
+++ b/akka-docs/src/main/paradox/typed/dispatchers.md
@@ -58,10 +58,10 @@ details @ref:[here](#blocking-needs-careful-management).
 To select a dispatcher use `DispatcherSelector` to create a `Props` instance for spawning your actor:
 
 Scala
-:  @@snip [DispatcherDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/DispatchersDocSpec.scala) { #spawn-dispatcher }
+:  @@snip [DispatcherDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/DispatchersDocSpec.scala) { #spawn-dispatcher }
 
 Java
-:  @@snip [DispatcherDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/DispatchersDocTest.java) { #spawn-dispatcher }
+:  @@snip [DispatcherDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java) { #spawn-dispatcher }
 
 `DispatcherSelector` has a few convenience methods:
 
@@ -72,7 +72,7 @@ Java
 The final example shows how to load a custom dispatcher from configuration and relies on this being in your `application.conf`:
 
 
-@@snip [DispatcherDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/DispatchersDocSpec.scala) { #config }
+@@snip [DispatcherDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/DispatchersDocSpec.scala) { #config }
 
 ## Types of dispatchers
 
@@ -88,7 +88,7 @@ There are 2 different types of message dispatchers:
     * Use cases: Default dispatcher, Bulkheading
     * Driven by: `java.util.concurrent.ExecutorService`.
       Specify using "executor" using "fork-join-executor", "thread-pool-executor" or the fully-qualified
-      class name of an `akka.dispatcher.ExecutorServiceConfigurator` implementation.
+      class name of an `org.apache.pekko.dispatcher.ExecutorServiceConfigurator` implementation.
 
 * **PinnedDispatcher**
 
@@ -98,7 +98,7 @@ There are 2 different types of message dispatchers:
     * Shareability: None
     * Mailboxes: Any, creates one per Actor
     * Use cases: Bulkheading
-    * Driven by: Any `akka.dispatch.ThreadPoolExecutorConfigurator`.
+    * Driven by: Any `org.apache.pekko.dispatch.ThreadPoolExecutorConfigurator`.
       By default a "thread-pool-executor".
 
 Here is an example configuration of a Fork Join Pool dispatcher:
diff --git a/akka-docs/src/main/paradox/typed/distributed-data.md b/akka-docs/src/main/paradox/typed/distributed-data.md
index e18b1159b9..9ceca0f085 100644
--- a/akka-docs/src/main/paradox/typed/distributed-data.md
+++ b/akka-docs/src/main/paradox/typed/distributed-data.md
@@ -49,14 +49,14 @@ accessed through the @apidoc[typed.*.DistributedData] extension.
 The messages for the replicator, such as @apidoc[typed.*Replicator.Update] are defined as
 subclasses of @apidoc[typed.*Replicator.Command]
 and the actual CRDTs are defined in the `akka.cluster.ddata` package, for example
-@apidoc[akka.cluster.ddata.GCounter]. It requires a @scala[implicit] `akka.cluster.ddata.SelfUniqueAddress`,
+@apidoc[cluster.ddata.GCounter]. It requires a @scala[implicit] `org.apache.pekko.cluster.ddata.SelfUniqueAddress`,
 available from:
 
 Scala
-:  @@snip [ReplicatorSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala) { #selfUniqueAddress }
+:  @@snip [ReplicatorSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala) { #selfUniqueAddress }
 
 Java
-:  @@snip [ReplicatorTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/ddata/typed/javadsl/ReplicatorDocSample.java) { #selfUniqueAddress }
+:  @@snip [ReplicatorTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocSample.java) { #selfUniqueAddress }
  
 The replicator can contain multiple entries each containing a replicated data type, we therefore need to create a 
 key identifying the entry and helping us know what type it has, and then use that key for every interaction with
@@ -74,10 +74,10 @@ This sample uses the replicated data type `GCounter` to implement a counter that
 cluster: 
 
 Scala
-:  @@snip [ReplicatorSpec.scala](/akka-cluster-typed/src/test/scala/docs/akka/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala) { #sample }
+:  @@snip [ReplicatorSpec.scala](/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala) { #sample }
 
 Java
-:  @@snip [ReplicatorTest.java](/akka-cluster-typed/src/test/java/jdocs/akka/cluster/ddata/typed/javadsl/ReplicatorDocSample.java) { #sample }
+:  @@snip [ReplicatorTest.java](/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocSample.java) { #sample }
 
 Although you can interact with the `Replicator` using the @scala[`ActorRef[Replicator.Command]`]@java[`ActorRef`]
 from @scala[`DistributedData(ctx.system).replicator`]@java[`DistributedData(ctx.getSystem()).replicator()`] it's
@@ -103,7 +103,7 @@ it contains five values:
 There is alternative way of constructing the function for the `Update` message:
 
 Scala
-:  @@snip [ReplicatorSpec.scala](/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala) { #curried-update }
+:  @@snip [ReplicatorSpec.scala](/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala) { #curried-update }
 
 @@@
 
@@ -144,7 +144,7 @@ incoming message can be used when the `GetSuccess` response from the replicator
 Alternative way of constructing the function for the `Get` and `Delete`:
 
 Scala
-:  @@snip [ReplicatorSpec.scala](/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala) { #curried-get }
+:  @@snip [ReplicatorSpec.scala](/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala) { #curried-get }
 
 @@@
 
@@ -591,7 +591,7 @@ Implement the additional methods of @scala[`DeltaReplicatedData`]@java[`Abstract
 The data types must be serializable with an @ref:[Akka Serializer](../serialization.md).
 It is highly recommended that you implement  efficient serialization with Protobuf or similar
 for your custom data types. The built in data types are marked with `ReplicatedDataSerialization`
-and serialized with `akka.cluster.ddata.protobuf.ReplicatedDataSerializer`.
+and serialized with `org.apache.pekko.cluster.ddata.protobuf.ReplicatedDataSerializer`.
 
 Serialization of the data types are used in remote messages and also for creating message
 digests (SHA-1) to detect changes. Therefore it is important that the serialization is efficient
@@ -621,7 +621,7 @@ Java
 : @@snip [DistributedDataDocSpec.scala](/akka-docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala) { #japi-serializer-config }
 
 Using compression can sometimes be a good idea to reduce the data size. Gzip compression is
-provided by the @scala[`akka.cluster.ddata.protobuf.SerializationSupport` trait]@java[`akka.cluster.ddata.protobuf.AbstractSerializationSupport` interface]:
+provided by the @scala[`org.apache.pekko.cluster.ddata.protobuf.SerializationSupport` trait]@java[`org.apache.pekko.cluster.ddata.protobuf.AbstractSerializationSupport` interface]:
 
 Scala
 : @@snip [TwoPhaseSetSerializer.scala](/akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala) { #compression }
@@ -672,7 +672,7 @@ akka.cluster.distributed-data.durable.keys = ["*"]
 
 @scala[[LMDB](https://symas.com/lmdb/technical/)]@java[[LMDB](https://github.com/lmdbjava/lmdbjava/)] is the default storage implementation. It is
 possible to replace that with another implementation by implementing the actor protocol described in
-`akka.cluster.ddata.DurableStore` and defining the `akka.cluster.distributed-data.durable.store-actor-class`
+`org.apache.pekko.cluster.ddata.DurableStore` and defining the `akka.cluster.distributed-data.durable.store-actor-class`
 property for the new implementation.
 
 The location of the files for the data is configured with:
diff --git a/akka-docs/src/main/paradox/typed/distributed-pub-sub.md b/akka-docs/src/main/paradox/typed/distributed-pub-sub.md
index 0da2c84c86..c92a29a8cf 100644
--- a/akka-docs/src/main/paradox/typed/distributed-pub-sub.md
+++ b/akka-docs/src/main/paradox/typed/distributed-pub-sub.md
@@ -18,7 +18,7 @@ when used in a clustered application:
 
 ## The Topic Actor
 
-Distributed publish subscribe is achieved by representing each pub sub topic with an actor, @apidoc[akka.actor.typed.pubsub.Topic](akka.actor.typed.pubsub.Topic$). 
+Distributed publish subscribe is achieved by representing each pub sub topic with an actor, @apidoc[actor.typed.pubsub.Topic](typed.pubsub.Topic$). 
 
 The topic actor needs to run on each node where subscribers will live or that wants to publish messages to the topic.
  
@@ -26,26 +26,26 @@ The identity of the topic is a tuple of the type of messages that can be publish
 to not define multiple topics with different types and the same topic name.
 
 Scala
-:  @@snip [PubSubExample.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/pubsub/PubSubExample.scala) { #start-topic }
+:  @@snip [PubSubExample.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala) { #start-topic }
 
 Java
-:  @@snip [PubSubExample.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/pubsub/PubSubExample.java) { #start-topic }
+:  @@snip [PubSubExample.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java) { #start-topic }
 
 Local actors can then subscribe to the topic (and unsubscribe from it):
 
 Scala
-:  @@snip [PubSubExample.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/pubsub/PubSubExample.scala) { #subscribe }
+:  @@snip [PubSubExample.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala) { #subscribe }
 
 Java
-:  @@snip [PubSubExample.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/pubsub/PubSubExample.java) { #subscribe }
+:  @@snip [PubSubExample.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java) { #subscribe }
 
 And publish messages to the topic:
 
 Scala
-:  @@snip [PubSubExample.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/pubsub/PubSubExample.scala) { #publish }
+:  @@snip [PubSubExample.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala) { #publish }
 
 Java
-:  @@snip [PubSubExample.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/pubsub/PubSubExample.java) { #publish }
+:  @@snip [PubSubExample.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java) { #publish }
 
 ## Pub Sub Scalability
 
diff --git a/akka-docs/src/main/paradox/typed/durable-state/persistence-style.md b/akka-docs/src/main/paradox/typed/durable-state/persistence-style.md
index 4a3d5ff3ec..645c9edda4 100644
--- a/akka-docs/src/main/paradox/typed/durable-state/persistence-style.md
+++ b/akka-docs/src/main/paradox/typed/durable-state/persistence-style.md
@@ -6,7 +6,7 @@
 We can take the previous bank account example one step further by handling the commands within the state as well.
 
 Scala
-:  @@snip [AccountExampleWithCommandHandlersInDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala) { #account-entity }
+:  @@snip [AccountExampleWithCommandHandlersInDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala) { #account-entity }
 
 Take note of how the command handler is delegating to `applyCommand` in the `Account` (state), which is implemented
 in the concrete `EmptyAccount`, `OpenedAccount`, and `ClosedAccount`.
@@ -26,7 +26,7 @@ illustrates using `null` as the `emptyState`.]
 is used in command handlers at the outer layer before delegating to the state or other methods.]
 
 Scala
-:  @@snip [AccountExampleWithOptionDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala) { #account-entity }
+:  @@snip [AccountExampleWithOptionDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala) { #account-entity }
 
 Java
-:  @@snip [AccountExampleWithNullDurableState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullDurableState.java) { #account-entity }
+:  @@snip [AccountExampleWithNullDurableState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java) { #account-entity }
diff --git a/akka-docs/src/main/paradox/typed/durable-state/persistence.md b/akka-docs/src/main/paradox/typed/durable-state/persistence.md
index ffee804cc9..f2db5d2b0c 100644
--- a/akka-docs/src/main/paradox/typed/durable-state/persistence.md
+++ b/akka-docs/src/main/paradox/typed/durable-state/persistence.md
@@ -45,10 +45,10 @@ is ensured, have a look at the @ref:[Cluster Sharding and DurableStateBehavior](
 Let's start with a simple example that models a counter using an Akka persistent actor. The minimum required for a @apidoc[DurableStateBehavior] is:
 
 Scala
-:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #structure }
+:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #structure }
 
 Java
-:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java) { #structure }
+:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java) { #structure }
 
 The first important thing to notice is the `Behavior` of a persistent actor is typed to the type of the `Command`
 because this is the type of message a persistent actor should receive. In Akka this is now enforced by the type system.
@@ -63,7 +63,7 @@ Next we'll discuss each of these in detail.
 
 ### PersistenceId
 
-The @apidoc[akka.persistence.typed.PersistenceId] is the stable unique identifier for the persistent actor in the backend
+The @apidoc[persistence.typed.PersistenceId] is the stable unique identifier for the persistent actor in the backend
 durabe state store.
 
 @ref:[Cluster Sharding](../cluster-sharding.md) is typically used together with `DurableStateBehavior` to ensure
@@ -109,18 +109,18 @@ Let's fill in the details of the example.
 Commands:
 
 Scala
-:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #command }
+:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #command }
 
 Java
-:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java) { #command }
+:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java) { #command }
 
 State is a storage for the latest value of the counter.
 
 Scala
-:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #state }
+:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #state }
 
 Java
-:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java) { #state }
+:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java) { #state }
 
 The command handler handles the commands `Increment`, `IncrementBy` and `GetValue`. 
 
@@ -129,19 +129,19 @@ The command handler handles the commands `Increment`, `IncrementBy` and `GetValu
 * `GetValue` retrieves the value of the counter from the State and replies with it to the actor passed in
 
 Scala
-:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #command-handler }
+:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #command-handler }
 
 Java
-:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java) { #command-handler }
+:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java) { #command-handler }
 
 @scala[These are used to create a `DurableStateBehavior`:]
 @java[These are defined in an `DurableStateBehavior`:]
 
 Scala
-:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #behavior }
+:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #behavior }
 
 Java
-:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java) { #behavior }
+:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java) { #behavior }
 
 ## Effects and Side Effects
 
@@ -185,19 +185,19 @@ send an acknowledgement as a reply to the `ActorRef` passed in the command.
 Example of effects and side-effects:
 
 Scala
-:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #effects }
+:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #effects }
 
 Java
-:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java) { #effects }
+:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java) { #effects }
 
 The most common way to have a side-effect is to use the `thenRun` method on `Effect`. In case you have multiple side-effects
 that needs to be run for several commands, you can factor them out into functions and reuse for all the commands. For example:
 
 Scala
-:  @@snip [PersistentActorCompileOnlyTest.scala](/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala) { #commonChainedEffects }
+:  @@snip [PersistentActorCompileOnlyTest.scala](/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala) { #commonChainedEffects }
 
 Java
-:  @@snip [PersistentActorCompileOnlyTest.java](/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java) { #commonChainedEffects }
+:  @@snip [PersistentActorCompileOnlyTest.java](/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java) { #commonChainedEffects }
 
 ### Side effects ordering and guarantees
 
@@ -228,10 +228,10 @@ Cluster Sharding ensures that there is only one active entity (or actor instance
 If the @apidoc[DurableStateBehavior] needs to use the @apidoc[typed.*.ActorContext], for example to spawn child actors, it can be obtained by wrapping construction with `Behaviors.setup`:
 
 Scala
-:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #actor-context }
+:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #actor-context }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java) { #actor-context }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java) { #actor-context }
 
 ## Changing Behavior
 
@@ -258,18 +258,18 @@ Once it is started then one can look it up with `GetPost`, modify it with `Chang
 The state is captured by:
 
 Scala
-:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntityDurableState.scala) { #state }
+:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala) { #state }
 
 Java
-:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntityDurableState.java) { #state }
+:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.java) { #state }
 
 The commands, of which only a subset are valid depending on the state:
 
 Scala
-:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntityDurableState.scala) { #commands }
+:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala) { #commands }
 
 Java
-:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntityDurableState.java) { #commands }
+:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.java) { #commands }
 
 @java[The command handler to process each command is decided by the state class (or state predicate) that is
 given to the `forStateType` of the `CommandHandlerBuilder` and the match cases in the builders.]
@@ -278,18 +278,18 @@ It typically becomes two levels of pattern matching, first on the state and then
 Delegating to methods like `addPost`, `changeBody`, `publish` etc. is a good practice because the one-line cases give a nice overview of the message dispatch.
 
 Scala
-:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntityDurableState.scala) { #command-handler }
+:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala) { #command-handler }
 
 Java
-:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntityDurableState.java) { #command-handler }
+:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.java) { #command-handler }
 
 And finally the behavior is created @scala[from the `DurableStateBehavior.apply`]:
 
 Scala
-:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntityDurableState.scala) { #behavior }
+:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala) { #behavior }
 
 Java
-:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntityDurableState.java) { #behavior }
+:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.java) { #behavior }
 
 This can be refactored one or two steps further by defining the command handlers in the state class as
 illustrated in @ref:[command handlers in the state](persistence-style.md#command-handlers-in-the-state).
@@ -312,17 +312,17 @@ After validation errors or after persisting events, using a `thenRun` side effec
 be sent to the `ActorRef`.
 
 Scala
-:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntityDurableState.scala) { #reply-command }
+:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala) { #reply-command }
 
 Java
-:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntityDurableState.java) { #reply-command }
+:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.java) { #reply-command }
 
 
 Scala
-:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntityDurableState.scala) { #reply }
+:  @@snip [BlogPostEntityDurableState.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala) { #reply }
 
 Java
-:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntityDurableState.java) { #reply }
+:  @@snip [BlogPostEntityDurableState.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.java) { #reply }
 
 
 Since this is such a common pattern there is a reply effect for this purpose. It has the nice property that
@@ -333,18 +333,18 @@ created with @scala[`Effect.reply`]@java[`Effect().reply`], @scala[`Effect.noRep
 @scala[`Effect.thenReply`]@java[`Effect().thenReply`], or @scala[`Effect.thenNoReply`]@java[`Effect().thenNoReply`].
 
 Scala
-:  @@snip [AccountExampleWithCommandHandlersInDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala) { #withEnforcedReplies }
+:  @@snip [AccountExampleWithCommandHandlersInDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala) { #withEnforcedReplies }
 
 Java
-:  @@snip [AccountExampleWithNullDurableState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullDurableState.java) { #withEnforcedReplies }
+:  @@snip [AccountExampleWithNullDurableState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java) { #withEnforcedReplies }
 
 The commands must have a field of @scala[`ActorRef[ReplyMessageType]`]@java[`ActorRef`] that can then be used to send a reply.
 
 Scala
-:  @@snip [AccountExampleWithCommandHandlersInDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala) { #reply-command }
+:  @@snip [AccountExampleWithCommandHandlersInDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala) { #reply-command }
 
 Java
-:  @@snip [AccountExampleWithNullDurableState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullDurableState.java) { #reply-command }
+:  @@snip [AccountExampleWithNullDurableState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java) { #reply-command }
 
 The `ReplyEffect` is created with @scala[`Effect.reply`]@java[`Effect().reply`], @scala[`Effect.noReply`]@java[`Effect().noReply`],
 @scala[`Effect.thenReply`]@java[`Effect().thenReply`], or @scala[`Effect.thenNoReply`]@java[`Effect().thenNoReply`].
@@ -353,10 +353,10 @@ The `ReplyEffect` is created with @scala[`Effect.reply`]@java[`Effect().reply`],
 `EventSourcedBehaviorWithEnforcedReplies`, as opposed to newCommandHandlerBuilder when using `EventSourcedBehavior`.]
 
 Scala
-:  @@snip [AccountExampleWithCommandHandlersInDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala) { #reply }
+:  @@snip [AccountExampleWithCommandHandlersInDurableState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala) { #reply }
 
 Java
-:  @@snip [AccountExampleWithNullDurableState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullDurableState.java) { #reply }
+:  @@snip [AccountExampleWithNullDurableState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java) { #reply }
 
 These effects will send the reply message even when @scala[`DurableStateBehavior.withEnforcedReplies`]@java[`DurableStateBehaviorWithEnforcedReplies`]
 is not used, but then there will be no compilation errors if the reply decision is left out.
@@ -378,10 +378,10 @@ Persistence allows you to use tags in persistence query. Tagging allows you to i
 and separately consume them as a stream through the `DurableStateStoreQuery` interface. 
 
 Scala
-:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #tagging }
+:  @@snip [DurableStatePersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #tagging }
 
 Java
-:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java) { #tagging }
+:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java) { #tagging }
 
 ## Wrapping DurableStateBehavior
 
@@ -390,7 +390,7 @@ other behaviors such as `Behaviors.setup` in order to access the `ActorContext`
 to access the logger from within the `ActorContext` to log for debugging the `commandHandler`.
 
 Scala
-:  @@snip [DurableStatePersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #wrapPersistentBehavior }
+:  @@snip [DurableStatePersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala) { #wrapPersistentBehavior }
 
 Java
-:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java) { #wrapPersistentBehavior }
+:  @@snip [DurableStatePersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java) { #wrapPersistentBehavior }
diff --git a/akka-docs/src/main/paradox/typed/extending.md b/akka-docs/src/main/paradox/typed/extending.md
index 1e517502dd..9a4494eafa 100644
--- a/akka-docs/src/main/paradox/typed/extending.md
+++ b/akka-docs/src/main/paradox/typed/extending.md
@@ -22,37 +22,37 @@ ensure the thread safety and that it is non-blocking.
 Let's build an extension to manage a shared database connection pool.
 
 Scala
-:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala) { #shared-resource }
+:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala) { #shared-resource }
 
 Java
-:  @@snip [ExtensionDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/extensions/ExtensionDocTest.java) { #shared-resource }
+:  @@snip [ExtensionDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java) { #shared-resource }
 
-First create an @apidoc[akka.actor.typed.Extension], this will be created only once per ActorSystem:
+First create an @apidoc[actor.typed.Extension], this will be created only once per ActorSystem:
 
 Scala
-:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala) { #extension }
+:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala) { #extension }
 
 Java
-:  @@snip [ExtensionDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/extensions/ExtensionDocTest.java) { #extension }
+:  @@snip [ExtensionDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java) { #extension }
 
 This is the public API of your extension. Internally in this example we instantiate our expensive database connection. 
 
-Then create an @apidoc[akka.actor.typed.ExtensionId] to identify the extension.
+Then create an @apidoc[actor.typed.ExtensionId] to identify the extension.
 @scala[A good convention is to let the companion object of the `Extension` be the `ExtensionId`.]@java[A good convention is to define the `ExtensionId` as a static inner class of the `Extension`.]
 
 Scala
-:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala) { #extension-id }
+:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala) { #extension-id }
 
 Java
-:  @@snip [ExtensionDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/extensions/ExtensionDocTest.java) { #extension-id }
+:  @@snip [ExtensionDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java) { #extension-id }
 
 Then finally to use the extension it can be looked up:
 
 Scala
-:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala) { #usage }
+:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala) { #usage }
 
 Java
-:  @@snip [ExtensionDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/extensions/ExtensionDocTest.java) { #usage  }
+:  @@snip [ExtensionDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java) { #usage  }
 
 The `DatabaseConnectionPool` can be looked up in this way any number of times and it will return the same instance.
 
@@ -63,12 +63,12 @@ To be able to load extensions from your Akka configuration you must add FQCNs of
 in the `akka.actor.typed.extensions` section of the config you provide to your `ActorSystem`.
 
 Scala
-:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala) { #config }
+:  @@snip [ExtensionDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala) { #config }
 
 Java
 :   ```ruby
    akka.actor.typed {
-     extensions = ["jdocs.akka.extensions.ExtensionDocTest$DatabaseConnectionPool$Id"]
+     extensions = ["jdocs.org.apache.pekko.typed.extensions.ExtensionDocTest$DatabaseConnectionPool$Id"]
    }
    ```
      
diff --git a/akka-docs/src/main/paradox/typed/fault-tolerance.md b/akka-docs/src/main/paradox/typed/fault-tolerance.md
index 2bfa61bca5..24118691c7 100644
--- a/akka-docs/src/main/paradox/typed/fault-tolerance.md
+++ b/akka-docs/src/main/paradox/typed/fault-tolerance.md
@@ -31,52 +31,52 @@ with a fresh state that we know is valid.
 In Akka this "somewhere else" is called supervision. Supervision allows you to declaratively describe what should happen when certain types of exceptions are thrown inside an actor. 
 
 The default @ref:[supervision](../general/supervision.md) strategy is to stop the actor if an exception is thrown. 
-In many cases you will want to further customize this behavior. To use supervision the actual Actor behavior is wrapped using @apidoc[Behaviors.supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:akka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(akka.actor.typed.Behavior)"}. 
+In many cases you will want to further customize this behavior. To use supervision the actual Actor behavior is wrapped using @apidoc[Behaviors.supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:org.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(org.apache.pekko.actor.typed.Behavior)"}. 
 Typically you would wrap the actor with supervision in the parent when spawning it as a child.
  
 This example restarts the actor when it fails with an @javadoc[IllegalStateException](java.lang.IllegalStateException): 
 
 
 Scala
-:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala) { #restart }
+:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala) { #restart }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java) { #restart }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java) { #restart }
 
 Or to resume, ignore the failure and process the next message, instead:
 
 Scala
-:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala) { #resume }
+:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala) { #resume }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java) { #resume }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java) { #resume }
 
 More complicated restart strategies can be used e.g. to restart no more than 10
 times in a 10 second period:
 
 Scala
-:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala) { #restart-limit }
+:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala) { #restart-limit }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java) { #restart-limit }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java) { #restart-limit }
 
-To handle different exceptions with different strategies calls to @apidoc[supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:akka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(akka.actor.typed.Behavior)"}
+To handle different exceptions with different strategies calls to @apidoc[supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:org.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(org.apache.pekko.actor.typed.Behavior)"}
 can be nested:
 
 Scala
-:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala) { #multiple }
+:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala) { #multiple }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java) { #multiple }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java) { #multiple }
 
-For a full list of strategies see the public methods on @apidoc[akka.actor.typed.SupervisorStrategy].
+For a full list of strategies see the public methods on @apidoc[actor.typed.SupervisorStrategy].
 
 @@@ note
 
-When the behavior is restarted the original @apidoc[Behavior] that was given to @apidoc[Behaviors.supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:akka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(akka.actor.typed.Behavior)"} is re-installed,
-which means that if it contains mutable state it must be a factory via @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"}. When using the
+When the behavior is restarted the original @apidoc[Behavior] that was given to @apidoc[Behaviors.supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:org.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(org.apache.pekko.actor.typed.Behavior)"} is re-installed,
+which means that if it contains mutable state it must be a factory via @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"}. When using the
 object-oriented style with a class extending @apidoc[AbstractBehavior](typed.*.AbstractBehavior) it's always recommended to create it via
-@apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"} as described in @ref:[Behavior factory method](style-guide.md#behavior-factory-method).
+@apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"} as described in @ref:[Behavior factory method](style-guide.md#behavior-factory-method).
 For the function style there is typically no need for the factory if the state is captured in immutable
 parameters.
 @@@
@@ -87,47 +87,47 @@ With the @ref:[functional style](style-guide.md#functional-versus-object-oriente
 to store state by changing behavior e.g.
 
 Scala
-:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala) { #wrap }
+:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala) { #wrap }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java) { #wrap }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java) { #wrap }
 
 When doing this supervision only needs to be added to the top level:
 
 Scala
-:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala) { #top-level }
+:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala) { #top-level }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java) { #top-level }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java) { #top-level }
 
 Each returned behavior will be re-wrapped automatically with the supervisor.
 
 ## Child actors are stopped when parent is restarting
 
-Child actors are often started in a @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"} block that is run again when the parent actor is restarted.
+Child actors are often started in a @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"} block that is run again when the parent actor is restarted.
 The child actors are stopped to avoid resource leaks of creating new child actors each time the parent is restarted.
 
 Scala
-:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala) { #restart-stop-children }
+:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala) { #restart-stop-children }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java) { #restart-stop-children }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java) { #restart-stop-children }
 
 It is possible to override this so that child actors are not influenced when the parent actor is restarted.
 The restarted parent instance will then have the same children as before the failure.
 
-If child actors are created from @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"} like in the previous example and they should remain intact (not stopped)
-when parent is restarted the @apidoc[supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:akka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(akka.actor.typed.Behavior)"} should be placed inside the @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"} and using
-@scala[@scaladoc[SupervisorStrategy.restart.withStopChildren(false)](akka.actor.typed.RestartSupervisorStrategy#withStopChildren(enabled:Boolean):akka.actor.typed.RestartSupervisorStrategy)]@java[@javadoc[SupervisorStrategy.restart().withStopChildren(false)](akka.actor.typed.RestartSupervisorStrategy#withStopChildren(boolean))]
+If child actors are created from @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"} like in the previous example and they should remain intact (not stopped)
+when parent is restarted the @apidoc[supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:org.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(org.apache.pekko.actor.typed.Behavior)"} should be placed inside the @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"} and using
+@scala[@scaladoc[SupervisorStrategy.restart.withStopChildren(false)](pekko.actor.typed.RestartSupervisorStrategy#withStopChildren(enabled:Boolean):org.apache.pekko.actor.typed.RestartSupervisorStrategy)]@java[@javadoc[SupervisorStrategy.restart().withStopChildren(false)](pekko.actor.typed.RestartSupervisorStrategy#withStopChildren(boolean))]
 like this:
 
 Scala
-:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala) { #restart-keep-children }
+:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala) { #restart-keep-children }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java) { #restart-keep-children }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java) { #restart-keep-children }
 
-That means that the @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"} block will only be run when the parent actor is first started, and not when it is
+That means that the @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"} block will only be run when the parent actor is first started, and not when it is
 restarted.
 
 ## The PreRestart signal
@@ -137,10 +137,10 @@ it has created, much like the @apidoc[PostStop] signal when the @ref[actor stops
 The returned behavior from the @apidoc[PreRestart] signal is ignored.
 
 Scala
-:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/supervision/SupervisionCompileOnly.scala) { #restart-PreRestart-signal }
+:  @@snip [SupervisionCompileOnly.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala) { #restart-PreRestart-signal }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/supervision/SupervisionCompileOnlyTest.java) { #restart-PreRestart-signal }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java) { #restart-PreRestart-signal }
 
 Note that @apidoc[PostStop] is not emitted for a restart, so typically you need to handle both @apidoc[PreRestart] and @apidoc[PostStop]
 to cleanup resources.
@@ -167,7 +167,7 @@ There might be cases when you want the original exception to bubble up the hiera
 
  
 Scala
-:  @@snip [FaultToleranceDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FaultToleranceDocSpec.scala) { #bubbling-example }
+:  @@snip [FaultToleranceDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FaultToleranceDocSpec.scala) { #bubbling-example }
 
 Java
-:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSample.java) { #bubbling-example }
+:  @@snip [SupervisionCompileOnlyTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSample.java) { #bubbling-example }
diff --git a/akka-docs/src/main/paradox/typed/from-classic.md b/akka-docs/src/main/paradox/typed/from-classic.md
index 387214b05a..b2017b598f 100644
--- a/akka-docs/src/main/paradox/typed/from-classic.md
+++ b/akka-docs/src/main/paradox/typed/from-classic.md
@@ -59,18 +59,18 @@ APIs, which is familiar from Akka Streams.
 
 Examples of a few package names:
 
-| Classic               | Typed for Scala                       | Typed for Java                       |
-|-----------------------|---------------------------------------|--------------------------------------|
-| akka.actor            | akka.actor.typed.scaladsl             | akka.actor.typed.javadsl             |
-| akka.cluster          | akka.cluster.typed                    | akka.cluster.typed                   |
-| akka.cluster.sharding | akka.cluster.sharding.typed.scaladsl  | akka.cluster.sharding.typed.javadsl  |
-| akka.persistence      | akka.persistence.typed.scaladsl       | akka.persistence.typed.javadsl       |
+| Classic                           | Typed for Scala                                  | Typed for Java                                  |
+|-----------------------------------|--------------------------------------------------|-------------------------------------------------|
+| org.apache.pekko.actor            | org.apache.pekko.actor.typed.scaladsl            | org.apache.pekko.actor.typed.javadsl            |
+| org.apache.pekko.cluster          | org.apache.pekko.cluster.typed                   | org.apache.pekko.cluster.typed                  |
+| org.apache.pekko.cluster.sharding | org.apache.pekko.cluster.sharding.typed.scaladsl | org.apache.pekko.cluster.sharding.typed.javadsl |
+| org.apache.pekko.persistence      | org.apache.pekko.persistence.typed.scaladsl      | org.apache.pekko.persistence.typed.javadsl      |
 
 ## Actor definition
 
-A classic actor is defined by a class extending @scala[`akka.actor.Actor`]@java[`akka.actor.AbstractActor`].
+A classic actor is defined by a class extending @scala[`org.apache.pekko.actor.Actor`]@java[`org.apache.pekko.actor.AbstractActor`].
 
-An actor in Typed is defined by a class extending @scala[`akka.actor.typed.scaladsl.AbstractBehavior`]@java[`akka.actor.typed.javadsl.AbstractBehavior`].
+An actor in Typed is defined by a class extending @scala[`org.apache.pekko.actor.typed.scaladsl.AbstractBehavior`]@java[`org.apache.pekko.actor.typed.javadsl.AbstractBehavior`].
 
 It's also possible to define an actor in Typed from functions instead of extending a class. This is called
 the @ref:[functional style](style-guide.md#functional-versus-object-oriented-style).
@@ -78,18 +78,18 @@ the @ref:[functional style](style-guide.md#functional-versus-object-oriented-sty
 Classic HelloWorld actor:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/ClassicSample.scala) { #hello-world-actor }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/ClassicSample.scala) { #hello-world-actor }
 
 Java
-:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/fromclassic/ClassicSample.java) { #hello-world-actor }
+:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/ClassicSample.java) { #hello-world-actor }
 
 Typed HelloWorld actor:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/TypedSample.scala) { #hello-world-actor }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/TypedSample.scala) { #hello-world-actor }
 
 Java
-:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/fromclassic/TypedSample.java) { #hello-world-actor }
+:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java) { #hello-world-actor }
 
 Why is it called `Behavior` and not `Actor`?
 
@@ -110,9 +110,9 @@ Links to reference documentation:
 
 A classic actor is started with the `actorOf` method of the `ActorContext` or `ActorSystem`.
 
-Corresponding method in Typed is called `spawn` in the @scala[`akka.actor.typed.scaladsl.ActorContext`]@java[`akka.actor.typed.javadsl.ActorContext`].
+Corresponding method in Typed is called `spawn` in the @scala[`org.apache.pekko.actor.typed.scaladsl.ActorContext`]@java[`org.apache.pekko.actor.typed.javadsl.ActorContext`].
 
-There is no `spawn` method in the @scala[`akka.actor.typed.scaladsl.ActorSystem`]@java[`akka.actor.typed.javadsl.ActorSystem`]
+There is no `spawn` method in the @scala[`org.apache.pekko.actor.typed.scaladsl.ActorSystem`]@java[`org.apache.pekko.actor.typed.javadsl.ActorSystem`]
 for creating top level actors. Instead, there is a single top level actor defined by a user guardian `Behavior` that is given
 when starting the `ActorSystem`. Other actors are started as children of that user guardian actor or
 children of other actors in the actor hierarchy. This is explained more in @ref:[ActorSystem](#actorsystem).
@@ -120,17 +120,17 @@ children of other actors in the actor hierarchy. This is explained more in @ref:
 Note that when mixing classic and typed and have a classic system, spawning top level actors from the side is possible, see
 @ref:[Coexistence](coexisting.md#top-level-typed-actor-classic-system).
 
-The `actorOf` method takes an `akka.actor.Props` parameter, which is like a factory for creating the actor instance, and it's
+The `actorOf` method takes an `org.apache.pekko.actor.Props` parameter, which is like a factory for creating the actor instance, and it's
 also used when creating a new instance when the actor is restarted. The `Props` may also define additional
 properties such as which dispatcher to use for the actor.
 
 In typed, the `spawn` method creates an actor directly from a given `Behavior` without using a `Props` factory.
-It does however accept an optional `akka.actor.typed.Props` for specifying Actor metadata.
+It does however accept an optional `org.apache.pekko.actor.typed.Props` for specifying Actor metadata.
 The factory aspect is instead defined via `Behaviors.setup` when using the object-oriented style with
 a class extending `AbstractBehavior`. For the function style there is typically no need for the factory.
 
 Additional properties such as which dispatcher to use for the actor can still be given via an optional
-`akka.actor.typed.Props` parameter of the `spawn` method.
+`org.apache.pekko.actor.typed.Props` parameter of the `spawn` method.
 
 The `name` parameter of `actorOf` is optional and if not defined the actor will have a generated name. Corresponding
 in Typed is achieved with the `spawnAnonymous` method.
@@ -142,14 +142,14 @@ Links to reference documentation:
 
 ## ActorRef
 
-`akka.actor.ActorRef` has its correspondence in `akka.actor.typed.ActorRef`. The difference being that the latter
+`org.apache.pekko.actor.ActorRef` has its correspondence in `org.apache.pekko.actor.typed.ActorRef`. The difference being that the latter
 has a type parameter describing which messages the actor can handle. This information is not defined for a
 classic actor and you can send any type of message to a classic `ActorRef` even though the actor may not
 understand it.
 
 ## ActorSystem
 
-`akka.actor.ActorSystem` has its correspondence in `akka.actor.typed.ActorSystem`. One difference is that
+`org.apache.pekko.actor.ActorSystem` has its correspondence in `org.apache.pekko.actor.typed.ActorSystem`. One difference is that
 when creating an `ActorSystem` in Typed you give it a `Behavior` that will be used as the top level actor, also known 
 as the user guardian.
 
@@ -290,7 +290,7 @@ Links to reference documentation:
 The classic `ask` pattern returns a @scala[`Future`]@java[`CompletionStage`] for the response.
 
 Corresponding `ask` exists in Typed and is good when the requester itself isn't an actor.
-It is located in @scala[`akka.actor.typed.scaladsl.AskPattern`]@java[`akka.actor.typed.javadsl.AskPattern`].
+It is located in @scala[`org.apache.pekko.actor.typed.scaladsl.AskPattern`]@java[`org.apache.pekko.actor.typed.javadsl.AskPattern`].
 
 When the requester is an actor it is better to use the `ask` method of the `ActorContext` in Typed.
 It has the advantage of not having to mix @scala[`Future`]@java[`CompletionStage`] callbacks that are
@@ -322,10 +322,10 @@ collection for bookkeeping of children, such as a @scala[`Map[String, ActorRef[C
 @java[`Map>`]. It can look like this:
 
 Scala
-:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/fromclassic/TypedSample.scala) { #children }
+:  @@snip [IntroSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/TypedSample.scala) { #children }
 
 Java
-:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/fromclassic/TypedSample.java) { #children }
+:  @@snip [IntroSpec.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java) { #children }
 
 Remember to remove entries from the `Map` when the children are terminated. For that purpose it's
 convenient to use `watchWith`, as illustrated in the example above, because then you can include the
@@ -393,7 +393,7 @@ Links to reference documentation:
 
 ## PersistentActor
 
-The correspondence of the classic `PersistentActor` is @scala[`akka.persistence.typed.scaladsl.EventSourcedBehavior`]@java[`akka.persistence.typed.javadsl.EventSourcedBehavior`].
+The correspondence of the classic `PersistentActor` is @scala[`org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehavior`]@java[`org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior`].
 
 The Typed API is much more guided to facilitate Event Sourcing best practices. It also has tighter integration with
 Cluster Sharding.
diff --git a/akka-docs/src/main/paradox/typed/fsm.md b/akka-docs/src/main/paradox/typed/fsm.md
index 5901c23251..09d891e141 100644
--- a/akka-docs/src/main/paradox/typed/fsm.md
+++ b/akka-docs/src/main/paradox/typed/fsm.md
@@ -19,29 +19,29 @@ This example demonstrates how to:
 The events the FSM can receive become the type of message the Actor can receive:
 
 Scala
-:  @@snip [FSMSocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala) { #simple-events }
+:  @@snip [FSMSocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala) { #simple-events }
 
 Java
-:  @@snip [FSMSocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/FSMDocTest.java) { #simple-events }
+:  @@snip [FSMSocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java) { #simple-events }
 
 `SetTarget` is needed for starting it up, setting the destination for the
 `Batches` to be passed on; `Queue` will add to the internal queue while
 `Flush` will mark the end of a burst.
 
 Scala
-:  @@snip [FSMSocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala) { #storing-state }
+:  @@snip [FSMSocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala) { #storing-state }
 
 Java
-:  @@snip [FSMSocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/FSMDocTest.java) { #storing-state }
+:  @@snip [FSMSocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java) { #storing-state }
 
 Each state becomes a distinct behavior and after processing a message the next state in the form of a `Behavior`
 is returned.
 
 Scala
-:  @@snip [FSMSocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FSMDocSpec.scala) { #simple-state }
+:  @@snip [FSMSocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala) { #simple-state }
 
 Java
-:  @@snip [FSMSocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/FSMDocTest.java) { #simple-state}
+:  @@snip [FSMSocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java) { #simple-state}
 
 @@@ div { .group-scala }
 The method `idle` above makes use of `Behaviors.unhandled` which advises the system to reuse the previous behavior, 
diff --git a/akka-docs/src/main/paradox/typed/guide/tutorial_1.md b/akka-docs/src/main/paradox/typed/guide/tutorial_1.md
index a500f065eb..7c6fd1bd11 100644
--- a/akka-docs/src/main/paradox/typed/guide/tutorial_1.md
+++ b/akka-docs/src/main/paradox/typed/guide/tutorial_1.md
@@ -19,10 +19,10 @@ Use of Akka relieves you from creating the infrastructure for an actor system an
 
 ## The Akka actor hierarchy
 
-An actor in Akka always belongs to a parent. You create an actor by calling  @apidoc[ActorContext.spawn()](akka.actor.typed.*.ActorContext) {scala="#spawn[U](behavior:akka.actor.typed.Behavior[U],name:String,props:akka.actor.typed.Props):akka.actor.typed.ActorRef[U]" java="#spawn(akka.actor.typed.Behavior,java.lang.String,akka.actor.typed.Props)"}. The creator actor becomes the
+An actor in Akka always belongs to a parent. You create an actor by calling  @apidoc[ActorContext.spawn()](actor.typed.*.ActorContext) {scala="#spawn[U](behavior:org.apache.pekko.actor.typed.Behavior[U],name:String,props:org.apache.pekko.actor.typed.Props):org.apache.pekko.actor.typed.ActorRef[U]" java="#spawn(org.apache.pekko.actor.typed.Behavior,java.lang.String,org.apache.pekko.actor.typed.Props)"}. The creator actor becomes the
 _parent_ of the newly created _child_ actor. You might ask then, who is the parent of the _first_ actor you create?
 
-As illustrated below, all actors have a common parent, the user guardian, which is defined and created when you start the @apidoc[akka.actor.typed.ActorSystem].
+As illustrated below, all actors have a common parent, the user guardian, which is defined and created when you start the @apidoc[actor.typed.ActorSystem].
 As we covered in the @scala[[Quickstart Guide](https://developer.lightbend.com/guides/akka-quickstart-scala/)]@java[[Quickstart Guide](https://developer.lightbend.com/guides/akka-quickstart-java/)], creation of an actor returns a reference that is a valid URL. So, for example, if we create an actor named `someActor` from the user guardian with `context.spawn(someBehavior, "someActor")`, its reference will include the path `/user/someActor`.
 
 ![actor tree diagram](diagrams/actor_top_tree.png)
@@ -33,7 +33,7 @@ In fact, before your first actor is started, Akka has already created two actors
  - `/system` the _system guardian_. Akka or other libraries built on top of Akka may create actors in the _system_ namespace.
  - `/user` the _user guardian_. This is the top level actor that you provide to start all other actors in your application.
  
-The easiest way to see the actor hierarchy in action is to print @apidoc[akka.actor.typed.ActorRef] instances. In this small experiment, we create an actor, print its reference, create a child of this actor, and print the child's reference. We start with the Hello World project, if you have not downloaded it, download the Quickstart project from the @scala[[Lightbend Tech Hub](https://developer.lightbend.com/start/?group=akka&project=akka-quickstart-scala)]@java[[Lightbend Tech Hub](https://developer.lightbend.com/start/?group=akka&project=akka-quickstart-java)].
+The easiest way to see the actor hierarchy in action is to print @apidoc[actor.typed.ActorRef] instances. In this small experiment, we create an actor, print its reference, create a child of this actor, and print the child's reference. We start with the Hello World project, if you have not downloaded it, download the Quickstart project from the @scala[[Lightbend Tech Hub](https://developer.lightbend.com/start/?group=akka&project=akka-quickstart-scala)]@java[[Lightbend Tech Hub](https://developer.lightbend.com/start/?group=akka&project=akka-quickstart-java)].
 
 In your Hello World project, navigate to the `com.example` package and create @scala[a new Scala file called `ActorHierarchyExperiments.scala` here. Copy and paste the code from the snippet below to this new source file]@java[a Java file for each of the classes in the snippet below and copy the respective contents]. Save your @scala[file and run `sbt "runMain com.example.ActorHierarchyExperiments"`]@java[files and run `com.example.ActorHierarchyExperiments` from your build tool or IDE] to observe the output.
 
@@ -66,9 +66,9 @@ An important role of the hierarchy is to safely manage actor lifecycles. Let's c
 Actors pop into existence when created, then later, at user requests, they are stopped. Whenever an actor is stopped, all of its children are _recursively stopped_ too.
 This behavior greatly simplifies resource cleanup and helps avoid resource leaks such as those caused by open sockets and files. In fact, a commonly overlooked difficulty when dealing with low-level multi-threaded code is the lifecycle management of various concurrent resources.
 
-To stop an actor, the recommended pattern is to return @apidoc[Behaviors.stopped](typed.*.Behaviors$) {scala="#stopped[T]:akka.actor.typed.Behavior[T]" java="#stopped()"} inside the actor to stop itself, usually as a response to some user defined stop message or when the actor is done with its job. Stopping a child actor is technically possible by calling @apidoc[context.stop(childRef)](akka.actor.typed.*.ActorContext) {scala="#stop[U](child:akka.actor.typed.ActorRef[U]):Unit" java="#stop(akka.actor.typed.ActorRef)"} from the parent, but it's not possible to stop arbitrary (non-child) actors this way.
+To stop an actor, the recommended pattern is to return @apidoc[Behaviors.stopped](typed.*.Behaviors$) {scala="#stopped[T]:org.apache.pekko.actor.typed.Behavior[T]" java="#stopped()"} inside the actor to stop itself, usually as a response to some user defined stop message or when the actor is done with its job. Stopping a child actor is technically possible by calling @apidoc[context.stop(childRef)](actor.typed.*.ActorContext) {scala="#stop[U](child:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#stop(org.apache.pekko.actor.typed.ActorRef)"} from the parent, but it's not possible to stop arbitrary (non-child) actors this way.
 
-The Akka actor API exposes some lifecycle signals, for example @apidoc[akka.actor.typed.PostStop] is sent just after the actor has been stopped. No messages are processed after this point.
+The Akka actor API exposes some lifecycle signals, for example @apidoc[actor.typed.PostStop] is sent just after the actor has been stopped. No messages are processed after this point.
 
 Let's use the `PostStop` lifecycle signal in a simple experiment to observe the behavior when we stop an actor. First, add the following 2 actor classes to your project:
 
@@ -95,12 +95,12 @@ second stopped
 first stopped
 ```
 
-When we stopped actor `first`, it stopped its child actor, `second`, before stopping itself. This ordering is strict, _all_ @apidoc[akka.actor.typed.PostStop] signals of the children are processed before the `PostStop` signal of the parent
+When we stopped actor `first`, it stopped its child actor, `second`, before stopping itself. This ordering is strict, _all_ @apidoc[actor.typed.PostStop] signals of the children are processed before the `PostStop` signal of the parent
 is processed.
 
 ### Failure handling
 
-Parents and children are connected throughout their lifecycles. Whenever an actor fails (throws an exception or an unhandled exception bubbles out from @scala[@scaladoc[onMessage](akka.actor.typed.scaladsl.AbstractBehavior#onMessage(msg:T):akka.actor.typed.Behavior[T])]@java[@javadoc[Receive](akka.actor.typed.javadsl.Receive)]) the failure information is propagated
+Parents and children are connected throughout their lifecycles. Whenever an actor fails (throws an exception or an unhandled exception bubbles out from @scala[@scaladoc[onMessage](pekko.actor.typed.scaladsl.AbstractBehavior#onMessage(msg:T):org.apache.pekko.actor.typed.Behavior[T])]@java[@javadoc[Receive](pekko.actor.typed.javadsl.Receive)]) the failure information is propagated
 to the supervision strategy, which then decides how to handle the exception caused by the actor. The supervision strategy is typically defined by the parent actor when it spawns a child actor. In this way, parents act as supervisors for their children. The default _supervisor strategy_ is to stop the child. If you don't define the strategy all failures result in a stop.
 
 Let's observe a restart supervision strategy in a simple experiment. Add the following classes to your project, just as you did with the previous ones:
@@ -130,17 +130,17 @@ supervised actor started
 java.lang.Exception: I failed!
 	at typed.tutorial_1.SupervisedActor.onMessage(ActorHierarchyExperiments.scala:113)
 	at typed.tutorial_1.SupervisedActor.onMessage(ActorHierarchyExperiments.scala:106)
-	at akka.actor.typed.scaladsl.AbstractBehavior.receive(AbstractBehavior.scala:59)
-	at akka.actor.typed.Behavior$.interpret(Behavior.scala:395)
-	at akka.actor.typed.Behavior$.interpretMessage(Behavior.scala:369)
-	at akka.actor.typed.internal.InterceptorImpl$$anon$2.apply(InterceptorImpl.scala:49)
-	at akka.actor.typed.internal.SimpleSupervisor.aroundReceive(Supervision.scala:85)
-	at akka.actor.typed.internal.InterceptorImpl.receive(InterceptorImpl.scala:70)
-	at akka.actor.typed.Behavior$.interpret(Behavior.scala:395)
-	at akka.actor.typed.Behavior$.interpretMessage(Behavior.scala:369)
+	at org.apache.pekko.actor.typed.scaladsl.AbstractBehavior.receive(AbstractBehavior.scala:59)
+	at org.apache.pekko.actor.typed.Behavior$.interpret(Behavior.scala:395)
+	at org.apache.pekko.actor.typed.Behavior$.interpretMessage(Behavior.scala:369)
+	at org.apache.pekko.actor.typed.internal.InterceptorImpl$$anon$2.apply(InterceptorImpl.scala:49)
+	at org.apache.pekko.actor.typed.internal.SimpleSupervisor.aroundReceive(Supervision.scala:85)
+	at org.apache.pekko.actor.typed.internal.InterceptorImpl.receive(InterceptorImpl.scala:70)
+	at org.apache.pekko.actor.typed.Behavior$.interpret(Behavior.scala:395)
+	at org.apache.pekko.actor.typed.Behavior$.interpretMessage(Behavior.scala:369)
 ```
 
-We see that after failure the supervised actor is stopped and immediately restarted. We also see a log entry reporting the exception that was handled, in this case, our test exception. In this example we also used the @apidoc[akka.actor.typed.PreRestart] signal which is processed before restarts.
+We see that after failure the supervised actor is stopped and immediately restarted. We also see a log entry reporting the exception that was handled, in this case, our test exception. In this example we also used the @apidoc[actor.typed.PreRestart] signal which is processed before restarts.
 
 For the impatient, we also recommend looking into the @ref:[fault tolerance reference page](../fault-tolerance.md) for more in-depth
 details.
diff --git a/akka-docs/src/main/paradox/typed/guide/tutorial_2.md b/akka-docs/src/main/paradox/typed/guide/tutorial_2.md
index b1eb7ed111..ace2e698ed 100644
--- a/akka-docs/src/main/paradox/typed/guide/tutorial_2.md
+++ b/akka-docs/src/main/paradox/typed/guide/tutorial_2.md
@@ -17,7 +17,7 @@ Scala
 Java
 :   @@snip [IotSupervisor.java](/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotSupervisor.java) { #iot-supervisor }
 
-The code is similar to the actor examples we used in the previous experiments, but notice that instead of `println()` we use Akka's built in logging facility via @scala[@scaladoc[context.log](akka.actor.typed.scaladsl.ActorContext#log:org.slf4j.Logger)]@java[@javadoc[context.getLog()](akka.actor.typed.javadsl.ActorContext#getLog())].
+The code is similar to the actor examples we used in the previous experiments, but notice that instead of `println()` we use Akka's built in logging facility via @scala[@scaladoc[context.log](pekko.actor.typed.scaladsl.ActorContext#log:org.slf4j.Logger)]@java[@javadoc[context.getLog()](pekko.actor.typed.javadsl.ActorContext#getLog())].
 
 To provide the `main` entry point that creates the actor system, add the following code to the new @scala[`IotApp` object] @java[`IotMain` class].
 
diff --git a/akka-docs/src/main/paradox/typed/guide/tutorial_5.md b/akka-docs/src/main/paradox/typed/guide/tutorial_5.md
index 47f95519b5..b88c139f98 100644
--- a/akka-docs/src/main/paradox/typed/guide/tutorial_5.md
+++ b/akka-docs/src/main/paradox/typed/guide/tutorial_5.md
@@ -61,7 +61,7 @@ First, we need to design the lifecycle of our query actor. This consists of iden
 
 #### Scheduling the query timeout
 Since we need a way to indicate how long we are willing to wait for responses, it is time to introduce a new Akka feature that we have
-not used yet, the built-in scheduler facility. Using @apidoc[Behaviors.withTimers](typed.*.Behaviors$) {scala="#withTimers[T](factory:akka.actor.typed.scaladsl.TimerScheduler[T]=%3eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#withTimers(akka.japi.function.Function)"} and @apidoc[startSingleTimer](typed.*.TimerScheduler) {scala="#startSingleTimer(key:Any,msg:T,delay:scala.concurrent.duration.FiniteDuration):Unit" java="#startSingleTimer(java.lang.Object,T,java.time.Duration)"} to schedule a message that will be sent after a given delay.
+not used yet, the built-in scheduler facility. Using @apidoc[Behaviors.withTimers](typed.*.Behaviors$) {scala="#withTimers[T](factory:org.apache.pekko.actor.typed.scaladsl.TimerScheduler[T]=%3eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#withTimers(org.apache.pekko.japi.function.Function)"} and @apidoc[startSingleTimer](typed.*.TimerScheduler) {scala="#startSingleTimer(key:Any,msg:T,delay:scala.concurrent.duration.FiniteDuration):Unit" java="#startSingleTimer(java.lang.Object,T,java.time.Duration)"} to schedule a message that will be sent after a given delay.
 
 
 We need to create a message that represents the query timeout. We create a simple message `CollectionTimeout` without any parameters for this purpose.
diff --git a/akka-docs/src/main/paradox/typed/interaction-patterns.md b/akka-docs/src/main/paradox/typed/interaction-patterns.md
index e4b7792183..47efb6657f 100644
--- a/akka-docs/src/main/paradox/typed/interaction-patterns.md
+++ b/akka-docs/src/main/paradox/typed/interaction-patterns.md
@@ -17,13 +17,13 @@ To use Akka Actor Typed, you must add the following dependency in your project:
 
 ## Introduction
 
-Interacting with an Actor in Akka is done through an @scala[@scaladoc[ActorRef[T]](akka.actor.typed.ActorRef)]@java[@javadoc[ActorRef](akka.actor.typed.ActorRef)] where `T` is the type of messages the actor accepts, also known as the "protocol". This ensures that only the right kind of messages can be sent to an actor and also that no one else but the Actor itself can access the Actor instance internals.
+Interacting with an Actor in Akka is done through an @scala[@scaladoc[ActorRef[T]](pekko.actor.typed.ActorRef)]@java[@javadoc[ActorRef](pekko.actor.typed.ActorRef)] where `T` is the type of messages the actor accepts, also known as the "protocol". This ensures that only the right kind of messages can be sent to an actor and also that no one else but the Actor itself can access the Actor instance internals.
 
 Message exchange with Actors follow a few common patterns, let's go through each one of them. 
 
 ## Fire and Forget
 
-The fundamental way to interact with an actor is through @scala["tell", which is so common that it has a special symbolic method name: `actorRef` @scaladoc[!](akka.actor.typed.ActorRef#tell(msg:T):Unit) `message`]@java[@javadoc[actorRef.tell(message)](akka.actor.typed.ActorRef#tell(T))]. Sending a message with tell can safely be done from any thread.
+The fundamental way to interact with an actor is through @scala["tell", which is so common that it has a special symbolic method name: `actorRef` @scaladoc[!](org.apache.pekko.actor.typed.ActorRef#tell(msg:T):Unit) `message`]@java[@javadoc[actorRef.tell(message)](pekko.actor.typed.ActorRef#tell(T))]. Sending a message with tell can safely be done from any thread.
 
 Tell is asynchronous which means that the method returns right away. After the statement is executed there is no guarantee that the message has been processed by the recipient yet. It also means there is no way to know if the message was received, the processing succeeded or failed.
 
@@ -34,19 +34,19 @@ Tell is asynchronous which means that the method returns right away. After the s
 With the given protocol and actor behavior:
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #fire-and-forget-definition }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #fire-and-forget-definition }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #fire-and-forget-definition }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #fire-and-forget-definition }
 
 
 Fire and forget looks like this:
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #fire-and-forget-doit }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #fire-and-forget-doit }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #fire-and-forget-doit }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #fire-and-forget-doit }
 
 
 **Useful when:**
@@ -73,28 +73,28 @@ In Akka the recipient of responses has to be encoded as a field in the message i
 With the following protocol:
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #request-response-protocol }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #request-response-protocol }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #request-response-protocol }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #request-response-protocol }
 
 
-The sender would use its own @scala[`ActorRef[Response]`]@java[`ActorRef`], which it can access through @scala[@scaladoc[ActorContext.self](akka.actor.typed.scaladsl.ActorContext#self:akka.actor.typed.ActorRef[T])]@java[@javadoc[ActorContext.getSelf()](akka.actor.typed.javadsl.ActorContext#getSelf())], for the `replyTo`. 
+The sender would use its own @scala[`ActorRef[Response]`]@java[`ActorRef`], which it can access through @scala[@scaladoc[ActorContext.self](actor.typed.scaladsl.ActorContext#self:org.apache.pekko.actor.typed.ActorRef[T])]@java[@javadoc[ActorContext.getSelf()](pekko.actor.typed.javadsl.ActorContext#getSelf())], for the `replyTo`. 
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #request-response-send }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #request-response-send }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #request-response-send }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #request-response-send }
 
 
 On the receiving side the @scala[`ActorRef[Response]`]@java[`ActorRef`] can then be used to send one or more responses back:
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #request-response-respond }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #request-response-respond }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #request-response-respond }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #request-response-respond }
 
 
 **Useful when:**
@@ -112,17 +112,17 @@ Java
 
 ## Adapted Response
 
-Most often the sending actor does not, and should not, support receiving the response messages of another actor. In such cases we need to provide an @apidoc[akka.actor.typed.ActorRef] of the right type and adapt the response message to a type that the sending actor can handle.
+Most often the sending actor does not, and should not, support receiving the response messages of another actor. In such cases we need to provide an @apidoc[actor.typed.ActorRef] of the right type and adapt the response message to a type that the sending actor can handle.
 
 **Example:**
 
 ![adapted-response.png](./images/adapted-response.png)
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #adapted-response }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #adapted-response }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #adapted-response }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #adapted-response }
 
 You can register several message adapters for different message classes.
 It's only possible to have one message adapter per message class to make sure
@@ -134,9 +134,9 @@ A message adapter will be used if the message class matches the given class or
 is a subclass thereof. The registered adapters are tried in reverse order of
 their registration order, i.e. the last registered first.
 
-A message adapter (and the returned @apidoc[akka.actor.typed.ActorRef]) has the same lifecycle as
+A message adapter (and the returned @apidoc[actor.typed.ActorRef]) has the same lifecycle as
 the receiving actor. It's recommended to register the adapters in a top level
-@apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"} or constructor of @apidoc[akka.actor.typed.*.AbstractBehavior] but it's possible to
+@apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"} or constructor of @apidoc[actor.typed.*.AbstractBehavior] but it's possible to
 register them later if needed.
 
 The adapter function is running in the receiving actor and can safely access its state, but if it throws an exception the actor is stopped.
@@ -159,7 +159,7 @@ The adapter function is running in the receiving actor and can safely access its
  
 ## Request-Response with ask between two actors
  
-In an interaction where there is a 1:1 mapping between a request and a response we can use `ask` on the @apidoc[akka.actor.typed.*.ActorContext] to interact with another actor.
+In an interaction where there is a 1:1 mapping between a request and a response we can use `ask` on the @apidoc[actor.typed.*.ActorContext] to interact with another actor.
 
 The interaction has two steps, first we need to construct the outgoing message, to do that we need an @scala[`ActorRef[Response]`]@java[`ActorRef`] to put as recipient in the outgoing message. 
 The second step is to transform the successful `Response` or failure into a message that is part of the protocol of the sending actor.
@@ -170,10 +170,10 @@ See also the [Generic response wrapper](#generic-response-wrapper) for replies t
 ![ask-from-actor.png](./images/ask-from-actor.png)
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #actor-ask }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #actor-ask }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #actor-ask }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #actor-ask }
 
 
 The response adapting function is running in the receiving actor and can safely access its state, but if it throws an exception the actor is stopped.
@@ -197,9 +197,9 @@ The response adapting function is running in the receiving actor and can safely
 
 Sometimes you need to interact with actors from the outside of the actor system, this can be done with fire-and-forget as described above or through another version of `ask` that returns a @scala[@scaladoc[Future[Response]](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] that is either completed with a successful response or failed with a @javadoc[TimeoutException](java.util.concurrent.TimeoutException) if there was no response within the specified timeout.
  
-@scala[To do this we use `ask` (or the symbolic `?`) implicitly added to @scaladoc[ActorRef](akka.actor.typed.ActorRef) by `akka.actor.typed.scaladsl.AskPattern._`
-to send a message to an actor and get a `Future[Response]` back. `ask` takes implicit @scaladoc[Timeout](akka.util.Timeout) and @scaladoc[ActorSystem](akka.actor.typed.ActorSystem) parameters.]
-@java[To do this we use `akka.actor.typed.javadsl.AskPattern.ask` to send a message to an actor and get a 
+@scala[To do this we use `ask` (or the symbolic `?`) implicitly added to @scaladoc[ActorRef](pekko.actor.typed.ActorRef) by `org.apache.pekko.actor.typed.scaladsl.AskPattern._`
+to send a message to an actor and get a `Future[Response]` back. `ask` takes implicit @scaladoc[Timeout](pekko.util.Timeout) and @scaladoc[ActorSystem](org.apache.pekko.actor.typed.ActorSystem) parameters.]
+@java[To do this we use `org.apache.pekko.actor.typed.javadsl.AskPattern.ask` to send a message to an actor and get a 
 `CompletionState[Response]` back.]
 
 **Example:**
@@ -207,10 +207,10 @@ to send a message to an actor and get a `Future[Response]` back. `ask` takes imp
 ![ask-from-outside.png](./images/ask-from-outside.png)
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #standalone-ask }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #standalone-ask }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #standalone-ask }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #standalone-ask }
 
 Note that validation errors are also explicit in the message protocol. The `GiveMeCookies` request can reply
 with `Cookies` or `InvalidRequest`. The requestor has to decide how to handle an `InvalidRequest` reply. Sometimes
@@ -218,10 +218,10 @@ it should be treated as a failed @scala[@scaladoc[Future](scala.concurrent.Futur
 requestor side. See also the [Generic response wrapper](#generic-response-wrapper) for replies that are either a success or an error.
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #standalone-ask-fail-future }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #standalone-ask-fail-future }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #standalone-ask-fail-future }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #standalone-ask-fail-future }
 
 **Useful when:**
 
@@ -240,22 +240,22 @@ Having to define two response classes and a shared supertype for every request t
 where you also have to make sure the messages can be serialized to be sent over the network.
 
 To help with this a generic status-response type is included in Akka: @apidoc[StatusReply], everywhere where `ask` can be used
-there is also a second method @apidoc[askWithStatus](typed.*.ActorFlow$) {scala="#askWithStatus[I,Q,A](parallelism:Int)(ref:akka.actor.typed.ActorRef[Q])(makeMessage:(I,akka.actor.typed.ActorRef[akka.pattern.StatusReply[A]])=%3EQ)(implicittimeout:akka.util.Timeout):akka.stream.scaladsl.Flow[I,A,akka.NotUsed]" java="#askWithStatus(int,akka.actor.typed.ActorRef,java.time.Duration,java.util.function.BiFunction)"} which, given that the response is a `StatusReply` will unwrap successful responses
+there is also a second method @apidoc[askWithStatus](typed.*.ActorFlow$) {scala="#askWithStatus[I,Q,A](parallelism:Int)(ref:org.apache.pekko.actor.typed.ActorRef[Q])(makeMessage:(I,org.apache.pekko.actor.typed.ActorRef[org.apache.pekko.pattern.StatusReply[A]])=%3EQ)(implicittimeout:org.apache.pekko.util.Timeout):org.apache.pekko.stream.scaladsl.Flow[I,A,org.apache.pekko.NotUsed]" java="#askWithStatus(int,org.apache.pekko.actor.typed.ActorRef,java.time.Duration,java.util.function.BiFunction)"} which, given that the response is a `StatusReply` will unwrap successful responses
 and help with handling validation errors. Akka includes pre-built serializers for the type, so in the normal use case a clustered 
 application only needs to provide a serializer for the successful result.
 
 For the case where the successful reply does not contain an actual value but is more of an acknowledgment there is a pre defined
-@scala[@scaladoc[StatusReply.Ack](akka.pattern.StatusReply$#Ack:akka.pattern.StatusReply[akka.Done])]@java[@javadoc[StatusReply.ack()](akka.pattern.StatusReply$#ack())] of type @scala[`StatusReply[Done]`]@java[`StatusReply`].
+@scala[@scaladoc[StatusReply.Ack](pekko.pattern.StatusReply$#Ack:org.apache.pekko.pattern.StatusReply[org.apache.pekko.Done])]@java[@javadoc[StatusReply.ack()](pekko.pattern.StatusReply$#ack())] of type @scala[`StatusReply[Done]`]@java[`StatusReply`].
 
 Errors are preferably sent as a text describing what is wrong, but using exceptions to attach a type is also possible.
 
 **Example actor to actor ask:**
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #actor-ask-with-status }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #actor-ask-with-status }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsAskWithStatusTest.java) { #actor-ask-with-status }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java) { #actor-ask-with-status }
 
 A validation error is turned into a `Failure` for the message adapter. In this case we are explicitly handling the validation error separately from
 other ask failures.
@@ -263,33 +263,33 @@ other ask failures.
 **Example ask from the outside:**
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #standalone-ask-with-status }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #standalone-ask-with-status }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsAskWithStatusTest.java) { #standalone-ask-with-status }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java) { #standalone-ask-with-status }
 
-Note that validation errors are also explicit in the message protocol, but encoded as the wrapper type, constructed using @scala[@scaladoc[StatusReply.Error(text)](akka.pattern.StatusReply$$Error$#apply[T](errorMessage:String):akka.pattern.StatusReply[T])]@java[@javadoc[StatusReply.error(text)](akka.pattern.StatusReply$#error(java.lang.String))]:
+Note that validation errors are also explicit in the message protocol, but encoded as the wrapper type, constructed using @scala[@scaladoc[StatusReply.Error(text)](pekko.pattern.StatusReply$$Error$#apply[T](errorMessage:String):org.apache.pekko.pattern.StatusReply[T])]@java[@javadoc[StatusReply.error(text)](pekko.pattern.StatusReply$#error(java.lang.String))]:
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #standalone-ask-with-status-fail-future }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #standalone-ask-with-status-fail-future }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsAskWithStatusTest.java) { #standalone-ask-with-status-fail-future }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java) { #standalone-ask-with-status-fail-future }
 
 
 ## Ignoring replies
 
-In some situations an actor has a response for a particular request message but you are not interested in the response. In this case you can pass @scala[@scaladoc[system.ignoreRef](akka.actor.typed.ActorSystem#ignoreRef[U]:akka.actor.typed.ActorRef[U])]@java[@javadoc[system.ignoreRef()](akka.actor.typed.ActorSystem#ignoreRef())] turning the request-response into a fire-and-forget.
+In some situations an actor has a response for a particular request message but you are not interested in the response. In this case you can pass @scala[@scaladoc[system.ignoreRef](pekko.actor.typed.ActorSystem#ignoreRef[U]:org.apache.pekko.actor.typed.ActorRef[U])]@java[@javadoc[system.ignoreRef()](pekko.actor.typed.ActorSystem#ignoreRef())] turning the request-response into a fire-and-forget.
 
-@scala[`system.ignoreRef`]@java[`system.ignoreRef()`], as the name indicates, returns an @apidoc[akka.actor.typed.ActorRef] that ignores any message sent to it.
+@scala[`system.ignoreRef`]@java[`system.ignoreRef()`], as the name indicates, returns an @apidoc[actor.typed.ActorRef] that ignores any message sent to it.
 
 With the same protocol as the @ref[request response](#request-response) above, if the sender would prefer to ignore the reply it could pass @scala[`system.ignoreRef`]@java[`system.ignoreRef()`] for the `replyTo`, which it can access through @scala[`ActorContext.system.ignoreRef`]@java[`ActorContext.getSystem().ignoreRef()`]. 
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #ignore-reply }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #ignore-reply }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #ignore-reply }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #ignore-reply }
 
 **Useful when:**
 
@@ -297,17 +297,17 @@ Java
 
 **Problems:**
 
-The returned @apidoc[akka.actor.typed.ActorRef] ignores all messages sent to it, therefore it should be used carefully.
+The returned @apidoc[actor.typed.ActorRef] ignores all messages sent to it, therefore it should be used carefully.
  
  * Passing it around inadvertently as if it was a normal `ActorRef` may result in broken actor-to-actor interactions.
  * Using it when performing an `ask` from outside the Actor System will cause the @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] returned by the `ask` to timeout since it will never complete.
- * Finally, it's legal to @apidoc[watch](typed.*.ActorContext) {scala="#watch[U](other:akka.actor.typed.ActorRef[U]):Unit" java="#watch(akka.actor.typed.ActorRef)"} it, but since it's of a special kind, it never terminates and therefore you will never receive a @apidoc[akka.actor.typed.Terminated] signal from it.
+ * Finally, it's legal to @apidoc[watch](typed.*.ActorContext) {scala="#watch[U](other:org.apache.pekko.actor.typed.ActorRef[U]):Unit" java="#watch(org.apache.pekko.actor.typed.ActorRef)"} it, but since it's of a special kind, it never terminates and therefore you will never receive a @apidoc[actor.typed.Terminated] signal from it.
 
 ## Send Future result to self
 
 When using an API that returns a @scala[`Future`]@java[`CompletionStage`] from an actor it's common that you would
 like to use the value of the response in the actor when the @scala[`Future`]@java[`CompletionStage`] is completed. For
-this purpose the `ActorContext` provides a @apidoc[pipeToSelf](typed.*.ActorContext) {scala="#pipeToSelf[Value](future:scala.concurrent.Future[Value])(mapResult:scala.util.Try[Value]=%3ET):Unit" java="#pipeToSelf(java.util.concurrent.CompletionStage,akka.japi.function.Function2)"} method.
+this purpose the `ActorContext` provides a @apidoc[pipeToSelf](typed.*.ActorContext) {scala="#pipeToSelf[Value](future:scala.concurrent.Future[Value])(mapResult:scala.util.Try[Value]=%3ET):Unit" java="#pipeToSelf(java.util.concurrent.CompletionStage,org.apache.pekko.japi.function.Function2)"} method.
 
 **Example:**
 
@@ -316,10 +316,10 @@ this purpose the `ActorContext` provides a @apidoc[pipeToSelf](typed.*.ActorCont
 An actor, `CustomerRepository`, is invoking a method on `CustomerDataAccess` that returns a @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)].
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #pipeToSelf }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #pipeToSelf }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #pipeToSelf }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #pipeToSelf }
 
 It could be tempting to just use @scala[`onComplete on the Future`]@java[`a callback on the CompletionStage`], but
 that introduces the risk of accessing internal state of the actor that is not thread-safe from an external thread.
@@ -344,7 +344,7 @@ In some cases a complete response to a request can only be created and sent back
 
 Note that this is essentially how `ask` is implemented, if all you need is a single response with a timeout it is better to use `ask`.
 
-The child is created with the context it needs to do the work, including an @apidoc[akka.actor.typed.ActorRef] that it can respond to. When the complete result is there the child responds with the result and stops itself.
+The child is created with the context it needs to do the work, including an @apidoc[actor.typed.ActorRef] that it can respond to. When the complete result is there the child responds with the result and stops itself.
 
 As the protocol of the session actor is not a public API but rather an implementation detail of the parent actor, it may not always make sense to have an explicit protocol and adapt the messages of the actors that the session actor interacts with. For this use case it is possible to express that the actor can receive any message (@scala[@scaladoc[Any](scala.Any)]@java[@javadoc[Object](java.lang.Object)]).
 
@@ -353,10 +353,10 @@ As the protocol of the session actor is not a public API but rather an implement
 ![per-session-child.png](./images/per-session-child.png)
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #per-session-child }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #per-session-child }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #per-session-child }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #per-session-child }
 
 In an actual session child you would likely want to include some form of timeout as well (see @ref:[scheduling messages to self](#scheduling-messages-to-self)).
 
@@ -377,7 +377,7 @@ This is similar to above @ref:[Per session child Actor](#per-session-child-actor
 end up repeating the same way of aggregating replies and want to extract that to a reusable actor.
 
 There are many variations of this pattern and that is the reason this is provided as a documentation
-example rather than a built in @apidoc[akka.actor.typed.Behavior] in Akka. It is intended to be adjusted to your specific needs.
+example rather than a built in @apidoc[actor.typed.Behavior] in Akka. It is intended to be adjusted to your specific needs.
 
 **Example:**
 
@@ -390,19 +390,19 @@ function and sent back to the `replyTo`. If replies don't arrive within the `tim
 aggregated and sent back to the `replyTo`.
 
 Scala
-:  @@snip [AggregatorSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/AggregatorSpec.scala) { #usage }
+:  @@snip [AggregatorSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/AggregatorSpec.scala) { #usage }
 
 Java
-:  @@snip [AggregatorTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/AggregatorTest.java) { #usage }
+:  @@snip [AggregatorTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java) { #usage }
 
 
 The implementation of the `Aggregator`:
 
 Scala
-:  @@snip [Aggregator.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/Aggregator.scala) { #behavior }
+:  @@snip [Aggregator.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/Aggregator.scala) { #behavior }
 
 Java
-:  @@snip [Aggregator.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/Aggregator.java) { #behavior }
+:  @@snip [Aggregator.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java) { #behavior }
 
 **Useful when:**
 
@@ -430,17 +430,17 @@ are under heavy load simultaneously. This technique is explained in depth in Jef
 [Achieving Rapid Response Times in Large Online Services](https://static.googleusercontent.com/media/research.google.com/en//people/jeff/Berkeley-Latency-Mar2012.pdf).
 
 There are many variations of this pattern and that is the reason this is provided as a documentation
-example rather than a built in @apidoc[akka.actor.typed.Behavior] in Akka. It is intended to be adjusted to your specific needs.
+example rather than a built in @apidoc[actor.typed.Behavior] in Akka. It is intended to be adjusted to your specific needs.
 
 **Example:**
 
 ![tail-chopping.png](./images/tail-chopping.png)
 
 Scala
-:  @@snip [TailChopping.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/TailChopping.scala) { #behavior }
+:  @@snip [TailChopping.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/TailChopping.scala) { #behavior }
 
 Java
-:  @@snip [TailChopping.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/TailChopping.java) { #behavior }
+:  @@snip [TailChopping.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java) { #behavior }
 
 **Useful when:**
 
@@ -467,28 +467,28 @@ The following example demonstrates how to use timers to schedule messages to an
 The `Buncher` actor buffers a burst of incoming messages and delivers them as a batch after a timeout or when the number of batched messages exceeds a maximum size.
 
 Scala
-:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala) { #timer }
+:  @@snip [InteractionPatternsSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala) { #timer }
 
 Java
-:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java) { #timer }
+:  @@snip [InteractionPatternsTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java) { #timer }
 
 There are a few things worth noting here:
 
-* To get access to the timers you start with @apidoc[Behaviors.withTimers](typed.*.Behaviors$) {scala="#withTimers[T](factory:akka.actor.typed.scaladsl.TimerScheduler[T]=%3eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#withTimers(akka.japi.function.Function)"} that will pass a @apidoc[akka.actor.typed.*.TimerScheduler] instance to the function. 
-This can be used with any type of @apidoc[akka.actor.typed.Behavior], including @apidoc[receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(akka.actor.typed.scaladsl.ActorContext[T],T)=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(akka.japi.function.Function2,akka.japi.function.Function2)"}, @apidoc[receiveMessage](typed.*.Behaviors$) {scala="#receiveMessage[T](onMessage:T=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receiveMessage(akka.japi.Function)"}, but also @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"} or any other behavior.
+* To get access to the timers you start with @apidoc[Behaviors.withTimers](typed.*.Behaviors$) {scala="#withTimers[T](factory:org.apache.pekko.actor.typed.scaladsl.TimerScheduler[T]=%3eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#withTimers(org.apache.pekko.japi.function.Function)"} that will pass a @apidoc[actor.typed.*.TimerScheduler] instance to the function. 
+This can be used with any type of @apidoc[actor.typed.Behavior], including @apidoc[receive](typed.*.Behaviors$) {scala="#receive[T](onMessage:(org.apache.pekko.actor.typed.scaladsl.ActorContext[T],T)=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receive(org.apache.pekko.japi.function.Function2,org.apache.pekko.japi.function.Function2)"}, @apidoc[receiveMessage](typed.*.Behaviors$) {scala="#receiveMessage[T](onMessage:T=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Receive[T]" java="#receiveMessage(org.apache.pekko.japi.Function)"}, but also @apidoc[setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"} or any other behavior.
 * Each timer has a key and if a new timer with the same key is started, the previous is cancelled. It is guaranteed that a message from the previous timer is not received, even if it was already enqueued in the mailbox when the new timer was started.
 * Both periodic and single message timers are supported. 
 * The `TimerScheduler` is mutable in itself, because it performs and manages the side effects of registering the scheduled tasks.
 * The `TimerScheduler` is bound to the lifecycle of the actor that owns it and is cancelled automatically when the actor is stopped.
-* `Behaviors.withTimers` can also be used inside @apidoc[Behaviors.supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:akka.actor.typed.Behavior[T]):akka.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(akka.actor.typed.Behavior)"} and it will automatically cancel the started timers correctly when the actor is restarted, so that the new incarnation will not receive scheduled messages from a previous incarnation.
+* `Behaviors.withTimers` can also be used inside @apidoc[Behaviors.supervise](typed.*.Behaviors$) {scala="#supervise[T](wrapped:actor.typed.Behavior[T]):org.apache.pekko.actor.typed.scaladsl.Behaviors.Supervise[T]" java="#supervise(org.apache.pekko.actor.typed.Behavior)"} and it will automatically cancel the started timers correctly when the actor is restarted, so that the new incarnation will not receive scheduled messages from a previous incarnation.
 
 ### Schedule periodically
 
 Scheduling of recurring messages can have two different characteristics:
 
 * fixed-delay - The delay between sending subsequent messages will always be (at least) the given `delay`.
-  Use @apidoc[startTimerWithFixedDelay](akka.actor.TimerScheduler) {scala="#startTimerWithFixedDelay(key:Any,msg:Any,initialDelay:scala.concurrent.duration.FiniteDuration,delay:scala.concurrent.duration.FiniteDuration):Unit" java="#startTimerWithFixedDelay(java.lang.Object,java.lang.Object,java.time.Duration,java.time.Duration)"}.
-* fixed-rate - The frequency of execution over time will meet the given `interval`. Use @apidoc[startTimerAtFixedRate](akka.actor.TimerScheduler) {scala="#startTimerAtFixedRate(key:Any,msg:Any,interval:scala.concurrent.duration.FiniteDuration):Unit" java="#startTimerAtFixedRate(java.lang.Object,java.lang.Object,java.time.Duration,java.time.Duration)"}.
+  Use @apidoc[startTimerWithFixedDelay](actor.TimerScheduler) {scala="#startTimerWithFixedDelay(key:Any,msg:Any,initialDelay:scala.concurrent.duration.FiniteDuration,delay:scala.concurrent.duration.FiniteDuration):Unit" java="#startTimerWithFixedDelay(java.lang.Object,java.lang.Object,java.time.Duration,java.time.Duration)"}.
+* fixed-rate - The frequency of execution over time will meet the given `interval`. Use @apidoc[startTimerAtFixedRate](actor.TimerScheduler) {scala="#startTimerAtFixedRate(key:Any,msg:Any,interval:scala.concurrent.duration.FiniteDuration):Unit" java="#startTimerAtFixedRate(java.lang.Object,java.lang.Object,java.time.Duration,java.time.Duration)"}.
 
 If you are uncertain of which one to use you should pick `startTimerWithFixedDelay`.
 
@@ -528,8 +528,8 @@ which may in worst case cause undesired load on the system. `scheduleWithFixedDe
 When @ref:[Akka Cluster](cluster.md) is used to @ref:[shard actors](cluster-sharding.md) you need to
 take into account that an actor may move or get passivated.
 
-The normal pattern for expecting a reply is to include an @apidoc[akka.actor.typed.ActorRef] in the message, typically a message adapter. This can be used
-for a sharded actor but if @scala[@scaladoc[ctx.self](akka.actor.typed.scaladsl.ActorContext#self:akka.actor.typed.ActorRef[T])]@java[@javadoc[ctx.getSelf()](akka.actor.typed.javadsl.ActorContext#getSelf())] is sent and the sharded actor is moved or passivated then the reply
+The normal pattern for expecting a reply is to include an @apidoc[actor.typed.ActorRef] in the message, typically a message adapter. This can be used
+for a sharded actor but if @scala[@scaladoc[ctx.self](pekko.actor.typed.scaladsl.ActorContext#self:org.apache.pekko.actor.typed.ActorRef[T])]@java[@javadoc[ctx.getSelf()](pekko.actor.typed.javadsl.ActorContext#getSelf())] is sent and the sharded actor is moved or passivated then the reply
 will sent to dead letters.
 
 An alternative is to send the `entityId` in the message and have the reply sent via sharding.
@@ -539,10 +539,10 @@ An alternative is to send the `entityId` in the message and have the reply sent
 ![sharded-response.png](./images/sharded-response.png)
 
 Scala
-:  @@snip [sharded.response](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #sharded-response }
+:  @@snip [sharded.response](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala) { #sharded-response }
 
 Java
-:  @@snip [sharded.response](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java) { #sharded-response }
+:  @@snip [sharded.response](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java) { #sharded-response }
 
 A disadvantage is that a message adapter can't be used so the response has to be in the protocol of the actor being responded to. Additionally the @apidoc[typed.*.EntityTypeKey]
 could be included in the message if it is not known statically.
@@ -554,5 +554,5 @@ has been moved to a different cluster node, it will be routed to that new node.
 As with directly including the `entityId` and `EntityTypeKey` in the message, `EntityRef`s do not support message adaptation: the response has to be in the protocol
 of the entity being responded to.
 
-In some cases, it may be useful to define messages with a @apidoc[akka.actor.typed.RecipientRef] which is a common supertype of @apidoc[typed.ActorRef] and `EntityRef`.  At this time,
+In some cases, it may be useful to define messages with a @apidoc[actor.typed.RecipientRef] which is a common supertype of @apidoc[typed.ActorRef] and `EntityRef`.  At this time,
 serializing a `RecipientRef` requires a custom serializer.
diff --git a/akka-docs/src/main/paradox/typed/logging.md b/akka-docs/src/main/paradox/typed/logging.md
index 87dcb89007..dd0157a209 100644
--- a/akka-docs/src/main/paradox/typed/logging.md
+++ b/akka-docs/src/main/paradox/typed/logging.md
@@ -33,10 +33,10 @@ which can slow down the operations of your code if it was performed synchronousl
 The @apidoc[typed.*.ActorContext] provides access to an [org.slf4j.Logger](https://www.slf4j.org/api/org/slf4j/Logger.html) for a specific actor.
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #context-log }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #context-log }
 
 Java
-:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java) { #context-log }
+:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java) { #context-log }
 
 The `Logger` via the `ActorContext` will automatically have a name that corresponds to the @apidoc[Behavior] of the
 actor when the log is accessed the first time. The class name when using @apidoc[AbstractBehavior] or the class @scala[or object]
@@ -44,17 +44,17 @@ name where the `Behavior` is defined when using the functional style. You can se
 with the @apidoc[setLoggerName](typed.*.ActorContext) {scala="#setLoggerName(name:String):Unit" java="#setLoggerName(java.lang.String)"} of the `ActorContext`.
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #logger-name }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #logger-name }
 
 Java
-:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java) { #logger-name }
+:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java) { #logger-name }
 
 The convention is to use logger names like fully qualified class names. The parameter to `setLoggerName`
 can be a `String` or a `Class`, where the latter is convenience for the class name.
 
 When logging via the `ActorContext` the path of the actor will automatically be added as `akkaSource`
 Mapped Diagnostic Context (MDC) value. MDC is typically implemented with a @javadoc[ThreadLocal](java.lang.ThreadLocal) by the SLF4J backend.
-To reduce performance impact, this MDC value is set when you access the @scala[@scaladoc[log](akka.actor.typed.scaladsl.ActorContext#log:org.slf4j.Logger)]@java[@javadoc[getLog()](akka.actor.typed.javadsl.ActorContext#getLog())] method so
+To reduce performance impact, this MDC value is set when you access the @scala[@scaladoc[log](pekko.actor.typed.scaladsl.ActorContext#log:org.slf4j.Logger)]@java[@javadoc[getLog()](pekko.actor.typed.javadsl.ActorContext#getLog())] method so
 you shouldn't cache the returned `Logger` in your own field. That is handled by `ActorContext` and retrieving
 the `Logger` repeatedly with the @scala[`log`]@java[`getLog`] method has low overhead.
 The MDC is cleared automatically after processing of current message has finished.
@@ -72,10 +72,10 @@ events will not include the `akkaSource` MDC value. This is the recommended way
 of an actor, including logging from @scala[@scaladoc[Future](scala.concurrent.Future)]@java[@javadoc[CompletionStage](java.util.concurrent.CompletionStage)] callbacks.
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #logger-factory }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #logger-factory }
 
 Java
-:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java) { #logger-factory }
+:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java) { #logger-factory }
 
 ### Placeholder arguments
 
@@ -93,10 +93,10 @@ don't allocate the vararg array.
 When using the methods for 2 argument placeholders the compiler will often not be able to select the
 right method and report compiler error "ambiguous reference to overloaded definition". To work around this
 problem you can use the `trace2`, `debug2`, `info2`, `warn2` or `error2` extension methods that are added
-by `import akka.actor.typed.scaladsl.LoggerOps` or `import akka.actor.typed.scaladsl._`.
+by `import org.apache.pekko.actor.typed.scaladsl.LoggerOps` or `import org.apache.pekko.actor.typed.scaladsl._`.
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #info2 }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #info2 }
 
 When using the methods for 3 or more argument placeholders, the compiler will not be able to convert
 the method parameters to the vararg array when they contain primitive values such as `Int`,
@@ -105,26 +105,26 @@ To work around this problem you can use the `traceN`, `debugN`, `infoN`, `warnN`
 methods that are added by the same `LoggerOps` import.
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #infoN }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #infoN }
 
 If you find it tedious to add the import of `LoggerOps` at many places you can make those additional methods
 available with a single implicit conversion placed in a root package object of your code:
 
 Scala
-:  @@snip [package.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/myapp/package.scala) { #loggerops-package-implicit }
+:  @@snip [package.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/myapp/package.scala) { #loggerops-package-implicit }
 
 @@@
 
 ### Behaviors.logMessages
 
 If you want very detailed logging of messages and signals you can decorate a @apidoc[Behavior]
-with @apidoc[Behaviors.logMessages](Behaviors$) {scala="#logMessages[T](logOptions:akka.actor.typed.LogOptions,behavior:akka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#logMessages(akka.actor.typed.LogOptions,akka.actor.typed.Behavior)"}.
+with @apidoc[Behaviors.logMessages](Behaviors$) {scala="#logMessages[T](logOptions:org.apache.pekko.actor.typed.LogOptions,behavior:org.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#logMessages(org.apache.pekko.actor.typed.LogOptions,org.apache.pekko.actor.typed.Behavior)"}.
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #logMessages }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #logMessages }
 
 Java
-:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java) { #logMessages }
+:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java) { #logMessages }
 
 
 ## MDC
@@ -137,25 +137,25 @@ list and be put in the MDC attribute `akkaTags`. This can be used to categorize
 to allow easier filtering of logs:
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #tags }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #tags }
 
 Java
-:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java) { #tags }
+:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java) { #tags }
 
-In addition to these two built in MDC attributes you can also decorate a @apidoc[Behavior] with @apidoc[Behaviors.withMdc](Behaviors$) {scala="#withMdc[T](staticMdc:Map[String,String],mdcForMessage:T=%3EMap[String,String])(behavior:akka.actor.typed.Behavior[T])(implicitevidence$4:scala.reflect.ClassTag[T]):akka.actor.typed.Behavior[T]" java="#withMdc(java.lang.Class,java.util.Map,akka.japi.function.Function,akka.actor.typed.Behavior)"} or 
+In addition to these two built in MDC attributes you can also decorate a @apidoc[Behavior] with @apidoc[Behaviors.withMdc](Behaviors$) {scala="#withMdc[T](staticMdc:Map[String,String],mdcForMessage:T=%3EMap[String,String])(behavior:org.apache.pekko.actor.typed.Behavior[T])(implicitevidence$4:scala.reflect.ClassTag[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#withMdc(java.lang.Class,java.util.Map,org.apache.pekko.japi.function.Function,org.apache.pekko.actor.typed.Behavior)"} or 
 use the [org.slf4j.MDC](https://www.slf4j.org/api/org/slf4j/MDC.html) API directly.
 
 The `Behaviors.withMdc` decorator has two parts. A static `Map` of MDC attributes that are not changed,
 and a dynamic `Map` that can be constructed for each message.
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #withMdc }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #withMdc }
 
 Java
-:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java) { #withMdc }
+:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java) { #withMdc }
 
 If you use the MDC API directly, be aware that MDC is typically implemented with a @javadoc[ThreadLocal](java.lang.ThreadLocal) by the SLF4J backend.
-Akka clears the MDC if logging is performed via the @scala[@scaladoc[log](akka.actor.typed.scaladsl.ActorContext#log:org.slf4j.Logger)]@java[@javadoc[getLog()](akka.actor.typed.javadsl.ActorContext#getLog())] of the `ActorContext` and it is cleared
+Akka clears the MDC if logging is performed via the @scala[@scaladoc[log](pekko.actor.typed.scaladsl.ActorContext#log:org.slf4j.Logger)]@java[@javadoc[getLog()](pekko.actor.typed.javadsl.ActorContext#getLog())] of the `ActorContext` and it is cleared
 automatically after processing of current message has finished, but only if you accessed @scala[`log`]@java[`getLog()`].
 The entire MDC is cleared, including attributes that you add yourself to the MDC.
 MDC is not cleared automatically if you use a [Logger](https://www.slf4j.org/api/org/slf4j/Logger.html) via [LoggerFactory](https://www.slf4j.org/api/org/slf4j/LoggerFactory.html) or not touch @scala[`log`]@java[`getLog()`]
@@ -223,7 +223,7 @@ logging configuration in `src/test/resources/logback-test.xml`.
 
 #### MDC values
 
-When logging via the  @scala[@scaladoc[log](akka.actor.typed.scaladsl.ActorContext#log:org.slf4j.Logger)]@java[@javadoc[getLog()](akka.actor.typed.javadsl.ActorContext#getLog())] of the `ActorContext`, as described in
+When logging via the  @scala[@scaladoc[log](pekko.actor.typed.scaladsl.ActorContext#log:org.slf4j.Logger)]@java[@javadoc[getLog()](pekko.actor.typed.javadsl.ActorContext#getLog())] of the `ActorContext`, as described in
 @ref:[How to log](#how-to-log), Akka includes a few MDC properties:
 
 * `akkaSource`: the actor's path
@@ -258,7 +258,7 @@ through an event bus. Such log events are processed by an event handler actor, w
 SLF4J or directly to standard out.
 
 When `akka-actor-typed` and `akka-slf4j` are on the classpath this event handler actor will emit the events to SLF4J.
-The @apidoc[akka.event.slf4j.Slf4jLogger](Slf4jLogger) and @apidoc[akka.event.slf4j.Slf4jLoggingFilter](Slf4jLoggingFilter) are enabled automatically
+The @apidoc[event.slf4j.Slf4jLogger](Slf4jLogger) and @apidoc[event.slf4j.Slf4jLoggingFilter](Slf4jLoggingFilter) are enabled automatically
 without additional configuration. This can be disabled by `akka.use-slf4j=off` configuration property.
 
 In other words, you don't have to do anything for the Akka internal logging to end up in your configured
@@ -429,10 +429,10 @@ the MDC key will not have any value for a typed actor.
 Akka is logging some events with markers. Some of these events also include structured MDC properties. 
 
 * The "SECURITY" marker is used for highlighting security related events or incidents.
-* Akka Actor is using the markers defined in @apidoc[akka.actor.ActorLogMarker$].
-* Akka Cluster is using the markers defined in @apidoc[akka.cluster.ClusterLogMarker$].
-* Akka Remoting is using the markers defined in @apidoc[akka.remote.RemoteLogMarker$].
-* Akka Cluster Sharding is using the markers defined in @apidoc[akka.cluster.sharding.ShardingLogMarker$].
+* Akka Actor is using the markers defined in @apidoc[actor.ActorLogMarker$].
+* Akka Cluster is using the markers defined in @apidoc[cluster.ClusterLogMarker$].
+* Akka Remoting is using the markers defined in @apidoc[remote.RemoteLogMarker$].
+* Akka Cluster Sharding is using the markers defined in @apidoc[cluster.sharding.ShardingLogMarker$].
 
 Markers and MDC properties are automatically picked up by the [Logstash Logback encoder](https://github.com/logstash/logstash-logback-encoder).
 
diff --git a/akka-docs/src/main/paradox/typed/mailboxes.md b/akka-docs/src/main/paradox/typed/mailboxes.md
index 5f5cba316d..180001aa02 100644
--- a/akka-docs/src/main/paradox/typed/mailboxes.md
+++ b/akka-docs/src/main/paradox/typed/mailboxes.md
@@ -36,12 +36,12 @@ For advanced use cases it is also possible to defer mailbox selection to config
 To select a specific mailbox for an actor use @apidoc[MailboxSelector](MailboxSelector$) to create a @apidoc[Props](typed.Props) instance for spawning your actor:
 
 Scala
-:  @@snip [MailboxDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/MailboxDocSpec.scala) { #select-mailbox }
+:  @@snip [MailboxDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/MailboxDocSpec.scala) { #select-mailbox }
 
 Java
-:  @@snip [MailboxDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/MailboxDocTest.java) { #select-mailbox }
+:  @@snip [MailboxDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java) { #select-mailbox }
 
-@apidoc[fromConfig](MailboxSelector$) {scala="#fromConfig(path:String):akka.actor.typed.MailboxSelector" java="#fromConfig(java.lang.String)"} takes an absolute config path to a block defining the dispatcher in the config file:
+@apidoc[fromConfig](MailboxSelector$) {scala="#fromConfig(path:String):org.apache.pekko.actor.typed.MailboxSelector" java="#fromConfig(java.lang.String)"} takes an absolute config path to a block defining the dispatcher in the config file:
 
 @@snip [MailboxDocSpec.scala](/akka-actor-typed-tests/src/test/resources/mailbox-config-sample.conf) { }
 
@@ -68,41 +68,41 @@ Akka ships with a number of mailbox implementations:
     * Backed by a Multiple-Producer Single-Consumer queue, cannot be used with `BalancingDispatcher`
     * Blocking: No
     * Bounded: No
-    * Configuration name: `"akka.dispatch.SingleConsumerOnlyUnboundedMailbox"`
+    * Configuration name: `"org.apache.pekko.dispatch.SingleConsumerOnlyUnboundedMailbox"`
  * 
    @apidoc[UnboundedMailbox]
     * Backed by a @javadoc[java.util.concurrent.ConcurrentLinkedQueue](java.util.concurrent.ConcurrentLinkedQueue)
     * Blocking: No
     * Bounded: No
-    * Configuration name: `"unbounded"` or `"akka.dispatch.UnboundedMailbox"`
+    * Configuration name: `"unbounded"` or `"org.apache.pekko.dispatch.UnboundedMailbox"`
 
  * 
    @apidoc[NonBlockingBoundedMailbox]
     * Backed by a very efficient Multiple-Producer Single-Consumer queue
     * Blocking: No (discards overflowing messages into deadLetters)
     * Bounded: Yes
-    * Configuration name: `"akka.dispatch.NonBlockingBoundedMailbox"`
+    * Configuration name: `"org.apache.pekko.dispatch.NonBlockingBoundedMailbox"`
  * 
    @apidoc[UnboundedControlAwareMailbox]
-    * Delivers messages that extend @apidoc[akka.dispatch.ControlMessage](dispatch.ControlMessage) with higher priority
+    * Delivers messages that extend @apidoc[dispatch.ControlMessage](dispatch.ControlMessage) with higher priority
     * Backed by two @javadoc[java.util.concurrent.ConcurrentLinkedQueue](java.util.concurrent.ConcurrentLinkedQueue)
     * Blocking: No
     * Bounded: No
-    * Configuration name: `"akka.dispatch.UnboundedControlAwareMailbox"`
+    * Configuration name: `"org.apache.pekko.dispatch.UnboundedControlAwareMailbox"`
  * 
    @apidoc[UnboundedPriorityMailbox]
     * Backed by a @javadoc[java.util.concurrent.PriorityBlockingQueue](java.util.concurrent.PriorityBlockingQueue)
     * Delivery order for messages of equal priority is undefined - contrast with the `UnboundedStablePriorityMailbox`
     * Blocking: No
     * Bounded: No
-    * Configuration name: `"akka.dispatch.UnboundedPriorityMailbox"`
+    * Configuration name: `"org.apache.pekko.dispatch.UnboundedPriorityMailbox"`
  * 
    @apidoc[UnboundedStablePriorityMailbox]
-    * Backed by a @javadoc[java.util.concurrent.PriorityBlockingQueue](java.util.concurrent.PriorityBlockingQueue) wrapped in an @apidoc[akka.util.PriorityQueueStabilizer](PriorityQueueStabilizer)
+    * Backed by a @javadoc[java.util.concurrent.PriorityBlockingQueue](java.util.concurrent.PriorityBlockingQueue) wrapped in an @apidoc[util.PriorityQueueStabilizer](PriorityQueueStabilizer)
     * FIFO order is preserved for messages of equal priority - contrast with the `UnboundedPriorityMailbox`
     * Blocking: No
     * Bounded: No
-    * Configuration name: `"akka.dispatch.UnboundedStablePriorityMailbox"`
+    * Configuration name: `"org.apache.pekko.dispatch.UnboundedStablePriorityMailbox"`
 
 Other bounded mailbox implementations which will block the sender if the capacity is reached and
 configured with non-zero `mailbox-push-timeout-time`. 
@@ -117,25 +117,25 @@ The following mailboxes should only be used with zero `mailbox-push-timeout-time
     * Backed by a @javadoc[java.util.concurrent.LinkedBlockingQueue](java.util.concurrent.LinkedBlockingQueue)
     * Blocking: Yes if used with non-zero `mailbox-push-timeout-time`, otherwise No
     * Bounded: Yes
-    * Configuration name: `"bounded"` or `"akka.dispatch.BoundedMailbox"`
+    * Configuration name: `"bounded"` or `"org.apache.pekko.dispatch.BoundedMailbox"`
  * @apidoc[BoundedPriorityMailbox]
-    * Backed by a @javadoc[java.util.PriorityQueue](java.util.PriorityQueue) wrapped in an @apidoc[akka.util.BoundedBlockingQueue](BoundedBlockingQueue)
+    * Backed by a @javadoc[java.util.PriorityQueue](java.util.PriorityQueue) wrapped in an @apidoc[util.BoundedBlockingQueue](BoundedBlockingQueue)
     * Delivery order for messages of equal priority is undefined - contrast with the `BoundedStablePriorityMailbox`
     * Blocking: Yes if used with non-zero `mailbox-push-timeout-time`, otherwise No
     * Bounded: Yes
-    * Configuration name: `"akka.dispatch.BoundedPriorityMailbox"`
+    * Configuration name: `"org.apache.pekko.dispatch.BoundedPriorityMailbox"`
  * @apidoc[BoundedStablePriorityMailbox]
-    * Backed by a @javadoc[java.util.PriorityQueue](java.util.PriorityQueue) wrapped in an @apidoc[akka.util.PriorityQueueStabilizer](PriorityQueueStabilizer) and an @apidoc[akka.util.BoundedBlockingQueue](BoundedBlockingQueue)
+    * Backed by a @javadoc[java.util.PriorityQueue](java.util.PriorityQueue) wrapped in an @apidoc[util.PriorityQueueStabilizer](PriorityQueueStabilizer) and an @apidoc[util.BoundedBlockingQueue](BoundedBlockingQueue)
     * FIFO order is preserved for messages of equal priority - contrast with the BoundedPriorityMailbox
     * Blocking: Yes if used with non-zero `mailbox-push-timeout-time`, otherwise No
     * Bounded: Yes
-    * Configuration name: `"akka.dispatch.BoundedStablePriorityMailbox"`
+    * Configuration name: `"org.apache.pekko.dispatch.BoundedStablePriorityMailbox"`
  * @apidoc[BoundedControlAwareMailbox]
-    * Delivers messages that extend @apidoc[akka.dispatch.ControlMessage](dispatch.ControlMessage) with higher priority
+    * Delivers messages that extend @apidoc[dispatch.ControlMessage](dispatch.ControlMessage) with higher priority
     * Backed by two @javadoc[java.util.concurrent.ConcurrentLinkedQueue](java.util.concurrent.ConcurrentLinkedQueue) and blocking on enqueue if capacity has been reached
     * Blocking: Yes if used with non-zero `mailbox-push-timeout-time`, otherwise No
     * Bounded: Yes
-    * Configuration name: `"akka.dispatch.BoundedControlAwareMailbox"`
+    * Configuration name: `"org.apache.pekko.dispatch.BoundedControlAwareMailbox"`
 
 ## Custom Mailbox type
 
@@ -160,7 +160,7 @@ configuration, or the mailbox configuration.
 @@@ note
 
 Make sure to include a constructor which takes
-@apidoc[akka.actor.ActorSystem.Settings](actor.ActorSystem.Settings) and [com.typesafe.config.Config](https://lightbend.github.io/config/latest/api/index.html?com/typesafe/config/Config.html)
+@apidoc[actor.ActorSystem.Settings](actor.ActorSystem.Settings) and [com.typesafe.config.Config](https://lightbend.github.io/config/latest/api/index.html?com/typesafe/config/Config.html)
 arguments, as this constructor is invoked reflectively to construct your
 mailbox type. The config passed in as second argument is that section from
 the configuration which describes the dispatcher or mailbox setting using
diff --git a/akka-docs/src/main/paradox/typed/persistence-fsm.md b/akka-docs/src/main/paradox/typed/persistence-fsm.md
index 56d4bdae59..3ddad99e6a 100644
--- a/akka-docs/src/main/paradox/typed/persistence-fsm.md
+++ b/akka-docs/src/main/paradox/typed/persistence-fsm.md
@@ -11,10 +11,10 @@ To demonstrate this consider an example of a shopping application. A customer ca
 * Paid
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #state }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #state }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #state }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #state }
 
 
 And the commands that can result in state changes:
@@ -29,10 +29,10 @@ And the following read only commands:
 * Get current cart 
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #commands }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #commands }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #commands }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #commands }
 
 The command handler of the EventSourcedBehavior is used to convert the commands that change the state of the FSM
 to events, and reply to commands.
@@ -40,18 +40,18 @@ to events, and reply to commands.
 @scala[The command handler:]@java[The `forStateType` command handler can be used:]
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #command-handler }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #command-handler }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #command-handler }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #command-handler }
 
 The event handler is used to change state once the events have been persisted. When the EventSourcedBehavior is restarted
 the events are replayed to get back into the correct state.
 
 Scala
-:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #event-handler }
+:  @@snip [PersistentFsmToTypedMigrationSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala) { #event-handler }
 
 Java
-:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #event-handler }
+:  @@snip [PersistentFsmToTypedMigrationCompileOnlyTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java) { #event-handler }
 
 
diff --git a/akka-docs/src/main/paradox/typed/persistence-snapshot.md b/akka-docs/src/main/paradox/typed/persistence-snapshot.md
index 7fd4130189..e88563dd80 100644
--- a/akka-docs/src/main/paradox/typed/persistence-snapshot.md
+++ b/akka-docs/src/main/paradox/typed/persistence-snapshot.md
@@ -16,17 +16,17 @@ Persistent actors can save snapshots of internal state every N events or when a
 is fulfilled.
 
 Scala
-:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #retentionCriteria }
+:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #retentionCriteria }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #retentionCriteria }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #retentionCriteria }
 
 
 Scala
-:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #snapshottingPredicate }
+:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #snapshottingPredicate }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #snapshottingPredicate }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #snapshottingPredicate }
 
 When a snapshot is triggered, incoming commands are stashed until the snapshot has been saved. This means that
 the state can safely be mutable although the serialization and storage of the state is performed asynchronously.
@@ -41,10 +41,10 @@ which selects the latest (youngest) snapshot. It's possible to override the sele
 recovery like this:
 
 Scala
-:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #snapshotSelection }
+:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #snapshotSelection }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #snapshotSelection }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #snapshotSelection }
 
 To disable snapshot-based recovery, applications can use @scala[`SnapshotSelectionCriteria.None`]@java[`SnapshotSelectionCriteria.none()`].
 A recovery where no saved snapshot matches the specified `SnapshotSelectionCriteria` will replay all journaled
@@ -90,10 +90,10 @@ Don't set `snapshot-is-optional = true` if events have been deleted because that
 To free up space, an event sourced actor can automatically delete older snapshots based on the given `RetentionCriteria`.
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #retentionCriteria }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #retentionCriteria }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #retentionCriteria #snapshottingPredicate }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #retentionCriteria #snapshottingPredicate }
 
 Snapshot deletion is triggered after saving a new snapshot.
 
@@ -110,10 +110,10 @@ You can react to signal outcomes by using @scala[with `receiveSignal` handler] @
 By default, successful completion is logged by the system at log level `debug`, failures at log level `warning`.
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #retentionCriteriaWithSignals }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #retentionCriteriaWithSignals }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #retentionCriteriaWithSignals }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #retentionCriteriaWithSignals }
 
 ## Event deletion
 
@@ -127,10 +127,10 @@ If snapshot-based retention is enabled, after a snapshot has been successfully s
 To elect to use this, enable `withDeleteEventsOnSnapshot` of the `RetentionCriteria` which is disabled by default.
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #snapshotAndEventDeletes }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #snapshotAndEventDeletes }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #snapshotAndEventDeletes }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #snapshotAndEventDeletes }
 
 Event deletion is triggered after saving a new snapshot. Old events would be deleted prior to old snapshots being deleted.
 
diff --git a/akka-docs/src/main/paradox/typed/persistence-style.md b/akka-docs/src/main/paradox/typed/persistence-style.md
index df4deabd41..ab63e520be 100644
--- a/akka-docs/src/main/paradox/typed/persistence-style.md
+++ b/akka-docs/src/main/paradox/typed/persistence-style.md
@@ -14,10 +14,10 @@ Here we are using a bank account as the example domain. It has 3 state classes t
 of the account; `EmptyAccount`, `OpenedAccount`, and `ClosedAccount`.
 
 Scala
-:  @@snip [AccountExampleWithEventHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala) { #account-entity }
+:  @@snip [AccountExampleWithEventHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala) { #account-entity }
 
 Java
-:  @@snip [AccountExampleWithEventHandlersInState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java) { #account-entity }
+:  @@snip [AccountExampleWithEventHandlersInState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java) { #account-entity }
 
 @scala[Notice how the `eventHandler` delegates to the `applyEvent` in the `Account` (state), which is implemented
 in the concrete `EmptyAccount`, `OpenedAccount`, and `ClosedAccount`.]
@@ -30,7 +30,7 @@ in the concrete `EmptyAccount`, `OpenedAccount`, and `ClosedAccount`.]
 We can take the previous bank account example one step further by handling the commands in the state too.
 
 Scala
-:  @@snip [AccountExampleWithCommandHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala) { #account-entity }
+:  @@snip [AccountExampleWithCommandHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala) { #account-entity }
 
 Notice how the command handler is delegating to `applyCommand` in the `Account` (state), which is implemented
 in the concrete `EmptyAccount`, `OpenedAccount`, and `ClosedAccount`.
@@ -50,10 +50,10 @@ illustrates using `null` as the `emptyState`.]
 is then used in command and event handlers at the outer layer before delegating to the state or other methods.]
 
 Scala
-:  @@snip [AccountExampleWithOptionState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithOptionState.scala) { #account-entity }
+:  @@snip [AccountExampleWithOptionState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionState.scala) { #account-entity }
 
 Java
-:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithNullState.java) { #account-entity }
+:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java) { #account-entity }
 
 @@@ div { .group-java }
 ## Mutable state
@@ -67,6 +67,6 @@ e.g. as a reply to a command. Messages must be immutable to avoid concurrency pr
 The above examples are using immutable state classes and below is corresponding example with mutable state.
 
 Java
-:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithMutableState.java) { #account-entity }
+:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java) { #account-entity }
 
 @@@
diff --git a/akka-docs/src/main/paradox/typed/persistence-testing.md b/akka-docs/src/main/paradox/typed/persistence-testing.md
index e88f33f3ab..02891c7f5d 100644
--- a/akka-docs/src/main/paradox/typed/persistence-testing.md
+++ b/akka-docs/src/main/paradox/typed/persistence-testing.md
@@ -32,18 +32,18 @@ You need to configure the `ActorSystem` with the `EventSourcedBehaviorTestKit.co
 the in-memory journal and snapshot storage.
 
 Scala
-:  @@snip [AccountExampleDocSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleDocSpec.scala) { #testkit }
+:  @@snip [AccountExampleDocSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocSpec.scala) { #testkit }
 
 Java
-:  @@snip [AccountExampleDocTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleDocTest.java) { #testkit } 
+:  @@snip [AccountExampleDocTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocTest.java) { #testkit } 
 
 A full test for the `AccountEntity`, which is shown in the @ref:[Persistence Style Guide](persistence-style.md), may look like this:
 
 Scala
-:  @@snip [AccountExampleDocSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleDocSpec.scala) { #test }
+:  @@snip [AccountExampleDocSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocSpec.scala) { #test }
 
 Java
-:  @@snip [AccountExampleDocTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleDocTest.java) { #test }  
+:  @@snip [AccountExampleDocTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocTest.java) { #test }  
 
 Serialization of commands, events and state are verified automatically. The serialization checks can be
 customized with the `SerializationSettings` when creating the `EventSourcedBehaviorTestKit`. By default,
diff --git a/akka-docs/src/main/paradox/typed/persistence.md b/akka-docs/src/main/paradox/typed/persistence.md
index 002b4988a3..88f2269e3b 100644
--- a/akka-docs/src/main/paradox/typed/persistence.md
+++ b/akka-docs/src/main/paradox/typed/persistence.md
@@ -79,10 +79,10 @@ actors may also process commands that do not change application state such as qu
 Let's start with a simple example. The minimum required for a @apidoc[EventSourcedBehavior] is:
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #structure }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #structure }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #structure }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #structure }
 
 The first important thing to notice is the @apidoc[typed.Behavior] of a persistent actor is typed to the type of the `Command`
 because this is the type of message a persistent actor should receive. In Akka this is now enforced by the type system.
@@ -107,7 +107,7 @@ Next we'll discuss each of these in detail.
 
 ### PersistenceId
 
-The @apidoc[akka.persistence.typed.PersistenceId] is the stable unique identifier for the persistent actor in the backend
+The @apidoc[persistence.typed.PersistenceId] is the stable unique identifier for the persistent actor in the backend
 event journal and snapshot store.
 
 @ref:[Cluster Sharding](cluster-sharding.md) is typically used together with `EventSourcedBehavior` to ensure
@@ -133,13 +133,13 @@ you should use `""` as the separator.
 
 @@@
 
-A custom identifier can be created with @apidoc[PersistenceId.ofUniqueId](typed.PersistenceId$) {scala="#ofUniqueId(id:String):akka.persistence.typed.PersistenceId" java="#ofUniqueId(java.lang.String)"}.  
+A custom identifier can be created with @apidoc[PersistenceId.ofUniqueId](typed.PersistenceId$) {scala="#ofUniqueId(id:String):org.apache.pekko.persistence.typed.PersistenceId" java="#ofUniqueId(java.lang.String)"}.  
 
 ### Command handler
 
 The command handler is a function with 2 parameters, the current `State` and the incoming `Command`.
 
-A command handler returns an @scala[@scaladoc[Effect](akka.persistence.typed.scaladsl.Effect)]@java[@javadoc[Effect](akka.persistence.typed.javadsl.Effect)] directive that defines what event or events, if any, to persist. 
+A command handler returns an @scala[@scaladoc[Effect](pekko.persistence.typed.scaladsl.Effect)]@java[@javadoc[Effect](pekko.persistence.typed.javadsl.Effect)] directive that defines what event or events, if any, to persist. 
 Effects are created using @java[a factory that is returned via the `Effect()` method] @scala[the `Effect` factory].
 
 The two most commonly used effects are: 
@@ -177,44 +177,44 @@ Let's fill in the details of the example.
 Command and event:
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #command }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #command }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #command }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #command }
 
 State is a List containing the 5 latest items:
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #state }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #state }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #state }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #state }
 
 The command handler persists the `Add` payload in an `Added` event:
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #command-handler }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #command-handler }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #command-handler }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #command-handler }
 
 The event handler appends the item to the state and keeps 5 items. This is called after successfully
 persisting the event in the database:
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #event-handler }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #event-handler }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #event-handler }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #event-handler }
 
-@scala[These are used to create an @scaladoc[EventSourcedBehavior](akka.persistence.typed.scaladsl.EventSourcedBehavior):]
-@java[These are defined in an @javadoc[EventSourcedBehavior](akka.persistence.typed.javadsl.EventSourcedBehavior):]
+@scala[These are used to create an @scaladoc[EventSourcedBehavior](pekko.persistence.typed.scaladsl.EventSourcedBehavior):]
+@java[These are defined in an @javadoc[EventSourcedBehavior](pekko.persistence.typed.javadsl.EventSourcedBehavior):]
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #behavior }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #behavior }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #behavior }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #behavior }
 
 ## Effects and Side Effects
 
@@ -222,19 +222,19 @@ A command handler returns an @apidoc[typed.(scaladsl|javadsl).Effect] directive
 Effects are created using @java[a factory that is returned via the `Effect()` method] @scala[the `Effect` factory]
 and can be one of: 
 
-* @scala[@scaladoc[persist](akka.persistence.typed.scaladsl.Effect$#persist[Event,State](events:Seq[Event]):akka.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[persist](akka.persistence.typed.javadsl.EffectFactories#persist(java.util.List))] will persist one single event or several events atomically, i.e. all events
+* @scala[@scaladoc[persist](pekko.persistence.typed.scaladsl.Effect$#persist[Event,State](events:Seq[Event]):org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[persist](pekko.persistence.typed.javadsl.EffectFactories#persist(java.util.List))] will persist one single event or several events atomically, i.e. all events
   are stored or none of them are stored if there is an error
-* @scala[@scaladoc[none](akka.persistence.typed.scaladsl.Effect$#none[Event,State]:akka.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[none](akka.persistence.typed.javadsl.EffectFactories#none())] no events are to be persisted, for example a read-only command
-* @scala[@scaladoc[unhandled](akka.persistence.typed.scaladsl.Effect$#unhandled[Event,State]:akka.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[unhandled](akka.persistence.typed.javadsl.EffectFactories#unhandled())] the command is unhandled (not supported) in current state
-* @scala[@scaladoc[stop](akka.persistence.typed.scaladsl.Effect$#stop[Event,State]():akka.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[stop](akka.persistence.typed.javadsl.EffectFactories#stop())] stop this actor
-* @scala[@scaladoc[stash](akka.persistence.typed.scaladsl.Effect$#stash[Event,State]():akka.persistence.typed.scaladsl.ReplyEffect[Event,State])]@java[@javadoc[stash](akka.persistence.typed.javadsl.EffectFactories#stash())] the current command is stashed
-* @scala[@scaladoc[unstashAll](akka.persistence.typed.scaladsl.Effect$#unstashAll[Event,State]():akka.persistence.typed.scaladsl.Effect[Event,State])]@java[@javadoc[unstashAll](akka.persistence.typed.javadsl.EffectFactories#unstashAll())] process the commands that were stashed with @scala[`Effect.stash`]@java[`Effect().stash`]
-* @scala[@scaladoc[reply](akka.persistence.typed.scaladsl.Effect$#reply[ReplyMessage,Event,State](replyTo:akka.actor.typed.ActorRef[ReplyMessage])(replyWithMessage:ReplyMessage):akka.persistence.typed.scaladsl.ReplyEffect[Event,State])]@java[@javadoc[reply](akka.persistence.typed.javadsl.EffectFactories#reply(akka.actor.typed.ActorRef,ReplyMessage))] send a reply message to the given @apidoc[typed.ActorRef]
+* @scala[@scaladoc[none](pekko.persistence.typed.scaladsl.Effect$#none[Event,State]:org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[none](pekko.persistence.typed.javadsl.EffectFactories#none())] no events are to be persisted, for example a read-only command
+* @scala[@scaladoc[unhandled](pekko.persistence.typed.scaladsl.Effect$#unhandled[Event,State]:org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[unhandled](pekko.persistence.typed.javadsl.EffectFactories#unhandled())] the command is unhandled (not supported) in current state
+* @scala[@scaladoc[stop](pekko.persistence.typed.scaladsl.Effect$#stop[Event,State]():org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[stop](pekko.persistence.typed.javadsl.EffectFactories#stop())] stop this actor
+* @scala[@scaladoc[stash](pekko.persistence.typed.scaladsl.Effect$#stash[Event,State]():org.apache.pekko.persistence.typed.scaladsl.ReplyEffect[Event,State])]@java[@javadoc[stash](pekko.persistence.typed.javadsl.EffectFactories#stash())] the current command is stashed
+* @scala[@scaladoc[unstashAll](pekko.persistence.typed.scaladsl.Effect$#unstashAll[Event,State]():org.apache.pekko.persistence.typed.scaladsl.Effect[Event,State])]@java[@javadoc[unstashAll](pekko.persistence.typed.javadsl.EffectFactories#unstashAll())] process the commands that were stashed with @scala[`Effect.stash`]@java[`Effect().stash`]
+* @scala[@scaladoc[reply](pekko.persistence.typed.scaladsl.Effect$#reply[ReplyMessage,Event,State](replyTo:org.apache.pekko.actor.typed.ActorRef[ReplyMessage])(replyWithMessage:ReplyMessage):org.apache.pekko.persistence.typed.scaladsl.ReplyEffect[Event,State])]@java[@javadoc[reply](pekko.persistence.typed.javadsl.EffectFactories#reply(org.apache.pekko.actor.typed.ActorRef,ReplyMessage))] send a reply message to the given @apidoc[typed.ActorRef]
 
 Note that only one of those can be chosen per incoming command. It is not possible to both persist and say none/unhandled.
 
 In addition to returning the primary `Effect` for the command @apidoc[typed.*.EventSourcedBehavior]s can also 
-chain side effects that are to be performed after successful persist which is achieved with the @apidoc[thenRun](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenRun(callback:State=%3EUnit):akka.persistence.typed.scaladsl.EffectBuilder[Event,State]" java="#thenRun(akka.japi.function.Effect)"}
+chain side effects that are to be performed after successful persist which is achieved with the @apidoc[thenRun](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenRun(callback:State=%3EUnit):org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State]" java="#thenRun(org.apache.pekko.japi.function.Effect)"}
 function e.g. @scala[`Effect.persist(..).thenRun`]@java[`Effect().persist(..).thenRun`].
 
 In the example below the state is sent to the `subscriber` ActorRef. Note that the new state after applying 
@@ -246,26 +246,26 @@ All `thenRun` registered callbacks are executed sequentially after successful ex
 
 In addition to `thenRun` the following actions can also be performed after successful persist:
 
-* @apidoc[thenStop](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenStop():akka.persistence.typed.scaladsl.EffectBuilder[Event,State]" java="#thenStop()"} the actor will be stopped
-* @apidoc[thenUnstashAll](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenUnstashAll():akka.persistence.typed.scaladsl.Effect[Event,State]" java="#thenUnstashAll()"} process the commands that were stashed with @scala[`Effect.stash`]@java[`Effect().stash`]
-* @apidoc[thenReply](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenReply[ReplyMessage](replyTo:akka.actor.typed.ActorRef[ReplyMessage])(replyWithMessage:State=%3EReplyMessage):akka.persistence.typed.scaladsl.ReplyEffect[Event,State]" java="#thenReply(akka.actor.typed.ActorRef,akka.japi.function.Function)"} send a reply message to the given @apidoc[typed.ActorRef]
+* @apidoc[thenStop](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenStop():org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State]" java="#thenStop()"} the actor will be stopped
+* @apidoc[thenUnstashAll](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenUnstashAll():org.apache.pekko.persistence.typed.scaladsl.Effect[Event,State]" java="#thenUnstashAll()"} process the commands that were stashed with @scala[`Effect.stash`]@java[`Effect().stash`]
+* @apidoc[thenReply](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenReply[ReplyMessage](replyTo:org.apache.pekko.actor.typed.ActorRef[ReplyMessage])(replyWithMessage:State=%3EReplyMessage):org.apache.pekko.persistence.typed.scaladsl.ReplyEffect[Event,State]" java="#thenReply(org.apache.pekko.actor.typed.ActorRef,org.apache.pekko.japi.function.Function)"} send a reply message to the given @apidoc[typed.ActorRef]
 
 Example of effects:
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #effects }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #effects }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #effects }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #effects }
 
-Most of the time this will be done with the @apidoc[thenRun](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenRun(callback:State=%3EUnit):akka.persistence.typed.scaladsl.EffectBuilder[Event,State]" java="#thenRun(akka.japi.function.Effect)"} method on the `Effect` above. You can factor out
+Most of the time this will be done with the @apidoc[thenRun](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenRun(callback:State=%3EUnit):org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State]" java="#thenRun(function.Effect)"} method on the `Effect` above. You can factor out
 common side effects into functions and reuse for several commands. For example:
 
 Scala
-:  @@snip [PersistentActorCompileOnlyTest.scala](/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala) { #commonChainedEffects }
+:  @@snip [PersistentActorCompileOnlyTest.scala](/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala) { #commonChainedEffects }
 
 Java
-:  @@snip [PersistentActorCompileOnlyTest.java](/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java) { #commonChainedEffects }
+:  @@snip [PersistentActorCompileOnlyTest.java](/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java) { #commonChainedEffects }
 
 ### Side effects ordering and guarantees
 
@@ -283,11 +283,11 @@ side effect is performed but the event is not stored if the persist fails.
 
 ### Atomic writes
 
-It is possible to store several events atomically by using the @scala[@scaladoc[persist](akka.persistence.typed.scaladsl.Effect$#persist[Event,State](events:Seq[Event]):akka.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[persist](akka.persistence.typed.javadsl.EffectFactories#persist(java.util.List))] effect with a list of events.
+It is possible to store several events atomically by using the @scala[@scaladoc[persist](pekko.persistence.typed.scaladsl.Effect$#persist[Event,State](events:Seq[Event]):org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[persist](pekko.persistence.typed.javadsl.EffectFactories#persist(java.util.List))] effect with a list of events.
 That means that all events passed to that method are stored or none of them are stored if there is an error.
 
 The recovery of a persistent actor will therefore never be done partially with only a subset of events persisted by
-a single @scala[@scaladoc[persist](akka.persistence.typed.scaladsl.Effect$#persist[Event,State](event:Event):akka.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[persist](akka.persistence.typed.javadsl.EffectFactories#persist(Event))] effect.
+a single @scala[@scaladoc[persist](pekko.persistence.typed.scaladsl.Effect$#persist[Event,State](event:Event):org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[persist](pekko.persistence.typed.javadsl.EffectFactories#persist(Event))] effect.
 
 Some journals may not support atomic writes of several events and they will then reject the `persist` with
 multiple events. This is signalled to an @apidoc[typed.*.EventSourcedBehavior] via an @apidoc[typed.EventRejectedException] (typically with a 
@@ -310,13 +310,13 @@ interpreted correctly on replay. Cluster Sharding ensures that there is only one
 ## Accessing the ActorContext
 
 If the @apidoc[EventSourcedBehavior] needs to use the @apidoc[typed.*.ActorContext], for example to spawn child actors, it can be obtained by
-wrapping construction with @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"}:
+wrapping construction with @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"}:
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #actor-context }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #actor-context }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #actor-context }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #actor-context }
 
 ## Changing Behavior
 
@@ -341,47 +341,47 @@ Once it is started then one can look it up with `GetPost`, modify it with `Chang
 The state is captured by:
 
 Scala
-:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala) { #state }
+:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala) { #state }
 
 Java
-:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java) { #state }
+:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java) { #state }
 
 The commands, of which only a subset are valid depending on the state:
 
 Scala
-:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala) { #commands }
+:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala) { #commands }
 
 Java
-:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java) { #commands }
+:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java) { #commands }
 
 @java[The command handler to process each command is decided by the state class (or state predicate) that is
-given to the `forStateType` of the @javadoc[CommandHandlerBuilder](akka.persistence.typed.javadsl.CommandHandlerBuilder) and the match cases in the builders.]
+given to the `forStateType` of the @javadoc[CommandHandlerBuilder](pekko.persistence.typed.javadsl.CommandHandlerBuilder) and the match cases in the builders.]
 @scala[The command handler to process each command is decided by first looking at the state and then the command.
 It typically becomes two levels of pattern matching, first on the state and then on the command.]
 Delegating to methods is a good practice because the one-line cases give a nice overview of the message dispatch.
 
 Scala
-:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala) { #command-handler }
+:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala) { #command-handler }
 
 Java
-:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java) { #command-handler }
+:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java) { #command-handler }
 
 
 The event handler:
 
 Scala
-:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala) { #event-handler }
+:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala) { #event-handler }
 
 Java
-:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java) { #event-handler }
+:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java) { #event-handler }
 
-And finally the behavior is created @scala[from the @scaladoc[EventSourcedBehavior.apply](akka.persistence.typed.scaladsl.EventSourcedBehavior$#apply[Command,Event,State](persistenceId:akka.persistence.typed.PersistenceId,emptyState:State,commandHandler:(State,Command)=%3Eakka.persistence.typed.scaladsl.Effect[Event,State],eventHandler:(State,Event)=%3EState):akka.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State])]:
+And finally the behavior is created @scala[from the @scaladoc[EventSourcedBehavior.apply](pekko.persistence.typed.scaladsl.EventSourcedBehavior$#apply[Command,Event,State](persistenceId:org.apache.pekko.persistence.typed.PersistenceId,emptyState:State,commandHandler:(State,Command)=%3Eorg.apache.pekko.persistence.typed.scaladsl.Effect[Event,State],eventHandler:(State,Event)=%3EState):org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State])]:
 
 Scala
-:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala) { #behavior }
+:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala) { #behavior }
 
 Java
-:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java) { #behavior }
+:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java) { #behavior }
 
 This can be taken one or two steps further by defining the event and command handlers in the state class as
 illustrated in @ref:[event handlers in the state](persistence-style.md#event-handlers-in-the-state) and
@@ -398,60 +398,60 @@ when accepted you want a confirmation when the events have been successfully sto
 Therefore you typically include a @apidoc[typed.ActorRef]@scala[`[ReplyMessageType]`]@java[``]. If the 
 command can either have a successful response or a validation error returned, the generic response type @apidoc[pattern.StatusReply]@scala[`[ReplyType]`]
 @java[``] can be used. If the successful reply does not contain a value but is more of an acknowledgement
-a pre defined @scala[@scaladoc[StatusReply.Ack](akka.pattern.StatusReply$#Ack:akka.pattern.StatusReply[akka.Done])]@java[@javadoc[StatusReply.ack()](akka.pattern.StatusReply$#ack():akka.pattern.StatusReply[akka.Done])] of type @scala[`StatusReply[Done]`]@java[`StatusReply`]
+a pre defined @scala[@scaladoc[StatusReply.Ack](pekko.pattern.StatusReply$#Ack:org.apache.pekko.pattern.StatusReply[org.apache.pekko.Done])]@java[@javadoc[StatusReply.ack()](pekko.pattern.StatusReply$#ack():org.apache.pekko.pattern.StatusReply[org.apache.pekko.Done])] of type @scala[`StatusReply[Done]`]@java[`StatusReply`]
 can be used.
 
-After validation errors or after persisting events, using a @apidoc[thenRun](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenRun(callback:State=%3EUnit):akka.persistence.typed.scaladsl.EffectBuilder[Event,State]" java="#thenRun(akka.japi.function.Effect)"} side effect, the reply message can
+After validation errors or after persisting events, using a @apidoc[thenRun](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenRun(callback:State=%3EUnit):org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State]" java="#thenRun(org.apache.pekko.japi.function.Effect)"} side effect, the reply message can
 be sent to the @apidoc[typed.ActorRef].
 
 Scala
-:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala) { #reply-command }
+:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala) { #reply-command }
 
 Java
-:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java) { #reply-command }
+:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java) { #reply-command }
 
 
 Scala
-:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala) { #reply }
+:  @@snip [BlogPostEntity.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala) { #reply }
 
 Java
-:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java) { #reply }
+:  @@snip [BlogPostEntity.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java) { #reply }
 
 
 Since this is such a common pattern there is a reply effect for this purpose. It has the nice property that
 it can be used to enforce that replies are not forgotten when implementing the @apidoc[typed.*.EventSourcedBehavior].
-If it's defined with @scala[@scaladoc[EventSourcedBehavior.withEnforcedReplies](akka.persistence.typed.scaladsl.EventSourcedBehavior$#withEnforcedReplies[Command,Event,State](persistenceId:akka.persistence.typed.PersistenceId,emptyState:State,commandHandler:(State,Command)=%3Eakka.persistence.typed.scaladsl.ReplyEffect[Event,State],eventHandler:(State,Event)=%3EState):akka.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State])]@java[@javadoc[EventSourcedBehaviorWithEnforcedReplies](akka.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies)]
+If it's defined with @scala[@scaladoc[EventSourcedBehavior.withEnforcedReplies](pekko.persistence.typed.scaladsl.EventSourcedBehavior$#withEnforcedReplies[Command,Event,State](persistenceId:org.apache.pekko.persistence.typed.PersistenceId,emptyState:State,commandHandler:(State,Command)=%3Eorg.apache.pekko.persistence.typed.scaladsl.ReplyEffect[Event,State],eventHandler:(State,Event)=%3EState):org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State])]@java[@javadoc[EventSourcedBehaviorWithEnforcedReplies](pekko.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies)]
 there will be compilation errors if the returned effect isn't a @apidoc[typed.(scaladsl|javadsl).ReplyEffect], which can be
 created with @scala[`Effect.reply`]@java[`Effect().reply`], @scala[`Effect.noReply`]@java[`Effect().noReply`],
 @scala[`Effect.thenReply`]@java[`Effect().thenReply`], or @scala[`Effect.thenNoReply`]@java[`Effect().thenNoReply`].
 
 Scala
-:  @@snip [AccountExampleWithEventHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala) { #withEnforcedReplies }
+:  @@snip [AccountExampleWithEventHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala) { #withEnforcedReplies }
 
 Java
-:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java) { #withEnforcedReplies }
+:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java) { #withEnforcedReplies }
 
 The commands must have a field of @apidoc[typed.ActorRef]@scala[`[ReplyMessageType]`]@java[``] that can then be used to send a reply.
 
 Scala
-:  @@snip [AccountExampleWithEventHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala) { #reply-command }
+:  @@snip [AccountExampleWithEventHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala) { #reply-command }
 
 Java
-:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java) { #reply-command }
+:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java) { #reply-command }
 
 The @apidoc[typed.(scaladsl|javadsl).ReplyEffect] is created with @scala[`Effect.reply`]@java[`Effect().reply`], @scala[`Effect.noReply`]@java[`Effect().noReply`],
 @scala[`Effect.thenReply`]@java[`Effect().thenReply`], or @scala[`Effect.thenNoReply`]@java[`Effect().thenNoReply`].
 
 @java[Note that command handlers are defined with `newCommandHandlerWithReplyBuilder` when using
-@javadoc[EventSourcedBehaviorWithEnforcedReplies](akka.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies), as opposed to `newCommandHandlerBuilder` when using @javadoc[EventSourcedBehavior](akka.persistence.typed.javadsl.EventSourcedBehavior).]
+@javadoc[EventSourcedBehaviorWithEnforcedReplies](pekko.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies), as opposed to `newCommandHandlerBuilder` when using @javadoc[EventSourcedBehavior](pekko.persistence.typed.javadsl.EventSourcedBehavior).]
 
 Scala
-:  @@snip [AccountExampleWithEventHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala) { #reply }
+:  @@snip [AccountExampleWithEventHandlersInState.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala) { #reply }
 
 Java
-:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java) { #reply }
+:  @@snip [AccountExampleWithNullState.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java) { #reply }
 
-These effects will send the reply message even when @scala[@scaladoc[EventSourcedBehavior.withEnforcedReplies](akka.persistence.typed.scaladsl.EventSourcedBehavior$#withEnforcedReplies[Command,Event,State](persistenceId:akka.persistence.typed.PersistenceId,emptyState:State,commandHandler:(State,Command)=%3Eakka.persistence.typed.scaladsl.ReplyEffect[Event,State],eventHandler:(State,Event)=%3EState):akka.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State])]@java[@javadoc[EventSourcedBehaviorWithEnforcedReplies](akka.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies)]
+These effects will send the reply message even when @scala[@scaladoc[EventSourcedBehavior.withEnforcedReplies](pekko.persistence.typed.scaladsl.EventSourcedBehavior$#withEnforcedReplies[Command,Event,State](persistenceId:org.apache.pekko.persistence.typed.PersistenceId,emptyState:State,commandHandler:(State,Command)=%3Eorg.apache.pekko.persistence.typed.scaladsl.ReplyEffect[Event,State],eventHandler:(State,Event)=%3EState):org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State])]@java[@javadoc[EventSourcedBehaviorWithEnforcedReplies](pekko.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies)]
 is not used, but then there will be no compilation errors if the reply decision is left out.
 
 Note that the `noReply` is a way of making conscious decision that a reply shouldn't be sent for a specific
@@ -485,13 +485,13 @@ akka.persistence.max-concurrent-recoveries = 50
 The @ref:[event handler](#event-handler) is used for updating the state when replaying the journaled events.
 
 It is strongly discouraged to perform side effects in the event handler, so side effects should be performed
-once recovery has completed as a reaction to the @apidoc[typed.RecoveryCompleted] signal @scala[in the @scaladoc[receiveSignal](akka.persistence.typed.scaladsl.EventSourcedBehavior#receiveSignal(signalHandler:PartialFunction[(State,akka.actor.typed.Signal),Unit]):akka.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State]) handler] @java[by overriding @javadoc[receiveSignal](akka.persistence.typed.javadsl.SignalHandlerBuilder#onSignal(java.lang.Class,java.util.function.BiConsumer))]
+once recovery has completed as a reaction to the @apidoc[typed.RecoveryCompleted] signal @scala[in the @scaladoc[receiveSignal](pekko.persistence.typed.scaladsl.EventSourcedBehavior#receiveSignal(signalHandler:PartialFunction[(State,org.apache.pekko.actor.typed.Signal),Unit]):org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State]) handler] @java[by overriding @javadoc[receiveSignal](pekko.persistence.typed.javadsl.SignalHandlerBuilder#onSignal(java.lang.Class,java.util.function.BiConsumer))]
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #recovery }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #recovery }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #recovery }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #recovery }
 
 The `RecoveryCompleted` contains the current `State`.
 
@@ -537,10 +537,10 @@ akka.persistence.journal.leveldb.replay-filter {
 You can also completely disable the recovery of events and snapshots:
 
 Scala
-:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #recovery-disabled }
+:  @@snip [BasicPersistentBehaviorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #recovery-disabled }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #recovery-disabled }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #recovery-disabled }
 
 Please refer to @ref[snapshots](persistence-snapshot.md#snapshots) if you need to disable only the snapshot recovery, or you need to select specific snapshots.
 
@@ -551,10 +551,10 @@ In any case, the highest sequence number will always be recovered so you can kee
 Persistence allows you to use event tags without using an @ref[`EventAdapter`](../persistence.md#event-adapters):
 
 Scala
-:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #tagging }
+:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #tagging }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #tagging }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #tagging }
 
 ## Event adapters
 
@@ -564,30 +564,30 @@ to another type that is then passed to the journal.
 Defining an event adapter is done by extending an EventAdapter:
 
 Scala
-:  @@snip [x](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #event-wrapper }
+:  @@snip [x](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #event-wrapper }
 
 Java
-:  @@snip [x](/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java) { #event-wrapper }
+:  @@snip [x](/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java) { #event-wrapper }
 
 Then install it on an `EventSourcedBehavior`:
 
 Scala
-:  @@snip [x](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #install-event-adapter }
+:  @@snip [x](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #install-event-adapter }
 
 Java
-:  @@snip [x](/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java) { #install-event-adapter }
+:  @@snip [x](/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java) { #install-event-adapter }
 
 ## Wrapping EventSourcedBehavior
 
 When creating an @apidoc[typed.*.EventSourcedBehavior], it is possible to wrap `EventSourcedBehavior` in
-other behaviors such as @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:akka.actor.typed.scaladsl.ActorContext[T]=%3Eakka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#setup(akka.japi.function.Function)"} in order to access the @apidoc[typed.*.ActorContext] object. For instance
+other behaviors such as @apidoc[Behaviors.setup](typed.*.Behaviors$) {scala="#setup[T](factory:org.apache.pekko.actor.typed.scaladsl.ActorContext[T]=%3Eorg.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#setup(org.apache.pekko.japi.function.Function)"} in order to access the @apidoc[typed.*.ActorContext] object. For instance
 to access the actor logging upon taking snapshots for debug purpose.
 
 Scala
-:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #wrapPersistentBehavior }
+:  @@snip [BasicPersistentActorCompileOnly.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #wrapPersistentBehavior }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #wrapPersistentBehavior }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #wrapPersistentBehavior }
 
 
 ## Journal failures
@@ -597,13 +597,13 @@ any @apidoc[typed.BackoffSupervisorStrategy]. It is not possible to use the norm
 `resume` a behavior on a journal failure as it is not known if the event was persisted.
 
 Scala
-:  @@snip [BasicPersistentBehaviorSpec.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #supervision }
+:  @@snip [BasicPersistentBehaviorSpec.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala) { #supervision }
 
 Java
-:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java) { #supervision }
+:  @@snip [BasicPersistentBehaviorTest.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java) { #supervision }
 
 If there is a problem with recovering the state of the actor from the journal, a @apidoc[typed.RecoveryFailed] signal is
-emitted to the @scala[@scaladoc[receiveSignal](akka.persistence.typed.scaladsl.EventSourcedBehavior#receiveSignal(signalHandler:PartialFunction[(State,akka.actor.typed.Signal),Unit]):akka.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State]) handler] @java[@javadoc[receiveSignal](akka.persistence.typed.javadsl.SignalHandlerBuilder#onSignal(java.lang.Class,java.util.function.BiConsumer)) method] and the actor will be stopped
+emitted to the @scala[@scaladoc[receiveSignal](pekko.persistence.typed.scaladsl.EventSourcedBehavior#receiveSignal(signalHandler:PartialFunction[(State,org.apache.pekko.actor.typed.Signal),Unit]):org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehavior[Command,Event,State]) handler] @java[@javadoc[receiveSignal](pekko.persistence.typed.javadsl.SignalHandlerBuilder#onSignal(java.lang.Class,java.util.function.BiConsumer)) method] and the actor will be stopped
 (or restarted with backoff).
 
 ### Journal rejections
@@ -615,7 +615,7 @@ Not all journal implementations use rejections and treat these kind of problems
 
 ## Stash
 
-When persisting events with @scala[@scaladoc[persist](akka.persistence.typed.scaladsl.Effect$#persist[Event,State](events:Seq[Event]):akka.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[persist](akka.persistence.typed.javadsl.EffectFactories#persist(java.util.List))] it is guaranteed that the @apidoc[typed.*.EventSourcedBehavior] will not receive
+When persisting events with @scala[@scaladoc[persist](pekko.persistence.typed.scaladsl.Effect$#persist[Event,State](events:Seq[Event]):org.apache.pekko.persistence.typed.scaladsl.EffectBuilder[Event,State])]@java[@javadoc[persist](pekko.persistence.typed.javadsl.EffectFactories#persist(java.util.List))] it is guaranteed that the @apidoc[typed.*.EventSourcedBehavior] will not receive
 further commands until after the events have been confirmed to be persisted and additional side effects have been run.
 Incoming messages are stashed automatically until the `persist` is completed.
 
@@ -624,8 +624,8 @@ when recovery has been completed.
 
 The stashing described above is handled automatically, but there is also a possibility to stash commands when
 they are received to defer processing of them until later. One example could be waiting for some external condition
-or interaction to complete before processing additional commands. That is accomplished by returning a @scala[@scaladoc[stash](akka.persistence.typed.scaladsl.Effect$#stash[Event,State]():akka.persistence.typed.scaladsl.ReplyEffect[Event,State])]@java[@javadoc[stash](akka.persistence.typed.javadsl.EffectFactories#stash())] effect
-and later use @apidoc[thenUnstashAll](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenUnstashAll():akka.persistence.typed.scaladsl.Effect[Event,State]" java="#thenUnstashAll()"}.
+or interaction to complete before processing additional commands. That is accomplished by returning a @scala[@scaladoc[stash](pekko.persistence.typed.scaladsl.Effect$#stash[Event,State]():org.apache.pekko.persistence.typed.scaladsl.ReplyEffect[Event,State])]@java[@javadoc[stash](pekko.persistence.typed.javadsl.EffectFactories#stash())] effect
+and later use @apidoc[thenUnstashAll](typed.(scaladsl|javadsl).EffectBuilder) {scala="#thenUnstashAll():org.apache.pekko.persistence.typed.scaladsl.Effect[Event,State]" java="#thenUnstashAll()"}.
 
 Let's use an example of a task manager to illustrate how the stashing effects can be used. It handles three commands;
 `StartTask`, `NextStep` and `EndTask`. Those commands are associated with a given `taskId` and the manager processes
@@ -634,10 +634,10 @@ until the final `EndTask` is received. Commands with another `taskId` than the o
 stashing them. When `EndTask` is processed a new task can start and the stashed commands are processed.
 
 Scala
-:  @@snip [StashingExample.scala](/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/StashingExample.scala) { #stashing }
+:  @@snip [StashingExample.scala](/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/StashingExample.scala) { #stashing }
 
 Java
-:  @@snip [StashingExample.java](/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/StashingExample.java) { #stashing }
+:  @@snip [StashingExample.java](/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/StashingExample.java) { #stashing }
 
 You should be careful to not send more messages to a persistent actor than it can keep up with, otherwise the stash
 buffer will fill up and when reaching its maximum capacity the commands will be dropped. The capacity can be configured with:
@@ -654,7 +654,7 @@ processed.
 * Stashed commands are preserved and processed later in case of a failure while storing events but only if an `onPersistFailure` backoff supervisor strategy is defined.
 
 It's allowed to stash messages while unstashing. Those newly added commands will not be processed by the
-@scala[@scaladoc[unstashAll](akka.persistence.typed.scaladsl.Effect$#unstashAll[Event,State]():akka.persistence.typed.scaladsl.Effect[Event,State])]@java[@javadoc[unstashAll](akka.persistence.typed.javadsl.EffectFactories#unstashAll())] effect that was in progress and have to be unstashed by another `unstashAll`.
+@scala[@scaladoc[unstashAll](pekko.persistence.typed.scaladsl.Effect$#unstashAll[Event,State]():org.apache.pekko.persistence.typed.scaladsl.Effect[Event,State])]@java[@javadoc[unstashAll](pekko.persistence.typed.javadsl.EffectFactories#unstashAll())] effect that was in progress and have to be unstashed by another `unstashAll`.
 
 ## Scaling out
 
diff --git a/akka-docs/src/main/paradox/typed/replicated-eventsourcing-auction.md b/akka-docs/src/main/paradox/typed/replicated-eventsourcing-auction.md
index a10bc9ba9f..e50e25ea9d 100644
--- a/akka-docs/src/main/paradox/typed/replicated-eventsourcing-auction.md
+++ b/akka-docs/src/main/paradox/typed/replicated-eventsourcing-auction.md
@@ -12,28 +12,28 @@ We are building a small auction service. It has the following operations:
 We model those operations as commands to be sent to the auction actor:
 
 Scala
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #commands }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #commands }
 
 Java
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java) { #commands }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java) { #commands }
 
 The events:
 
 Scala
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #events }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #events }
 
 Java
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java) { #events }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java) { #events }
 
 The winner does not have to pay the highest bid but only enough to beat the second highest, so the `highestCounterOffer` is in the `AuctionFinished` event. 
 
 Let's have a look at the auction entity that will handle incoming commands:
 
 Scala
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #command-handler }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #command-handler }
 
 Java
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java) { #command-handler }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java) { #command-handler }
 
 There is nothing specific to Replicated Event Sourcing about the command handler. It is the same as a command handler for a standard `EventSourcedBehavior`.
 For `OfferBid` and `AuctionFinished` we do nothing more than to emit
@@ -45,17 +45,17 @@ The auction entity is started with the initial parameters for the auction.
 The minimum bid is modelled as an `initialBid`.
 
 Scala
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #setup }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #setup }
 
 Java
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java) { #setup }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java) { #setup }
 
 @@@ div { .group-scala }
 
 The auction moves through the following phases:
 
 Scala
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #phase }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #phase }
 
 @@@
 
@@ -65,10 +65,10 @@ actually closing the action.
 Let's have a look at our state class, `AuctionState` which also represents the CRDT in our example.
 
 Scala
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #state }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #state }
 
 Java
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java) { #state }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java) { #state }
 
 The state consists of a flag that keeps track of whether the auction is still active, the currently highest bid,
 and the highest counter offer so far.
@@ -107,10 +107,10 @@ all replicas have seen all bids.
 In the event handler above, when recovery is not running, it calls `eventTriggers`.
 
 Scala
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #event-triggers }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala) { #event-triggers }
 
 Java
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java) { #event-triggers }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java) { #event-triggers }
 
 The event trigger uses the `ReplicationContext` to decide when to trigger the Finish of the action.
 When a replica saves the `AuctionFinished` event it checks whether it should close the auction.
diff --git a/akka-docs/src/main/paradox/typed/replicated-eventsourcing-cart.md b/akka-docs/src/main/paradox/typed/replicated-eventsourcing-cart.md
index 09da74c292..ccb546eb1d 100644
--- a/akka-docs/src/main/paradox/typed/replicated-eventsourcing-cart.md
+++ b/akka-docs/src/main/paradox/typed/replicated-eventsourcing-cart.md
@@ -9,10 +9,10 @@ add or remove of items in any data center will eventually lead to all data cente
 each product. 
  
 Scala
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedShoppingCartExampleSpec.scala) { #shopping-cart }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExampleSpec.scala) { #shopping-cart }
 
 Java
-:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedShoppingCartExample.java) { #shopping-cart }
+:   @@snip [AuctionExample](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExample.java) { #shopping-cart }
 
 With this model we cannot have a `ClearCart` command as that could give different states in different data centers.
 It is quite easy to imagine such a scenario: commands arriving in the order `ClearCart`, `AddItem('a', 5)` in one
diff --git a/akka-docs/src/main/paradox/typed/replicated-eventsourcing.md b/akka-docs/src/main/paradox/typed/replicated-eventsourcing.md
index f99d9be225..b2f2271473 100644
--- a/akka-docs/src/main/paradox/typed/replicated-eventsourcing.md
+++ b/akka-docs/src/main/paradox/typed/replicated-eventsourcing.md
@@ -55,24 +55,24 @@ To assist in implementing the event handler the Replicated Event Sourcing detect
 @scala[The same API as regular `EventSourcedBehavior`s]@java[A very similar API to the regular `EventSourcedBehavior`] is used to define the logic. 
 
 To enable an entity for Replicated Event Sourcing
-@java[let it extend `ReplicatedEventSourcedBehavior` instead of `EventSourcedBehavior` and] use the factory methods on @scala[`akka.persistence.typed.scaladsl.ReplicatedEventSourcing`]@java[`akka.persistence.typed.javadsl.ReplicatedEventSourcing`]. 
+@java[let it extend `ReplicatedEventSourcedBehavior` instead of `EventSourcedBehavior` and] use the factory methods on @scala[`org.apache.pekko.persistence.typed.scaladsl.ReplicatedEventSourcing`]@java[`org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcing`]. 
 
 All replicas need to be known up front:
 
 Scala
-:  @@snip [ReplicatedEventSourcingCompileOnlySpec.scala](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala) { #replicas }
+:  @@snip [ReplicatedEventSourcingCompileOnlySpec.scala](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala) { #replicas }
 
 Java
-:  @@snip [MyReplicatedBehavior.java](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/MyReplicatedBehavior.java) { #replicas }
+:  @@snip [MyReplicatedBehavior.java](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java) { #replicas }
 
 
 Then to enable replication create the event sourced behavior with the factory method:
 
 Scala
-:  @@snip [ReplicatedEventSourcingCompileOnlySpec.scala](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala) { #factory }
+:  @@snip [ReplicatedEventSourcingCompileOnlySpec.scala](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala) { #factory }
 
 Java
-:  @@snip [MyReplicatedBehavior.java](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/MyReplicatedBehavior.java) { #factory }
+:  @@snip [MyReplicatedBehavior.java](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java) { #factory }
 
 The factory takes in:
 
@@ -84,10 +84,10 @@ The factory takes in:
 In this scenario each replica reads from each other's database effectively providing cross region replication for any database that has an Akka Persistence plugin. Alternatively if all the replicas use the same journal, e.g. for testing or if it is a distributed database such as Cassandra, the `withSharedJournal` factory can be used. 
 
 Scala
-:  @@snip [ReplicatedEventSourcingCompileOnlySpec.scala](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala) { #factory-shared}
+:  @@snip [ReplicatedEventSourcingCompileOnlySpec.scala](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala) { #factory-shared}
 
 Java
-:  @@snip [MyReplicatedBehavior.java](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/MyReplicatedBehavior.java) { #factory-shared }
+:  @@snip [MyReplicatedBehavior.java](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java) { #factory-shared }
 
 
 @@@ div { .group-scala }
@@ -145,23 +145,23 @@ The following CRDTs are included that can you can use as the state or part of th
 
 * @apidoc[LwwTime]
 * @apidoc[Counter]
-* @apidoc[akka.persistence.typed.crdt.ORSet]
+* @apidoc[persistence.typed.crdt.ORSet]
 
 Akka serializers are included for all these types and can be used to serialize when 
 @ref[embedded in Jackson](../serialization-jackson.md#using-akka-serialization-for-embedded-types).
 
 An example would be a movies watch list that is represented by the general purpose 
-@apidoc[akka.persistence.typed.crdt.ORSet] CRDT. `ORSet` is short for Observed Remove Set. Elements can be added and
+@apidoc[persistence.typed.crdt.ORSet] CRDT. `ORSet` is short for Observed Remove Set. Elements can be added and
 removed any number of times. Concurrent add wins over remove. It is an operation based CRDT where the delta of an
 operation (add/remove) can be represented as an event.
 
 Such movies watch list example:
 
 Scala
-:   @@snip [movie](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedMovieWatchListExampleSpec.scala) { #movie-entity }
+:   @@snip [movie](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedMovieWatchListExampleSpec.scala) { #movie-entity }
 
 Java
-:   @@snip [movie](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedMovieExample.java) { #movie-entity }
+:   @@snip [movie](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedMovieExample.java) { #movie-entity }
 
 The @ref[Auction example](replicated-eventsourcing-auction.md) is a more comprehensive example that illustrates how application-specific
 rules can be used to implement an entity with CRDT semantics.
@@ -181,19 +181,19 @@ identifier is used if the two timestamps are equal, and then the one from the `r
 alphanumeric order wins.
 
 Scala
-:   @@snip [blog](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedBlogExampleSpec.scala) { #event-handler }
+:   @@snip [blog](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedBlogExampleSpec.scala) { #event-handler }
 
 Java
-:   @@snip [blog](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedBlogExample.java) { #event-handler }
+:   @@snip [blog](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedBlogExample.java) { #event-handler }
 
 When creating the `LwwTime` it is good to have a monotonically increasing timestamp, and for that the `increase`
 method in `LwwTime` can be used:
 
 Scala
-:   @@snip [blog](/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedBlogExampleSpec.scala) { #command-handler }
+:   @@snip [blog](/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedBlogExampleSpec.scala) { #command-handler }
 
 Java
-:   @@snip [blog](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedBlogExample.java) { #command-handler }
+:   @@snip [blog](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedBlogExample.java) { #command-handler }
 
 The nature of last writer wins means that if you only have one timestamp for the state the events must represent an
 update of the full state. Otherwise, there is a risk that the state in different replicas will be different and
@@ -305,10 +305,10 @@ To simplify all three cases the @apidoc[ReplicatedShardingExtension] is availabl
 `akka-cluster-sharding-typed` module.
 
 Scala
-:  @@snip [ReplicatedShardingSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala) { #bootstrap }
+:  @@snip [ReplicatedShardingSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala) { #bootstrap }
 
 Java
-:  @@snip [ReplicatedShardingTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java) { #bootstrap }
+:  @@snip [ReplicatedShardingTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java) { #bootstrap }
 
 This will run an instance of sharding and per replica and each entity id contains the replica id and the type name.
 Replicas could be on the same node if they end up in the same shard or if the shards get allocated to the same node.
@@ -316,28 +316,28 @@ Replicas could be on the same node if they end up in the same shard or if the sh
 To prevent this roles can be used. You could for instance add a cluster role per availability zone / rack and have a replica per rack.
 
 Scala
-:  @@snip [ReplicatedShardingSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala) { #bootstrap-role }
+:  @@snip [ReplicatedShardingSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala) { #bootstrap-role }
 
 Java
-:  @@snip [ReplicatedShardingTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java) { #bootstrap-role }
+:  @@snip [ReplicatedShardingTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java) { #bootstrap-role }
 
 Lastly if your Akka Cluster is setup across DCs you can run a replica per DC.
 
 Scala
-:  @@snip [ReplicatedShardingSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala) { #bootstrap-dc }
+:  @@snip [ReplicatedShardingSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala) { #bootstrap-dc }
 
 Java
-:  @@snip [ReplicatedShardingTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java) { #bootstrap-dc }
+:  @@snip [ReplicatedShardingTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java) { #bootstrap-dc }
 
 Regardless of which replication strategy you use sending messages to the replicated entities is the same.
 
 `init` returns an @apidoc[ReplicatedSharding] instance which gives access to @apidoc[EntityRef]s for each of the replicas for arbitrary routing logic:
 
 Scala
-:  @@snip [ReplicatedShardingSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala) { #sending-messages }
+:  @@snip [ReplicatedShardingSpec.scala](/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala) { #sending-messages }
 
 Java
-:  @@snip [ReplicatedShardingTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java) { #sending-messages }
+:  @@snip [ReplicatedShardingTest.java](/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java) { #sending-messages }
 
 More advanced routing among the replicas is currently left as an exercise for the reader (or may be covered in a future release [#29281](https://github.com/akka/akka/issues/29281), [#29319](https://github.com/akka/akka/issues/29319)).
 
@@ -370,10 +370,10 @@ Determining the replica id of the replicated actor itself and the origin replica
 @apidoc[ReplicationContext] when the tagger callback is invoked like this:
 
 Scala
-:  @@snip [ReplicatedEventSourcingTaggingSpec.scala](/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingTaggingSpec.scala) { #tagging }
+:  @@snip [ReplicatedEventSourcingTaggingSpec.scala](/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTaggingSpec.scala) { #tagging }
 
 Java
-:  @@snip [ReplicatedStringSet.java](/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedStringSet.java) { #tagging }
+:  @@snip [ReplicatedStringSet.java](/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedStringSet.java) { #tagging }
 
 In this sample we are using a shared journal, and single tag but only tagging local events to it and therefore ending up
 with a single stream of tagged events from all replicas without duplicates. 
@@ -409,8 +409,8 @@ For a journal plugin to support replication it needs to store and read metadata
  `metadata` field. To attach the metadata after writing it, `PersistentRepr.withMetadata` is used. The @apidoc[JournalSpec] in the Persistence TCK provides 
  a capability flag `supportsMetadata` to toggle verification that metadata is handled correctly.
  
-For a snapshot plugin to support replication it needs to store and read metadata for the snapshot if it is defined in the @apiref[akka.persistence.SnapshotMetadata] `metadata` field. 
-To attach the metadata when reading the snapshot the `akka.persistence.SnapshotMetadata.apply` factory overload taking a `metadata` parameter is used.
+For a snapshot plugin to support replication it needs to store and read metadata for the snapshot if it is defined in the @apiref[org.apache.pekko.persistence.SnapshotMetadata] `metadata` field. 
+To attach the metadata when reading the snapshot the `org.apache.pekko.persistence.SnapshotMetadata.apply` factory overload taking a `metadata` parameter is used.
 The @apidoc[SnapshotStoreSpec] in the Persistence TCK provides a capability flag `supportsMetadata` to toggle verification that metadata is handled correctly.
 
 The following plugins support Replicated Event Sourcing:
diff --git a/akka-docs/src/main/paradox/typed/routers.md b/akka-docs/src/main/paradox/typed/routers.md
index 512f60593f..d5fd930ed1 100644
--- a/akka-docs/src/main/paradox/typed/routers.md
+++ b/akka-docs/src/main/paradox/typed/routers.md
@@ -38,18 +38,18 @@ As actor children are always local the routees are never spread across a cluster
 Let's first introduce the routee:
 
 Scala
-:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala) { #routee }
+:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala) { #routee }
 
 Java
-:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java) { #routee }
+:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java) { #routee }
 
 After having defined the routee, we can now concentrate on configuring the router itself. Note again the the router is an Actor in itself:
 
 Scala
-:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala) { #pool }
+:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala) { #pool }
 
 Java
-:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java) { #pool }
+:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java) { #pool }
 
 ### Configuring Dispatchers
 
@@ -58,10 +58,10 @@ The routees, however, are spawned by the router.
 Therefore, the `PoolRouter` has a property to configure the `Props` of its routees:
 
 Scala
-:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala) { #pool-dispatcher }
+:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala) { #pool-dispatcher }
 
 Java
-:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java) { #pool-dispatcher }
+:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java) { #pool-dispatcher }
 
 ### Broadcasting a message to all routees
 
@@ -69,10 +69,10 @@ Pool routers can be configured to identify messages intended to be broad-casted
 Therefore, the `PoolRouter` has a property to configure its `broadcastPredicate`:
 
 Scala
-:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala) { #broadcast }
+:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala) { #broadcast }
 
 Java
-:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java) { #broadcast }
+:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java) { #broadcast }
 
 ## Group Router
 
@@ -88,13 +88,13 @@ the group router is started the set of routees it knows about is empty, until it
 it stashes incoming messages and forwards them as soon as it gets a listing from the receptionist.  
 
 When the router has received a listing from the receptionist and the set of registered actors is empty the router will
-drop them (publish them to the event stream as `akka.actor.Dropped`).
+drop them (publish them to the event stream as `org.apache.pekko.actor.Dropped`).
 
 Scala
-:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala) { #group }
+:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala) { #group }
 
 Java
-:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java) { #group }
+:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java) { #group }
 
 ## Routing strategies
 
@@ -102,10 +102,10 @@ There are three different strategies for selecting which routee a message is for
 from the router before spawning it:
 
 Scala
-:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala) { #strategy }
+:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala) { #strategy }
 
 Java
-:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java) { #strategy }
+:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java) { #strategy }
 
 ### Round Robin
 
@@ -141,10 +141,10 @@ When the set of routees changes, consistent hashing tries to make sure, but does
 
 
 Scala
-:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/RouterSpec.scala) { #consistent-hashing }
+:  @@snip [RouterSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala) { #consistent-hashing }
 
 Java
-:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/RouterTest.java) { #consistent-hashing }
+:  @@snip [RouterTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java) { #consistent-hashing }
 
 See also @ref[Akka Cluster Sharding](cluster-sharding.md) which provides stable routing and rebalancing of the routee actors.
 
diff --git a/akka-docs/src/main/paradox/typed/stash.md b/akka-docs/src/main/paradox/typed/stash.md
index 124a3a3b5b..c9509f5f11 100644
--- a/akka-docs/src/main/paradox/typed/stash.md
+++ b/akka-docs/src/main/paradox/typed/stash.md
@@ -32,10 +32,10 @@ When a new state is saved in the database it also stashes incoming messages to m
 processing sequential, one after the other without multiple pending writes.
 
 Scala
-:  @@snip [StashDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StashDocSpec.scala) { #stashing }
+:  @@snip [StashDocSpec.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StashDocSpec.scala) { #stashing }
 
 Java
-:  @@snip [StashDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocSample.java) {
+:  @@snip [StashDocTest.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java) {
   #import
   #db
   #stashing
@@ -51,13 +51,13 @@ If you try to stash more messages than the `capacity` a @apidoc[StashOverflowExc
 You can use @apidoc[StashBuffer.isFull](StashBuffer) {scala="#isFull:Boolean" java="#isFull()"} before stashing a message to avoid that and take other actions, such as
 dropping the message.
 
-When unstashing the buffered messages by calling @apidoc[unstashAll](StashBuffer) {scala="#unstashAll(behavior:akka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#unstashAll(akka.actor.typed.Behavior)"} the messages will be processed sequentially
+When unstashing the buffered messages by calling @apidoc[unstashAll](StashBuffer) {scala="#unstashAll(behavior:org.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#unstashAll(org.apache.pekko.actor.typed.Behavior)"} the messages will be processed sequentially
 in the order they were added and all are processed unless an exception is thrown. The actor is unresponsive
-to other new messages until @apidoc[unstashAll](StashBuffer) {scala="#unstashAll(behavior:akka.actor.typed.Behavior[T]):akka.actor.typed.Behavior[T]" java="#unstashAll(akka.actor.typed.Behavior)"} is completed. That is another reason for keeping the number of
+to other new messages until @apidoc[unstashAll](StashBuffer) {scala="#unstashAll(behavior:org.apache.pekko.actor.typed.Behavior[T]):org.apache.pekko.actor.typed.Behavior[T]" java="#unstashAll(org.apache.pekko.actor.typed.Behavior)"} is completed. That is another reason for keeping the number of
 stashed messages low. Actors that hog the message processing thread for too long can result in starvation
 of other actors.
 
-That can be mitigated by using the @apidoc[StashBuffer.unstash](StashBuffer) {scala="#unstash(behavior:akka.actor.typed.Behavior[T],numberOfMessages:Int,wrap:T=%3ET):akka.actor.typed.Behavior[T]" java="#unstash(akka.actor.typed.Behavior,int,java.util.function.Function)"} with `numberOfMessages` parameter and then send a
+That can be mitigated by using the @apidoc[StashBuffer.unstash](StashBuffer) {scala="#unstash(behavior:org.apache.pekko.actor.typed.Behavior[T],numberOfMessages:Int,wrap:T=%3ET):org.apache.pekko.actor.typed.Behavior[T]" java="#unstash(org.apache.pekko.actor.typed.Behavior,int,java.util.function.Function)"} with `numberOfMessages` parameter and then send a
 message to @scala[`context.self`]@java[`context.getSelf`] before continuing unstashing more. That means that other
 new messages may arrive in-between and those must be stashed to keep the original order of messages. It
 becomes more complicated, so better keep the number of stashed messages low.
diff --git a/akka-docs/src/main/paradox/typed/style-guide.md b/akka-docs/src/main/paradox/typed/style-guide.md
index 6f8ac4cf23..13901ab3e8 100644
--- a/akka-docs/src/main/paradox/typed/style-guide.md
+++ b/akka-docs/src/main/paradox/typed/style-guide.md
@@ -19,18 +19,18 @@ There are two flavors of the Actor APIs.
 An example of a counter actor implemented in the functional style:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #fun-style }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #fun-style }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #fun-style }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #fun-style }
 
 Corresponding actor implemented in the object-oriented style:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #oo-style }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #oo-style }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #oo-style }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #oo-style }
 
 Some similarities to note:
 
@@ -138,10 +138,10 @@ Let's add `name` parameter and timers to the previous `Counter` example. A first
 as separate parameters:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #fun-style-setup-params1 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #fun-style-setup-params1 }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #fun-style-setup-params1 }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #fun-style-setup-params1 }
 
 Ouch, that doesn't look good. More things may be needed, such as stashing or application specific "constructor"
 parameters. As you can imagine, that will be too much boilerplate.
@@ -150,10 +150,10 @@ As a first step we can place all these parameters in a class so that we at least
 Still good to have the "changing" state, the @scala[`n: Int`]@java[`final int n`] here, as a separate parameter.
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #fun-style-setup-params2 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #fun-style-setup-params2 }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #fun-style-setup-params2 }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #fun-style-setup-params2 }
 
 That's better. Only one thing to carry around and easy to add more things to it without rewriting everything.
 @scala[Note that we also placed the `ActorContext` in the `Setup` class, and therefore switched from
@@ -166,10 +166,10 @@ The "constructor" parameters can be @scala[immutable]@java[`final`] instance fie
 member methods.
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #fun-style-setup-params3 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #fun-style-setup-params3 }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #fun-style-setup-params3 }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #fun-style-setup-params3 }
 
 That's nice. One thing to be cautious with here is that it's important that you create a new instance for
 each spawned actor, since those parameters must not be shared between different actor instances. That comes natural
@@ -193,7 +193,7 @@ block. That works fine, but for more complex behaviors it can be better to struc
 For completeness, here is how it would look like:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #fun-style-setup-params4 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #fun-style-setup-params4 }
 
 @@@
 
@@ -220,18 +220,18 @@ parameters it is preferred to consistently use a method @scala[(`def`)] for the
 Example:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #behavior-factory-method }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #behavior-factory-method }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #behavior-factory-method }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #behavior-factory-method }
 
 When spawning an actor from this initial behavior it looks like:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #behavior-factory-method-spawn }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #behavior-factory-method-spawn }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #behavior-factory-method-spawn }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #behavior-factory-method-spawn }
 
 
 ## Where to define messages
@@ -240,10 +240,10 @@ When sending or receiving actor messages they should be prefixed with the name
 of the actor/behavior that defines them to avoid ambiguities.
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #message-prefix-in-tell }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #message-prefix-in-tell }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #message-prefix-in-tell }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #message-prefix-in-tell }
 
 Such a style is preferred over using @scala[importing `Down` and using `countDown ! Down`]
 @java[importing `Down` and using `countDown.tell(Down.INSTANCE);`].
@@ -255,10 +255,10 @@ For the majority of cases it's good style to define
 the messages @scala[in the companion object]@java[as static inner classes] together with the `Behavior`.
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #messages }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #messages }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #messages }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #messages }
 
 If several actors share the same message protocol, it's recommended to define
 those messages in a separate @scala[`object`]@java[`interface`] for that protocol.
@@ -266,10 +266,10 @@ those messages in a separate @scala[`object`]@java[`interface`] for that protoco
 Here's an example of a shared message protocol setup:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #message-protocol }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #message-protocol }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #message-protocol }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #message-protocol }
 
 Note that the response message hierarchy in this case could be completely avoided by using the @apiDoc[StatusReply] API 
 instead (see @ref[Generic Response Wrapper](interaction-patterns.md#generic-response-wrapper)).
@@ -286,10 +286,10 @@ public `Command` @scala[trait]@java[interface].
 Here is an example of using `private` for an internal message:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #public-private-messages-1 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #public-private-messages-1 }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #public-private-messages-1 }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #public-private-messages-1 }
 
 An alternative approach is using a type hierarchy and `narrow` to have a super-type for the public messages as a
 distinct type from the super-type of all actor messages.  The
@@ -299,10 +299,10 @@ using shared message protocol classes as described in @ref:[Where to define mess
 Here's an example of using a type hierarchy to separate public and private messages:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #public-private-messages-2 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #public-private-messages-2 }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #public-private-messages-2 }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #public-private-messages-2 }
 
 `private` visibility can be defined for the `PrivateCommand` messages but it's not strictly needed since they can't be
 sent to an @scala[ActorRef[Command]]@java[ActorRef], which is the public message type of the actor.
@@ -314,12 +314,12 @@ sent to an @scala[ActorRef[Command]]@java[ActorRef], which is the publi
 For messages without parameters the `enum` singleton pattern is recommended:
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #message-enum }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #message-enum }
 
 In the `ReceiveBuilder` it can be matched in same way as other messages:
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #message-enum-match }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #message-enum-match }
 
 @@@
 
@@ -335,13 +335,13 @@ The delegation can be with lambdas or [method references](https://docs.oracle.co
 Example of delegation using a lambda:
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #on-message-lambda }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #on-message-lambda }
 
 When possible it's preferred to use method references instead of lambdas. The benefit is less verbosity and
 in some cases it can actually give better type inference.
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #on-message-method-ref }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #on-message-method-ref }
 
 `this::onGetValue` is a method reference in above example. It corresponds to `command -> onGetValue(command)`.
 
@@ -351,7 +351,7 @@ More important than the choice between lambdas or method references is to avoid
 An anti-pattern would be to inline all message handling inside the lambdas like this:
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #on-message-lambda-anti }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #on-message-lambda-anti }
 
 In a real application it would often be more than 3 lines for each message.
 It's not only making it more difficult to get an overview of the message matching, but compiler errors related
@@ -370,7 +370,7 @@ It's recommended to use a `sealed` trait as the super type of the commands (inco
 as the compiler will emit a warning if a message type is forgotten in the pattern match.
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #messages-sealed }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #messages-sealed }
 
 That is the main reason for `Behaviors.receive`, `Behaviors.receiveMessage` taking a `Function` rather than a `PartialFunction`.
 
@@ -388,14 +388,14 @@ attention to those. If a `Behavior` should not handle certain messages you can s
 in the pattern match and return `Behaviors.unhandled`.
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #pattern-match-unhandled }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #pattern-match-unhandled }
 
 It's recommended to use the `sealed` trait and total functions with exhaustiveness check to detect mistakes
 of forgetting to handle some messages. Sometimes that can be inconvenient and then you can use a `PartialFunction`
 with `Behaviors.receivePartial` or `Behaviors.receiveMessagePartial`
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #pattern-match-partial }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #pattern-match-partial }
 
 @@@
 
@@ -410,19 +410,19 @@ A good use case for composing two or more `PartialFunction`s is when there is a
 The Command definition is still highly recommended be kept within a `sealed` Trait:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #messages-sealed-composition }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #messages-sealed-composition }
 
 In this particular case, the Behavior that is repeating over is the one in charge to handle
 the `GetValue` Command, as it behaves the same regardless of the Actor's internal state.
 Instead of defining the specific handlers as a `Behavior`, we can define them as a `PartialFunction`:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #get-handler-partial #set-handler-non-zero-partial #set-handler-zero-partial }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #get-handler-partial #set-handler-non-zero-partial #set-handler-zero-partial }
 
 Finally, we can go on defining the two different behaviors for this specific actor. For each `Behavior` we would go and concatenate all needed `PartialFunction` instances with `orElse` to finally apply the command to the resulting one:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #top-level-behaviors-partial }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #top-level-behaviors-partial }
 
 Even though in this particular example we could use `receiveMessage` as we cover all cases, we use `receiveMessagePartial` instead to cover potential future unhandled message cases.
 
@@ -435,22 +435,22 @@ Even though in this particular example we could use `receiveMessage` as we cover
 When using the `AskPattern` it's recommended to use the `ask` method rather than the infix `?` operator, like so:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #ask-1 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #ask-1 }
 
 You may also use the more terse placeholder syntax `_` instead of `replyTo`:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #ask-2 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #ask-2 }
 
 However, using the infix operator `?` with the placeholder syntax `_`, like is done in the following example, won't typecheck because of the binding scope rules for wildcard parameters:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #ask-3 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #ask-3 }
 
 Adding the necessary parentheses (as shown below) makes it typecheck, but, subjectively, it's rather ugly so the recommendation is to use `ask`.
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #ask-4 }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #ask-4 }
 
 Note that `AskPattern` is only intended for request-response interaction from outside an actor. If the requester is
 inside an actor, prefer `ActorContext.ask` as it provides better thread-safety by not requiring the use of a @scala[`Future`]@java[`CompletionStage`] inside the actor.
@@ -473,7 +473,7 @@ be good to know that it's optional in case you would prefer a different approach
 In `Behaviors` there are `receive`, `receiveMessage` and `receiveSignal` factory methods that takes functions
 instead of using the `ReceiveBuilder`, which is the `receive` with the class parameter.
 
-In `AbstractBehavior` you can return your own `akka.actor.typed.javadsl.Receive` from `createReceive` instead
+In `AbstractBehavior` you can return your own `org.apache.pekko.actor.typed.javadsl.Receive` from `createReceive` instead
 of using `newReceiveBuilder`. Implement the `receiveMessage` and `receiveSignal` in the `Receive` subclass.
 
 @@@
@@ -484,10 +484,10 @@ When an actor behavior needs more than one of `setup`, `withTimers` and `withSta
 the needed dependencies:
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #nesting }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #nesting }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #nesting }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #nesting }
 
 The order of the nesting does not change the behavior as long as there is no additional logic in any other function than the innermost one. 
 It can be nice to default to put `setup` outermost as that is the least likely block that will be removed if the actor logic changes. 
@@ -495,10 +495,10 @@ It can be nice to default to put `setup` outermost as that is the least likely b
 Note that adding `supervise` to the mix is different as it will restart the behavior it wraps, but not the behavior around itself:   
 
 Scala
-:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StyleGuideDocExamples.scala) { #nesting-supervise }
+:  @@snip [StyleGuideDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala) { #nesting-supervise }
 
 Java
-:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StyleGuideDocExamples.java) { #nesting-supervise }
+:  @@snip [StyleGuideDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java) { #nesting-supervise }
 
 
 ## Additional naming conventions
diff --git a/akka-docs/src/main/paradox/typed/testing-async.md b/akka-docs/src/main/paradox/typed/testing-async.md
index a77d7c8fd5..d9b8148cb3 100644
--- a/akka-docs/src/main/paradox/typed/testing-async.md
+++ b/akka-docs/src/main/paradox/typed/testing-async.md
@@ -2,7 +2,7 @@
 
 You are viewing the documentation for the new actor APIs, to view the Akka Classic documentation, see @ref:[Classic Testing](../testing.md).
 
-Asynchronous testing uses a real @apidoc[akka.actor.typed.ActorSystem] that allows you to test your Actors in a more realistic environment.
+Asynchronous testing uses a real @apidoc[actor.typed.ActorSystem] that allows you to test your Actors in a more realistic environment.
 
 The minimal setup consists of the test procedure, which provides the desired stimuli, the actor under test,
 and an actor receiving replies. Bigger systems replace the actor under test with a network of actors, apply stimuli
@@ -14,10 +14,10 @@ the same in that a single procedure drives the test.
 Actor under test:
 
 Scala
-:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #under-test }
+:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #under-test }
 
 Java
-:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #under-test }
+:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #under-test }
 
 Tests create an instance of @apidoc[ActorTestKit]. This provides access to:
 
@@ -30,18 +30,18 @@ simplify the tests by using the @ref:[Test framework integration](#test-framewor
 to read this section to understand how it works.
 
 Scala
-:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-header }
+:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-header }
 
 Java
-:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-header }
+:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-header }
 
-Your test is responsible for shutting down the @apidoc[akka.actor.typed.ActorSystem] e.g. using @scala[`BeforeAndAfterAll` when using ScalaTest]@java[`@AfterClass` when using JUnit].
+Your test is responsible for shutting down the @apidoc[actor.typed.ActorSystem] e.g. using @scala[`BeforeAndAfterAll` when using ScalaTest]@java[`@AfterClass` when using JUnit].
 
 Scala
-:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-shutdown }
+:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-shutdown }
 
 Java
-:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-shutdown }
+:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-shutdown }
 
 The following demonstrates:
 
@@ -49,22 +49,22 @@ The following demonstrates:
 * Creating a `TestProbe`
 * Verifying that the actor under test responds via the `TestProbe`
 
-Note that it is possible to use a `TestProbe` directly as a @apidoc[akka.actor.typed.RecipientRef] (a common supertype of `ActorRef` and @ref:[Cluster Sharding](cluster-sharding.md)
+Note that it is possible to use a `TestProbe` directly as a @apidoc[actor.typed.RecipientRef] (a common supertype of `ActorRef` and @ref:[Cluster Sharding](cluster-sharding.md)
 `EntityRef`), in cases where a message protocol uses `RecipientRef` instead of specifying `ActorRef` or `EntityRef`.
 
 Scala
-:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-spawn }
+:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-spawn }
 
 Java
-:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-spawn }
+:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-spawn }
 
 Actors can also be spawned anonymously:
 
 Scala
-:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-spawn-anonymous }
+:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-spawn-anonymous }
 
 Java
-:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-spawn-anonymous }
+:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-spawn-anonymous }
 
 Note that you can add `import testKit._` to get access to the `spawn` and `createTestProbe` methods at the top level
 without prefixing them with `testKit`.
@@ -73,10 +73,10 @@ without prefixing them with `testKit`.
 The method will wait until the actor stops or throw an assertion error in case of a timeout.
 
 Scala
-:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-stop-actors }
+:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-stop-actors }
 
 Java
-:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-stop-actors }
+:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-stop-actors }
 
 The `stop` method can only be used for actors that were spawned by the same @apidoc[ActorTestKit]. Other actors
 will not be stopped by that method.
@@ -93,25 +93,25 @@ This allows the same kinds of tests as classic `TestActor`/`Autopilot`.
 As an example, let's assume we'd like to test the following component:
 
 Scala
-:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #under-test-2 }
+:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #under-test-2 }
 
 Java
-:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #under-test-2 }
+:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #under-test-2 }
 
 In our test, we create a mocked `publisher` actor. Additionally we use `Behaviors.monitor` with a `TestProbe` in order
 to be able to verify the interaction of the `producer` with the `publisher`:
 
 Scala
-:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-observe-mocked-behavior }
+:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-observe-mocked-behavior }
 
 Java
-:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-observe-mocked-behavior }
+:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-observe-mocked-behavior }
 
 ### Test framework integration
 
 @@@ div { .group-java }
 
-If you are using JUnit you can use @javadoc[TestKitJunitResource](akka.actor.testkit.typed.javadsl.TestKitJunitResource) to have the async test kit automatically
+If you are using JUnit you can use @javadoc[TestKitJunitResource](pekko.actor.testkit.typed.javadsl.TestKitJunitResource) to have the async test kit automatically
 shutdown when the test is complete.
 
 Note that the dependency on JUnit is marked as optional from the test kit module, so your project must explicitly include
@@ -121,7 +121,7 @@ a dependency on JUnit to use this.
 
 @@@ div { .group-scala }
 
-If you are using ScalaTest you can extend @scaladoc[ScalaTestWithActorTestKit](akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit) to
+If you are using ScalaTest you can extend @scaladoc[ScalaTestWithActorTestKit](pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit) to
 have the async test kit automatically shutdown when the test is complete. This is done in `afterAll` from
 the `BeforeAndAfterAll` trait. If you override that method you should call `super.afterAll` to shutdown the
 test kit.
@@ -132,10 +132,10 @@ a dependency on ScalaTest to use this.
 @@@
 
 Scala
-:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala) { #scalatest-integration }
+:  @@snip [AsyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala) { #scalatest-integration }
 
 Java
-:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java) { #junit-integration }
+:  @@snip [AsyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java) { #junit-integration }
 
 ### Configuration
 
@@ -148,27 +148,27 @@ If you prefer to use `application.conf` you can pass that as the configuration p
 It's loaded with:
 
 Scala
-:  @@snip [TestConfigExample.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala) { #default-application-conf }
+:  @@snip [TestConfigExample.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala) { #default-application-conf }
 
 Java
-:  @@snip [TestConfigExample.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/TestConfigExample.java) { #default-application-conf }
+:  @@snip [TestConfigExample.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java) { #default-application-conf }
 
 It's often convenient to define configuration for a specific test as a `String` in the test itself and
 use that as the configuration parameter to the TestKit. `ConfigFactory.parseString` can be used for that:
 
 Scala
-:  @@snip [TestConfigExample.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala) { #parse-string }
+:  @@snip [TestConfigExample.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala) { #parse-string }
 
 Java
-:  @@snip [TestConfigExample.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/TestConfigExample.java) { #parse-string }
+:  @@snip [TestConfigExample.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java) { #parse-string }
 
 Combining those approaches using `withFallback`:
 
 Scala
-:  @@snip [TestConfigExample.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/TestConfigExample.scala) { #fallback-application-conf }
+:  @@snip [TestConfigExample.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala) { #fallback-application-conf }
 
 Java
-:  @@snip [TestConfigExample.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/TestConfigExample.java) { #fallback-application-conf }
+:  @@snip [TestConfigExample.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java) { #fallback-application-conf }
 
 
 More information can be found in the [documentation of the configuration library](https://github.com/lightbend/config#using-the-library).
@@ -190,10 +190,10 @@ Making such tests more reliable by using generous timeouts make the tests take a
 For such situations, we provide a scheduler where you can manually, explicitly advance the clock.
 
 Scala
-:   @@snip [ManualTimerExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala) { #manual-scheduling-simple }
+:   @@snip [ManualTimerExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala) { #manual-scheduling-simple }
 
 Java
-:   @@snip [ManualTimerExampleTest.scala](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java) { #manual-scheduling-simple }
+:   @@snip [ManualTimerExampleTest.scala](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java) { #manual-scheduling-simple }
 
 
 ### Test of logging
@@ -211,18 +211,18 @@ The @apidoc[typed.*.LoggingTestKit] implementation @ref:[requires Logback depend
 For example, a criteria that verifies that an `INFO` level event with a message containing "Received message" is logged:
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #test-logging }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #test-logging }
 
 Java
-:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java) { #test-logging }
+:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java) { #test-logging }
 
 More advanced criteria can be built by chaining conditions that all must be satisfied for a matching event.
 
 Scala
-:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/akka/typed/LoggingDocExamples.scala) { #test-logging-criteria }
+:  @@snip [LoggingDocExamples.scala](/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala) { #test-logging-criteria }
 
 Java
-:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/LoggingDocExamples.java) { #test-logging-criteria }
+:  @@snip [LoggingDocExamples.java](/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java) { #test-logging-criteria }
 
 See @apidoc[typed.*.LoggingTestKit] for more details.
 
@@ -245,10 +245,10 @@ The `LogCapturing` utility @ref:[requires Logback dependency](logging.md#logback
 @scala[Mix `LogCapturing` trait into the ScalaTest]@java[Add a `LogCapturing` `@Rule` in the JUnit test] like this:
 
 Scala
-:  @@snip [ScalaTestIntegrationExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala) { #log-capturing }
+:  @@snip [ScalaTestIntegrationExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala) { #log-capturing }
 
 Java
-:  @@snip [LogCapturingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/LogCapturingExampleTest.java) { #log-capturing }
+:  @@snip [LogCapturingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExampleTest.java) { #log-capturing }
 
 Then you also need to configure the `CapturingAppender` and `CapturingAppenderDelegate` in
 `src/test/resources/logback-test.xml`:
diff --git a/akka-docs/src/main/paradox/typed/testing-sync.md b/akka-docs/src/main/paradox/typed/testing-sync.md
index 16ba52f767..d28a9042bc 100644
--- a/akka-docs/src/main/paradox/typed/testing-sync.md
+++ b/akka-docs/src/main/paradox/typed/testing-sync.md
@@ -29,30 +29,30 @@ The following demonstrates how to test:
 The examples below require the following imports:
 
 Scala
-:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #imports }
+:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #imports }
 
 Java
-:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #imports }
+:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #imports }
 
 Each of the tests are testing an actor that based on the message executes a different effect to be tested:
 
 Scala
-:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #under-test }
+:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #under-test }
 
 Java
-:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #under-test }
+:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #under-test }
 
 For creating a child actor a noop actor is created:
 
 
 Scala
-:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #child }
+:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #child }
 
 Java
-:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #child }
+:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #child }
 
 All of the tests make use of the @apidoc[BehaviorTestKit] to avoid the need for a real `ActorContext`. Some of the tests
-make use of the @apidoc[TestInbox] which allows the creation of an @apidoc[akka.actor.typed.ActorRef] that can be used for synchronous testing, similar to the
+make use of the @apidoc[TestInbox] which allows the creation of an @apidoc[actor.typed.ActorRef] that can be used for synchronous testing, similar to the
 `TestProbe` used for asynchronous testing.
 
 
@@ -61,50 +61,50 @@ make use of the @apidoc[TestInbox] which allows the creation of an @apidoc[akka.
 With a name:
 
 Scala
-:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child }
+:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child }
 
 Java
-:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child }
+:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child }
 
 Anonymously:
 
 Scala
-:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-anonymous-child }
+:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-anonymous-child }
 
 Java
-:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-anonymous-child }
+:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-anonymous-child }
 
 ### Sending messages
 
-For testing sending a message a @apidoc[TestInbox] is created that provides an @apidoc[akka.actor.typed.ActorRef] and methods to assert against the
+For testing sending a message a @apidoc[TestInbox] is created that provides an @apidoc[actor.typed.ActorRef] and methods to assert against the
 messages that have been sent to it.
 
 Scala
-:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-message }
+:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-message }
 
 Java
-:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-message }
+:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-message }
 
 Another use case is sending a message to a child actor you can do this by looking up the @apidoc[TestInbox] for
 a child actor from the @apidoc[BehaviorTestKit]:
 
 Scala
-:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child-message }
+:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child-message }
 
 Java
-:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child-message }
+:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child-message }
 
 For anonymous children the actor names are generated in a deterministic way:
 
 Scala
-:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child-message-anonymous }
+:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child-message-anonymous }
 
 Java
-:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child-message-anonymous }
+:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child-message-anonymous }
 
 ### Testing other effects
 
-The @apidoc[BehaviorTestKit] keeps track other effects you can verify, look at the sub-classes of @apidoc[akka.actor.testkit.typed.Effect]
+The @apidoc[BehaviorTestKit] keeps track other effects you can verify, look at the sub-classes of @apidoc[actor.testkit.typed.Effect]
 
  * SpawnedAdapter
  * Stopped
@@ -121,10 +121,10 @@ The @apidoc[BehaviorTestKit] also keeps track of everything that is being logged
 if the behavior logged certain messages:
 
 Scala
-:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-check-logging }
+:  @@snip [SyncTestingExampleSpec.scala](/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-check-logging }
 
 Java
-:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-check-logging }
+:  @@snip [SyncTestingExampleTest.java](/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-check-logging }
 
 
 See the other public methods and API documentation on @apidoc[BehaviorTestKit] for other types of verification.
diff --git a/akka-docs/src/main/paradox/typed/testing.md b/akka-docs/src/main/paradox/typed/testing.md
index aaa9d8bb1a..fe310e0d64 100644
--- a/akka-docs/src/main/paradox/typed/testing.md
+++ b/akka-docs/src/main/paradox/typed/testing.md
@@ -33,7 +33,7 @@ We recommend using Akka TestKit with ScalaTest:
 
 ## Introduction
 
-Testing can either be done asynchronously using a real @apidoc[akka.actor.typed.ActorSystem] or synchronously on the testing thread using the
+Testing can either be done asynchronously using a real @apidoc[actor.typed.ActorSystem] or synchronously on the testing thread using the
 @apidoc[typed.*.BehaviorTestKit].
 
 For testing logic in a @apidoc[Behavior] in isolation synchronous testing is preferred, but the features that can be
diff --git a/akka-docs/src/test/java-jdk9-only/jdocs/stream/operators/source/AsSubscriber.java b/akka-docs/src/test/java-jdk9-only/jdocs/stream/operators/source/AsSubscriber.java
index 0446c346cd..588838b6de 100644
--- a/akka-docs/src/test/java-jdk9-only/jdocs/stream/operators/source/AsSubscriber.java
+++ b/akka-docs/src/test/java-jdk9-only/jdocs/stream/operators/source/AsSubscriber.java
@@ -8,9 +8,9 @@ package jdocs.stream.operators.source;
 import java.util.concurrent.Flow.Subscriber;
 import java.util.concurrent.Flow.Publisher;
 
-import akka.NotUsed;
-import akka.stream.javadsl.Source;
-import akka.stream.javadsl.JavaFlowSupport;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.JavaFlowSupport;
 
 //#imports
 
diff --git a/akka-docs/src/test/java-jdk9-only/jdocs/stream/operators/source/FromPublisher.java b/akka-docs/src/test/java-jdk9-only/jdocs/stream/operators/source/FromPublisher.java
index dead1ab4ec..eb257a9527 100644
--- a/akka-docs/src/test/java-jdk9-only/jdocs/stream/operators/source/FromPublisher.java
+++ b/akka-docs/src/test/java-jdk9-only/jdocs/stream/operators/source/FromPublisher.java
@@ -7,9 +7,9 @@ package jdocs.stream.operators.source;
 //#imports
 import java.util.concurrent.Flow.Publisher;
 
-import akka.NotUsed;
-import akka.stream.javadsl.Source;
-import akka.stream.javadsl.JavaFlowSupport;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.JavaFlowSupport;
 
 //#imports
 
diff --git a/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java b/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java
index c75112c0fd..f45cffa8ee 100644
--- a/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/ActorDocTest.java
@@ -4,19 +4,19 @@
 
 package jdocs.actor;
 
-import akka.actor.*;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import jdocs.AbstractJavaTest;
 import static jdocs.actor.Messages.Swap.Swap;
 import static jdocs.actor.Messages.*;
-import akka.actor.CoordinatedShutdown;
+import org.apache.pekko.actor.CoordinatedShutdown;
 
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.time.Duration;
-import akka.testkit.TestActors;
+import org.apache.pekko.testkit.TestActors;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -24,31 +24,31 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 // #import-props
-import akka.actor.Props;
+import org.apache.pekko.actor.Props;
 // #import-props
 // #import-actorRef
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
 // #import-actorRef
 // #import-identify
-import akka.actor.ActorIdentity;
-import akka.actor.ActorSelection;
-import akka.actor.Identify;
+import org.apache.pekko.actor.ActorIdentity;
+import org.apache.pekko.actor.ActorSelection;
+import org.apache.pekko.actor.Identify;
 // #import-identify
 // #import-ask
-import static akka.pattern.Patterns.ask;
-import static akka.pattern.Patterns.pipe;
+import static org.apache.pekko.pattern.Patterns.ask;
+import static org.apache.pekko.pattern.Patterns.pipe;
 
 import java.util.concurrent.CompletableFuture;
 // #import-ask
 // #import-gracefulStop
-import static akka.pattern.Patterns.gracefulStop;
-import akka.pattern.AskTimeoutException;
+import static org.apache.pekko.pattern.Patterns.gracefulStop;
+import org.apache.pekko.pattern.AskTimeoutException;
 import java.util.concurrent.CompletionStage;
 
 // #import-gracefulStop
 // #import-terminated
-import akka.actor.Terminated;
+import org.apache.pekko.actor.Terminated;
 // #import-terminated
 
 public class ActorDocTest extends AbstractJavaTest {
@@ -56,7 +56,7 @@ public class ActorDocTest extends AbstractJavaTest {
   public static Config config =
       ConfigFactory.parseString(
           "akka {\n"
-              + "  loggers = [\"akka.testkit.TestEventListener\"]\n"
+              + "  loggers = [\"org.apache.pekko.testkit.TestEventListener\"]\n"
               + "  loglevel = \"WARNING\"\n"
               + "  stdout-loglevel = \"WARNING\"\n"
               + "}\n");
@@ -351,7 +351,7 @@ public class ActorDocTest extends AbstractJavaTest {
                   String result = operation();
                   getSender().tell(result, getSelf());
                 } catch (Exception e) {
-                  getSender().tell(new akka.actor.Status.Failure(e), getSelf());
+                  getSender().tell(new org.apache.pekko.actor.Status.Failure(e), getSelf());
                   throw e;
                 }
                 // #reply-exception
@@ -841,7 +841,8 @@ public class ActorDocTest extends AbstractJavaTest {
         // using timeout from above
         CompletableFuture future2 = ask(actorB, "another request", t).toCompletableFuture();
 
-        CompletableFuture transformed = future1.thenCombine(future2, (x, s) -> new Result((String) x, (String) s));
+        CompletableFuture transformed =
+            future1.thenCombine(future2, (x, s) -> new Result((String) x, (String) s));
 
         pipe(transformed, system.dispatcher()).to(actorC);
         // #ask-pipe
@@ -858,7 +859,7 @@ public class ActorDocTest extends AbstractJavaTest {
         ActorRef victim = system.actorOf(TestActors.echoActorProps());
         watch(victim);
         // #kill
-        victim.tell(akka.actor.Kill.getInstance(), ActorRef.noSender());
+        victim.tell(org.apache.pekko.actor.Kill.getInstance(), ActorRef.noSender());
 
         // expecting the actor to indeed terminate:
         expectTerminated(Duration.ofSeconds(3), victim);
@@ -874,7 +875,7 @@ public class ActorDocTest extends AbstractJavaTest {
         ActorRef victim = system.actorOf(TestActors.echoActorProps());
         watch(victim);
         // #poison-pill
-        victim.tell(akka.actor.PoisonPill.getInstance(), ActorRef.noSender());
+        victim.tell(org.apache.pekko.actor.PoisonPill.getInstance(), ActorRef.noSender());
         // #poison-pill
         expectTerminated(Duration.ofSeconds(3), victim);
       }
diff --git a/akka-docs/src/test/java/jdocs/actor/ByteBufferSerializerDocTest.java b/akka-docs/src/test/java/jdocs/actor/ByteBufferSerializerDocTest.java
index 1111071cc6..746cc8bc67 100644
--- a/akka-docs/src/test/java/jdocs/actor/ByteBufferSerializerDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/ByteBufferSerializerDocTest.java
@@ -5,8 +5,8 @@
 package jdocs.actor;
 
 // #bytebufserializer-with-manifest
-import akka.serialization.ByteBufferSerializer;
-import akka.serialization.SerializerWithStringManifest;
+import org.apache.pekko.serialization.ByteBufferSerializer;
+import org.apache.pekko.serialization.SerializerWithStringManifest;
 
 // #bytebufserializer-with-manifest
 import java.nio.ByteBuffer;
diff --git a/akka-docs/src/test/java/jdocs/actor/DependencyInjectionDocTest.java b/akka-docs/src/test/java/jdocs/actor/DependencyInjectionDocTest.java
index ca915794fe..6ea07ce322 100644
--- a/akka-docs/src/test/java/jdocs/actor/DependencyInjectionDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/DependencyInjectionDocTest.java
@@ -5,19 +5,19 @@
 package jdocs.actor;
 
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import akka.actor.AbstractActor;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
 
 // #import
-import akka.actor.Actor;
-import akka.actor.IndirectActorProducer;
+import org.apache.pekko.actor.Actor;
+import org.apache.pekko.actor.IndirectActorProducer;
 // #import
 
 public class DependencyInjectionDocTest extends AbstractJavaTest {
diff --git a/akka-docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java b/akka-docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java
index ecf6b0a0b2..7e2a0b829d 100644
--- a/akka-docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java
+++ b/akka-docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java
@@ -12,21 +12,21 @@ import java.util.List;
 import java.util.Map;
 import java.time.Duration;
 
-import akka.actor.*;
-import akka.dispatch.Mapper;
-import akka.event.LoggingReceive;
-import akka.japi.pf.DeciderBuilder;
-import akka.pattern.Patterns;
-import akka.util.Timeout;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.dispatch.Mapper;
+import org.apache.pekko.event.LoggingReceive;
+import org.apache.pekko.japi.pf.DeciderBuilder;
+import org.apache.pekko.pattern.Patterns;
+import org.apache.pekko.util.Timeout;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-import static akka.japi.Util.classTag;
-import static akka.actor.SupervisorStrategy.restart;
-import static akka.actor.SupervisorStrategy.stop;
-import static akka.actor.SupervisorStrategy.escalate;
+import static org.apache.pekko.japi.Util.classTag;
+import static org.apache.pekko.actor.SupervisorStrategy.restart;
+import static org.apache.pekko.actor.SupervisorStrategy.stop;
+import static org.apache.pekko.actor.SupervisorStrategy.escalate;
 
-import static akka.pattern.Patterns.pipe;
+import static org.apache.pekko.pattern.Patterns.pipe;
 
 import static jdocs.actor.FaultHandlingDocSample.WorkerApi.*;
 import static jdocs.actor.FaultHandlingDocSample.CounterServiceApi.*;
diff --git a/akka-docs/src/test/java/jdocs/actor/FaultHandlingTest.java b/akka-docs/src/test/java/jdocs/actor/FaultHandlingTest.java
index c8aa12386d..799c53d238 100644
--- a/akka-docs/src/test/java/jdocs/actor/FaultHandlingTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/FaultHandlingTest.java
@@ -4,24 +4,24 @@
 
 package jdocs.actor;
 
-import akka.actor.*;
+import org.apache.pekko.actor.*;
 
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import jdocs.AbstractJavaTest;
 import java.util.Optional;
 import java.time.Duration;
 
-import static akka.pattern.Patterns.ask;
+import static org.apache.pekko.pattern.Patterns.ask;
 
 // #testkit
-import akka.testkit.TestProbe;
-import akka.testkit.ErrorFilter;
-import akka.testkit.EventFilter;
-import akka.testkit.TestEvent;
+import org.apache.pekko.testkit.TestProbe;
+import org.apache.pekko.testkit.ErrorFilter;
+import org.apache.pekko.testkit.EventFilter;
+import org.apache.pekko.testkit.TestEvent;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static akka.japi.Util.immutableSeq;
+import static org.apache.pekko.japi.Util.immutableSeq;
 import static org.junit.Assert.assertEquals;
 
 import scala.concurrent.Await;
@@ -29,8 +29,8 @@ import scala.concurrent.Await;
 // #testkit
 
 // #supervisor
-import akka.japi.pf.DeciderBuilder;
-import akka.actor.SupervisorStrategy;
+import org.apache.pekko.japi.pf.DeciderBuilder;
+import org.apache.pekko.actor.SupervisorStrategy;
 
 // #supervisor
 
@@ -45,7 +45,7 @@ public class FaultHandlingTest extends AbstractJavaTest {
   public static Config config =
       ConfigFactory.parseString(
           "akka {\n"
-              + "  loggers = [\"akka.testkit.TestEventListener\"]\n"
+              + "  loggers = [\"org.apache.pekko.testkit.TestEventListener\"]\n"
               + "  loglevel = \"WARNING\"\n"
               + "  stdout-loglevel = \"WARNING\"\n"
               + "}\n");
diff --git a/akka-docs/src/test/java/jdocs/actor/GraduallyBuiltActor.java b/akka-docs/src/test/java/jdocs/actor/GraduallyBuiltActor.java
index 3572ee8c95..1debe10312 100644
--- a/akka-docs/src/test/java/jdocs/actor/GraduallyBuiltActor.java
+++ b/akka-docs/src/test/java/jdocs/actor/GraduallyBuiltActor.java
@@ -5,10 +5,10 @@
 package jdocs.actor;
 
 // #imports
-import akka.actor.AbstractActor;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.japi.pf.ReceiveBuilder;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.japi.pf.ReceiveBuilder;
 
 // #imports
 
diff --git a/akka-docs/src/test/java/jdocs/actor/InitializationDocTest.java b/akka-docs/src/test/java/jdocs/actor/InitializationDocTest.java
index 4fcba30791..74ef96ab22 100644
--- a/akka-docs/src/test/java/jdocs/actor/InitializationDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/InitializationDocTest.java
@@ -4,13 +4,13 @@
 
 package jdocs.actor;
 
-import akka.actor.AbstractActor;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.japi.pf.FI;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.japi.pf.FI;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/actor/MyActor.java b/akka-docs/src/test/java/jdocs/actor/MyActor.java
index 9f3aa4f8d5..50f77c718e 100644
--- a/akka-docs/src/test/java/jdocs/actor/MyActor.java
+++ b/akka-docs/src/test/java/jdocs/actor/MyActor.java
@@ -5,9 +5,9 @@
 package jdocs.actor;
 
 // #imports
-import akka.actor.AbstractActor;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
 
 // #imports
 
diff --git a/akka-docs/src/test/java/jdocs/actor/MyBoundedActor.java b/akka-docs/src/test/java/jdocs/actor/MyBoundedActor.java
index 8f05cca654..71aa89dd6e 100644
--- a/akka-docs/src/test/java/jdocs/actor/MyBoundedActor.java
+++ b/akka-docs/src/test/java/jdocs/actor/MyBoundedActor.java
@@ -5,8 +5,8 @@
 package jdocs.actor;
 
 // #my-bounded-classic-actor
-import akka.dispatch.BoundedMessageQueueSemantics;
-import akka.dispatch.RequiresMessageQueue;
+import org.apache.pekko.dispatch.BoundedMessageQueueSemantics;
+import org.apache.pekko.dispatch.RequiresMessageQueue;
 
 public class MyBoundedActor extends MyActor
     implements RequiresMessageQueue {}
diff --git a/akka-docs/src/test/java/jdocs/actor/MyStoppingActor.java b/akka-docs/src/test/java/jdocs/actor/MyStoppingActor.java
index 1aedecbd7a..f68da1a6ac 100644
--- a/akka-docs/src/test/java/jdocs/actor/MyStoppingActor.java
+++ b/akka-docs/src/test/java/jdocs/actor/MyStoppingActor.java
@@ -5,8 +5,8 @@
 package jdocs.actor;
 
 // #my-stopping-actor
-import akka.actor.ActorRef;
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.AbstractActor;
 
 public class MyStoppingActor extends AbstractActor {
 
diff --git a/akka-docs/src/test/java/jdocs/actor/SampleActor.java b/akka-docs/src/test/java/jdocs/actor/SampleActor.java
index 5ceeabbff2..9f25adbfe5 100644
--- a/akka-docs/src/test/java/jdocs/actor/SampleActor.java
+++ b/akka-docs/src/test/java/jdocs/actor/SampleActor.java
@@ -5,7 +5,7 @@
 package jdocs.actor;
 
 // #sample-actor
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.AbstractActor;
 
 public class SampleActor extends AbstractActor {
 
diff --git a/akka-docs/src/test/java/jdocs/actor/SampleActorTest.java b/akka-docs/src/test/java/jdocs/actor/SampleActorTest.java
index 38fa6f9d9b..ed390eaebf 100644
--- a/akka-docs/src/test/java/jdocs/actor/SampleActorTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/SampleActorTest.java
@@ -4,11 +4,11 @@
 
 package jdocs.actor;
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/actor/SchedulerDocTest.java b/akka-docs/src/test/java/jdocs/actor/SchedulerDocTest.java
index 1b03be1184..49f1ce2d0a 100644
--- a/akka-docs/src/test/java/jdocs/actor/SchedulerDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/SchedulerDocTest.java
@@ -9,16 +9,16 @@ import java.time.Duration;
 // #imports1
 
 // #imports2
-import akka.actor.Cancellable;
+import org.apache.pekko.actor.Cancellable;
 // #imports2
 
 import jdocs.AbstractJavaTest;
-import akka.actor.Props;
-import akka.actor.AbstractActor;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.testkit.AkkaSpec;
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.testkit.AkkaSpec;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 import org.junit.*;
 
 public class SchedulerDocTest extends AbstractJavaTest {
diff --git a/akka-docs/src/test/java/jdocs/actor/TimerDocTest.java b/akka-docs/src/test/java/jdocs/actor/TimerDocTest.java
index 47521c45d4..2172341cd4 100644
--- a/akka-docs/src/test/java/jdocs/actor/TimerDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/TimerDocTest.java
@@ -6,7 +6,7 @@ package jdocs.actor;
 
 // #timers
 import java.time.Duration;
-import akka.actor.AbstractActorWithTimers;
+import org.apache.pekko.actor.AbstractActorWithTimers;
 
 // #timers
 
diff --git a/akka-docs/src/test/java/jdocs/actor/fsm/Buncher.java b/akka-docs/src/test/java/jdocs/actor/fsm/Buncher.java
index ba5d6800b5..4beeb701f3 100644
--- a/akka-docs/src/test/java/jdocs/actor/fsm/Buncher.java
+++ b/akka-docs/src/test/java/jdocs/actor/fsm/Buncher.java
@@ -5,9 +5,9 @@
 package jdocs.actor.fsm;
 
 // #simple-imports
-import akka.actor.AbstractFSM;
-import akka.actor.ActorRef;
-import akka.japi.pf.UnitMatch;
+import org.apache.pekko.actor.AbstractFSM;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.japi.pf.UnitMatch;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/akka-docs/src/test/java/jdocs/actor/fsm/BuncherTest.java b/akka-docs/src/test/java/jdocs/actor/fsm/BuncherTest.java
index c5f202d2c4..7fae2552fc 100644
--- a/akka-docs/src/test/java/jdocs/actor/fsm/BuncherTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/fsm/BuncherTest.java
@@ -4,11 +4,11 @@
 
 package jdocs.actor.fsm;
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/actor/fsm/Events.java b/akka-docs/src/test/java/jdocs/actor/fsm/Events.java
index b4e326022e..8957cbe121 100644
--- a/akka-docs/src/test/java/jdocs/actor/fsm/Events.java
+++ b/akka-docs/src/test/java/jdocs/actor/fsm/Events.java
@@ -4,7 +4,7 @@
 
 package jdocs.actor.fsm;
 
-import akka.actor.ActorRef;
+import org.apache.pekko.actor.ActorRef;
 import java.util.List;
 
 public class Events {
diff --git a/akka-docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java b/akka-docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java
index 6b345c83e6..2937571e7d 100644
--- a/akka-docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java
@@ -4,9 +4,9 @@
 
 package jdocs.actor.fsm;
 
-import akka.actor.*;
+import org.apache.pekko.actor.*;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java b/akka-docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java
index 9bcc914219..dd3444dbba 100644
--- a/akka-docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java
@@ -4,12 +4,12 @@
 
 package jdocs.actor.io.dns;
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.io.Dns;
-import akka.io.dns.DnsProtocol;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.io.Dns;
+import org.apache.pekko.io.dns.DnsProtocol;
 
-import static akka.pattern.Patterns.ask;
+import static org.apache.pekko.pattern.Patterns.ask;
 
 import scala.Option;
 
diff --git a/akka-docs/src/test/java/jdocs/actor/typed/BlockingActor.java b/akka-docs/src/test/java/jdocs/actor/typed/BlockingActor.java
index 385b8e6923..737677dda3 100644
--- a/akka-docs/src/test/java/jdocs/actor/typed/BlockingActor.java
+++ b/akka-docs/src/test/java/jdocs/actor/typed/BlockingActor.java
@@ -5,8 +5,8 @@
 package jdocs.actor.typed;
 
 // #blocking-in-actor
-import akka.actor.typed.*;
-import akka.actor.typed.javadsl.*;
+import org.apache.pekko.actor.typed.*;
+import org.apache.pekko.actor.typed.javadsl.*;
 
 public class BlockingActor extends AbstractBehavior {
   public static Behavior create() {
diff --git a/akka-docs/src/test/java/jdocs/actor/typed/BlockingDispatcherTest.java b/akka-docs/src/test/java/jdocs/actor/typed/BlockingDispatcherTest.java
index 55bc2335be..e7c496ccec 100644
--- a/akka-docs/src/test/java/jdocs/actor/typed/BlockingDispatcherTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/typed/BlockingDispatcherTest.java
@@ -4,8 +4,8 @@
 
 package jdocs.actor.typed;
 
-import akka.actor.typed.*;
-import akka.actor.typed.javadsl.*;
+import org.apache.pekko.actor.typed.*;
+import org.apache.pekko.actor.typed.javadsl.*;
 
 public class BlockingDispatcherTest {
   public static void main(String args[]) {
diff --git a/akka-docs/src/test/java/jdocs/actor/typed/CoordinatedActorShutdownTest.java b/akka-docs/src/test/java/jdocs/actor/typed/CoordinatedActorShutdownTest.java
index 95d00378ef..7c1a204464 100644
--- a/akka-docs/src/test/java/jdocs/actor/typed/CoordinatedActorShutdownTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/typed/CoordinatedActorShutdownTest.java
@@ -4,15 +4,15 @@
 
 package jdocs.actor.typed;
 
-import akka.Done;
-import akka.actor.Cancellable;
-import akka.actor.CoordinatedShutdown;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.*;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.actor.CoordinatedShutdown;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.*;
 // #coordinated-shutdown-addTask
-import static akka.actor.typed.javadsl.AskPattern.ask;
+import static org.apache.pekko.actor.typed.javadsl.AskPattern.ask;
 
 // #coordinated-shutdown-addTask
 
diff --git a/akka-docs/src/test/java/jdocs/actor/typed/DispatcherDocTest.java b/akka-docs/src/test/java/jdocs/actor/typed/DispatcherDocTest.java
index d005e6feb3..d62593bbf4 100644
--- a/akka-docs/src/test/java/jdocs/actor/typed/DispatcherDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/typed/DispatcherDocTest.java
@@ -6,8 +6,8 @@ package jdocs.actor.typed;
 
 import scala.concurrent.ExecutionContextExecutor;
 
-import akka.actor.typed.*;
-import akka.actor.typed.javadsl.*;
+import org.apache.pekko.actor.typed.*;
+import org.apache.pekko.actor.typed.javadsl.*;
 
 @SuppressWarnings("unused")
 public class DispatcherDocTest {
diff --git a/akka-docs/src/test/java/jdocs/actor/typed/PrintActor.java b/akka-docs/src/test/java/jdocs/actor/typed/PrintActor.java
index c45cf43760..13b3dea5aa 100644
--- a/akka-docs/src/test/java/jdocs/actor/typed/PrintActor.java
+++ b/akka-docs/src/test/java/jdocs/actor/typed/PrintActor.java
@@ -4,8 +4,8 @@
 
 package jdocs.actor.typed;
 
-import akka.actor.typed.*;
-import akka.actor.typed.javadsl.*;
+import org.apache.pekko.actor.typed.*;
+import org.apache.pekko.actor.typed.javadsl.*;
 
 // #print-actor
 class PrintActor extends AbstractBehavior {
diff --git a/akka-docs/src/test/java/jdocs/actor/typed/SeparateDispatcherCompletionStageActor.java b/akka-docs/src/test/java/jdocs/actor/typed/SeparateDispatcherCompletionStageActor.java
index 3e5c973afc..b9e38a5cf4 100644
--- a/akka-docs/src/test/java/jdocs/actor/typed/SeparateDispatcherCompletionStageActor.java
+++ b/akka-docs/src/test/java/jdocs/actor/typed/SeparateDispatcherCompletionStageActor.java
@@ -7,8 +7,8 @@ package jdocs.actor.typed;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 
-import akka.actor.typed.*;
-import akka.actor.typed.javadsl.*;
+import org.apache.pekko.actor.typed.*;
+import org.apache.pekko.actor.typed.javadsl.*;
 
 // #separate-dispatcher
 class SeparateDispatcherFutureActor extends AbstractBehavior {
diff --git a/akka-docs/src/test/java/jdocs/actor/typed/SharedMutableStateDocTest.java b/akka-docs/src/test/java/jdocs/actor/typed/SharedMutableStateDocTest.java
index c610bf8b96..0885ad36ef 100644
--- a/akka-docs/src/test/java/jdocs/actor/typed/SharedMutableStateDocTest.java
+++ b/akka-docs/src/test/java/jdocs/actor/typed/SharedMutableStateDocTest.java
@@ -4,12 +4,12 @@
 
 package jdocs.actor.typed;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Receive;
-import akka.actor.typed.javadsl.AskPattern;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.javadsl.AskPattern;
 
 import java.time.Duration;
 import java.util.HashSet;
diff --git a/akka-docs/src/test/java/jdocs/circuitbreaker/DangerousJavaActor.java b/akka-docs/src/test/java/jdocs/circuitbreaker/DangerousJavaActor.java
index 520da6178a..b16bf5a660 100644
--- a/akka-docs/src/test/java/jdocs/circuitbreaker/DangerousJavaActor.java
+++ b/akka-docs/src/test/java/jdocs/circuitbreaker/DangerousJavaActor.java
@@ -6,13 +6,13 @@ package jdocs.circuitbreaker;
 
 // #imports1
 
-import akka.actor.AbstractActor;
-import akka.event.LoggingAdapter;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.LoggingAdapter;
 import java.time.Duration;
-import akka.pattern.CircuitBreaker;
-import akka.event.Logging;
+import org.apache.pekko.pattern.CircuitBreaker;
+import org.apache.pekko.event.Logging;
 
-import static akka.pattern.Patterns.pipe;
+import static org.apache.pekko.pattern.Patterns.pipe;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/akka-docs/src/test/java/jdocs/circuitbreaker/EvenNoFailureJavaExample.java b/akka-docs/src/test/java/jdocs/circuitbreaker/EvenNoFailureJavaExample.java
index bf9aeff5f4..fbd13175fb 100644
--- a/akka-docs/src/test/java/jdocs/circuitbreaker/EvenNoFailureJavaExample.java
+++ b/akka-docs/src/test/java/jdocs/circuitbreaker/EvenNoFailureJavaExample.java
@@ -4,8 +4,8 @@
 
 package jdocs.circuitbreaker;
 
-import akka.actor.AbstractActor;
-import akka.pattern.CircuitBreaker;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.pattern.CircuitBreaker;
 import java.time.Duration;
 
 import java.util.Optional;
diff --git a/akka-docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java b/akka-docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java
index 44c64fdc13..1fdc6cc11e 100644
--- a/akka-docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java
+++ b/akka-docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java
@@ -4,12 +4,12 @@
 
 package jdocs.circuitbreaker;
 
-import akka.actor.ActorRef;
-import akka.actor.ReceiveTimeout;
-import akka.actor.AbstractActor;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.pattern.CircuitBreaker;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ReceiveTimeout;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.pattern.CircuitBreaker;
 import java.time.Duration;
 
 public class TellPatternJavaActor extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/cluster/ClusterDocTest.java b/akka-docs/src/test/java/jdocs/cluster/ClusterDocTest.java
index 4302b12e0d..dabf853e20 100644
--- a/akka-docs/src/test/java/jdocs/cluster/ClusterDocTest.java
+++ b/akka-docs/src/test/java/jdocs/cluster/ClusterDocTest.java
@@ -4,7 +4,7 @@
 
 package jdocs.cluster;
 
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import com.typesafe.config.ConfigFactory;
 
 import java.util.LinkedList;
@@ -16,12 +16,12 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 // #join-seed-nodes-imports
-import akka.actor.Address;
-import akka.cluster.Cluster;
+import org.apache.pekko.actor.Address;
+import org.apache.pekko.cluster.Cluster;
 
 // #join-seed-nodes-imports
-import akka.actor.ActorSystem;
-import akka.cluster.Member;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.cluster.Member;
 
 public class ClusterDocTest extends AbstractJavaTest {
 
diff --git a/akka-docs/src/test/java/jdocs/cluster/FactorialBackend.java b/akka-docs/src/test/java/jdocs/cluster/FactorialBackend.java
index 57e5bc682d..26833f00c7 100644
--- a/akka-docs/src/test/java/jdocs/cluster/FactorialBackend.java
+++ b/akka-docs/src/test/java/jdocs/cluster/FactorialBackend.java
@@ -7,8 +7,8 @@ package jdocs.cluster;
 import java.math.BigInteger;
 import java.util.concurrent.CompletableFuture;
 
-import akka.actor.AbstractActor;
-import static akka.pattern.Patterns.pipe;
+import org.apache.pekko.actor.AbstractActor;
+import static org.apache.pekko.pattern.Patterns.pipe;
 
 // #backend
 public class FactorialBackend extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/cluster/FactorialFrontend.java b/akka-docs/src/test/java/jdocs/cluster/FactorialFrontend.java
index 7d790003e0..414f1e8e43 100644
--- a/akka-docs/src/test/java/jdocs/cluster/FactorialFrontend.java
+++ b/akka-docs/src/test/java/jdocs/cluster/FactorialFrontend.java
@@ -10,21 +10,21 @@ import java.util.HashSet;
 import java.util.Set;
 import java.time.Duration;
 
-import akka.actor.Props;
-import akka.cluster.metrics.AdaptiveLoadBalancingGroup;
-import akka.cluster.metrics.AdaptiveLoadBalancingPool;
-import akka.cluster.metrics.HeapMetricsSelector;
-import akka.cluster.metrics.SystemLoadAverageMetricsSelector;
-import akka.cluster.routing.ClusterRouterGroup;
-import akka.cluster.routing.ClusterRouterGroupSettings;
-import akka.cluster.routing.ClusterRouterPool;
-import akka.cluster.routing.ClusterRouterPoolSettings;
-import akka.actor.ActorRef;
-import akka.actor.ReceiveTimeout;
-import akka.actor.AbstractActor;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.routing.FromConfig;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.cluster.metrics.AdaptiveLoadBalancingGroup;
+import org.apache.pekko.cluster.metrics.AdaptiveLoadBalancingPool;
+import org.apache.pekko.cluster.metrics.HeapMetricsSelector;
+import org.apache.pekko.cluster.metrics.SystemLoadAverageMetricsSelector;
+import org.apache.pekko.cluster.routing.ClusterRouterGroup;
+import org.apache.pekko.cluster.routing.ClusterRouterGroupSettings;
+import org.apache.pekko.cluster.routing.ClusterRouterPool;
+import org.apache.pekko.cluster.routing.ClusterRouterPoolSettings;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ReceiveTimeout;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.routing.FromConfig;
 
 // #frontend
 public class FactorialFrontend extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java b/akka-docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java
index fb5c528dc9..3db0b30619 100644
--- a/akka-docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java
+++ b/akka-docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java
@@ -8,9 +8,9 @@ import java.util.concurrent.TimeUnit;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.cluster.Cluster;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.cluster.Cluster;
 
 public class FactorialFrontendMain {
 
diff --git a/akka-docs/src/test/java/jdocs/cluster/MetricsListener.java b/akka-docs/src/test/java/jdocs/cluster/MetricsListener.java
index dd732f49e5..ad3c282e86 100644
--- a/akka-docs/src/test/java/jdocs/cluster/MetricsListener.java
+++ b/akka-docs/src/test/java/jdocs/cluster/MetricsListener.java
@@ -5,17 +5,17 @@
 package jdocs.cluster;
 
 // #metrics-listener
-import akka.actor.AbstractActor;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterEvent.CurrentClusterState;
-import akka.cluster.metrics.ClusterMetricsChanged;
-import akka.cluster.metrics.NodeMetrics;
-import akka.cluster.metrics.StandardMetrics;
-import akka.cluster.metrics.StandardMetrics.HeapMemory;
-import akka.cluster.metrics.StandardMetrics.Cpu;
-import akka.cluster.metrics.ClusterMetricsExtension;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState;
+import org.apache.pekko.cluster.metrics.ClusterMetricsChanged;
+import org.apache.pekko.cluster.metrics.NodeMetrics;
+import org.apache.pekko.cluster.metrics.StandardMetrics;
+import org.apache.pekko.cluster.metrics.StandardMetrics.HeapMemory;
+import org.apache.pekko.cluster.metrics.StandardMetrics.Cpu;
+import org.apache.pekko.cluster.metrics.ClusterMetricsExtension;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
 
 public class MetricsListener extends AbstractActor {
   LoggingAdapter log = Logging.getLogger(getContext().getSystem(), this);
diff --git a/akka-docs/src/test/java/jdocs/cluster/SimpleClusterListener.java b/akka-docs/src/test/java/jdocs/cluster/SimpleClusterListener.java
index 0b935ad7ca..a341fa19c5 100644
--- a/akka-docs/src/test/java/jdocs/cluster/SimpleClusterListener.java
+++ b/akka-docs/src/test/java/jdocs/cluster/SimpleClusterListener.java
@@ -4,15 +4,15 @@
 
 package jdocs.cluster;
 
-import akka.actor.AbstractActor;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterEvent;
-import akka.cluster.ClusterEvent.MemberEvent;
-import akka.cluster.ClusterEvent.MemberUp;
-import akka.cluster.ClusterEvent.MemberRemoved;
-import akka.cluster.ClusterEvent.UnreachableMember;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.cluster.ClusterEvent;
+import org.apache.pekko.cluster.ClusterEvent.MemberEvent;
+import org.apache.pekko.cluster.ClusterEvent.MemberUp;
+import org.apache.pekko.cluster.ClusterEvent.MemberRemoved;
+import org.apache.pekko.cluster.ClusterEvent.UnreachableMember;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
 
 public class SimpleClusterListener extends AbstractActor {
   LoggingAdapter log = Logging.getLogger(getContext().getSystem(), this);
diff --git a/akka-docs/src/test/java/jdocs/cluster/SimpleClusterListener2.java b/akka-docs/src/test/java/jdocs/cluster/SimpleClusterListener2.java
index bb2e07b4f4..02fb4d83f3 100644
--- a/akka-docs/src/test/java/jdocs/cluster/SimpleClusterListener2.java
+++ b/akka-docs/src/test/java/jdocs/cluster/SimpleClusterListener2.java
@@ -4,15 +4,15 @@
 
 package jdocs.cluster;
 
-import akka.actor.AbstractActor;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterEvent.CurrentClusterState;
-import akka.cluster.ClusterEvent.MemberEvent;
-import akka.cluster.ClusterEvent.MemberUp;
-import akka.cluster.ClusterEvent.MemberRemoved;
-import akka.cluster.ClusterEvent.UnreachableMember;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState;
+import org.apache.pekko.cluster.ClusterEvent.MemberEvent;
+import org.apache.pekko.cluster.ClusterEvent.MemberUp;
+import org.apache.pekko.cluster.ClusterEvent.MemberRemoved;
+import org.apache.pekko.cluster.ClusterEvent.UnreachableMember;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
 
 public class SimpleClusterListener2 extends AbstractActor {
   LoggingAdapter log = Logging.getLogger(getContext().getSystem(), this);
diff --git a/akka-docs/src/test/java/jdocs/cluster/StatsAggregator.java b/akka-docs/src/test/java/jdocs/cluster/StatsAggregator.java
index 54384363fa..51b71fe12d 100644
--- a/akka-docs/src/test/java/jdocs/cluster/StatsAggregator.java
+++ b/akka-docs/src/test/java/jdocs/cluster/StatsAggregator.java
@@ -10,9 +10,9 @@ import java.time.Duration;
 
 import jdocs.cluster.StatsMessages.JobFailed;
 import jdocs.cluster.StatsMessages.StatsResult;
-import akka.actor.ActorRef;
-import akka.actor.ReceiveTimeout;
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ReceiveTimeout;
+import org.apache.pekko.actor.AbstractActor;
 
 // #aggregator
 public class StatsAggregator extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/cluster/StatsSampleClient.java b/akka-docs/src/test/java/jdocs/cluster/StatsSampleClient.java
index 2b15dfd80d..67f01ac66c 100644
--- a/akka-docs/src/test/java/jdocs/cluster/StatsSampleClient.java
+++ b/akka-docs/src/test/java/jdocs/cluster/StatsSampleClient.java
@@ -14,19 +14,19 @@ import jdocs.cluster.StatsMessages.StatsJob;
 import jdocs.cluster.StatsMessages.StatsResult;
 import java.util.concurrent.ThreadLocalRandom;
 import java.time.Duration;
-import akka.actor.ActorSelection;
-import akka.actor.Address;
-import akka.actor.Cancellable;
-import akka.actor.AbstractActor;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterEvent.UnreachableMember;
-import akka.cluster.ClusterEvent.ReachableMember;
-import akka.cluster.ClusterEvent.CurrentClusterState;
-import akka.cluster.ClusterEvent.MemberEvent;
-import akka.cluster.ClusterEvent.MemberUp;
-import akka.cluster.ClusterEvent.ReachabilityEvent;
-import akka.cluster.Member;
-import akka.cluster.MemberStatus;
+import org.apache.pekko.actor.ActorSelection;
+import org.apache.pekko.actor.Address;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.cluster.ClusterEvent.UnreachableMember;
+import org.apache.pekko.cluster.ClusterEvent.ReachableMember;
+import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState;
+import org.apache.pekko.cluster.ClusterEvent.MemberEvent;
+import org.apache.pekko.cluster.ClusterEvent.MemberUp;
+import org.apache.pekko.cluster.ClusterEvent.ReachabilityEvent;
+import org.apache.pekko.cluster.Member;
+import org.apache.pekko.cluster.MemberStatus;
 
 public class StatsSampleClient extends AbstractActor {
 
diff --git a/akka-docs/src/test/java/jdocs/cluster/StatsSampleOneMasterClientMain.java b/akka-docs/src/test/java/jdocs/cluster/StatsSampleOneMasterClientMain.java
index 69622c308f..27d93e97bd 100644
--- a/akka-docs/src/test/java/jdocs/cluster/StatsSampleOneMasterClientMain.java
+++ b/akka-docs/src/test/java/jdocs/cluster/StatsSampleOneMasterClientMain.java
@@ -6,8 +6,8 @@ package jdocs.cluster;
 
 import com.typesafe.config.ConfigFactory;
 
-import akka.actor.ActorSystem;
-import akka.actor.Props;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
 
 public class StatsSampleOneMasterClientMain {
 
diff --git a/akka-docs/src/test/java/jdocs/cluster/StatsSampleOneMasterMain.java b/akka-docs/src/test/java/jdocs/cluster/StatsSampleOneMasterMain.java
index 4f644ae335..2ab42220dd 100644
--- a/akka-docs/src/test/java/jdocs/cluster/StatsSampleOneMasterMain.java
+++ b/akka-docs/src/test/java/jdocs/cluster/StatsSampleOneMasterMain.java
@@ -7,13 +7,13 @@ package jdocs.cluster;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-import akka.actor.ActorSystem;
-import akka.actor.PoisonPill;
-import akka.actor.Props;
-import akka.cluster.singleton.ClusterSingletonManager;
-import akka.cluster.singleton.ClusterSingletonManagerSettings;
-import akka.cluster.singleton.ClusterSingletonProxy;
-import akka.cluster.singleton.ClusterSingletonProxySettings;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.PoisonPill;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.cluster.singleton.ClusterSingletonManager;
+import org.apache.pekko.cluster.singleton.ClusterSingletonManagerSettings;
+import org.apache.pekko.cluster.singleton.ClusterSingletonProxy;
+import org.apache.pekko.cluster.singleton.ClusterSingletonProxySettings;
 
 public class StatsSampleOneMasterMain {
 
diff --git a/akka-docs/src/test/java/jdocs/cluster/StatsService.java b/akka-docs/src/test/java/jdocs/cluster/StatsService.java
index 3ae2b35072..f29c68c2f0 100644
--- a/akka-docs/src/test/java/jdocs/cluster/StatsService.java
+++ b/akka-docs/src/test/java/jdocs/cluster/StatsService.java
@@ -4,18 +4,18 @@
 
 package jdocs.cluster;
 
-import akka.cluster.routing.ClusterRouterGroup;
-import akka.cluster.routing.ClusterRouterGroupSettings;
-import akka.cluster.routing.ClusterRouterPool;
-import akka.cluster.routing.ClusterRouterPoolSettings;
-import akka.routing.ConsistentHashingGroup;
-import akka.routing.ConsistentHashingPool;
+import org.apache.pekko.cluster.routing.ClusterRouterGroup;
+import org.apache.pekko.cluster.routing.ClusterRouterGroupSettings;
+import org.apache.pekko.cluster.routing.ClusterRouterPool;
+import org.apache.pekko.cluster.routing.ClusterRouterPoolSettings;
+import org.apache.pekko.routing.ConsistentHashingGroup;
+import org.apache.pekko.routing.ConsistentHashingPool;
 import jdocs.cluster.StatsMessages.StatsJob;
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.actor.AbstractActor;
-import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope;
-import akka.routing.FromConfig;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope;
+import org.apache.pekko.routing.FromConfig;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/akka-docs/src/test/java/jdocs/cluster/StatsWorker.java b/akka-docs/src/test/java/jdocs/cluster/StatsWorker.java
index 5fa101ba4f..c7ab2b9689 100644
--- a/akka-docs/src/test/java/jdocs/cluster/StatsWorker.java
+++ b/akka-docs/src/test/java/jdocs/cluster/StatsWorker.java
@@ -7,7 +7,7 @@ package jdocs.cluster;
 import java.util.HashMap;
 import java.util.Map;
 
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.AbstractActor;
 
 // #worker
 public class StatsWorker extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/cluster/TransformationBackend.java b/akka-docs/src/test/java/jdocs/cluster/TransformationBackend.java
index 29c0a440d8..d9d51e80c7 100644
--- a/akka-docs/src/test/java/jdocs/cluster/TransformationBackend.java
+++ b/akka-docs/src/test/java/jdocs/cluster/TransformationBackend.java
@@ -7,12 +7,12 @@ package jdocs.cluster;
 import static jdocs.cluster.TransformationMessages.BACKEND_REGISTRATION;
 import jdocs.cluster.TransformationMessages.TransformationJob;
 import jdocs.cluster.TransformationMessages.TransformationResult;
-import akka.actor.AbstractActor;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterEvent.CurrentClusterState;
-import akka.cluster.ClusterEvent.MemberUp;
-import akka.cluster.Member;
-import akka.cluster.MemberStatus;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState;
+import org.apache.pekko.cluster.ClusterEvent.MemberUp;
+import org.apache.pekko.cluster.Member;
+import org.apache.pekko.cluster.MemberStatus;
 
 // #backend
 public class TransformationBackend extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/cluster/TransformationFrontend.java b/akka-docs/src/test/java/jdocs/cluster/TransformationFrontend.java
index d055e90898..90c21bb718 100644
--- a/akka-docs/src/test/java/jdocs/cluster/TransformationFrontend.java
+++ b/akka-docs/src/test/java/jdocs/cluster/TransformationFrontend.java
@@ -11,9 +11,9 @@ import java.util.List;
 
 import jdocs.cluster.TransformationMessages.JobFailed;
 import jdocs.cluster.TransformationMessages.TransformationJob;
-import akka.actor.ActorRef;
-import akka.actor.Terminated;
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Terminated;
+import org.apache.pekko.actor.AbstractActor;
 
 // #frontend
 public class TransformationFrontend extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/cluster/singleton/ClusterSingletonSupervision.java b/akka-docs/src/test/java/jdocs/cluster/singleton/ClusterSingletonSupervision.java
index 0cd70620d8..01b6dd992e 100644
--- a/akka-docs/src/test/java/jdocs/cluster/singleton/ClusterSingletonSupervision.java
+++ b/akka-docs/src/test/java/jdocs/cluster/singleton/ClusterSingletonSupervision.java
@@ -4,16 +4,16 @@
 
 package jdocs.cluster.singleton;
 
-import akka.actor.AbstractActor;
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.actor.SupervisorStrategy;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.SupervisorStrategy;
 
 // #singleton-supervisor-actor-usage-imports
-import akka.actor.PoisonPill;
-import akka.actor.Props;
-import akka.cluster.singleton.ClusterSingletonManager;
-import akka.cluster.singleton.ClusterSingletonManagerSettings;
+import org.apache.pekko.actor.PoisonPill;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.cluster.singleton.ClusterSingletonManager;
+import org.apache.pekko.cluster.singleton.ClusterSingletonManagerSettings;
 // #singleton-supervisor-actor-usage-imports
 
 abstract class ClusterSingletonSupervision extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/cluster/singleton/SupervisorActor.java b/akka-docs/src/test/java/jdocs/cluster/singleton/SupervisorActor.java
index 4bf301cb9b..841cf696a0 100644
--- a/akka-docs/src/test/java/jdocs/cluster/singleton/SupervisorActor.java
+++ b/akka-docs/src/test/java/jdocs/cluster/singleton/SupervisorActor.java
@@ -5,11 +5,11 @@
 package jdocs.cluster.singleton;
 
 // #singleton-supervisor-actor
-import akka.actor.AbstractActor;
-import akka.actor.AbstractActor.Receive;
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.actor.SupervisorStrategy;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.AbstractActor.Receive;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.SupervisorStrategy;
 
 public class SupervisorActor extends AbstractActor {
   final Props childProps;
diff --git a/akka-docs/src/test/java/jdocs/config/ConfigDocTest.java b/akka-docs/src/test/java/jdocs/config/ConfigDocTest.java
index 56ac24c43d..a8a93bd796 100644
--- a/akka-docs/src/test/java/jdocs/config/ConfigDocTest.java
+++ b/akka-docs/src/test/java/jdocs/config/ConfigDocTest.java
@@ -5,14 +5,14 @@
 package jdocs.config;
 
 // #imports
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
 // #imports
-import akka.actor.testkit.typed.javadsl.ActorTestKit;
+import org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit;
 
 public class ConfigDocTest {
 
diff --git a/akka-docs/src/test/java/jdocs/coordination/LeaseDocTest.java b/akka-docs/src/test/java/jdocs/coordination/LeaseDocTest.java
index 548156931e..9b196863d2 100644
--- a/akka-docs/src/test/java/jdocs/coordination/LeaseDocTest.java
+++ b/akka-docs/src/test/java/jdocs/coordination/LeaseDocTest.java
@@ -4,11 +4,11 @@
 
 package jdocs.coordination;
 
-import akka.actor.ActorSystem;
-import akka.coordination.lease.LeaseSettings;
-import akka.coordination.lease.javadsl.Lease;
-import akka.coordination.lease.javadsl.LeaseProvider;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.coordination.lease.LeaseSettings;
+import org.apache.pekko.coordination.lease.javadsl.Lease;
+import org.apache.pekko.coordination.lease.javadsl.LeaseProvider;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import docs.coordination.LeaseDocSpec;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/ddata/DataBot.java b/akka-docs/src/test/java/jdocs/ddata/DataBot.java
index dec510e66d..237191f665 100644
--- a/akka-docs/src/test/java/jdocs/ddata/DataBot.java
+++ b/akka-docs/src/test/java/jdocs/ddata/DataBot.java
@@ -8,22 +8,22 @@ package jdocs.ddata;
 import java.time.Duration;
 import java.util.concurrent.ThreadLocalRandom;
 
-import akka.actor.AbstractActor;
-import akka.actor.ActorRef;
-import akka.actor.Cancellable;
-import akka.cluster.Cluster;
-import akka.cluster.ddata.DistributedData;
-import akka.cluster.ddata.Key;
-import akka.cluster.ddata.ORSet;
-import akka.cluster.ddata.ORSetKey;
-import akka.cluster.ddata.Replicator;
-import akka.cluster.ddata.Replicator.Changed;
-import akka.cluster.ddata.Replicator.Subscribe;
-import akka.cluster.ddata.Replicator.Update;
-import akka.cluster.ddata.Replicator.UpdateResponse;
-import akka.cluster.ddata.SelfUniqueAddress;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.cluster.ddata.DistributedData;
+import org.apache.pekko.cluster.ddata.Key;
+import org.apache.pekko.cluster.ddata.ORSet;
+import org.apache.pekko.cluster.ddata.ORSetKey;
+import org.apache.pekko.cluster.ddata.Replicator;
+import org.apache.pekko.cluster.ddata.Replicator.Changed;
+import org.apache.pekko.cluster.ddata.Replicator.Subscribe;
+import org.apache.pekko.cluster.ddata.Replicator.Update;
+import org.apache.pekko.cluster.ddata.Replicator.UpdateResponse;
+import org.apache.pekko.cluster.ddata.SelfUniqueAddress;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
 
 public class DataBot extends AbstractActor {
 
diff --git a/akka-docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java b/akka-docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java
index d89e53cd9c..192610c066 100644
--- a/akka-docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java
+++ b/akka-docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java
@@ -10,8 +10,8 @@ import java.util.Set;
 import java.math.BigInteger;
 import java.util.Optional;
 
-import akka.actor.*;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import com.typesafe.config.ConfigFactory;
 import docs.ddata.DistributedDataDocSpec;
 import jdocs.AbstractJavaTest;
@@ -23,10 +23,10 @@ import org.junit.Test;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-import akka.cluster.ddata.*;
-import akka.japi.pf.ReceiveBuilder;
+import org.apache.pekko.cluster.ddata.*;
+import org.apache.pekko.japi.pf.ReceiveBuilder;
 
-import static akka.cluster.ddata.Replicator.*;
+import static org.apache.pekko.cluster.ddata.Replicator.*;
 
 @SuppressWarnings({"unchecked", "unused"})
 public class DistributedDataDocTest extends AbstractJavaTest {
diff --git a/akka-docs/src/test/java/jdocs/ddata/ShoppingCart.java b/akka-docs/src/test/java/jdocs/ddata/ShoppingCart.java
index a999ddad73..03e82dc99c 100644
--- a/akka-docs/src/test/java/jdocs/ddata/ShoppingCart.java
+++ b/akka-docs/src/test/java/jdocs/ddata/ShoppingCart.java
@@ -10,22 +10,22 @@ import java.util.Optional;
 import java.util.Set;
 import java.time.Duration;
 
-import akka.actor.AbstractActor;
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.cluster.ddata.*;
-import akka.cluster.ddata.Replicator.GetFailure;
-import akka.cluster.ddata.Replicator.GetResponse;
-import akka.cluster.ddata.Replicator.GetSuccess;
-import akka.cluster.ddata.Replicator.NotFound;
-import akka.cluster.ddata.Replicator.ReadConsistency;
-import akka.cluster.ddata.Replicator.ReadMajority;
-import akka.cluster.ddata.Replicator.Update;
-import akka.cluster.ddata.Replicator.UpdateFailure;
-import akka.cluster.ddata.Replicator.UpdateSuccess;
-import akka.cluster.ddata.Replicator.UpdateTimeout;
-import akka.cluster.ddata.Replicator.WriteConsistency;
-import akka.cluster.ddata.Replicator.WriteMajority;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.cluster.ddata.*;
+import org.apache.pekko.cluster.ddata.Replicator.GetFailure;
+import org.apache.pekko.cluster.ddata.Replicator.GetResponse;
+import org.apache.pekko.cluster.ddata.Replicator.GetSuccess;
+import org.apache.pekko.cluster.ddata.Replicator.NotFound;
+import org.apache.pekko.cluster.ddata.Replicator.ReadConsistency;
+import org.apache.pekko.cluster.ddata.Replicator.ReadMajority;
+import org.apache.pekko.cluster.ddata.Replicator.Update;
+import org.apache.pekko.cluster.ddata.Replicator.UpdateFailure;
+import org.apache.pekko.cluster.ddata.Replicator.UpdateSuccess;
+import org.apache.pekko.cluster.ddata.Replicator.UpdateTimeout;
+import org.apache.pekko.cluster.ddata.Replicator.WriteConsistency;
+import org.apache.pekko.cluster.ddata.Replicator.WriteMajority;
 
 @SuppressWarnings("unchecked")
 public class ShoppingCart extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/ddata/TwoPhaseSet.java b/akka-docs/src/test/java/jdocs/ddata/TwoPhaseSet.java
index 4a286c5752..64bdaf78b6 100644
--- a/akka-docs/src/test/java/jdocs/ddata/TwoPhaseSet.java
+++ b/akka-docs/src/test/java/jdocs/ddata/TwoPhaseSet.java
@@ -8,8 +8,8 @@ import java.util.HashSet;
 
 import java.util.Set;
 
-import akka.cluster.ddata.AbstractReplicatedData;
-import akka.cluster.ddata.GSet;
+import org.apache.pekko.cluster.ddata.AbstractReplicatedData;
+import org.apache.pekko.cluster.ddata.GSet;
 
 // #twophaseset
 public class TwoPhaseSet extends AbstractReplicatedData {
diff --git a/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer.java b/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer.java
index 512cb2bc50..51e85e1444 100644
--- a/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer.java
+++ b/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer.java
@@ -11,9 +11,9 @@ import docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet.Builder;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import akka.actor.ExtendedActorSystem;
-import akka.cluster.ddata.GSet;
-import akka.cluster.ddata.protobuf.AbstractSerializationSupport;
+import org.apache.pekko.actor.ExtendedActorSystem;
+import org.apache.pekko.cluster.ddata.GSet;
+import org.apache.pekko.cluster.ddata.protobuf.AbstractSerializationSupport;
 
 public class TwoPhaseSetSerializer extends AbstractSerializationSupport {
 
diff --git a/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer2.java b/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer2.java
index 0f88fa3b99..60f3187a34 100644
--- a/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer2.java
+++ b/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer2.java
@@ -9,10 +9,10 @@ import jdocs.ddata.TwoPhaseSet;
 import docs.ddata.protobuf.msg.TwoPhaseSetMessages;
 import docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2.Builder;
 
-import akka.actor.ExtendedActorSystem;
-import akka.cluster.ddata.GSet;
-import akka.cluster.ddata.protobuf.AbstractSerializationSupport;
-import akka.cluster.ddata.protobuf.ReplicatedDataSerializer;
+import org.apache.pekko.actor.ExtendedActorSystem;
+import org.apache.pekko.cluster.ddata.GSet;
+import org.apache.pekko.cluster.ddata.protobuf.AbstractSerializationSupport;
+import org.apache.pekko.cluster.ddata.protobuf.ReplicatedDataSerializer;
 
 public class TwoPhaseSetSerializer2 extends AbstractSerializationSupport {
 
diff --git a/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializerWithCompression.java b/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializerWithCompression.java
index 77ff2ad417..4a6615727f 100644
--- a/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializerWithCompression.java
+++ b/akka-docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializerWithCompression.java
@@ -6,7 +6,7 @@ package jdocs.ddata.protobuf;
 
 import jdocs.ddata.TwoPhaseSet;
 
-import akka.actor.ExtendedActorSystem;
+import org.apache.pekko.actor.ExtendedActorSystem;
 
 public class TwoPhaseSetSerializerWithCompression extends TwoPhaseSetSerializer {
   public TwoPhaseSetSerializerWithCompression(ExtendedActorSystem system) {
diff --git a/akka-docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java b/akka-docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java
index 5aaa2a2c5d..df356346b9 100644
--- a/akka-docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java
+++ b/akka-docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java
@@ -4,12 +4,12 @@
 
 package jdocs.discovery;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 // #lookup-dns
-import akka.discovery.Discovery;
-import akka.discovery.ServiceDiscovery;
+import org.apache.pekko.discovery.Discovery;
+import org.apache.pekko.discovery.ServiceDiscovery;
 // #lookup-dns
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import docs.discovery.DnsDiscoveryDocSpec;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/dispatcher/DispatcherDocTest.java b/akka-docs/src/test/java/jdocs/dispatcher/DispatcherDocTest.java
index 41a4d69d57..76e0a26769 100644
--- a/akka-docs/src/test/java/jdocs/dispatcher/DispatcherDocTest.java
+++ b/akka-docs/src/test/java/jdocs/dispatcher/DispatcherDocTest.java
@@ -4,10 +4,10 @@
 
 package jdocs.dispatcher;
 
-import akka.dispatch.ControlMessage;
-import akka.dispatch.RequiresMessageQueue;
-import akka.testkit.AkkaSpec;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.dispatch.ControlMessage;
+import org.apache.pekko.dispatch.RequiresMessageQueue;
+import org.apache.pekko.testkit.AkkaSpec;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import com.typesafe.config.ConfigFactory;
 import docs.dispatcher.DispatcherDocSpec;
 import jdocs.AbstractJavaTest;
@@ -18,18 +18,18 @@ import org.junit.Test;
 import scala.concurrent.ExecutionContextExecutor;
 
 // #imports
-import akka.actor.*;
+import org.apache.pekko.actor.*;
 // #imports
 // #imports-prio
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
 
 // #imports-prio
 
 // #imports-prio-mailbox
-import akka.dispatch.PriorityGenerator;
-import akka.dispatch.UnboundedStablePriorityMailbox;
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.dispatch.PriorityGenerator;
+import org.apache.pekko.dispatch.UnboundedStablePriorityMailbox;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 import com.typesafe.config.Config;
 
 // #imports-prio-mailbox
diff --git a/akka-docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java b/akka-docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java
index 5a150c6e4a..fa8154f009 100644
--- a/akka-docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java
+++ b/akka-docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java
@@ -5,12 +5,12 @@
 package jdocs.dispatcher;
 
 // #mailbox-implementation-example
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.dispatch.Envelope;
-import akka.dispatch.MailboxType;
-import akka.dispatch.MessageQueue;
-import akka.dispatch.ProducesMessageQueue;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.dispatch.Envelope;
+import org.apache.pekko.dispatch.MailboxType;
+import org.apache.pekko.dispatch.MessageQueue;
+import org.apache.pekko.dispatch.ProducesMessageQueue;
 import com.typesafe.config.Config;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.Queue;
diff --git a/akka-docs/src/test/java/jdocs/event/EventBusDocTest.java b/akka-docs/src/test/java/jdocs/event/EventBusDocTest.java
index bfb1683149..9f4d9aeb6b 100644
--- a/akka-docs/src/test/java/jdocs/event/EventBusDocTest.java
+++ b/akka-docs/src/test/java/jdocs/event/EventBusDocTest.java
@@ -4,37 +4,37 @@
 
 package jdocs.event;
 
-import akka.event.japi.EventBus;
+import org.apache.pekko.event.japi.EventBus;
 
 import java.time.Duration;
 
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import akka.actor.ActorSystem;
-import akka.actor.ActorRef;
-import akka.testkit.AkkaJUnitActorSystemResource;
-import akka.util.Subclassification;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.util.Subclassification;
 
 // #lookup-bus
-import akka.event.japi.LookupEventBus;
+import org.apache.pekko.event.japi.LookupEventBus;
 
 // #lookup-bus
 
 // #subchannel-bus
-import akka.event.japi.SubchannelEventBus;
+import org.apache.pekko.event.japi.SubchannelEventBus;
 
 // #subchannel-bus
 
 // #scanning-bus
-import akka.event.japi.ScanningEventBus;
+import org.apache.pekko.event.japi.ScanningEventBus;
 
 // #scanning-bus
 
 // #actor-bus
-import akka.event.japi.ManagedActorEventBus;
+import org.apache.pekko.event.japi.ManagedActorEventBus;
 
 // #actor-bus
 
diff --git a/akka-docs/src/test/java/jdocs/event/LoggingDocTest.java b/akka-docs/src/test/java/jdocs/event/LoggingDocTest.java
index 51a41d4b0d..d99f7df6c3 100644
--- a/akka-docs/src/test/java/jdocs/event/LoggingDocTest.java
+++ b/akka-docs/src/test/java/jdocs/event/LoggingDocTest.java
@@ -5,35 +5,35 @@
 package jdocs.event;
 
 // #imports
-import akka.actor.*;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
 
 // #imports
 
 // #imports-listener
-import akka.event.Logging.InitializeLogger;
-import akka.event.Logging.Error;
-import akka.event.Logging.Warning;
-import akka.event.Logging.Info;
-import akka.event.Logging.Debug;
+import org.apache.pekko.event.Logging.InitializeLogger;
+import org.apache.pekko.event.Logging.Error;
+import org.apache.pekko.event.Logging.Warning;
+import org.apache.pekko.event.Logging.Info;
+import org.apache.pekko.event.Logging.Debug;
 
 // #imports-listener
 
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.Test;
 import java.util.Optional;
 
 // #imports-mdc
-import akka.event.DiagnosticLoggingAdapter;
+import org.apache.pekko.event.DiagnosticLoggingAdapter;
 import java.util.HashMap;
 import java.util.Map;
 // #imports-mdc
 
 // #imports-deadletter
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
 // #imports-deadletter
 
 public class LoggingDocTest extends AbstractJavaTest {
diff --git a/akka-docs/src/test/java/jdocs/extension/ExtensionDocTest.java b/akka-docs/src/test/java/jdocs/extension/ExtensionDocTest.java
index c49730b0d1..a3bebe70d9 100644
--- a/akka-docs/src/test/java/jdocs/extension/ExtensionDocTest.java
+++ b/akka-docs/src/test/java/jdocs/extension/ExtensionDocTest.java
@@ -5,7 +5,7 @@
 package jdocs.extension;
 
 // #imports
-import akka.actor.*;
+import org.apache.pekko.actor.*;
 import java.util.concurrent.atomic.AtomicLong;
 
 // #imports
diff --git a/akka-docs/src/test/java/jdocs/extension/SettingsExtensionDocTest.java b/akka-docs/src/test/java/jdocs/extension/SettingsExtensionDocTest.java
index 165779e15e..6fd94b4554 100644
--- a/akka-docs/src/test/java/jdocs/extension/SettingsExtensionDocTest.java
+++ b/akka-docs/src/test/java/jdocs/extension/SettingsExtensionDocTest.java
@@ -5,11 +5,11 @@
 package jdocs.extension;
 
 // #imports
-import akka.actor.Extension;
-import akka.actor.AbstractExtensionId;
-import akka.actor.ExtensionIdProvider;
-import akka.actor.ActorSystem;
-import akka.actor.ExtendedActorSystem;
+import org.apache.pekko.actor.Extension;
+import org.apache.pekko.actor.AbstractExtensionId;
+import org.apache.pekko.actor.ExtensionIdProvider;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.ExtendedActorSystem;
 import com.typesafe.config.Config;
 import java.util.concurrent.TimeUnit;
 import java.time.Duration;
@@ -17,7 +17,7 @@ import java.time.Duration;
 // #imports
 
 import jdocs.AbstractJavaTest;
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.AbstractActor;
 import org.junit.Test;
 
 public class SettingsExtensionDocTest extends AbstractJavaTest {
diff --git a/akka-docs/src/test/java/jdocs/future/ActorWithFuture.java b/akka-docs/src/test/java/jdocs/future/ActorWithFuture.java
index cce8d527a2..8aec6296b4 100644
--- a/akka-docs/src/test/java/jdocs/future/ActorWithFuture.java
+++ b/akka-docs/src/test/java/jdocs/future/ActorWithFuture.java
@@ -5,8 +5,8 @@
 package jdocs.future;
 
 // #context-dispatcher
-import akka.actor.AbstractActor;
-import akka.dispatch.Futures;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.dispatch.Futures;
 
 public class ActorWithFuture extends AbstractActor {
   ActorWithFuture() {
diff --git a/akka-docs/src/test/java/jdocs/future/FutureDocTest.java b/akka-docs/src/test/java/jdocs/future/FutureDocTest.java
index 896599de6d..4be45ee0ef 100644
--- a/akka-docs/src/test/java/jdocs/future/FutureDocTest.java
+++ b/akka-docs/src/test/java/jdocs/future/FutureDocTest.java
@@ -4,12 +4,12 @@
 
 package jdocs.future;
 
-import akka.actor.typed.ActorSystem;
-import akka.dispatch.Futures;
-import akka.pattern.Patterns;
-import akka.testkit.AkkaJUnitActorSystemResource;
-import akka.testkit.AkkaSpec;
-import akka.util.Timeout;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.dispatch.Futures;
+import org.apache.pekko.pattern.Patterns;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.testkit.AkkaSpec;
+import org.apache.pekko.util.Timeout;
 import jdocs.AbstractJavaTest;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -24,10 +24,10 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import static akka.actor.typed.javadsl.Adapter.toTyped;
-import static akka.dispatch.Futures.future;
+import static org.apache.pekko.actor.typed.javadsl.Adapter.toTyped;
+import static org.apache.pekko.dispatch.Futures.future;
 // #imports
-import akka.pattern.Patterns;
+import org.apache.pekko.pattern.Patterns;
 
 // #imports
 import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/akka-docs/src/test/java/jdocs/io/IODocTest.java b/akka-docs/src/test/java/jdocs/io/IODocTest.java
index e7498744e9..eb3f4be8bc 100644
--- a/akka-docs/src/test/java/jdocs/io/IODocTest.java
+++ b/akka-docs/src/test/java/jdocs/io/IODocTest.java
@@ -4,18 +4,18 @@
 
 package jdocs.io;
 
-import akka.actor.ActorSystem;
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.AbstractActor;
 // #imports
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
-import akka.actor.ActorRef;
-import akka.io.Inet;
-import akka.io.Tcp;
-import akka.io.TcpMessage;
-import akka.io.TcpSO;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.io.Inet;
+import org.apache.pekko.io.Tcp;
+import org.apache.pekko.io.TcpMessage;
+import org.apache.pekko.io.TcpSO;
+import org.apache.pekko.util.ByteString;
 import java.time.Duration;
 // #imports
 
diff --git a/akka-docs/src/test/java/jdocs/io/JavaReadBackPressure.java b/akka-docs/src/test/java/jdocs/io/JavaReadBackPressure.java
index 024d85f746..6850b5d204 100644
--- a/akka-docs/src/test/java/jdocs/io/JavaReadBackPressure.java
+++ b/akka-docs/src/test/java/jdocs/io/JavaReadBackPressure.java
@@ -4,13 +4,13 @@
 
 package jdocs.io;
 
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.actor.AbstractActor;
-import akka.io.Inet;
-import akka.io.Tcp;
-import akka.io.TcpMessage;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.io.Inet;
+import org.apache.pekko.io.Tcp;
+import org.apache.pekko.io.TcpMessage;
+import org.apache.pekko.util.ByteString;
 import java.time.Duration;
 
 import java.net.InetSocketAddress;
diff --git a/akka-docs/src/test/java/jdocs/io/JavaUdpMulticast.java b/akka-docs/src/test/java/jdocs/io/JavaUdpMulticast.java
index 0b9805ae11..a3d28b1d52 100644
--- a/akka-docs/src/test/java/jdocs/io/JavaUdpMulticast.java
+++ b/akka-docs/src/test/java/jdocs/io/JavaUdpMulticast.java
@@ -5,14 +5,14 @@
 package jdocs.io;
 
 // #imports
-import akka.actor.ActorRef;
-import akka.actor.AbstractActor;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.io.Inet;
-import akka.io.Udp;
-import akka.io.UdpMessage;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.io.Inet;
+import org.apache.pekko.io.Udp;
+import org.apache.pekko.io.UdpMessage;
+import org.apache.pekko.util.ByteString;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
diff --git a/akka-docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java b/akka-docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java
index 13bb5f75bf..39e04ed990 100644
--- a/akka-docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java
+++ b/akka-docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java
@@ -4,14 +4,14 @@
 
 package jdocs.io;
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.io.Udp;
-import akka.testkit.SocketUtil;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.io.Udp;
+import org.apache.pekko.testkit.SocketUtil;
 
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/io/UdpConnectedDocTest.java b/akka-docs/src/test/java/jdocs/io/UdpConnectedDocTest.java
index 5fe7b8ac8a..d20eabc4eb 100644
--- a/akka-docs/src/test/java/jdocs/io/UdpConnectedDocTest.java
+++ b/akka-docs/src/test/java/jdocs/io/UdpConnectedDocTest.java
@@ -4,23 +4,23 @@
 
 package jdocs.io;
 
-import akka.japi.pf.ReceiveBuilder;
+import org.apache.pekko.japi.pf.ReceiveBuilder;
 import org.junit.Test;
 
-import akka.actor.ActorSystem;
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.AbstractActor;
 // #imports
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
-import akka.actor.ActorRef;
-import akka.io.Inet;
-import akka.io.UdpConnected;
-import akka.io.UdpConnectedMessage;
-import akka.io.UdpSO;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.io.Inet;
+import org.apache.pekko.io.UdpConnected;
+import org.apache.pekko.io.UdpConnectedMessage;
+import org.apache.pekko.io.UdpSO;
+import org.apache.pekko.util.ByteString;
 
-import static akka.util.ByteString.emptyByteString;
+import static org.apache.pekko.util.ByteString.emptyByteString;
 
 // #imports
 
diff --git a/akka-docs/src/test/java/jdocs/io/UdpDocTest.java b/akka-docs/src/test/java/jdocs/io/UdpDocTest.java
index 6e015fc9f3..763eb77cfa 100644
--- a/akka-docs/src/test/java/jdocs/io/UdpDocTest.java
+++ b/akka-docs/src/test/java/jdocs/io/UdpDocTest.java
@@ -5,14 +5,14 @@
 package jdocs.io;
 
 // #imports
-import akka.actor.ActorRef;
-import akka.actor.PoisonPill;
-import akka.actor.AbstractActor;
-import akka.io.Udp;
-import akka.io.UdpConnected;
-import akka.io.UdpConnectedMessage;
-import akka.io.UdpMessage;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.PoisonPill;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.io.Udp;
+import org.apache.pekko.io.UdpConnected;
+import org.apache.pekko.io.UdpConnectedMessage;
+import org.apache.pekko.io.UdpMessage;
+import org.apache.pekko.util.ByteString;
 
 import java.net.InetSocketAddress;
 // #imports
diff --git a/akka-docs/src/test/java/jdocs/io/japi/EchoHandler.java b/akka-docs/src/test/java/jdocs/io/japi/EchoHandler.java
index def72175b5..0ab5bb1052 100644
--- a/akka-docs/src/test/java/jdocs/io/japi/EchoHandler.java
+++ b/akka-docs/src/test/java/jdocs/io/japi/EchoHandler.java
@@ -8,18 +8,18 @@ import java.net.InetSocketAddress;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import akka.actor.ActorRef;
-import akka.actor.AbstractActor;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.io.Tcp.CommandFailed;
-import akka.io.Tcp.ConnectionClosed;
-import akka.io.Tcp.Event;
-import akka.io.Tcp.Received;
-import akka.io.Tcp.Write;
-import akka.io.Tcp.WritingResumed;
-import akka.io.TcpMessage;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.io.Tcp.CommandFailed;
+import org.apache.pekko.io.Tcp.ConnectionClosed;
+import org.apache.pekko.io.Tcp.Event;
+import org.apache.pekko.io.Tcp.Received;
+import org.apache.pekko.io.Tcp.Write;
+import org.apache.pekko.io.Tcp.WritingResumed;
+import org.apache.pekko.io.TcpMessage;
+import org.apache.pekko.util.ByteString;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/akka-docs/src/test/java/jdocs/io/japi/EchoManager.java b/akka-docs/src/test/java/jdocs/io/japi/EchoManager.java
index f7682adc7e..626ecffaad 100644
--- a/akka-docs/src/test/java/jdocs/io/japi/EchoManager.java
+++ b/akka-docs/src/test/java/jdocs/io/japi/EchoManager.java
@@ -6,17 +6,17 @@ package jdocs.io.japi;
 
 import java.net.InetSocketAddress;
 
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.actor.SupervisorStrategy;
-import akka.actor.AbstractActor;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.io.Tcp;
-import akka.io.Tcp.Bind;
-import akka.io.Tcp.Bound;
-import akka.io.Tcp.Connected;
-import akka.io.TcpMessage;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.SupervisorStrategy;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.io.Tcp;
+import org.apache.pekko.io.Tcp.Bind;
+import org.apache.pekko.io.Tcp.Bound;
+import org.apache.pekko.io.Tcp.Connected;
+import org.apache.pekko.io.TcpMessage;
 
 public class EchoManager extends AbstractActor {
 
diff --git a/akka-docs/src/test/java/jdocs/io/japi/EchoServer.java b/akka-docs/src/test/java/jdocs/io/japi/EchoServer.java
index 1148bd6211..44aaf0cb36 100644
--- a/akka-docs/src/test/java/jdocs/io/japi/EchoServer.java
+++ b/akka-docs/src/test/java/jdocs/io/japi/EchoServer.java
@@ -7,9 +7,9 @@ package jdocs.io.japi;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
diff --git a/akka-docs/src/test/java/jdocs/io/japi/IODocTest.java b/akka-docs/src/test/java/jdocs/io/japi/IODocTest.java
index 91f0d484d8..b897255614 100644
--- a/akka-docs/src/test/java/jdocs/io/japi/IODocTest.java
+++ b/akka-docs/src/test/java/jdocs/io/japi/IODocTest.java
@@ -4,29 +4,29 @@
 
 package jdocs.io.japi;
 
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.ClassRule;
 import org.junit.Test;
 
 // #imports
 import java.net.InetSocketAddress;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.actor.AbstractActor;
-import akka.io.Tcp;
-import akka.io.Tcp.Bound;
-import akka.io.Tcp.CommandFailed;
-import akka.io.Tcp.Connected;
-import akka.io.Tcp.ConnectionClosed;
-import akka.io.Tcp.Received;
-import akka.io.TcpMessage;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.io.Tcp;
+import org.apache.pekko.io.Tcp.Bound;
+import org.apache.pekko.io.Tcp.CommandFailed;
+import org.apache.pekko.io.Tcp.Connected;
+import org.apache.pekko.io.Tcp.ConnectionClosed;
+import org.apache.pekko.io.Tcp.Received;
+import org.apache.pekko.io.TcpMessage;
+import org.apache.pekko.util.ByteString;
 // #imports
 
-import akka.testkit.AkkaSpec;
+import org.apache.pekko.testkit.AkkaSpec;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/akka-docs/src/test/java/jdocs/io/japi/SimpleEchoHandler.java b/akka-docs/src/test/java/jdocs/io/japi/SimpleEchoHandler.java
index 31613b91b7..4160dce336 100644
--- a/akka-docs/src/test/java/jdocs/io/japi/SimpleEchoHandler.java
+++ b/akka-docs/src/test/java/jdocs/io/japi/SimpleEchoHandler.java
@@ -8,15 +8,15 @@ import java.net.InetSocketAddress;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import akka.actor.ActorRef;
-import akka.actor.AbstractActor;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.io.Tcp.ConnectionClosed;
-import akka.io.Tcp.Event;
-import akka.io.Tcp.Received;
-import akka.io.TcpMessage;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.io.Tcp.ConnectionClosed;
+import org.apache.pekko.io.Tcp.Event;
+import org.apache.pekko.io.Tcp.Received;
+import org.apache.pekko.io.TcpMessage;
+import org.apache.pekko.util.ByteString;
 
 // #simple-echo-handler
 public class SimpleEchoHandler extends AbstractActor {
diff --git a/akka-docs/src/test/java/jdocs/io/japi/Watcher.java b/akka-docs/src/test/java/jdocs/io/japi/Watcher.java
index 12eeb7f199..fd7810940d 100644
--- a/akka-docs/src/test/java/jdocs/io/japi/Watcher.java
+++ b/akka-docs/src/test/java/jdocs/io/japi/Watcher.java
@@ -6,9 +6,9 @@ package jdocs.io.japi;
 
 import java.util.concurrent.CountDownLatch;
 
-import akka.actor.ActorRef;
-import akka.actor.Terminated;
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Terminated;
+import org.apache.pekko.actor.AbstractActor;
 
 public class Watcher extends AbstractActor {
 
diff --git a/akka-docs/src/test/java/jdocs/pattern/BackoffSupervisorDocTest.java b/akka-docs/src/test/java/jdocs/pattern/BackoffSupervisorDocTest.java
index 21cbfbf394..c3d3a6b660 100644
--- a/akka-docs/src/test/java/jdocs/pattern/BackoffSupervisorDocTest.java
+++ b/akka-docs/src/test/java/jdocs/pattern/BackoffSupervisorDocTest.java
@@ -4,10 +4,10 @@
 
 package jdocs.pattern;
 
-import akka.actor.*;
-import akka.pattern.BackoffOpts;
-import akka.pattern.BackoffSupervisor;
-import akka.testkit.TestActors.EchoActor;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.pattern.BackoffOpts;
+import org.apache.pekko.pattern.BackoffSupervisor;
+import org.apache.pekko.testkit.TestActors.EchoActor;
 // #backoff-imports
 import java.time.Duration;
 // #backoff-imports
diff --git a/akka-docs/src/test/java/jdocs/pattern/SupervisedAsk.java b/akka-docs/src/test/java/jdocs/pattern/SupervisedAsk.java
index a32853d431..5809e7451c 100644
--- a/akka-docs/src/test/java/jdocs/pattern/SupervisedAsk.java
+++ b/akka-docs/src/test/java/jdocs/pattern/SupervisedAsk.java
@@ -8,18 +8,18 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeoutException;
 import java.time.Duration;
 
-import akka.actor.ActorKilledException;
-import akka.actor.ActorRef;
-import akka.actor.ActorRefFactory;
-import akka.actor.Cancellable;
-import akka.actor.OneForOneStrategy;
-import akka.actor.Props;
-import akka.actor.Scheduler;
-import akka.actor.Status;
-import akka.actor.SupervisorStrategy;
-import akka.actor.Terminated;
-import akka.actor.AbstractActor;
-import akka.pattern.Patterns;
+import org.apache.pekko.actor.ActorKilledException;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorRefFactory;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.actor.OneForOneStrategy;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.Scheduler;
+import org.apache.pekko.actor.Status;
+import org.apache.pekko.actor.SupervisorStrategy;
+import org.apache.pekko.actor.Terminated;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.pattern.Patterns;
 
 public class SupervisedAsk {
 
diff --git a/akka-docs/src/test/java/jdocs/pattern/SupervisedAskSpec.java b/akka-docs/src/test/java/jdocs/pattern/SupervisedAskSpec.java
index 8aa766c6e1..ac640d18a2 100644
--- a/akka-docs/src/test/java/jdocs/pattern/SupervisedAskSpec.java
+++ b/akka-docs/src/test/java/jdocs/pattern/SupervisedAskSpec.java
@@ -4,10 +4,10 @@
 
 package jdocs.pattern;
 
-import akka.actor.ActorRef;
-import akka.actor.ActorRefFactory;
-import akka.actor.Props;
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorRefFactory;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.AbstractActor;
 
 import java.time.Duration;
 import java.util.concurrent.CompletionStage;
diff --git a/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java b/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java
index ba25bded75..54204f254d 100644
--- a/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java
@@ -4,11 +4,11 @@
 
 package jdocs.persistence;
 
-import akka.actor.*;
-import akka.japi.Procedure;
-import akka.pattern.BackoffOpts;
-import akka.pattern.BackoffSupervisor;
-import akka.persistence.*;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.japi.Procedure;
+import org.apache.pekko.pattern.BackoffOpts;
+import org.apache.pekko.pattern.BackoffSupervisor;
+import org.apache.pekko.persistence.*;
 
 import java.io.Serializable;
 import java.time.Duration;
diff --git a/akka-docs/src/test/java/jdocs/persistence/LambdaPersistencePluginDocTest.java b/akka-docs/src/test/java/jdocs/persistence/LambdaPersistencePluginDocTest.java
index a9379832e1..ce3ca99d63 100644
--- a/akka-docs/src/test/java/jdocs/persistence/LambdaPersistencePluginDocTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/LambdaPersistencePluginDocTest.java
@@ -5,15 +5,15 @@
 package jdocs.persistence;
 
 // #plugin-imports
-import akka.dispatch.Futures;
-import akka.persistence.*;
-import akka.persistence.journal.japi.*;
-import akka.persistence.snapshot.japi.*;
+import org.apache.pekko.dispatch.Futures;
+import org.apache.pekko.persistence.*;
+import org.apache.pekko.persistence.journal.japi.*;
+import org.apache.pekko.persistence.snapshot.japi.*;
 // #plugin-imports
 
-import akka.actor.*;
-import akka.persistence.journal.leveldb.SharedLeveldbJournal;
-import akka.persistence.journal.leveldb.SharedLeveldbStore;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.persistence.journal.leveldb.SharedLeveldbJournal;
+import org.apache.pekko.persistence.journal.leveldb.SharedLeveldbStore;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
@@ -28,8 +28,8 @@ import java.util.function.Consumer;
 import org.iq80.leveldb.util.FileUtils;
 import java.util.Optional;
 
-import akka.persistence.japi.journal.JavaJournalSpec;
-import akka.persistence.japi.snapshot.JavaSnapshotStoreSpec;
+import org.apache.pekko.persistence.japi.journal.JavaJournalSpec;
+import org.apache.pekko.persistence.japi.snapshot.JavaSnapshotStoreSpec;
 
 public class LambdaPersistencePluginDocTest {
 
diff --git a/akka-docs/src/test/java/jdocs/persistence/PersistenceEventAdapterDocTest.java b/akka-docs/src/test/java/jdocs/persistence/PersistenceEventAdapterDocTest.java
index cf86be6549..46b2f7d3b1 100644
--- a/akka-docs/src/test/java/jdocs/persistence/PersistenceEventAdapterDocTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/PersistenceEventAdapterDocTest.java
@@ -4,8 +4,8 @@
 
 package jdocs.persistence;
 
-import akka.persistence.journal.EventAdapter;
-import akka.persistence.journal.EventSeq;
+import org.apache.pekko.persistence.journal.EventAdapter;
+import org.apache.pekko.persistence.journal.EventSeq;
 
 public class PersistenceEventAdapterDocTest {
 
diff --git a/akka-docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java b/akka-docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java
index bbb9e4ac46..74104593f9 100644
--- a/akka-docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java
@@ -4,8 +4,8 @@
 
 package jdocs.persistence;
 
-import akka.persistence.AbstractPersistentActor;
-import akka.persistence.RuntimePluginConfig;
+import org.apache.pekko.persistence.AbstractPersistentActor;
+import org.apache.pekko.persistence.RuntimePluginConfig;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
diff --git a/akka-docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java b/akka-docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java
index 8c77d378e9..7d82beb020 100644
--- a/akka-docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java
@@ -9,15 +9,15 @@ import java.time.Duration;
 import java.util.HashSet;
 import java.util.Set;
 
-import akka.NotUsed;
-import akka.persistence.query.Sequence;
-import akka.persistence.query.Offset;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.persistence.query.Sequence;
+import org.apache.pekko.persistence.query.Offset;
 import com.typesafe.config.Config;
 
-import akka.actor.*;
-import akka.persistence.query.*;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.persistence.query.*;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import jdocs.persistence.query.MyEventsByTagSource;
 import org.reactivestreams.Subscriber;
@@ -83,11 +83,11 @@ public class PersistenceQueryDocTest {
   public
   // #my-read-journal
   static class MyJavadslReadJournal
-      implements akka.persistence.query.javadsl.ReadJournal,
-          akka.persistence.query.javadsl.EventsByTagQuery,
-          akka.persistence.query.javadsl.EventsByPersistenceIdQuery,
-          akka.persistence.query.javadsl.PersistenceIdsQuery,
-          akka.persistence.query.javadsl.CurrentPersistenceIdsQuery {
+      implements org.apache.pekko.persistence.query.javadsl.ReadJournal,
+          org.apache.pekko.persistence.query.javadsl.EventsByTagQuery,
+          org.apache.pekko.persistence.query.javadsl.EventsByPersistenceIdQuery,
+          org.apache.pekko.persistence.query.javadsl.PersistenceIdsQuery,
+          org.apache.pekko.persistence.query.javadsl.CurrentPersistenceIdsQuery {
 
     private final Duration refreshInterval;
     private Connection conn;
@@ -153,11 +153,11 @@ public class PersistenceQueryDocTest {
   public
   // #my-read-journal
   static class MyScaladslReadJournal
-      implements akka.persistence.query.scaladsl.ReadJournal,
-          akka.persistence.query.scaladsl.EventsByTagQuery,
-          akka.persistence.query.scaladsl.EventsByPersistenceIdQuery,
-          akka.persistence.query.scaladsl.PersistenceIdsQuery,
-          akka.persistence.query.scaladsl.CurrentPersistenceIdsQuery {
+      implements org.apache.pekko.persistence.query.scaladsl.ReadJournal,
+          org.apache.pekko.persistence.query.scaladsl.EventsByTagQuery,
+          org.apache.pekko.persistence.query.scaladsl.EventsByPersistenceIdQuery,
+          org.apache.pekko.persistence.query.scaladsl.PersistenceIdsQuery,
+          org.apache.pekko.persistence.query.scaladsl.CurrentPersistenceIdsQuery {
 
     private final MyJavadslReadJournal javadslReadJournal;
 
@@ -166,13 +166,13 @@ public class PersistenceQueryDocTest {
     }
 
     @Override
-    public akka.stream.scaladsl.Source eventsByTag(
-        String tag, akka.persistence.query.Offset offset) {
+    public org.apache.pekko.stream.scaladsl.Source eventsByTag(
+        String tag, org.apache.pekko.persistence.query.Offset offset) {
       return javadslReadJournal.eventsByTag(tag, offset).asScala();
     }
 
     @Override
-    public akka.stream.scaladsl.Source eventsByPersistenceId(
+    public org.apache.pekko.stream.scaladsl.Source eventsByPersistenceId(
         String persistenceId, long fromSequenceNr, long toSequenceNr) {
       return javadslReadJournal
           .eventsByPersistenceId(persistenceId, fromSequenceNr, toSequenceNr)
@@ -180,18 +180,18 @@ public class PersistenceQueryDocTest {
     }
 
     @Override
-    public akka.stream.scaladsl.Source persistenceIds() {
+    public org.apache.pekko.stream.scaladsl.Source persistenceIds() {
       return javadslReadJournal.persistenceIds().asScala();
     }
 
     @Override
-    public akka.stream.scaladsl.Source currentPersistenceIds() {
+    public org.apache.pekko.stream.scaladsl.Source currentPersistenceIds() {
       return javadslReadJournal.currentPersistenceIds().asScala();
     }
 
     // possibility to add more plugin specific queries
 
-    public akka.stream.scaladsl.Source byTagsWithMeta(
+    public org.apache.pekko.stream.scaladsl.Source byTagsWithMeta(
         scala.collection.Set tags) {
       Set jTags = scala.collection.JavaConverters.setAsJavaSetConverter(tags).asJava();
       return javadslReadJournal.byTagsWithMeta(jTags).asScala();
diff --git a/akka-docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java b/akka-docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java
index d896ec9390..3ac20e9144 100644
--- a/akka-docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java
@@ -13,10 +13,10 @@ import java.nio.charset.StandardCharsets;
 
 import spray.json.JsObject;
 
-import akka.persistence.journal.EventAdapter;
-import akka.persistence.journal.EventSeq;
-import akka.protobufv3.internal.InvalidProtocolBufferException;
-import akka.serialization.SerializerWithStringManifest;
+import org.apache.pekko.persistence.journal.EventAdapter;
+import org.apache.pekko.persistence.journal.EventSeq;
+import org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException;
+import org.apache.pekko.serialization.SerializerWithStringManifest;
 
 public class PersistenceSchemaEvolutionDocTest {
 
diff --git a/akka-docs/src/test/java/jdocs/persistence/PersistentActorExample.java b/akka-docs/src/test/java/jdocs/persistence/PersistentActorExample.java
index 692d554a68..557a0824f9 100644
--- a/akka-docs/src/test/java/jdocs/persistence/PersistentActorExample.java
+++ b/akka-docs/src/test/java/jdocs/persistence/PersistentActorExample.java
@@ -6,11 +6,11 @@ package jdocs.persistence;
 
 // #persistent-actor-example
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.persistence.AbstractPersistentActor;
-import akka.persistence.SnapshotOffer;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.persistence.AbstractPersistentActor;
+import org.apache.pekko.persistence.SnapshotOffer;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/akka-docs/src/test/java/jdocs/persistence/query/LeveldbPersistenceQueryDocTest.java b/akka-docs/src/test/java/jdocs/persistence/query/LeveldbPersistenceQueryDocTest.java
index 300753e474..c05b930637 100644
--- a/akka-docs/src/test/java/jdocs/persistence/query/LeveldbPersistenceQueryDocTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/query/LeveldbPersistenceQueryDocTest.java
@@ -7,15 +7,15 @@ package jdocs.persistence.query;
 import java.util.HashSet;
 import java.util.Set;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.persistence.journal.WriteEventAdapter;
-import akka.persistence.journal.Tagged;
-import akka.persistence.query.EventEnvelope;
-import akka.persistence.query.Sequence;
-import akka.persistence.query.PersistenceQuery;
-import akka.persistence.query.journal.leveldb.javadsl.LeveldbReadJournal;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.persistence.journal.WriteEventAdapter;
+import org.apache.pekko.persistence.journal.Tagged;
+import org.apache.pekko.persistence.query.EventEnvelope;
+import org.apache.pekko.persistence.query.Sequence;
+import org.apache.pekko.persistence.query.PersistenceQuery;
+import org.apache.pekko.persistence.query.journal.leveldb.javadsl.LeveldbReadJournal;
+import org.apache.pekko.stream.javadsl.Source;
 
 public class LeveldbPersistenceQueryDocTest {
 
diff --git a/akka-docs/src/test/java/jdocs/persistence/query/MyEventsByTagSource.java b/akka-docs/src/test/java/jdocs/persistence/query/MyEventsByTagSource.java
index fe80bf8f73..d6fb9f85a3 100644
--- a/akka-docs/src/test/java/jdocs/persistence/query/MyEventsByTagSource.java
+++ b/akka-docs/src/test/java/jdocs/persistence/query/MyEventsByTagSource.java
@@ -4,13 +4,13 @@
 
 package jdocs.persistence.query;
 
-import akka.actor.ActorSystem;
-import akka.persistence.query.EventEnvelope;
-import akka.persistence.query.Offset;
-import akka.serialization.Serialization;
-import akka.serialization.SerializationExtension;
-import akka.stream.*;
-import akka.stream.stage.*;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.persistence.query.EventEnvelope;
+import org.apache.pekko.persistence.query.Offset;
+import org.apache.pekko.serialization.Serialization;
+import org.apache.pekko.serialization.SerializationExtension;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.stage.*;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/akka-docs/src/test/java/jdocs/persistence/testkit/Configuration.java b/akka-docs/src/test/java/jdocs/persistence/testkit/Configuration.java
index 75bb161996..34ba7a1574 100644
--- a/akka-docs/src/test/java/jdocs/persistence/testkit/Configuration.java
+++ b/akka-docs/src/test/java/jdocs/persistence/testkit/Configuration.java
@@ -4,12 +4,12 @@
 
 package jdocs.persistence.testkit;
 
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.persistence.testkit.PersistenceTestKitPlugin;
-import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin;
-import akka.persistence.testkit.javadsl.PersistenceTestKit;
-import akka.persistence.testkit.javadsl.SnapshotTestKit;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin;
+import org.apache.pekko.persistence.testkit.PersistenceTestKitSnapshotPlugin;
+import org.apache.pekko.persistence.testkit.javadsl.PersistenceTestKit;
+import org.apache.pekko.persistence.testkit.javadsl.SnapshotTestKit;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
diff --git a/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceInitTest.java b/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceInitTest.java
index 7709b8c285..2a573b29da 100644
--- a/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceInitTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceInitTest.java
@@ -4,7 +4,7 @@
 
 package jdocs.persistence.testkit;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 
 import com.typesafe.config.ConfigFactory;
 import jdocs.AbstractJavaTest;
@@ -14,8 +14,8 @@ import org.junit.Test;
 import java.util.UUID;
 
 // #imports
-import akka.persistence.testkit.javadsl.PersistenceInit;
-import akka.Done;
+import org.apache.pekko.persistence.testkit.javadsl.PersistenceInit;
+import org.apache.pekko.Done;
 
 import java.time.Duration;
 import java.util.concurrent.CompletionStage;
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 6eaf004b4d..8fb7bb1af7 100644
--- a/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java
@@ -4,17 +4,17 @@
 
 package jdocs.persistence.testkit;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.typed.ActorRef;
-import akka.persistence.testkit.JournalOperation;
-import akka.persistence.testkit.PersistenceTestKitPlugin;
-import akka.persistence.testkit.ProcessingPolicy;
-import akka.persistence.testkit.ProcessingResult;
-import akka.persistence.testkit.ProcessingSuccess;
-import akka.persistence.testkit.StorageFailure;
-import akka.persistence.testkit.WriteEvents;
-import akka.persistence.testkit.javadsl.PersistenceTestKit;
-import akka.persistence.typed.PersistenceId;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.persistence.testkit.JournalOperation;
+import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin;
+import org.apache.pekko.persistence.testkit.ProcessingPolicy;
+import org.apache.pekko.persistence.testkit.ProcessingResult;
+import org.apache.pekko.persistence.testkit.ProcessingSuccess;
+import org.apache.pekko.persistence.testkit.StorageFailure;
+import org.apache.pekko.persistence.testkit.WriteEvents;
+import org.apache.pekko.persistence.testkit.javadsl.PersistenceTestKit;
+import org.apache.pekko.persistence.typed.PersistenceId;
 import com.typesafe.config.ConfigFactory;
 import jdocs.AbstractJavaTest;
 import org.junit.Before;
diff --git a/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitSampleTest.java b/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitSampleTest.java
index 93a2e7ab65..ec17fe21ff 100644
--- a/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitSampleTest.java
+++ b/akka-docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitSampleTest.java
@@ -4,17 +4,17 @@
 
 package jdocs.persistence.testkit;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.persistence.testkit.PersistenceTestKitPlugin;
-import akka.persistence.testkit.javadsl.PersistenceTestKit;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.EventSourcedBehavior;
-import akka.serialization.jackson.CborSerializable;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin;
+import org.apache.pekko.persistence.testkit.javadsl.PersistenceTestKit;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
+import org.apache.pekko.serialization.jackson.CborSerializable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.typesafe.config.ConfigFactory;
 import jdocs.AbstractJavaTest;
diff --git a/akka-docs/src/test/java/jdocs/persistence/testkit/TestKitExamples.java b/akka-docs/src/test/java/jdocs/persistence/testkit/TestKitExamples.java
index 1110d2ad38..f93b1cf046 100644
--- a/akka-docs/src/test/java/jdocs/persistence/testkit/TestKitExamples.java
+++ b/akka-docs/src/test/java/jdocs/persistence/testkit/TestKitExamples.java
@@ -4,21 +4,21 @@
 
 package jdocs.persistence.testkit;
 
-import akka.persistence.testkit.DeleteEvents;
-import akka.persistence.testkit.DeleteSnapshotByMeta;
-import akka.persistence.testkit.DeleteSnapshotsByCriteria;
-import akka.persistence.testkit.JournalOperation;
-import akka.persistence.testkit.ProcessingPolicy;
-import akka.persistence.testkit.ProcessingResult;
-import akka.persistence.testkit.ProcessingSuccess;
-import akka.persistence.testkit.ReadEvents;
-import akka.persistence.testkit.ReadSeqNum;
-import akka.persistence.testkit.ReadSnapshot;
-import akka.persistence.testkit.Reject;
-import akka.persistence.testkit.SnapshotOperation;
-import akka.persistence.testkit.StorageFailure;
-import akka.persistence.testkit.WriteEvents;
-import akka.persistence.testkit.WriteSnapshot;
+import org.apache.pekko.persistence.testkit.DeleteEvents;
+import org.apache.pekko.persistence.testkit.DeleteSnapshotByMeta;
+import org.apache.pekko.persistence.testkit.DeleteSnapshotsByCriteria;
+import org.apache.pekko.persistence.testkit.JournalOperation;
+import org.apache.pekko.persistence.testkit.ProcessingPolicy;
+import org.apache.pekko.persistence.testkit.ProcessingResult;
+import org.apache.pekko.persistence.testkit.ProcessingSuccess;
+import org.apache.pekko.persistence.testkit.ReadEvents;
+import org.apache.pekko.persistence.testkit.ReadSeqNum;
+import org.apache.pekko.persistence.testkit.ReadSnapshot;
+import org.apache.pekko.persistence.testkit.Reject;
+import org.apache.pekko.persistence.testkit.SnapshotOperation;
+import org.apache.pekko.persistence.testkit.StorageFailure;
+import org.apache.pekko.persistence.testkit.WriteEvents;
+import org.apache.pekko.persistence.testkit.WriteSnapshot;
 
 public class TestKitExamples {
 
diff --git a/akka-docs/src/test/java/jdocs/remoting/RemoteDeploymentDocTest.java b/akka-docs/src/test/java/jdocs/remoting/RemoteDeploymentDocTest.java
index 4b0adee684..62708beb51 100644
--- a/akka-docs/src/test/java/jdocs/remoting/RemoteDeploymentDocTest.java
+++ b/akka-docs/src/test/java/jdocs/remoting/RemoteDeploymentDocTest.java
@@ -4,8 +4,8 @@
 
 package jdocs.remoting;
 
-import akka.testkit.AkkaJUnitActorSystemResource;
-import akka.testkit.AkkaSpec;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.testkit.AkkaSpec;
 import jdocs.AbstractJavaTest;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -13,16 +13,16 @@ import org.junit.Test;
 import com.typesafe.config.ConfigFactory;
 
 // #import
-import akka.actor.ActorRef;
-import akka.actor.Address;
-import akka.actor.AddressFromURIString;
-import akka.actor.Deploy;
-import akka.actor.Props;
-import akka.actor.ActorSystem;
-import akka.remote.RemoteScope;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Address;
+import org.apache.pekko.actor.AddressFromURIString;
+import org.apache.pekko.actor.Deploy;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.remote.RemoteScope;
 // #import
 
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.AbstractActor;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/akka-docs/src/test/java/jdocs/routing/ConsistentHashingRouterDocTest.java b/akka-docs/src/test/java/jdocs/routing/ConsistentHashingRouterDocTest.java
index d4f61e8b50..0ea8b0b11e 100644
--- a/akka-docs/src/test/java/jdocs/routing/ConsistentHashingRouterDocTest.java
+++ b/akka-docs/src/test/java/jdocs/routing/ConsistentHashingRouterDocTest.java
@@ -4,18 +4,18 @@
 
 package jdocs.routing;
 
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 
 // #imports1
-import akka.actor.AbstractActor;
-import akka.routing.ConsistentHashingRouter.ConsistentHashable;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.routing.ConsistentHashingRouter.ConsistentHashable;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -23,11 +23,11 @@ import java.io.Serializable;
 // #imports1
 
 // #imports2
-import akka.actor.Props;
-import akka.actor.ActorRef;
-import akka.routing.ConsistentHashingPool;
-import akka.routing.ConsistentHashingRouter.ConsistentHashMapper;
-import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.routing.ConsistentHashingPool;
+import org.apache.pekko.routing.ConsistentHashingRouter.ConsistentHashMapper;
+import org.apache.pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope;
 // #imports2
 
 public class ConsistentHashingRouterDocTest extends AbstractJavaTest {
diff --git a/akka-docs/src/test/java/jdocs/routing/CustomRouterDocTest.java b/akka-docs/src/test/java/jdocs/routing/CustomRouterDocTest.java
index b9a450dbb3..f08a17f2bd 100644
--- a/akka-docs/src/test/java/jdocs/routing/CustomRouterDocTest.java
+++ b/akka-docs/src/test/java/jdocs/routing/CustomRouterDocTest.java
@@ -4,15 +4,15 @@
 
 package jdocs.routing;
 
-import akka.routing.FromConfig;
-import akka.routing.RoundRobinRoutingLogic;
-import akka.routing.Routee;
-import akka.routing.RoutingLogic;
-import akka.routing.SeveralRoutees;
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.routing.FromConfig;
+import org.apache.pekko.routing.RoundRobinRoutingLogic;
+import org.apache.pekko.routing.Routee;
+import org.apache.pekko.routing.RoutingLogic;
+import org.apache.pekko.routing.SeveralRoutees;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.ClassRule;
 import org.junit.Test;
 
@@ -21,14 +21,14 @@ import static org.junit.Assert.*;
 import com.typesafe.config.ConfigFactory;
 
 import scala.collection.immutable.IndexedSeq;
-import static akka.japi.Util.immutableIndexedSeq;
+import static org.apache.pekko.japi.Util.immutableIndexedSeq;
 
 import docs.routing.CustomRouterDocSpec;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
 // #imports1
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.AbstractActor;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/akka-docs/src/test/java/jdocs/routing/RedundancyGroup.java b/akka-docs/src/test/java/jdocs/routing/RedundancyGroup.java
index 8a651ab67f..e2c31109e0 100644
--- a/akka-docs/src/test/java/jdocs/routing/RedundancyGroup.java
+++ b/akka-docs/src/test/java/jdocs/routing/RedundancyGroup.java
@@ -7,13 +7,13 @@ package jdocs.routing;
 // #group
 import java.util.List;
 
-import akka.actor.ActorSystem;
-import akka.dispatch.Dispatchers;
-import akka.routing.Router;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.dispatch.Dispatchers;
+import org.apache.pekko.routing.Router;
 
 import com.typesafe.config.Config;
 
-import akka.routing.GroupBase;
+import org.apache.pekko.routing.GroupBase;
 import static jdocs.routing.CustomRouterDocTest.RedundancyRoutingLogic;
 
 public class RedundancyGroup extends GroupBase {
diff --git a/akka-docs/src/test/java/jdocs/routing/RouterDocTest.java b/akka-docs/src/test/java/jdocs/routing/RouterDocTest.java
index 3adb4049c1..09972cd788 100644
--- a/akka-docs/src/test/java/jdocs/routing/RouterDocTest.java
+++ b/akka-docs/src/test/java/jdocs/routing/RouterDocTest.java
@@ -4,10 +4,10 @@
 
 package jdocs.routing;
 
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.ClassRule;
 import org.junit.Test;
 
@@ -22,45 +22,45 @@ import java.util.Collections;
 import java.util.List;
 import java.time.Duration;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 
 // #imports1
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.actor.Terminated;
-import akka.actor.AbstractActor;
-import akka.routing.ActorRefRoutee;
-import akka.routing.Routee;
-import akka.routing.Router;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.Terminated;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.routing.ActorRefRoutee;
+import org.apache.pekko.routing.Routee;
+import org.apache.pekko.routing.Router;
 
 // #imports1
 
 // #imports2
-import akka.actor.Address;
-import akka.actor.AddressFromURIString;
-import akka.actor.Kill;
-import akka.actor.PoisonPill;
-import akka.actor.SupervisorStrategy;
-import akka.actor.OneForOneStrategy;
-import akka.remote.routing.RemoteRouterConfig;
-import akka.routing.Broadcast;
-import akka.routing.BroadcastGroup;
-import akka.routing.BroadcastPool;
-import akka.routing.ConsistentHashingGroup;
-import akka.routing.ConsistentHashingPool;
-import akka.routing.DefaultResizer;
-import akka.routing.FromConfig;
-import akka.routing.RandomGroup;
-import akka.routing.RandomPool;
-import akka.routing.RoundRobinGroup;
-import akka.routing.RoundRobinPool;
-import akka.routing.RoundRobinRoutingLogic;
-import akka.routing.ScatterGatherFirstCompletedGroup;
-import akka.routing.ScatterGatherFirstCompletedPool;
-import akka.routing.BalancingPool;
-import akka.routing.SmallestMailboxPool;
-import akka.routing.TailChoppingGroup;
-import akka.routing.TailChoppingPool;
+import org.apache.pekko.actor.Address;
+import org.apache.pekko.actor.AddressFromURIString;
+import org.apache.pekko.actor.Kill;
+import org.apache.pekko.actor.PoisonPill;
+import org.apache.pekko.actor.SupervisorStrategy;
+import org.apache.pekko.actor.OneForOneStrategy;
+import org.apache.pekko.remote.routing.RemoteRouterConfig;
+import org.apache.pekko.routing.Broadcast;
+import org.apache.pekko.routing.BroadcastGroup;
+import org.apache.pekko.routing.BroadcastPool;
+import org.apache.pekko.routing.ConsistentHashingGroup;
+import org.apache.pekko.routing.ConsistentHashingPool;
+import org.apache.pekko.routing.DefaultResizer;
+import org.apache.pekko.routing.FromConfig;
+import org.apache.pekko.routing.RandomGroup;
+import org.apache.pekko.routing.RandomPool;
+import org.apache.pekko.routing.RoundRobinGroup;
+import org.apache.pekko.routing.RoundRobinPool;
+import org.apache.pekko.routing.RoundRobinRoutingLogic;
+import org.apache.pekko.routing.ScatterGatherFirstCompletedGroup;
+import org.apache.pekko.routing.ScatterGatherFirstCompletedPool;
+import org.apache.pekko.routing.BalancingPool;
+import org.apache.pekko.routing.SmallestMailboxPool;
+import org.apache.pekko.routing.TailChoppingGroup;
+import org.apache.pekko.routing.TailChoppingPool;
 
 // #imports2
 
diff --git a/akka-docs/src/test/java/jdocs/serialization/SerializationDocTest.java b/akka-docs/src/test/java/jdocs/serialization/SerializationDocTest.java
index 0be9008f9f..c6aae5d996 100644
--- a/akka-docs/src/test/java/jdocs/serialization/SerializationDocTest.java
+++ b/akka-docs/src/test/java/jdocs/serialization/SerializationDocTest.java
@@ -4,15 +4,15 @@
 
 package jdocs.serialization;
 
-import akka.actor.typed.javadsl.Behaviors;
-import akka.cluster.Cluster;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 // #imports
-import akka.actor.*;
-import akka.serialization.*;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.serialization.*;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -184,8 +184,8 @@ public class SerializationDocTest {
 
   public void demonstrateTheProgrammaticAPITyped() {
     // #programmatic-typed
-    akka.actor.typed.ActorSystem system =
-        akka.actor.typed.ActorSystem.create(Behaviors.empty(), "example");
+    org.apache.pekko.actor.typed.ActorSystem system =
+        org.apache.pekko.actor.typed.ActorSystem.create(Behaviors.empty(), "example");
 
     // Get the Serialization Extension
     Serialization serialization = SerializationExtension.get(system);
diff --git a/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java b/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java
index 0d8149998a..d892361b88 100644
--- a/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java
+++ b/akka-docs/src/test/java/jdocs/sharding/ClusterShardingTest.java
@@ -7,28 +7,28 @@ package jdocs.sharding;
 import java.util.Optional;
 import java.time.Duration;
 
-import akka.actor.AbstractActor;
-import akka.actor.ActorInitializationException;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.OneForOneStrategy;
-import akka.actor.PoisonPill;
-import akka.actor.Props;
-import akka.actor.SupervisorStrategy;
-import akka.actor.ReceiveTimeout;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorInitializationException;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.OneForOneStrategy;
+import org.apache.pekko.actor.PoisonPill;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.SupervisorStrategy;
+import org.apache.pekko.actor.ReceiveTimeout;
 // #counter-extractor
-import akka.cluster.sharding.ShardRegion;
+import org.apache.pekko.cluster.sharding.ShardRegion;
 
 // #counter-extractor
 
 // #counter-start
-import akka.japi.Option;
-import akka.cluster.sharding.ClusterSharding;
-import akka.cluster.sharding.ClusterShardingSettings;
+import org.apache.pekko.japi.Option;
+import org.apache.pekko.cluster.sharding.ClusterSharding;
+import org.apache.pekko.cluster.sharding.ClusterShardingSettings;
 
 // #counter-start
-import akka.persistence.AbstractPersistentActor;
-import akka.japi.pf.DeciderBuilder;
+import org.apache.pekko.persistence.AbstractPersistentActor;
+import org.apache.pekko.japi.pf.DeciderBuilder;
 
 // Doc code, compile only
 public class ClusterShardingTest {
diff --git a/akka-docs/src/test/java/jdocs/stream/BidiFlowDocTest.java b/akka-docs/src/test/java/jdocs/stream/BidiFlowDocTest.java
index 94df23b044..51c613e8de 100644
--- a/akka-docs/src/test/java/jdocs/stream/BidiFlowDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/BidiFlowDocTest.java
@@ -10,23 +10,23 @@ import java.util.List;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 
-import akka.NotUsed;
-import akka.stream.javadsl.GraphDSL;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.javadsl.GraphDSL;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import akka.actor.ActorSystem;
-import akka.japi.pf.PFBuilder;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.stream.stage.*;
-import akka.util.ByteIterator;
-import akka.util.ByteString;
-import static akka.util.ByteString.emptyByteString;
-import akka.util.ByteStringBuilder;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.pf.PFBuilder;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.stage.*;
+import org.apache.pekko.util.ByteIterator;
+import org.apache.pekko.util.ByteString;
+import static org.apache.pekko.util.ByteString.emptyByteString;
+import org.apache.pekko.util.ByteStringBuilder;
 import static org.junit.Assert.assertArrayEquals;
 
 public class BidiFlowDocTest extends AbstractJavaTest {
diff --git a/akka-docs/src/test/java/jdocs/stream/CompositionDocTest.java b/akka-docs/src/test/java/jdocs/stream/CompositionDocTest.java
index e9fa5d33f2..3e533b7893 100644
--- a/akka-docs/src/test/java/jdocs/stream/CompositionDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/CompositionDocTest.java
@@ -9,20 +9,20 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import akka.NotUsed;
-import akka.stream.ClosedShape;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.ClosedShape;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.stream.javadsl.Tcp.OutgoingConnection;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.javadsl.Tcp.OutgoingConnection;
+import org.apache.pekko.util.ByteString;
 
 public class CompositionDocTest extends AbstractJavaTest {
 
diff --git a/akka-docs/src/test/java/jdocs/stream/FlowDocTest.java b/akka-docs/src/test/java/jdocs/stream/FlowDocTest.java
index c7ac173eff..94e8f7cc62 100644
--- a/akka-docs/src/test/java/jdocs/stream/FlowDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/FlowDocTest.java
@@ -4,17 +4,17 @@
 
 package jdocs.stream;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.AbstractActor;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Cancellable;
-import akka.dispatch.Futures;
-import akka.japi.Pair;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.dispatch.Futures;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/FlowErrorDocTest.java b/akka-docs/src/test/java/jdocs/stream/FlowErrorDocTest.java
index 154e18db90..1497a858e8 100644
--- a/akka-docs/src/test/java/jdocs/stream/FlowErrorDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/FlowErrorDocTest.java
@@ -11,19 +11,19 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import akka.NotUsed;
-import akka.japi.pf.PFBuilder;
-import akka.stream.javadsl.*;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.japi.pf.PFBuilder;
+import org.apache.pekko.stream.javadsl.*;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import akka.actor.ActorSystem;
-import akka.stream.Supervision;
-import akka.stream.ActorAttributes;
-import akka.japi.function.Function;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.Supervision;
+import org.apache.pekko.stream.ActorAttributes;
+import org.apache.pekko.japi.function.Function;
 
 public class FlowErrorDocTest extends AbstractJavaTest {
 
diff --git a/akka-docs/src/test/java/jdocs/stream/FlowParallelismDocTest.java b/akka-docs/src/test/java/jdocs/stream/FlowParallelismDocTest.java
index f6e795bae3..687c127558 100644
--- a/akka-docs/src/test/java/jdocs/stream/FlowParallelismDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/FlowParallelismDocTest.java
@@ -4,15 +4,15 @@
 
 package jdocs.stream;
 
-import akka.NotUsed;
+import org.apache.pekko.NotUsed;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import akka.actor.ActorSystem;
-import akka.stream.*;
-import akka.stream.javadsl.*;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
 
 public class FlowParallelismDocTest extends AbstractJavaTest {
 
diff --git a/akka-docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java b/akka-docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java
index 8094394658..1559645163 100644
--- a/akka-docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java
@@ -4,14 +4,14 @@
 
 package jdocs.stream;
 
-import akka.NotUsed;
-import akka.actor.AbstractActor;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import jdocs.AbstractJavaTest;
 import org.junit.Test;
 import scala.concurrent.duration.FiniteDuration;
diff --git a/akka-docs/src/test/java/jdocs/stream/GraphCyclesDocTest.java b/akka-docs/src/test/java/jdocs/stream/GraphCyclesDocTest.java
index e591eb79bd..95064f2426 100644
--- a/akka-docs/src/test/java/jdocs/stream/GraphCyclesDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/GraphCyclesDocTest.java
@@ -6,17 +6,17 @@ package jdocs.stream;
 
 import java.util.Arrays;
 
-import akka.NotUsed;
+import org.apache.pekko.NotUsed;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import akka.actor.ActorSystem;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.stream.scaladsl.MergePreferred.MergePreferredShape;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.scaladsl.MergePreferred.MergePreferredShape;
 
 public class GraphCyclesDocTest extends AbstractJavaTest {
 
diff --git a/akka-docs/src/test/java/jdocs/stream/GraphStageDocTest.java b/akka-docs/src/test/java/jdocs/stream/GraphStageDocTest.java
index 3c1d696be9..ac401a8aa3 100644
--- a/akka-docs/src/test/java/jdocs/stream/GraphStageDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/GraphStageDocTest.java
@@ -5,22 +5,22 @@
 package jdocs.stream;
 
 // #imports
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Option;
-import akka.japi.Pair;
-import akka.japi.Predicate;
-import akka.japi.Function;
-import akka.japi.function.Procedure;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.stream.stage.*;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Option;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.japi.Predicate;
+import org.apache.pekko.japi.Function;
+import org.apache.pekko.japi.function.Procedure;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.stage.*;
 // #imports
-import akka.stream.testkit.TestPublisher;
-import akka.stream.testkit.TestSubscriber;
+import org.apache.pekko.stream.testkit.TestPublisher;
+import org.apache.pekko.stream.testkit.TestSubscriber;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/GraphStageLoggingDocTest.java b/akka-docs/src/test/java/jdocs/stream/GraphStageLoggingDocTest.java
index b0eb71e90a..e50c670edc 100644
--- a/akka-docs/src/test/java/jdocs/stream/GraphStageLoggingDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/GraphStageLoggingDocTest.java
@@ -4,16 +4,16 @@
 
 package jdocs.stream;
 
-import akka.actor.ActorSystem;
-import akka.stream.Attributes;
-import akka.stream.Materializer;
-import akka.stream.Outlet;
-import akka.stream.SourceShape;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.Attributes;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.Outlet;
+import org.apache.pekko.stream.SourceShape;
 // #stage-with-logging
-import akka.stream.stage.AbstractOutHandler;
-import akka.stream.stage.GraphStage;
-import akka.stream.stage.GraphStageLogic;
-import akka.stream.stage.GraphStageLogicWithLogging;
+import org.apache.pekko.stream.stage.AbstractOutHandler;
+import org.apache.pekko.stream.stage.GraphStage;
+import org.apache.pekko.stream.stage.GraphStageLogic;
+import org.apache.pekko.stream.stage.GraphStageLogicWithLogging;
 
 // #stage-with-logging
 import jdocs.AbstractJavaTest;
diff --git a/akka-docs/src/test/java/jdocs/stream/HubDocTest.java b/akka-docs/src/test/java/jdocs/stream/HubDocTest.java
index 5325ba4c6a..508b89bec1 100644
--- a/akka-docs/src/test/java/jdocs/stream/HubDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/HubDocTest.java
@@ -4,15 +4,15 @@
 
 package jdocs.stream;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.actor.Cancellable;
-import akka.japi.Pair;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.stream.javadsl.PartitionHub.ConsumerInfo;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.javadsl.PartitionHub.ConsumerInfo;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/IntegrationDocTest.java b/akka-docs/src/test/java/jdocs/stream/IntegrationDocTest.java
index 347d13d013..c0108854cf 100644
--- a/akka-docs/src/test/java/jdocs/stream/IntegrationDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/IntegrationDocTest.java
@@ -4,14 +4,14 @@
 
 package jdocs.stream;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.*;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.testkit.TestProbe;
-import akka.testkit.javadsl.TestKit;
-import akka.util.Timeout;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.testkit.TestProbe;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.apache.pekko.util.Timeout;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
@@ -33,7 +33,7 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import static akka.pattern.Patterns.ask;
+import static org.apache.pekko.pattern.Patterns.ask;
 import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.AKKA;
 import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.tweets;
 import static junit.framework.TestCase.assertTrue;
@@ -831,7 +831,8 @@ public class IntegrationDocTest extends AbstractJavaTest {
         actorRef.tell(2, ActorRef.noSender());
         actorRef.tell(3, ActorRef.noSender());
         actorRef.tell(
-            new akka.actor.Status.Success(CompletionStrategy.draining()), ActorRef.noSender());
+            new org.apache.pekko.actor.Status.Success(CompletionStrategy.draining()),
+            ActorRef.noSender());
         // #source-actorRef
       }
     };
diff --git a/akka-docs/src/test/java/jdocs/stream/KillSwitchDocTest.java b/akka-docs/src/test/java/jdocs/stream/KillSwitchDocTest.java
index 93c14c62c0..b37fc092bd 100644
--- a/akka-docs/src/test/java/jdocs/stream/KillSwitchDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/KillSwitchDocTest.java
@@ -4,15 +4,15 @@
 
 package jdocs.stream;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.*;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/Main.java b/akka-docs/src/test/java/jdocs/stream/Main.java
index 0eea40cca0..f33b0c1cdc 100644
--- a/akka-docs/src/test/java/jdocs/stream/Main.java
+++ b/akka-docs/src/test/java/jdocs/stream/Main.java
@@ -4,7 +4,7 @@
 
 package jdocs.stream;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 
 // #main-app
 public class Main {
diff --git a/akka-docs/src/test/java/jdocs/stream/MigrationsJava.java b/akka-docs/src/test/java/jdocs/stream/MigrationsJava.java
index 07162163f2..43782c8031 100644
--- a/akka-docs/src/test/java/jdocs/stream/MigrationsJava.java
+++ b/akka-docs/src/test/java/jdocs/stream/MigrationsJava.java
@@ -6,11 +6,11 @@ package jdocs.stream;
 
 import java.util.stream.Stream;
 
-import akka.NotUsed;
-import akka.japi.Pair;
-import akka.stream.javadsl.*;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.*;
 // #asPublisher-import
-import static akka.stream.javadsl.AsPublisher.*;
+import static org.apache.pekko.stream.javadsl.AsPublisher.*;
 // #asPublisher-import
 
 public class MigrationsJava {
diff --git a/akka-docs/src/test/java/jdocs/stream/QuickStartDocTest.java b/akka-docs/src/test/java/jdocs/stream/QuickStartDocTest.java
index 903db3a13d..c3d12c2b12 100644
--- a/akka-docs/src/test/java/jdocs/stream/QuickStartDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/QuickStartDocTest.java
@@ -5,15 +5,15 @@
 package jdocs.stream;
 
 // #stream-imports
-import akka.stream.*;
-import akka.stream.javadsl.*;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
 // #stream-imports
 
 // #other-imports
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.util.ByteString;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.util.ByteString;
 
 import java.nio.file.Paths;
 import java.math.BigInteger;
diff --git a/akka-docs/src/test/java/jdocs/stream/RateTransformationDocTest.java b/akka-docs/src/test/java/jdocs/stream/RateTransformationDocTest.java
index 3849991741..4e8a2ea271 100644
--- a/akka-docs/src/test/java/jdocs/stream/RateTransformationDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/RateTransformationDocTest.java
@@ -4,20 +4,20 @@
 
 package jdocs.stream;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.japi.tuple.Tuple3;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.stream.testkit.TestPublisher;
-import akka.stream.testkit.TestSubscriber;
-import akka.stream.testkit.javadsl.TestSink;
-import akka.stream.testkit.javadsl.TestSource;
-import akka.testkit.TestLatch;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.japi.tuple.Tuple3;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.testkit.TestPublisher;
+import org.apache.pekko.stream.testkit.TestSubscriber;
+import org.apache.pekko.stream.testkit.javadsl.TestSink;
+import org.apache.pekko.stream.testkit.javadsl.TestSource;
+import org.apache.pekko.testkit.TestLatch;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/ReactiveStreamsDocTest.java b/akka-docs/src/test/java/jdocs/stream/ReactiveStreamsDocTest.java
index c0dab52b1e..f2f91b0e8b 100644
--- a/akka-docs/src/test/java/jdocs/stream/ReactiveStreamsDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/ReactiveStreamsDocTest.java
@@ -4,16 +4,16 @@
 
 package jdocs.stream;
 
-import akka.NotUsed;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.japi.function.Creator;
-import akka.stream.javadsl.*;
-import akka.testkit.TestProbe;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.function.Creator;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.testkit.TestProbe;
 import jdocs.AbstractJavaTest;
 import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Author;
 import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Tweet;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/RestartDocTest.java b/akka-docs/src/test/java/jdocs/stream/RestartDocTest.java
index e926a58709..f3512ee073 100644
--- a/akka-docs/src/test/java/jdocs/stream/RestartDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/RestartDocTest.java
@@ -4,16 +4,16 @@
 
 package jdocs.stream;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.KillSwitch;
-import akka.stream.KillSwitches;
-import akka.stream.Materializer;
-import akka.stream.RestartSettings;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.RestartSource;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.KillSwitch;
+import org.apache.pekko.stream.KillSwitches;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.RestartSettings;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.RestartSource;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
diff --git a/akka-docs/src/test/java/jdocs/stream/SilenceSystemOut.java b/akka-docs/src/test/java/jdocs/stream/SilenceSystemOut.java
index 2199ca4855..e7e6b7fff9 100644
--- a/akka-docs/src/test/java/jdocs/stream/SilenceSystemOut.java
+++ b/akka-docs/src/test/java/jdocs/stream/SilenceSystemOut.java
@@ -4,7 +4,7 @@
 
 package jdocs.stream;
 
-import akka.actor.ActorRef;
+import org.apache.pekko.actor.ActorRef;
 
 import java.util.function.Predicate;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/SinkRecipeDocTest.java b/akka-docs/src/test/java/jdocs/stream/SinkRecipeDocTest.java
index e216801a11..3c94bc0e90 100644
--- a/akka-docs/src/test/java/jdocs/stream/SinkRecipeDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/SinkRecipeDocTest.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.function.Function;
-import akka.stream.javadsl.Source;
-import akka.stream.javadsl.Sink;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.Sink;
 import jdocs.AbstractJavaTest;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/StreamBuffersRateDocTest.java b/akka-docs/src/test/java/jdocs/stream/StreamBuffersRateDocTest.java
index b85be6bfe2..0a6a8bb251 100644
--- a/akka-docs/src/test/java/jdocs/stream/StreamBuffersRateDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/StreamBuffersRateDocTest.java
@@ -4,12 +4,12 @@
 
 package jdocs.stream;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.actor.Cancellable;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/StreamPartialGraphDSLDocTest.java b/akka-docs/src/test/java/jdocs/stream/StreamPartialGraphDSLDocTest.java
index df629e315a..7b62ef3ee9 100644
--- a/akka-docs/src/test/java/jdocs/stream/StreamPartialGraphDSLDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/StreamPartialGraphDSLDocTest.java
@@ -4,15 +4,15 @@
 
 package jdocs.stream;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.*;
-import akka.stream.javadsl.*;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java b/akka-docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java
index 92abea1419..506d5b5129 100644
--- a/akka-docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java
@@ -14,20 +14,20 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import akka.Done;
-import akka.NotUsed;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import akka.actor.*;
-import akka.japi.Pair;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.stream.testkit.*;
-import akka.stream.testkit.javadsl.*;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.testkit.*;
+import org.apache.pekko.stream.testkit.javadsl.*;
 
 public class StreamTestKitDocTest extends AbstractJavaTest {
 
@@ -95,7 +95,7 @@ public class StreamTestKitDocTest extends AbstractJavaTest {
     final TestKit probe = new TestKit(system);
     final CompletionStage>> future =
         sourceUnderTest.grouped(2).runWith(Sink.head(), system);
-    akka.pattern.Patterns.pipe(future, system.dispatcher()).to(probe.getRef());
+    org.apache.pekko.pattern.Patterns.pipe(future, system.dispatcher()).to(probe.getRef());
     probe.expectMsg(Duration.ofSeconds(3), Arrays.asList(Arrays.asList(1, 2), Arrays.asList(3, 4)));
     // #pipeto-testprobe
   }
@@ -208,7 +208,7 @@ public class StreamTestKitDocTest extends AbstractJavaTest {
             .mapAsyncUnordered(
                 2,
                 sleep ->
-                    akka.pattern.Patterns.after(
+                    org.apache.pekko.pattern.Patterns.after(
                         Duration.ofMillis(10),
                         system.scheduler(),
                         system.dispatcher(),
diff --git a/akka-docs/src/test/java/jdocs/stream/SubstreamDocTest.java b/akka-docs/src/test/java/jdocs/stream/SubstreamDocTest.java
index c96e8b11b1..5a6dbd5bf1 100644
--- a/akka-docs/src/test/java/jdocs/stream/SubstreamDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/SubstreamDocTest.java
@@ -4,10 +4,10 @@
 
 package jdocs.stream;
 
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java b/akka-docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java
index d794c7f58e..f89a15d4b0 100644
--- a/akka-docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java
@@ -4,19 +4,19 @@
 
 package jdocs.stream;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.JavaPartialFunction;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.JavaPartialFunction;
 // #imports
-import akka.stream.*;
-import akka.stream.javadsl.*;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
 // #imports
 import jdocs.AbstractJavaTest;
 import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Author;
 import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Hashtag;
 import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Tweet;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/io/StreamFileDocTest.java b/akka-docs/src/test/java/jdocs/stream/io/StreamFileDocTest.java
index 8d6db3c2e0..4bad247d88 100644
--- a/akka-docs/src/test/java/jdocs/stream/io/StreamFileDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/io/StreamFileDocTest.java
@@ -10,22 +10,22 @@ import java.nio.file.Paths;
 import java.io.IOException;
 import java.util.concurrent.CompletionStage;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.ActorAttributes;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.FileIO;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.ActorAttributes;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.FileIO;
+import org.apache.pekko.stream.javadsl.Source;
 import jdocs.AbstractJavaTest;
 import jdocs.stream.SilenceSystemOut;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import akka.stream.*;
-import akka.util.ByteString;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.util.ByteString;
 
 public class StreamFileDocTest extends AbstractJavaTest {
 
diff --git a/akka-docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java b/akka-docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java
index fefea6d2e4..09f68f272c 100644
--- a/akka-docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java
@@ -7,11 +7,11 @@ package jdocs.stream.io;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import akka.NotUsed;
-import akka.stream.javadsl.Framing;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.javadsl.Framing;
 import jdocs.AbstractJavaTest;
 import jdocs.stream.SilenceSystemOut;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import java.net.InetSocketAddress;
 import java.util.concurrent.TimeUnit;
 
@@ -19,12 +19,12 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.*;
-import akka.stream.javadsl.Tcp.*;
-import akka.testkit.SocketUtil;
-import akka.testkit.TestProbe;
-import akka.util.ByteString;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.javadsl.Tcp.*;
+import org.apache.pekko.testkit.SocketUtil;
+import org.apache.pekko.testkit.TestProbe;
+import org.apache.pekko.util.ByteString;
 
 public class StreamTcpDocTest extends AbstractJavaTest {
 
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java
index 5903a80b5a..596459c34b 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java
@@ -4,16 +4,16 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.dispatch.Futures;
-import akka.japi.pf.PFBuilder;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Source;
-import akka.stream.testkit.TestSubscriber;
-import akka.stream.testkit.javadsl.TestSink;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.dispatch.Futures;
+import org.apache.pekko.japi.pf.PFBuilder;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.testkit.TestSubscriber;
+import org.apache.pekko.stream.testkit.javadsl.TestSink;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java
index a7bccafa7a..9d62a51048 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java
@@ -4,16 +4,16 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.*;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.stream.stage.*;
-import akka.testkit.javadsl.TestKit;
-import akka.util.ByteString;
-import static akka.util.ByteString.emptyByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.stage.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.apache.pekko.util.ByteString;
+import static org.apache.pekko.util.ByteString.emptyByteString;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java
index 7c227da824..86b4201dd1 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java
@@ -4,13 +4,13 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Compression;
-import akka.stream.javadsl.Source;
-import akka.testkit.javadsl.TestKit;
-import akka.util.ByteString;
-import static akka.util.ByteString.emptyByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Compression;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.apache.pekko.util.ByteString;
+import static org.apache.pekko.util.ByteString.emptyByteString;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDigest.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDigest.java
index 0ee6d13c80..5ebd72d2d3 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDigest.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDigest.java
@@ -4,14 +4,14 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.*;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.stream.stage.*;
-import akka.testkit.javadsl.TestKit;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.stage.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.apache.pekko.util.ByteString;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDroppyBroadcast.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDroppyBroadcast.java
index 527596b9c7..e22ebaf893 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDroppyBroadcast.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDroppyBroadcast.java
@@ -4,12 +4,12 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeFlattenList.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeFlattenList.java
index 7b2e0298e5..401c80efd3 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeFlattenList.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeFlattenList.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeGlobalRateLimit.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeGlobalRateLimit.java
index a1558549f8..d7dfd6345e 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeGlobalRateLimit.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeGlobalRateLimit.java
@@ -4,14 +4,14 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.*;
-import akka.pattern.Patterns;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.stream.testkit.TestSubscriber;
-import akka.stream.testkit.javadsl.TestSink;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.pattern.Patterns;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.testkit.TestSubscriber;
+import org.apache.pekko.stream.testkit.javadsl.TestSink;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java
index 4662f871d6..78ae01eb2e 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java
@@ -4,18 +4,18 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.*;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.stream.stage.*;
-import akka.stream.testkit.TestPublisher;
-import akka.stream.testkit.TestSubscriber;
-import akka.stream.testkit.javadsl.TestSink;
-import akka.stream.testkit.javadsl.TestSource;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.stage.*;
+import org.apache.pekko.stream.testkit.TestPublisher;
+import org.apache.pekko.stream.testkit.TestSubscriber;
+import org.apache.pekko.stream.testkit.javadsl.TestSink;
+import org.apache.pekko.stream.testkit.javadsl.TestSource;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeKeepAlive.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeKeepAlive.java
index 1d7c6674b7..af29c8c830 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeKeepAlive.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeKeepAlive.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Flow;
-import akka.testkit.javadsl.TestKit;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.apache.pekko.util.ByteString;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeLoggingElements.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeLoggingElements.java
index d551e1444e..41bfb6b635 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeLoggingElements.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeLoggingElements.java
@@ -4,15 +4,15 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.stream.Attributes;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.testkit.DebugFilter;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.stream.Attributes;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.DebugFilter;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import com.typesafe.config.ConfigFactory;
 import jdocs.stream.SilenceSystemOut;
 import org.junit.AfterClass;
@@ -31,7 +31,7 @@ public class RecipeLoggingElements extends RecipeTest {
         ActorSystem.create(
             "RecipeLoggingElements",
             ConfigFactory.parseString(
-                "akka.loglevel=DEBUG\nakka.loggers = [akka.testkit.TestEventListener]"));
+                "akka.loglevel=DEBUG\nakka.loggers = [org.apache.pekko.testkit.TestEventListener]"));
   }
 
   @AfterClass
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java
index 730cdfebba..95668f332c 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java
@@ -4,15 +4,15 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.stream.testkit.TestPublisher;
-import akka.stream.testkit.TestSubscriber;
-import akka.stream.testkit.javadsl.TestSink;
-import akka.stream.testkit.javadsl.TestSource;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.testkit.TestPublisher;
+import org.apache.pekko.stream.testkit.TestSubscriber;
+import org.apache.pekko.stream.testkit.javadsl.TestSink;
+import org.apache.pekko.stream.testkit.javadsl.TestSource;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java
index 3f17f5ee7b..971d7ec796 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java
@@ -4,19 +4,19 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.stream.testkit.TestPublisher;
-import akka.stream.testkit.TestSubscriber;
-import akka.stream.testkit.javadsl.TestSink;
-import akka.stream.testkit.javadsl.TestSource;
-import akka.testkit.TestLatch;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.testkit.TestPublisher;
+import org.apache.pekko.stream.testkit.TestSubscriber;
+import org.apache.pekko.stream.testkit.javadsl.TestSink;
+import org.apache.pekko.stream.testkit.javadsl.TestSource;
+import org.apache.pekko.testkit.TestLatch;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMultiGroupByTest.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMultiGroupByTest.java
index ae168ed331..47126f2c9b 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMultiGroupByTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMultiGroupByTest.java
@@ -4,14 +4,14 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Function;
-import akka.japi.Pair;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.stream.javadsl.SubSource;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Function;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.SubSource;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeParseLines.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeParseLines.java
index a0955da569..cc0264975e 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeParseLines.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeParseLines.java
@@ -4,14 +4,14 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Framing;
-import akka.stream.javadsl.FramingTruncation;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.testkit.javadsl.TestKit;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Framing;
+import org.apache.pekko.stream.javadsl.FramingTruncation;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.apache.pekko.util.ByteString;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeReduceByKeyTest.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeReduceByKeyTest.java
index 010f3bdd46..865d4fc0fc 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeReduceByKeyTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeReduceByKeyTest.java
@@ -4,15 +4,15 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.japi.function.Function;
-import akka.japi.function.Function2;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.japi.function.Function2;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSeq.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSeq.java
index 274cacbe82..12d1bf08ef 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSeq.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSeq.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSimpleDrop.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSimpleDrop.java
index b1dbccbfd8..2d22964ca5 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSimpleDrop.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSimpleDrop.java
@@ -4,16 +4,16 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.javadsl.Flow;
-import akka.stream.testkit.TestPublisher;
-import akka.stream.testkit.TestSubscriber;
-import akka.stream.testkit.javadsl.TestSink;
-import akka.stream.testkit.javadsl.TestSource;
-import akka.testkit.TestLatch;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.testkit.TestPublisher;
+import org.apache.pekko.stream.testkit.TestSubscriber;
+import org.apache.pekko.stream.testkit.javadsl.TestSink;
+import org.apache.pekko.stream.testkit.javadsl.TestSource;
+import org.apache.pekko.testkit.TestLatch;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSourceFromFunction.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSourceFromFunction.java
index 1920f719c4..4a75db6cc3 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSourceFromFunction.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSourceFromFunction.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import com.typesafe.config.ConfigFactory;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -28,7 +28,7 @@ public class RecipeSourceFromFunction extends RecipeTest {
         ActorSystem.create(
             "RecipeSourceFromFunction",
             ConfigFactory.parseString(
-                "akka.loglevel=DEBUG\nakka.loggers = [akka.testkit.TestEventListener]"));
+                "akka.loglevel=DEBUG\nakka.loggers = [org.apache.pekko.testkit.TestEventListener]"));
   }
 
   @AfterClass
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSplitter.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSplitter.java
index fcf51f8a35..83cdfbe612 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSplitter.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSplitter.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeWorkerPool.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeWorkerPool.java
index 531e40d8e9..a4085ff981 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeWorkerPool.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeWorkerPool.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream.javadsl.cookbook;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.*;
-import akka.stream.javadsl.*;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/BroadcastDocExample.java b/akka-docs/src/test/java/jdocs/stream/operators/BroadcastDocExample.java
index 2bb775d763..a03bf65381 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/BroadcastDocExample.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/BroadcastDocExample.java
@@ -4,20 +4,20 @@
 
 package jdocs.stream.operators;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 
 // #import
-import akka.NotUsed;
-import akka.japi.tuple.Tuple3;
-import akka.stream.ClosedShape;
-import akka.stream.UniformFanOutShape;
-import akka.stream.javadsl.Broadcast;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.GraphDSL;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.RunnableGraph;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.japi.tuple.Tuple3;
+import org.apache.pekko.stream.ClosedShape;
+import org.apache.pekko.stream.UniformFanOutShape;
+import org.apache.pekko.stream.javadsl.Broadcast;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.GraphDSL;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.RunnableGraph;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 import java.util.concurrent.CompletionStage;
 // #import
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/MergeSequenceDocExample.java b/akka-docs/src/test/java/jdocs/stream/operators/MergeSequenceDocExample.java
index 76b22d5598..6f67c845a2 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/MergeSequenceDocExample.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/MergeSequenceDocExample.java
@@ -4,21 +4,21 @@
 
 package jdocs.stream.operators;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 
 // #import
-import akka.NotUsed;
-import akka.japi.Pair;
-import akka.stream.ClosedShape;
-import akka.stream.UniformFanInShape;
-import akka.stream.UniformFanOutShape;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.GraphDSL;
-import akka.stream.javadsl.MergeSequence;
-import akka.stream.javadsl.Partition;
-import akka.stream.javadsl.RunnableGraph;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.ClosedShape;
+import org.apache.pekko.stream.UniformFanInShape;
+import org.apache.pekko.stream.UniformFanOutShape;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.GraphDSL;
+import org.apache.pekko.stream.javadsl.MergeSequence;
+import org.apache.pekko.stream.javadsl.Partition;
+import org.apache.pekko.stream.javadsl.RunnableGraph;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 // #import
 
 public class MergeSequenceDocExample {
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/PartitionDocExample.java b/akka-docs/src/test/java/jdocs/stream/operators/PartitionDocExample.java
index bf913ee6fe..2f32593d15 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/PartitionDocExample.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/PartitionDocExample.java
@@ -4,19 +4,19 @@
 
 package jdocs.stream.operators;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 
 // #import
-import akka.NotUsed;
-import akka.stream.Attributes;
-import akka.stream.ClosedShape;
-import akka.stream.UniformFanOutShape;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.GraphDSL;
-import akka.stream.javadsl.Partition;
-import akka.stream.javadsl.RunnableGraph;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.Attributes;
+import org.apache.pekko.stream.ClosedShape;
+import org.apache.pekko.stream.UniformFanOutShape;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.GraphDSL;
+import org.apache.pekko.stream.javadsl.Partition;
+import org.apache.pekko.stream.javadsl.RunnableGraph;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 // #import
 
 public class PartitionDocExample {
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java b/akka-docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java
index c6cf65b9b8..0d8d94c859 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java
@@ -4,14 +4,14 @@
 
 package jdocs.stream.operators;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
 
-import akka.stream.javadsl.AsPublisher;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.AsPublisher;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 // #takeLast-operator-example
-import akka.japi.Pair;
+import org.apache.pekko.japi.Pair;
 import org.reactivestreams.Publisher;
 // #takeLast-operator-example
 import java.util.*;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java b/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java
index f14a55d913..12fd490e1e 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java
@@ -6,24 +6,24 @@ package jdocs.stream.operators;
 
 // #imports
 // #range-imports
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.actor.testkit.typed.javadsl.ManualTime;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.testkit.typed.javadsl.ManualTime;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.stream.javadsl.Source;
 // #range-imports
 
 // #actor-ref-imports
-import akka.actor.ActorRef;
-import akka.stream.OverflowStrategy;
-import akka.stream.CompletionStrategy;
-import akka.stream.javadsl.Sink;
-import akka.testkit.TestProbe;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.stream.OverflowStrategy;
+import org.apache.pekko.stream.CompletionStrategy;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.testkit.TestProbe;
 // #actor-ref-imports
 
 // #maybe
-import akka.stream.javadsl.RunnableGraph;
+import org.apache.pekko.stream.javadsl.RunnableGraph;
 import java.util.concurrent.CompletableFuture;
 // #maybe
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java b/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java
index 787e28ed6a..80ab3310ab 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/SourceOrFlow.java
@@ -4,17 +4,16 @@
 
 package jdocs.stream.operators;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.event.LogMarker;
-import akka.japi.Pair;
-import akka.japi.function.Function2;
-import akka.japi.pf.PFBuilder;
-import akka.stream.Attributes;
-import akka.stream.javadsl.Flow;
-
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.event.LogMarker;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.japi.function.Function2;
+import org.apache.pekko.japi.pf.PFBuilder;
+import org.apache.pekko.stream.Attributes;
+import org.apache.pekko.stream.javadsl.Flow;
 
 // #zip
 // #zip-with
@@ -29,9 +28,9 @@ import akka.stream.javadsl.Flow;
 // #interleaveAll
 // #merge
 // #merge-sorted
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Source;
-import akka.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.Sink;
 
 import java.util.*;
 
@@ -50,8 +49,8 @@ import java.util.*;
 // #zip
 
 // #log
-import akka.event.LogMarker;
-import akka.stream.Attributes;
+import org.apache.pekko.event.LogMarker;
+import org.apache.pekko.stream.Attributes;
 
 // #log
 
@@ -162,16 +161,17 @@ class SourceOrFlow {
 
     // #concatLazy
   }
-  
+
   void concatAllLazyExample() {
     // #concatAllLazy
     Source sourceA = Source.from(Arrays.asList(1, 2, 3));
     Source sourceB = Source.from(Arrays.asList(4, 5, 6));
-    Source sourceC = Source.from(Arrays.asList(7, 8 , 9));
-    sourceA.concatAllLazy(sourceB, sourceC)
+    Source sourceC = Source.from(Arrays.asList(7, 8, 9));
+    sourceA
+        .concatAllLazy(sourceB, sourceC)
         .fold(new StringJoiner(","), (joiner, input) -> joiner.add(String.valueOf(input)))
         .runForeach(System.out::println, system);
-    //prints 1,2,3,4,5,6,7,8,9
+    // prints 1,2,3,4,5,6,7,8,9
     // #concatAllLazy
   }
 
@@ -184,19 +184,20 @@ class SourceOrFlow {
 
     // #interleave
   }
-  
+
   void interleaveAllExample() {
     // #interleaveAll
     Source sourceA = Source.from(Arrays.asList(1, 2, 7, 8));
     Source sourceB = Source.from(Arrays.asList(3, 4, 9));
     Source sourceC = Source.from(Arrays.asList(5, 6));
-    sourceA.interleaveAll(Arrays.asList(sourceB, sourceC), 2, false)
-        .fold(new StringJoiner(","),(joiner, input) -> joiner.add(String.valueOf(input)))
+    sourceA
+        .interleaveAll(Arrays.asList(sourceB, sourceC), 2, false)
+        .fold(new StringJoiner(","), (joiner, input) -> joiner.add(String.valueOf(input)))
         .runForeach(System.out::println, system);
-    //prints 1,2,3,4,5,6,7,8,9
+    // prints 1,2,3,4,5,6,7,8,9
     // #interleaveAll
   }
-  
+
   void mergeExample() {
     // #merge
     Source sourceA = Source.from(Arrays.asList(1, 2, 3, 4));
@@ -206,13 +207,14 @@ class SourceOrFlow {
 
     // #merge
   }
-  
+
   void mergeAllExample() {
     // #merge-all
     Source sourceA = Source.from(Arrays.asList(1, 2, 3));
     Source sourceB = Source.from(Arrays.asList(4, 5, 6));
     Source sourceC = Source.from(Arrays.asList(7, 8, 9, 10));
-    sourceA.mergeAll(Arrays.asList(sourceB, sourceC), false)
+    sourceA
+        .mergeAll(Arrays.asList(sourceB, sourceC), false)
         .runForeach(System.out::println, system);
     // merging is not deterministic, can for example print 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     // #merge-all
@@ -594,7 +596,9 @@ class SourceOrFlow {
     Flow flow =
         Flow.of(String.class)
             .watch(ref)
-            .recover(akka.stream.WatchedActorTerminatedException.class, () -> ref + " terminated");
+            .recover(
+                org.apache.pekko.stream.WatchedActorTerminatedException.class,
+                () -> ref + " terminated");
     // #watch
   }
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/WithContextTest.java b/akka-docs/src/test/java/jdocs/stream/operators/WithContextTest.java
index 1e2ab792d9..0db10aeffc 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/WithContextTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/WithContextTest.java
@@ -4,13 +4,13 @@
 
 package jdocs.stream.operators;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 // #imports
-import akka.NotUsed;
-import akka.japi.Pair;
-import akka.stream.javadsl.*;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.*;
 // #imports
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/converters/StreamConvertersToJava.java b/akka-docs/src/test/java/jdocs/stream/operators/converters/StreamConvertersToJava.java
index aa34a5e9bf..4ad988f22d 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/converters/StreamConvertersToJava.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/converters/StreamConvertersToJava.java
@@ -4,13 +4,13 @@
 
 package jdocs.stream.operators.converters;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
 // #import
-import akka.japi.function.Creator;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.StreamConverters;
+import org.apache.pekko.japi.function.Creator;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.StreamConverters;
 
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
@@ -20,12 +20,12 @@ import java.util.stream.BaseStream;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 // #import
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.Source;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/converters/ToFromJavaIOStreams.java b/akka-docs/src/test/java/jdocs/stream/operators/converters/ToFromJavaIOStreams.java
index 299efd6f20..222d8532a3 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/converters/ToFromJavaIOStreams.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/converters/ToFromJavaIOStreams.java
@@ -4,17 +4,17 @@
 
 package jdocs.stream.operators.converters;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.IOResult;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.stream.javadsl.StreamConverters;
-import akka.testkit.javadsl.TestKit;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.IOResult;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.StreamConverters;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.apache.pekko.util.ByteString;
 import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -30,7 +30,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static akka.util.ByteString.emptyByteString;
+import static org.apache.pekko.util.ByteString.emptyByteString;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/flow/FromSinkAndSource.java b/akka-docs/src/test/java/jdocs/stream/operators/flow/FromSinkAndSource.java
index c3ec5399fd..7ef2a9d2d5 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/flow/FromSinkAndSource.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/flow/FromSinkAndSource.java
@@ -4,14 +4,14 @@
 
 package jdocs.stream.operators.flow;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.actor.Cancellable;
-import akka.japi.Pair;
-import akka.stream.javadsl.*;
-import akka.stream.testkit.TestPublisher;
-import akka.stream.testkit.TestSubscriber;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.testkit.TestPublisher;
+import org.apache.pekko.stream.testkit.TestSubscriber;
+import org.apache.pekko.util.ByteString;
 
 import java.time.Duration;
 import java.util.Collections;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/flow/FutureFlow.java b/akka-docs/src/test/java/jdocs/stream/operators/flow/FutureFlow.java
index 1e48173d78..3f27dd17a8 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/flow/FutureFlow.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/flow/FutureFlow.java
@@ -4,10 +4,10 @@
 
 package jdocs.stream.operators.flow;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/flow/Lazy.java b/akka-docs/src/test/java/jdocs/stream/operators/flow/Lazy.java
index 63ac982fb4..812af9cbd1 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/flow/Lazy.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/flow/Lazy.java
@@ -4,13 +4,13 @@
 
 package jdocs.stream.operators.flow;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.RunnableGraph;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.RunnableGraph;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/flow/StatefulMap.java b/akka-docs/src/test/java/jdocs/stream/operators/flow/StatefulMap.java
index 716d53fd1b..a6f4664dbf 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/flow/StatefulMap.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/flow/StatefulMap.java
@@ -4,10 +4,10 @@
 
 package jdocs.stream.operators.flow;
 
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.*;
 import java.util.stream.IntStream;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/flow/StatefulMapConcat.java b/akka-docs/src/test/java/jdocs/stream/operators/flow/StatefulMapConcat.java
index a645abbf9d..f3b5b4b629 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/flow/StatefulMapConcat.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/flow/StatefulMapConcat.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream.operators.flow;
 
-import akka.NotUsed;
-import akka.actor.typed.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.*;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sink/Lazy.java b/akka-docs/src/test/java/jdocs/stream/operators/sink/Lazy.java
index 92028ad6e8..020bd91cd3 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sink/Lazy.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sink/Lazy.java
@@ -4,10 +4,10 @@
 
 package jdocs.stream.operators.sink;
 
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Optional;
 import java.util.concurrent.CompletionStage;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/Combine.java b/akka-docs/src/test/java/jdocs/stream/operators/source/Combine.java
index 26279fb65f..520dbed333 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/Combine.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/Combine.java
@@ -4,12 +4,12 @@
 
 package jdocs.stream.operators.source;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
 // #imports
-import akka.stream.javadsl.Concat;
-import akka.stream.javadsl.Merge;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.Concat;
+import org.apache.pekko.stream.javadsl.Merge;
+import org.apache.pekko.stream.javadsl.Source;
 // ...
 
 // #imports
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/CompletionStageSource.java b/akka-docs/src/test/java/jdocs/stream/operators/source/CompletionStageSource.java
index 608b6400fa..1c522f133d 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/CompletionStageSource.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/CompletionStageSource.java
@@ -5,8 +5,8 @@
 package jdocs.stream.operators.source;
 
 // #sourceCompletionStageSource
-import akka.NotUsed;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.concurrent.CompletionStage;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/From.java b/akka-docs/src/test/java/jdocs/stream/operators/source/From.java
index 5cc053126f..625a526369 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/From.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/From.java
@@ -4,8 +4,8 @@
 
 package jdocs.stream.operators.source;
 
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Arrays;
 import java.util.stream.IntStream;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/FromCompletionStage.java b/akka-docs/src/test/java/jdocs/stream/operators/source/FromCompletionStage.java
index e30a367adc..8c4fae5ed4 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/FromCompletionStage.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/FromCompletionStage.java
@@ -8,10 +8,10 @@ package jdocs.stream.operators.source;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.CompletableFuture;
 
-import akka.NotUsed;
-import akka.Done;
-import akka.actor.typed.ActorSystem;
-import akka.stream.javadsl.*;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.stream.javadsl.*;
 
 // #sourceFromCompletionStage
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/Lazy.java b/akka-docs/src/test/java/jdocs/stream/operators/source/Lazy.java
index 323f86b278..920ebceadb 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/Lazy.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/Lazy.java
@@ -4,13 +4,13 @@
 
 package jdocs.stream.operators.source;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.javadsl.RunnableGraph;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.SinkQueueWithCancel;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.RunnableGraph;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.SinkQueueWithCancel;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Optional;
 import java.util.concurrent.CompletionStage;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/Restart.java b/akka-docs/src/test/java/jdocs/stream/operators/source/Restart.java
index a9f0a796e0..d3b89b3b90 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/Restart.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/Restart.java
@@ -4,22 +4,22 @@
 
 package jdocs.stream.operators.source;
 
-import akka.NotUsed;
-import akka.actor.Cancellable;
-import akka.japi.Creator;
-import akka.stream.KillSwitches;
-import akka.stream.RestartSettings;
-import akka.stream.UniqueKillSwitch;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.RestartSource;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.japi.Creator;
+import org.apache.pekko.stream.KillSwitches;
+import org.apache.pekko.stream.RestartSettings;
+import org.apache.pekko.stream.UniqueKillSwitch;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.RestartSource;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.time.Duration;
 import java.util.Arrays;
 
 public class Restart {
-  static akka.actor.ActorSystem system = akka.actor.ActorSystem.create();
+  static org.apache.pekko.actor.ActorSystem system = org.apache.pekko.actor.ActorSystem.create();
 
   public static void onRestartWithBackoffInnerFailure() {
     // #restart-failure-inner-failure
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/Tick.java b/akka-docs/src/test/java/jdocs/stream/operators/source/Tick.java
index 5af7df0c3b..cbc11d0fdc 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/Tick.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/Tick.java
@@ -4,17 +4,17 @@
 
 package jdocs.stream.operators.source;
 
-import akka.NotUsed;
-import akka.actor.Cancellable;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.javadsl.AskPattern;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.AskPattern;
 import java.util.concurrent.CompletionStage;
 import java.time.Duration;
 
-import akka.japi.Pair;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
 
 public class Tick {
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/Unfold.java b/akka-docs/src/test/java/jdocs/stream/operators/source/Unfold.java
index 56418718e9..7cfced47ef 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/Unfold.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/Unfold.java
@@ -4,9 +4,9 @@
 
 package jdocs.stream.operators.source;
 
-import akka.NotUsed;
-import akka.japi.Pair;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.math.BigInteger;
 import java.util.Optional;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldAsync.java b/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldAsync.java
index 6cd5875f87..6836c37ef6 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldAsync.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldAsync.java
@@ -4,13 +4,13 @@
 
 package jdocs.stream.operators.source;
 
-import akka.NotUsed;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.javadsl.Source;
-import akka.util.ByteString;
-import akka.actor.typed.javadsl.AskPattern;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.util.ByteString;
+import org.apache.pekko.actor.typed.javadsl.AskPattern;
 
 import java.time.Duration;
 import java.util.Optional;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldResource.java b/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldResource.java
index 084476adad..2e09d8cefb 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldResource.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldResource.java
@@ -4,9 +4,9 @@
 
 package jdocs.stream.operators.source;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Optional;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldResourceAsync.java b/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldResourceAsync.java
index 05a928a0fa..d82afd15ae 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldResourceAsync.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/UnfoldResourceAsync.java
@@ -4,10 +4,10 @@
 
 package jdocs.stream.operators.source;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/source/Zip.java b/akka-docs/src/test/java/jdocs/stream/operators/source/Zip.java
index 8dd841c5b3..1db7f6e4cc 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/source/Zip.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/source/Zip.java
@@ -4,9 +4,9 @@
 
 package jdocs.stream.operators.source;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/ExtrapolateAndExpand.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/ExtrapolateAndExpand.java
index 28248ddfd9..98ee53de5c 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/ExtrapolateAndExpand.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/ExtrapolateAndExpand.java
@@ -4,15 +4,15 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.actor.Cancellable;
-import akka.japi.Pair;
-import akka.japi.function.Function;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.util.ByteString;
 import docs.stream.operators.sourceorflow.ExtrapolateAndExpandCommon;
 import docs.stream.operators.sourceorflow.ExtrapolateAndExpandCommon.Frame;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapConcat.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapConcat.java
index d1253a8c77..a8f7195cf1 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapConcat.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapConcat.java
@@ -4,9 +4,9 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Arrays;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapMerge.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapMerge.java
index 19b3adc9a7..8b1001b8d0 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapMerge.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapMerge.java
@@ -4,9 +4,9 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Arrays;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Intersperse.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Intersperse.java
index 3050ffe28a..b310f83284 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Intersperse.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Intersperse.java
@@ -4,8 +4,8 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Arrays;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Limit.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Limit.java
index 3e71a6d52e..03740b4a84 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Limit.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Limit.java
@@ -4,10 +4,10 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.NotUsed;
-import akka.actor.typed.ActorSystem;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.List;
 import java.util.concurrent.CompletionStage;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/LimitWeighted.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/LimitWeighted.java
index c9332f3940..3337647ca5 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/LimitWeighted.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/LimitWeighted.java
@@ -4,10 +4,10 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.NotUsed;
-import akka.actor.typed.ActorSystem;
-import akka.stream.javadsl.Source;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.util.ByteString;
 
 import java.util.concurrent.CompletionStage;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapAsyncs.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapAsyncs.java
index 3220ec99f3..affb28417d 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapAsyncs.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapAsyncs.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.pattern.Patterns;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.pattern.Patterns;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.time.Duration;
 import java.util.Random;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapConcat.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapConcat.java
index c52cf8c9a2..1efb1c268f 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapConcat.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapConcat.java
@@ -4,8 +4,8 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Arrays;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapError.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapError.java
index 161a3c14ed..bb223d87dd 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapError.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MapError.java
@@ -4,9 +4,9 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Arrays;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MergeLatest.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MergeLatest.java
index b486283e18..ed21ae6c1e 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MergeLatest.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/MergeLatest.java
@@ -4,9 +4,9 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.NotUsed;
-import akka.actor.typed.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Arrays;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Monitor.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Monitor.java
index 6659a145a0..f6f0d32938 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Monitor.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Monitor.java
@@ -4,14 +4,14 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.Done;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.FlowMonitor;
-import akka.stream.FlowMonitorState;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.FlowMonitor;
+import org.apache.pekko.stream.FlowMonitorState;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.time.Duration;
 import java.util.Arrays;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Sliding.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Sliding.java
index 841f095aba..23483c5e05 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Sliding.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Sliding.java
@@ -4,9 +4,9 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.NotUsed;
-import akka.actor.typed.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Arrays;
 
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Split.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Split.java
index effbd7048a..7117ecdc50 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Split.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Split.java
@@ -4,11 +4,11 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.japi.function.Function;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Throttle.java b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Throttle.java
index c1e9b2708d..5712dbf5e9 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Throttle.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/sourceorflow/Throttle.java
@@ -4,12 +4,12 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.Materializer;
-import akka.stream.ThrottleMode;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.ThrottleMode;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.time.Duration;
 import java.util.stream.Stream;
diff --git a/akka-docs/src/test/java/jdocs/testkit/ParentChildTest.java b/akka-docs/src/test/java/jdocs/testkit/ParentChildTest.java
index 10013e3d90..eadb6cf7ae 100644
--- a/akka-docs/src/test/java/jdocs/testkit/ParentChildTest.java
+++ b/akka-docs/src/test/java/jdocs/testkit/ParentChildTest.java
@@ -4,12 +4,12 @@
 
 package jdocs.testkit;
 
-import akka.actor.*;
-import akka.japi.Creator;
-import akka.japi.Function;
-import akka.testkit.AkkaJUnitActorSystemResource;
-import akka.testkit.TestProbe;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.japi.Creator;
+import org.apache.pekko.japi.Function;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.testkit.TestProbe;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import com.typesafe.config.ConfigFactory;
 import docs.testkit.MockedChild;
 import jdocs.AbstractJavaTest;
@@ -21,7 +21,7 @@ public class ParentChildTest extends AbstractJavaTest {
   public static AkkaJUnitActorSystemResource actorSystemResource =
       new AkkaJUnitActorSystemResource(
           "TestKitDocTest",
-          ConfigFactory.parseString("akka.loggers = [akka.testkit.TestEventListener]"));
+          ConfigFactory.parseString("akka.loggers = [org.apache.pekko.testkit.TestEventListener]"));
 
   private final ActorSystem system = actorSystemResource.getSystem();
 
diff --git a/akka-docs/src/test/java/jdocs/testkit/TestKitDocTest.java b/akka-docs/src/test/java/jdocs/testkit/TestKitDocTest.java
index 40416ea4b4..94192da367 100644
--- a/akka-docs/src/test/java/jdocs/testkit/TestKitDocTest.java
+++ b/akka-docs/src/test/java/jdocs/testkit/TestKitDocTest.java
@@ -6,32 +6,32 @@ package jdocs.testkit;
 
 import static org.junit.Assert.*;
 
-import akka.pattern.Patterns;
+import org.apache.pekko.pattern.Patterns;
 import jdocs.AbstractJavaTest;
 import org.junit.Assert;
-import akka.japi.JavaPartialFunction;
-import akka.testkit.AkkaJUnitActorSystemResource;
-import akka.testkit.CallingThreadDispatcher;
-import akka.testkit.TestActor;
-import akka.testkit.TestActorRef;
-import akka.testkit.TestProbe;
-import akka.testkit.javadsl.EventFilter;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.japi.JavaPartialFunction;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.testkit.CallingThreadDispatcher;
+import org.apache.pekko.testkit.TestActor;
+import org.apache.pekko.testkit.TestActorRef;
+import org.apache.pekko.testkit.TestProbe;
+import org.apache.pekko.testkit.javadsl.EventFilter;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.ClassRule;
 import org.junit.Test;
 
 import com.typesafe.config.ConfigFactory;
 
-import akka.actor.AbstractActorWithTimers;
-import akka.actor.ActorKilledException;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Kill;
-import akka.actor.PoisonPill;
-import akka.actor.Props;
-import akka.actor.Terminated;
-import akka.actor.AbstractActor;
-import akka.testkit.TestActor.AutoPilot;
+import org.apache.pekko.actor.AbstractActorWithTimers;
+import org.apache.pekko.actor.ActorKilledException;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Kill;
+import org.apache.pekko.actor.PoisonPill;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.Terminated;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.testkit.TestActor.AutoPilot;
 
 import java.util.List;
 
@@ -44,7 +44,7 @@ public class TestKitDocTest extends AbstractJavaTest {
   public static AkkaJUnitActorSystemResource actorSystemResource =
       new AkkaJUnitActorSystemResource(
           "TestKitDocTest",
-          ConfigFactory.parseString("akka.loggers = [akka.testkit.TestEventListener]"));
+          ConfigFactory.parseString("akka.loggers = [org.apache.pekko.testkit.TestEventListener]"));
 
   private final ActorSystem system = actorSystemResource.getSystem();
 
diff --git a/akka-docs/src/test/java/jdocs/testkit/TestKitSampleTest.java b/akka-docs/src/test/java/jdocs/testkit/TestKitSampleTest.java
index 81ac54c490..b967e5b7c1 100644
--- a/akka-docs/src/test/java/jdocs/testkit/TestKitSampleTest.java
+++ b/akka-docs/src/test/java/jdocs/testkit/TestKitSampleTest.java
@@ -6,16 +6,16 @@ package jdocs.testkit;
 
 // #fullsample
 import jdocs.AbstractJavaTest;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.AbstractActor;
 
 import java.time.Duration;
 
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java b/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java
index 41e2e88c3a..714a63e440 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java
@@ -11,18 +11,18 @@ package com.example;
 //#print-refs
 */
 
-import akka.actor.typed.PreRestart;
-import akka.actor.typed.SupervisorStrategy;
-import akka.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.PreRestart;
+import org.apache.pekko.actor.typed.SupervisorStrategy;
+import org.apache.pekko.actor.typed.PostStop;
 
 // #print-refs
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 class PrintMyActorRefActor extends AbstractBehavior {
 
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotMain.java b/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotMain.java
index 8d50b9257a..c274f0db8c 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotMain.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotMain.java
@@ -12,7 +12,7 @@ package com.example;
 */
 
 // #iot-app
-import akka.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.ActorSystem;
 
 public class IotMain {
 
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotSupervisor.java b/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotSupervisor.java
index 3256511c72..03a2169545 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotSupervisor.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotSupervisor.java
@@ -12,12 +12,12 @@ package com.example;
 */
 
 // #iot-supervisor
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 public class IotSupervisor extends AbstractBehavior {
 
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_3/Device.java b/akka-docs/src/test/java/jdocs/typed/tutorial_3/Device.java
index 2e644fea38..ed538bbe99 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_3/Device.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_3/Device.java
@@ -8,13 +8,13 @@ package jdocs.typed.tutorial_3;
 
 import java.util.Optional;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 public class Device extends AbstractBehavior {
 
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java
index 6aea024aca..3f8a284b22 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java
@@ -5,9 +5,9 @@
 package jdocs.typed.tutorial_3;
 
 // #device-read-test
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
 import org.junit.ClassRule;
 import org.junit.Test;
 import java.util.Optional;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java b/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java
index dca0d481f9..1bd2395c1f 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java
@@ -12,7 +12,7 @@ package com.example;
 */
 
 // #read-protocol-1
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorRef;
 import java.util.Optional;
 
 public class Device {
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress2/Device.java b/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress2/Device.java
index 8e1f99f67d..e327c99f74 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress2/Device.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress2/Device.java
@@ -6,13 +6,13 @@ package jdocs.typed.tutorial_3.inprogress2;
 
 // #device-with-read
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 import java.util.Optional;
 
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_4/Device.java b/akka-docs/src/test/java/jdocs/typed/tutorial_4/Device.java
index 30b7c51d8b..cb09042b36 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_4/Device.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_4/Device.java
@@ -8,13 +8,13 @@ package jdocs.typed.tutorial_4;
 
 import java.util.Optional;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 public class Device extends AbstractBehavior {
 
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroup.java b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroup.java
index 74a25547f3..f5e189815e 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroup.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroup.java
@@ -4,13 +4,13 @@
 
 package jdocs.typed.tutorial_4;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java
index 63186029b7..cc969bef6d 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java
@@ -4,9 +4,9 @@
 
 package jdocs.typed.tutorial_4;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManager.java b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManager.java
index 360e23ffd7..5b4dce341f 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManager.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManager.java
@@ -4,13 +4,13 @@
 
 package jdocs.typed.tutorial_4;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java
index 764c6de080..ca0d8f1ddd 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java
@@ -4,9 +4,9 @@
 
 package jdocs.typed.tutorial_4;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java
index 76cfe11592..9d35fd6821 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java
@@ -4,9 +4,9 @@
 
 package jdocs.typed.tutorial_4;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/Device.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/Device.java
index ed4ac8efcf..7232302fa7 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/Device.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/Device.java
@@ -6,13 +6,13 @@ package jdocs.typed.tutorial_5;
 
 import java.util.Optional;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 public class Device extends AbstractBehavior {
 
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroup.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroup.java
index d52cec8e3a..91d2f0094c 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroup.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroup.java
@@ -4,13 +4,13 @@
 
 package jdocs.typed.tutorial_5;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 import java.time.Duration;
 import java.util.HashMap;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQuery.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQuery.java
index ba2dae66f3..3f0d4dda12 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQuery.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQuery.java
@@ -4,13 +4,13 @@
 
 package jdocs.typed.tutorial_5;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
-import akka.actor.typed.javadsl.TimerScheduler;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.javadsl.TimerScheduler;
 
 import java.time.Duration;
 import java.util.HashMap;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java
index 8f85b2d166..1d1d691887 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java
@@ -4,9 +4,9 @@
 
 package jdocs.typed.tutorial_5;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java
index 0a531425de..9490928d5a 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java
@@ -4,9 +4,9 @@
 
 package jdocs.typed.tutorial_5;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManager.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManager.java
index cb7fb67667..da1327ceab 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManager.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManager.java
@@ -4,13 +4,13 @@
 
 package jdocs.typed.tutorial_5;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java
index 718871a074..7a6936c9c9 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java
@@ -4,9 +4,9 @@
 
 package jdocs.typed.tutorial_5;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java
index 6b48785141..9b3e0703bf 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java
@@ -4,9 +4,9 @@
 
 package jdocs.typed.tutorial_5;
 
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
diff --git a/akka-docs/src/test/resources/application.conf b/akka-docs/src/test/resources/application.conf
index b4d39bb8d2..adaa9d9bdc 100644
--- a/akka-docs/src/test/resources/application.conf
+++ b/akka-docs/src/test/resources/application.conf
@@ -1 +1 @@
-akka.loggers = ["akka.testkit.TestEventListener"]
+akka.loggers = ["org.apache.pekko.testkit.TestEventListener"]
diff --git a/akka-docs/src/test/scala-jdk9-only/docs/stream/operators/source/AsSubscriber.scala b/akka-docs/src/test/scala-jdk9-only/docs/stream/operators/source/AsSubscriber.scala
index 86cb919e8a..24690d805d 100644
--- a/akka-docs/src/test/scala-jdk9-only/docs/stream/operators/source/AsSubscriber.scala
+++ b/akka-docs/src/test/scala-jdk9-only/docs/stream/operators/source/AsSubscriber.scala
@@ -8,9 +8,10 @@ package docs.stream.operators.source;
 import java.util.concurrent.Flow.Subscriber;
 import java.util.concurrent.Flow.Publisher;
 
-import akka.NotUsed;
-import akka.stream.scaladsl.Source;
-import akka.stream.scaladsl.JavaFlowSupport;
+import org.apache.pekko;
+import pekko.NotUsed;
+import pekko.stream.scaladsl.Source;
+import pekko.stream.scaladsl.JavaFlowSupport;
 
 //#imports
 
diff --git a/akka-docs/src/test/scala-jdk9-only/docs/stream/operators/source/FromPublisher.scala b/akka-docs/src/test/scala-jdk9-only/docs/stream/operators/source/FromPublisher.scala
index 0234b2ef80..ada3ec061d 100644
--- a/akka-docs/src/test/scala-jdk9-only/docs/stream/operators/source/FromPublisher.scala
+++ b/akka-docs/src/test/scala-jdk9-only/docs/stream/operators/source/FromPublisher.scala
@@ -8,9 +8,10 @@ package docs.stream.operators.source;
 import java.util.concurrent.Flow.Subscriber;
 import java.util.concurrent.Flow.Publisher;
 
-import akka.NotUsed;
-import akka.stream.scaladsl.Source;
-import akka.stream.scaladsl.JavaFlowSupport;
+import org.apache.pekko;
+import pekko.NotUsed;
+import pekko.stream.scaladsl.Source;
+import pekko.stream.scaladsl.JavaFlowSupport;
 
 //#imports
 
diff --git a/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala b/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala
index 1f4b7c5d9b..ad086ea1c6 100644
--- a/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala
@@ -4,26 +4,27 @@
 
 package docs.actor
 
-import akka.actor.Kill
+import org.apache.pekko.actor.Kill
 import jdocs.actor.ImmutableMessage
 
 import language.postfixOps
 
 //#imports1
-import akka.actor.Actor
-import akka.actor.Props
-import akka.event.Logging
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Props
+import pekko.event.Logging
 
 //#imports1
 
 import scala.concurrent.Future
-import akka.actor.{ ActorLogging, ActorRef, ActorSystem, PoisonPill, Terminated }
-import akka.testkit._
-import akka.util._
+import pekko.actor.{ ActorLogging, ActorRef, ActorSystem, PoisonPill, Terminated }
+import pekko.testkit._
+import pekko.util._
 import scala.concurrent.duration._
 import scala.concurrent.Await
-import akka.Done
-import akka.actor.CoordinatedShutdown
+import pekko.Done
+import pekko.actor.CoordinatedShutdown
 
 //#my-actor
 class MyActor extends Actor {
@@ -146,7 +147,7 @@ class ReplyException extends Actor {
         sender() ! result
       } catch {
         case e: Exception =>
-          sender() ! akka.actor.Status.Failure(e)
+          sender() ! pekko.actor.Status.Failure(e)
           throw e
       }
     // #reply-exception
@@ -277,7 +278,7 @@ final case class Give(thing: Any)
 //#receive-orElse
 
 //#fiddle_code
-import akka.actor.{ Actor, ActorRef, ActorSystem, PoisonPill, Props }
+import org.apache.pekko.actor.{ Actor, ActorRef, ActorSystem, PoisonPill, Props }
 import language.postfixOps
 import scala.concurrent.duration._
 
@@ -407,7 +408,7 @@ class ActorDocSpec extends AkkaSpec("""
 
   "creating a Props config" in {
     // #creating-props
-    import akka.actor.Props
+    import org.apache.pekko.actor.Props
 
     val props1 = Props[MyActor]()
     val props2 = Props(new ActorWithArgs("arg")) // careful, see below
@@ -423,7 +424,7 @@ class ActorDocSpec extends AkkaSpec("""
 
   "creating actor with Props" in {
     // #system-actorOf
-    import akka.actor.ActorSystem
+    import org.apache.pekko.actor.ActorSystem
 
     // ActorSystem is a heavy object: create only one per application
     val system = ActorSystem("mySystem")
@@ -448,7 +449,7 @@ class ActorDocSpec extends AkkaSpec("""
       val applicationContext = this
 
       // #creating-indirectly
-      import akka.actor.IndirectActorProducer
+      import org.apache.pekko.actor.IndirectActorProducer
 
       class DependencyInjector(applicationContext: AnyRef, beanName: String) extends IndirectActorProducer {
 
@@ -483,8 +484,9 @@ class ActorDocSpec extends AkkaSpec("""
     val myActor = system.actorOf(Props[FirstActor]())
     // #using-implicit-timeout
     import scala.concurrent.duration._
-    import akka.util.Timeout
-    import akka.pattern.ask
+    import org.apache.pekko
+    import pekko.util.Timeout
+    import pekko.pattern.ask
     implicit val timeout: Timeout = 5.seconds
     val future = myActor ? "hello"
     // #using-implicit-timeout
@@ -496,7 +498,7 @@ class ActorDocSpec extends AkkaSpec("""
     val myActor = system.actorOf(Props[FirstActor]())
     // #using-explicit-timeout
     import scala.concurrent.duration._
-    import akka.pattern.ask
+    import org.apache.pekko.pattern.ask
     val future = myActor.ask("hello")(5 seconds)
     // #using-explicit-timeout
     Await.result(future, 5 seconds) should be("hello")
@@ -504,7 +506,7 @@ class ActorDocSpec extends AkkaSpec("""
 
   "using receiveTimeout" in {
     // #receive-timeout
-    import akka.actor.ReceiveTimeout
+    import org.apache.pekko.actor.ReceiveTimeout
     import scala.concurrent.duration._
     class MyActor extends Actor {
       // To set an initial delay
@@ -548,7 +550,7 @@ class ActorDocSpec extends AkkaSpec("""
 
   "using Stash" in {
     // #stash
-    import akka.actor.Stash
+    import org.apache.pekko.actor.Stash
     class ActorWithProtocol extends Actor with Stash {
       def receive = {
         case "open" =>
@@ -569,7 +571,7 @@ class ActorDocSpec extends AkkaSpec("""
   "using watch" in {
     new AnyRef {
       // #watch
-      import akka.actor.{ Actor, Props, Terminated }
+      import org.apache.pekko.actor.{ Actor, Props, Terminated }
 
       class WatchActor extends Actor {
         val child = context.actorOf(Props.empty, "child")
@@ -630,7 +632,7 @@ class ActorDocSpec extends AkkaSpec("""
   "using Identify" in {
     new AnyRef {
       // #identify
-      import akka.actor.{ Actor, ActorIdentity, Identify, Props, Terminated }
+      import org.apache.pekko.actor.{ Actor, ActorIdentity, Identify, Props, Terminated }
 
       class Follower extends Actor {
         val identifyId = 1
@@ -654,14 +656,14 @@ class ActorDocSpec extends AkkaSpec("""
       val b = system.actorOf(Props(classOf[Follower], this))
       watch(b)
       system.stop(a)
-      expectMsgType[akka.actor.Terminated].actor should be(b)
+      expectMsgType[pekko.actor.Terminated].actor should be(b)
     }
   }
 
   "using pattern gracefulStop" in {
     val actorRef = system.actorOf(Props[Manager]())
     // #gracefulStop
-    import akka.pattern.gracefulStop
+    import org.apache.pekko.pattern.gracefulStop
     import scala.concurrent.Await
 
     try {
@@ -670,7 +672,7 @@ class ActorDocSpec extends AkkaSpec("""
       // the actor has been stopped
     } catch {
       // the actor wasn't stopped within 5 seconds
-      case e: akka.pattern.AskTimeoutException =>
+      case e: pekko.pattern.AskTimeoutException =>
     }
     // #gracefulStop
   }
@@ -678,7 +680,7 @@ class ActorDocSpec extends AkkaSpec("""
   "using pattern ask / pipeTo" in {
     val actorA, actorB, actorC, actorD = system.actorOf(Props.empty)
     // #ask-pipeTo
-    import akka.pattern.{ ask, pipe }
+    import org.apache.pekko.pattern.{ ask, pipe }
     import system.dispatcher // The ExecutionContext that will be used
     final case class Result(x: Int, s: String, d: Double)
     case object Request
diff --git a/akka-docs/src/test/scala/docs/actor/ByteBufferSerializerDocSpec.scala b/akka-docs/src/test/scala/docs/actor/ByteBufferSerializerDocSpec.scala
index 435b5a594a..5ac3926e52 100644
--- a/akka-docs/src/test/scala/docs/actor/ByteBufferSerializerDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/ByteBufferSerializerDocSpec.scala
@@ -6,8 +6,9 @@ package docs.actor
 
 //#bytebufserializer-with-manifest
 import java.nio.ByteBuffer
-import akka.serialization.ByteBufferSerializer
-import akka.serialization.SerializerWithStringManifest
+import org.apache.pekko
+import pekko.serialization.ByteBufferSerializer
+import pekko.serialization.SerializerWithStringManifest
 
 //#bytebufserializer-with-manifest
 
diff --git a/akka-docs/src/test/scala/docs/actor/FSMDocSpec.scala b/akka-docs/src/test/scala/docs/actor/FSMDocSpec.scala
index ea99798376..58f9aa6e00 100644
--- a/akka-docs/src/test/scala/docs/actor/FSMDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/FSMDocSpec.scala
@@ -6,17 +6,18 @@ package docs.actor
 
 import language.postfixOps
 
-import akka.testkit.{ AkkaSpec => MyFavoriteTestFrameWorkPlusAkkaTestKit }
-import akka.util.ByteString
+import org.apache.pekko.testkit.{ AkkaSpec => MyFavoriteTestFrameWorkPlusAkkaTestKit }
+import org.apache.pekko.util.ByteString
 
 //#test-code
-import akka.actor.Props
+import org.apache.pekko
+import pekko.actor.Props
 import scala.collection.immutable
 
 object FSMDocSpec {
   // messages and data types
   // #test-code
-  import akka.actor.ActorRef
+  import pekko.actor.ActorRef
   // #simple-events
   // received events
   final case class SetTarget(ref: ActorRef)
@@ -44,7 +45,7 @@ class FSMDocSpec extends MyFavoriteTestFrameWorkPlusAkkaTestKit {
 
   // #fsm-code-elided
   // #simple-imports
-  import akka.actor.{ ActorRef, FSM }
+  import pekko.actor.{ ActorRef, FSM }
   import scala.concurrent.duration._
   // #simple-imports
   // #simple-fsm
@@ -180,7 +181,7 @@ class FSMDocSpec extends MyFavoriteTestFrameWorkPlusAkkaTestKit {
     }
 
     // #logging-fsm
-    import akka.actor.LoggingFSM
+    import org.apache.pekko.actor.LoggingFSM
     class MyFSM extends LoggingFSM[StateType, Data] {
       // #body-elided
       override def logDepth = 12
diff --git a/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala b/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala
index c8c5d5737b..c09c0708e9 100644
--- a/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala
+++ b/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala
@@ -8,12 +8,13 @@ import language.postfixOps
 
 //#all
 //#imports
-import akka.actor._
-import akka.actor.SupervisorStrategy._
+import org.apache.pekko
+import pekko.actor._
+import pekko.actor.SupervisorStrategy._
 import scala.concurrent.duration._
-import akka.util.Timeout
-import akka.event.LoggingReceive
-import akka.pattern.{ ask, pipe }
+import pekko.util.Timeout
+import pekko.event.LoggingReceive
+import pekko.pattern.{ ask, pipe }
 import com.typesafe.config.ConfigFactory
 //#imports
 
diff --git a/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala b/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala
index 12a174f8a8..5c9fe7b612 100644
--- a/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala
@@ -5,7 +5,7 @@
 package docs.actor
 
 import language.postfixOps
-import akka.actor.{ ActorRef, ActorSystem, Props, Terminated }
+import org.apache.pekko.actor.{ ActorRef, ActorSystem, Props, Terminated }
 import FaultHandlingDocSpec._
 
 //#testkit
@@ -13,19 +13,20 @@ import com.typesafe.config.{ Config, ConfigFactory }
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
-import akka.testkit.{ EventFilter, ImplicitSender, TestKit }
+import org.apache.pekko.testkit.{ EventFilter, ImplicitSender, TestKit }
 
 //#testkit
 object FaultHandlingDocSpec {
   // #supervisor
   // #child
-  import akka.actor.Actor
+  import org.apache.pekko.actor.Actor
 
   // #child
   class Supervisor extends Actor {
     // #strategy
-    import akka.actor.OneForOneStrategy
-    import akka.actor.SupervisorStrategy._
+    import org.apache.pekko
+    import pekko.actor.OneForOneStrategy
+    import pekko.actor.SupervisorStrategy._
     import scala.concurrent.duration._
 
     override val supervisorStrategy =
@@ -46,8 +47,9 @@ object FaultHandlingDocSpec {
   // #supervisor2
   class Supervisor2 extends Actor {
     // #strategy2
-    import akka.actor.OneForOneStrategy
-    import akka.actor.SupervisorStrategy._
+    import org.apache.pekko
+    import pekko.actor.OneForOneStrategy
+    import pekko.actor.SupervisorStrategy._
     import scala.concurrent.duration._
 
     override val supervisorStrategy =
@@ -69,8 +71,9 @@ object FaultHandlingDocSpec {
 
   class Supervisor3 extends Actor {
     // #default-strategy-fallback
-    import akka.actor.OneForOneStrategy
-    import akka.actor.SupervisorStrategy._
+    import org.apache.pekko
+    import pekko.actor.OneForOneStrategy
+    import pekko.actor.SupervisorStrategy._
     import scala.concurrent.duration._
 
     override val supervisorStrategy =
@@ -97,7 +100,7 @@ object FaultHandlingDocSpec {
 
   val testConf: Config = ConfigFactory.parseString("""
       akka {
-        loggers = ["akka.testkit.TestEventListener"]
+        loggers = ["org.apache.pekko.testkit.TestEventListener"]
       }
   """)
 }
@@ -115,7 +118,7 @@ class FaultHandlingDocSpec(_system: ActorSystem)
         "FaultHandlingDocSpec",
         ConfigFactory.parseString("""
       akka {
-        loggers = ["akka.testkit.TestEventListener"]
+        loggers = ["org.apache.pekko.testkit.TestEventListener"]
         loglevel = "WARNING"
       }
       """)))
diff --git a/akka-docs/src/test/scala/docs/actor/InitializationDocSpec.scala b/akka-docs/src/test/scala/docs/actor/InitializationDocSpec.scala
index e1a77f4cc0..b9760b049c 100644
--- a/akka-docs/src/test/scala/docs/actor/InitializationDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/InitializationDocSpec.scala
@@ -4,8 +4,8 @@
 
 package docs.actor
 
-import akka.actor.{ Actor, Props }
-import akka.testkit.{ AkkaSpec, ImplicitSender }
+import org.apache.pekko.actor.{ Actor, Props }
+import org.apache.pekko.testkit.{ AkkaSpec, ImplicitSender }
 
 object InitializationDocSpec {
 
diff --git a/akka-docs/src/test/scala/docs/actor/PropsEdgeCaseSpec.scala b/akka-docs/src/test/scala/docs/actor/PropsEdgeCaseSpec.scala
index b66414058d..02a158939a 100644
--- a/akka-docs/src/test/scala/docs/actor/PropsEdgeCaseSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/PropsEdgeCaseSpec.scala
@@ -4,7 +4,7 @@
 
 package docs.actor
 
-import akka.actor.{ Actor, Props }
+import org.apache.pekko.actor.{ Actor, Props }
 import docs.CompileOnlySpec
 import org.scalatest.wordspec.AnyWordSpec
 
diff --git a/akka-docs/src/test/scala/docs/actor/SchedulerDocSpec.scala b/akka-docs/src/test/scala/docs/actor/SchedulerDocSpec.scala
index 9eb803ba86..64e38fb8a8 100644
--- a/akka-docs/src/test/scala/docs/actor/SchedulerDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/SchedulerDocSpec.scala
@@ -7,13 +7,14 @@ package docs.actor
 import language.postfixOps
 
 //#imports1
-import akka.actor.Actor
-import akka.actor.Props
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.Props
 import scala.concurrent.duration._
 
 //#imports1
 
-import akka.testkit._
+import pekko.testkit._
 
 class SchedulerDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
   "schedule a one-off task" in {
diff --git a/akka-docs/src/test/scala/docs/actor/SharedMutableStateDocSpec.scala b/akka-docs/src/test/scala/docs/actor/SharedMutableStateDocSpec.scala
index 9ef3bde372..29f5c0e3fa 100644
--- a/akka-docs/src/test/scala/docs/actor/SharedMutableStateDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/SharedMutableStateDocSpec.scala
@@ -7,9 +7,9 @@ package docs.actor
 class SharedMutableStateDocSpec {
 
   // #mutable-state
-  import akka.actor.{ Actor, ActorRef }
-  import akka.pattern.ask
-  import akka.util.Timeout
+  import org.apache.pekko.actor.{ Actor, ActorRef }
+  import org.apache.pekko.pattern.ask
+  import org.apache.pekko.util.Timeout
   import scala.concurrent.Future
   import scala.concurrent.duration._
   import scala.language.postfixOps
diff --git a/akka-docs/src/test/scala/docs/actor/TimerDocSpec.scala b/akka-docs/src/test/scala/docs/actor/TimerDocSpec.scala
index e5d86b2d6b..6512b1a8c7 100644
--- a/akka-docs/src/test/scala/docs/actor/TimerDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/TimerDocSpec.scala
@@ -8,8 +8,9 @@ object TimerDocSpec {
   // #timers
   import scala.concurrent.duration._
 
-  import akka.actor.Actor
-  import akka.actor.Timers
+  import org.apache.pekko
+  import pekko.actor.Actor
+  import pekko.actor.Timers
 
   object MyActor {
     private case object TickKey
diff --git a/akka-docs/src/test/scala/docs/actor/UnnestedReceives.scala b/akka-docs/src/test/scala/docs/actor/UnnestedReceives.scala
index d45efe721a..874124170d 100644
--- a/akka-docs/src/test/scala/docs/actor/UnnestedReceives.scala
+++ b/akka-docs/src/test/scala/docs/actor/UnnestedReceives.scala
@@ -4,7 +4,7 @@
 
 package docs.actor
 
-import akka.actor._
+import org.apache.pekko.actor._
 import scala.collection.mutable.ListBuffer
 
 /**
diff --git a/akka-docs/src/test/scala/docs/actor/io/dns/DnsCompileOnlyDocSpec.scala b/akka-docs/src/test/scala/docs/actor/io/dns/DnsCompileOnlyDocSpec.scala
index 41ad117de0..a8d699e04a 100644
--- a/akka-docs/src/test/scala/docs/actor/io/dns/DnsCompileOnlyDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/io/dns/DnsCompileOnlyDocSpec.scala
@@ -4,12 +4,12 @@
 
 package docs.actor.io.dns
 
-import akka.actor.{ ActorRef, ActorSystem }
-import akka.io.dns.DnsProtocol
-import akka.io.dns.DnsProtocol.Srv
-import akka.pattern.ask
-import akka.io.{ Dns, IO }
-import akka.util.Timeout
+import org.apache.pekko.actor.{ ActorRef, ActorSystem }
+import org.apache.pekko.io.dns.DnsProtocol
+import org.apache.pekko.io.dns.DnsProtocol.Srv
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.io.{ Dns, IO }
+import org.apache.pekko.util.Timeout
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/actor/typed/BlockingActor.scala b/akka-docs/src/test/scala/docs/actor/typed/BlockingActor.scala
index b7126d3bd1..a9ef6a1f12 100644
--- a/akka-docs/src/test/scala/docs/actor/typed/BlockingActor.scala
+++ b/akka-docs/src/test/scala/docs/actor/typed/BlockingActor.scala
@@ -5,8 +5,9 @@
 package docs.actor.typed
 
 // #blocking-in-actor
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
 
 object BlockingActor {
   def apply(): Behavior[Int] =
diff --git a/akka-docs/src/test/scala/docs/actor/typed/BlockingDispatcherSample.scala b/akka-docs/src/test/scala/docs/actor/typed/BlockingDispatcherSample.scala
index be1af12030..aaa565d8da 100644
--- a/akka-docs/src/test/scala/docs/actor/typed/BlockingDispatcherSample.scala
+++ b/akka-docs/src/test/scala/docs/actor/typed/BlockingDispatcherSample.scala
@@ -4,8 +4,8 @@
 
 package docs.actor.typed
 
-import akka.actor.typed._
-import akka.actor.typed.scaladsl._
+import org.apache.pekko.actor.typed._
+import org.apache.pekko.actor.typed.scaladsl._
 import com.typesafe.config.{ Config, ConfigFactory }
 
 import scala.concurrent.{ ExecutionContext, Future }
diff --git a/akka-docs/src/test/scala/docs/actor/typed/CoordinatedActorShutdownSpec.scala b/akka-docs/src/test/scala/docs/actor/typed/CoordinatedActorShutdownSpec.scala
index 637dc6fcba..26281e3811 100644
--- a/akka-docs/src/test/scala/docs/actor/typed/CoordinatedActorShutdownSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/typed/CoordinatedActorShutdownSpec.scala
@@ -4,12 +4,12 @@
 
 package docs.actor.typed
 
-import akka.Done
-import akka.actor.{ Cancellable, CoordinatedShutdown }
-import akka.actor.typed.{ ActorRef, ActorSystem, Behavior }
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.AskPattern._
-import akka.util.Timeout
+import org.apache.pekko.Done
+import org.apache.pekko.actor.{ Cancellable, CoordinatedShutdown }
+import org.apache.pekko.actor.typed.{ ActorRef, ActorSystem, Behavior }
+import org.apache.pekko.actor.typed.scaladsl.Behaviors
+import org.apache.pekko.actor.typed.scaladsl.AskPattern._
+import org.apache.pekko.util.Timeout
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/actor/typed/DispatcherDocSpec.scala b/akka-docs/src/test/scala/docs/actor/typed/DispatcherDocSpec.scala
index b9d58c088c..2c828a2434 100644
--- a/akka-docs/src/test/scala/docs/actor/typed/DispatcherDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/typed/DispatcherDocSpec.scala
@@ -4,7 +4,7 @@
 
 package docs.actor.typed
 
-import akka.actor.typed.scaladsl.ActorContext
+import org.apache.pekko.actor.typed.scaladsl.ActorContext
 
 object DispatcherDocSpec {
 
@@ -12,7 +12,7 @@ object DispatcherDocSpec {
 
   {
     // #defining-dispatcher-in-code
-    import akka.actor.typed.DispatcherSelector
+    import org.apache.pekko.actor.typed.DispatcherSelector
     val myActor =
       context.spawn(PrintActor(), "PrintActor", DispatcherSelector.fromConfig("PrintActor"))
     // #defining-dispatcher-in-code
@@ -20,7 +20,7 @@ object DispatcherDocSpec {
 
   {
     // #defining-fixed-pool-size-dispatcher
-    import akka.actor.typed.DispatcherSelector
+    import org.apache.pekko.actor.typed.DispatcherSelector
     val myActor =
       context.spawn(PrintActor(), "PrintActor", DispatcherSelector.fromConfig("blocking-io-dispatcher"))
     // #defining-fixed-pool-size-dispatcher
@@ -29,7 +29,7 @@ object DispatcherDocSpec {
   {
     // #lookup
     // for use with Futures, Scheduler, etc.
-    import akka.actor.typed.DispatcherSelector
+    import org.apache.pekko.actor.typed.DispatcherSelector
     implicit val executionContext = context.system.dispatchers.lookup(DispatcherSelector.fromConfig("my-dispatcher"))
     // #lookup
   }
diff --git a/akka-docs/src/test/scala/docs/actor/typed/PrintActor.scala b/akka-docs/src/test/scala/docs/actor/typed/PrintActor.scala
index ca189cb689..fb85797499 100644
--- a/akka-docs/src/test/scala/docs/actor/typed/PrintActor.scala
+++ b/akka-docs/src/test/scala/docs/actor/typed/PrintActor.scala
@@ -4,8 +4,8 @@
 
 package docs.actor.typed
 
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko.actor.typed.Behavior
+import org.apache.pekko.actor.typed.scaladsl.Behaviors
 
 // #print-actor
 object PrintActor {
diff --git a/akka-docs/src/test/scala/docs/actor/typed/SharedMutableStateDocSpec.scala b/akka-docs/src/test/scala/docs/actor/typed/SharedMutableStateDocSpec.scala
index b256bc2309..fa42547dfc 100644
--- a/akka-docs/src/test/scala/docs/actor/typed/SharedMutableStateDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/actor/typed/SharedMutableStateDocSpec.scala
@@ -4,9 +4,9 @@
 
 package docs.actor.typed
 
-import akka.actor.typed.scaladsl._
-import akka.actor.typed.{ ActorRef, Behavior }
-import akka.util.Timeout
+import org.apache.pekko.actor.typed.scaladsl._
+import org.apache.pekko.actor.typed.{ ActorRef, Behavior }
+import org.apache.pekko.util.Timeout
 
 import scala.collection.mutable
 import scala.concurrent.Future
@@ -67,7 +67,7 @@ class SharedMutableStateDocSpec {
 
         // Another example of incorrect approach
         // mutating actor state from ask future callback
-        import akka.actor.typed.scaladsl.AskPattern._
+        import org.apache.pekko.actor.typed.scaladsl.AskPattern._
         implicit val timeout: Timeout = 5.seconds // needed for `ask` below
         implicit val scheduler = context.system.scheduler
         val future: Future[String] = otherActor.ask(Query(_))
diff --git a/akka-docs/src/test/scala/docs/circuitbreaker/CircuitBreakerDocSpec.scala b/akka-docs/src/test/scala/docs/circuitbreaker/CircuitBreakerDocSpec.scala
index 308e4f4299..b6410b707e 100644
--- a/akka-docs/src/test/scala/docs/circuitbreaker/CircuitBreakerDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/circuitbreaker/CircuitBreakerDocSpec.scala
@@ -6,9 +6,10 @@ package docs.circuitbreaker
 
 //#imports1
 import scala.concurrent.duration._
-import akka.pattern.CircuitBreaker
-import akka.pattern.pipe
-import akka.actor.{ Actor, ActorLogging, ActorRef }
+import org.apache.pekko
+import pekko.pattern.CircuitBreaker
+import pekko.pattern.pipe
+import pekko.actor.{ Actor, ActorLogging, ActorRef }
 
 import scala.concurrent.Future
 import scala.util.{ Failure, Success, Try }
@@ -53,7 +54,7 @@ class TellPatternActor(recipient: ActorRef) extends Actor with ActorLogging {
     log.warning("My CircuitBreaker is now open, and will not close for one minute")
 
   // #circuit-breaker-tell-pattern
-  import akka.actor.ReceiveTimeout
+  import org.apache.pekko.actor.ReceiveTimeout
 
   def receive = {
     case "call" if breaker.isClosed => {
diff --git a/akka-docs/src/test/scala/docs/cluster/ClusterDocSpec.scala b/akka-docs/src/test/scala/docs/cluster/ClusterDocSpec.scala
index cbcebd06aa..d6ac8ba34b 100644
--- a/akka-docs/src/test/scala/docs/cluster/ClusterDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/cluster/ClusterDocSpec.scala
@@ -4,9 +4,9 @@
 
 package scala.docs.cluster
 
-import akka.cluster.Cluster
+import org.apache.pekko.cluster.Cluster
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 import docs.CompileOnlySpec
 
 object ClusterDocSpec {
@@ -44,8 +44,9 @@ class ClusterDocSpec extends AkkaSpec(ClusterDocSpec.config) with CompileOnlySpe
 
   "demonstrate programmatic joining to seed nodes" in compileOnlySpec {
     // #join-seed-nodes
-    import akka.actor.Address
-    import akka.cluster.Cluster
+    import org.apache.pekko
+    import pekko.actor.Address
+    import pekko.cluster.Cluster
 
     val cluster = Cluster(system)
     val list: List[Address] = ??? // your method to dynamically get seed nodes
diff --git a/akka-docs/src/test/scala/docs/cluster/FactorialBackend.scala b/akka-docs/src/test/scala/docs/cluster/FactorialBackend.scala
index e1671443cf..0fd8fd9b94 100644
--- a/akka-docs/src/test/scala/docs/cluster/FactorialBackend.scala
+++ b/akka-docs/src/test/scala/docs/cluster/FactorialBackend.scala
@@ -7,11 +7,11 @@ package scala.docs.cluster
 import scala.annotation.tailrec
 import scala.concurrent.Future
 import com.typesafe.config.ConfigFactory
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.pattern.pipe
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorLogging
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.Props
+import org.apache.pekko.pattern.pipe
 
 //#backend
 class FactorialBackend extends Actor with ActorLogging {
diff --git a/akka-docs/src/test/scala/docs/cluster/FactorialFrontend.scala b/akka-docs/src/test/scala/docs/cluster/FactorialFrontend.scala
index 7d11c6966c..4035e3bc75 100644
--- a/akka-docs/src/test/scala/docs/cluster/FactorialFrontend.scala
+++ b/akka-docs/src/test/scala/docs/cluster/FactorialFrontend.scala
@@ -6,13 +6,13 @@ package scala.docs.cluster
 
 import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.cluster.Cluster
-import akka.routing.FromConfig
-import akka.actor.ReceiveTimeout
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorLogging
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.Props
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.routing.FromConfig
+import org.apache.pekko.actor.ReceiveTimeout
 import scala.util.Try
 import scala.concurrent.Await
 
@@ -68,10 +68,11 @@ object FactorialFrontend {
 // not used, only for documentation
 abstract class FactorialFrontend2 extends Actor {
   // #router-lookup-in-code
-  import akka.cluster.routing.ClusterRouterGroup
-  import akka.cluster.routing.ClusterRouterGroupSettings
-  import akka.cluster.metrics.AdaptiveLoadBalancingGroup
-  import akka.cluster.metrics.HeapMetricsSelector
+  import org.apache.pekko
+  import pekko.cluster.routing.ClusterRouterGroup
+  import pekko.cluster.routing.ClusterRouterGroupSettings
+  import pekko.cluster.metrics.AdaptiveLoadBalancingGroup
+  import pekko.cluster.metrics.HeapMetricsSelector
 
   val backend = context.actorOf(
     ClusterRouterGroup(
@@ -88,11 +89,12 @@ abstract class FactorialFrontend2 extends Actor {
 
 // not used, only for documentation
 abstract class FactorialFrontend3 extends Actor {
+  import org.apache.pekko
   // #router-deploy-in-code
-  import akka.cluster.routing.ClusterRouterPool
-  import akka.cluster.routing.ClusterRouterPoolSettings
-  import akka.cluster.metrics.AdaptiveLoadBalancingPool
-  import akka.cluster.metrics.SystemLoadAverageMetricsSelector
+  import pekko.cluster.routing.ClusterRouterPool
+  import pekko.cluster.routing.ClusterRouterPoolSettings
+  import pekko.cluster.metrics.AdaptiveLoadBalancingPool
+  import pekko.cluster.metrics.SystemLoadAverageMetricsSelector
 
   val backend = context.actorOf(
     ClusterRouterPool(
diff --git a/akka-docs/src/test/scala/docs/cluster/MetricsListener.scala b/akka-docs/src/test/scala/docs/cluster/MetricsListener.scala
index 7ec29a45ce..38e5fd2920 100644
--- a/akka-docs/src/test/scala/docs/cluster/MetricsListener.scala
+++ b/akka-docs/src/test/scala/docs/cluster/MetricsListener.scala
@@ -5,16 +5,17 @@
 package scala.docs.cluster
 
 //#metrics-listener
-import akka.actor.ActorLogging
-import akka.actor.Actor
-import akka.cluster.Cluster
-import akka.cluster.metrics.ClusterMetricsEvent
-import akka.cluster.metrics.ClusterMetricsChanged
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.metrics.NodeMetrics
-import akka.cluster.metrics.StandardMetrics.HeapMemory
-import akka.cluster.metrics.StandardMetrics.Cpu
-import akka.cluster.metrics.ClusterMetricsExtension
+import org.apache.pekko
+import pekko.actor.ActorLogging
+import pekko.actor.Actor
+import pekko.cluster.Cluster
+import pekko.cluster.metrics.ClusterMetricsEvent
+import pekko.cluster.metrics.ClusterMetricsChanged
+import pekko.cluster.ClusterEvent.CurrentClusterState
+import pekko.cluster.metrics.NodeMetrics
+import pekko.cluster.metrics.StandardMetrics.HeapMemory
+import pekko.cluster.metrics.StandardMetrics.Cpu
+import pekko.cluster.metrics.ClusterMetricsExtension
 
 class MetricsListener extends Actor with ActorLogging {
   val selfAddress = Cluster(context.system).selfAddress
diff --git a/akka-docs/src/test/scala/docs/cluster/SimpleClusterListener.scala b/akka-docs/src/test/scala/docs/cluster/SimpleClusterListener.scala
index 62397e0e34..c66b31b23d 100644
--- a/akka-docs/src/test/scala/docs/cluster/SimpleClusterListener.scala
+++ b/akka-docs/src/test/scala/docs/cluster/SimpleClusterListener.scala
@@ -4,10 +4,11 @@
 
 package scala.docs.cluster
 
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
-import akka.actor.ActorLogging
-import akka.actor.Actor
+import org.apache.pekko
+import pekko.cluster.Cluster
+import pekko.cluster.ClusterEvent._
+import pekko.actor.ActorLogging
+import pekko.actor.Actor
 
 class SimpleClusterListener extends Actor with ActorLogging {
 
diff --git a/akka-docs/src/test/scala/docs/cluster/SimpleClusterListener2.scala b/akka-docs/src/test/scala/docs/cluster/SimpleClusterListener2.scala
index 24c5049345..96b384b3cf 100644
--- a/akka-docs/src/test/scala/docs/cluster/SimpleClusterListener2.scala
+++ b/akka-docs/src/test/scala/docs/cluster/SimpleClusterListener2.scala
@@ -4,9 +4,9 @@
 
 package docs.cluster
 
-import akka.actor.{ Actor, ActorLogging }
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
+import org.apache.pekko.actor.{ Actor, ActorLogging }
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.cluster.ClusterEvent._
 
 class SimpleClusterListener2 extends Actor with ActorLogging {
 
diff --git a/akka-docs/src/test/scala/docs/cluster/TransformationBackend.scala b/akka-docs/src/test/scala/docs/cluster/TransformationBackend.scala
index ca92d7d436..7a1d4db08c 100644
--- a/akka-docs/src/test/scala/docs/cluster/TransformationBackend.scala
+++ b/akka-docs/src/test/scala/docs/cluster/TransformationBackend.scala
@@ -6,16 +6,16 @@ package scala.docs.cluster
 
 import language.postfixOps
 import scala.concurrent.duration._
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterEvent.MemberUp
-import akka.cluster.Member
-import akka.cluster.MemberStatus
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.Props
+import org.apache.pekko.actor.RootActorPath
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState
+import org.apache.pekko.cluster.ClusterEvent.MemberUp
+import org.apache.pekko.cluster.Member
+import org.apache.pekko.cluster.MemberStatus
 import com.typesafe.config.ConfigFactory
 
 //#backend
diff --git a/akka-docs/src/test/scala/docs/cluster/TransformationFrontend.scala b/akka-docs/src/test/scala/docs/cluster/TransformationFrontend.scala
index 1789b23ce0..f12b8cfcd1 100644
--- a/akka-docs/src/test/scala/docs/cluster/TransformationFrontend.scala
+++ b/akka-docs/src/test/scala/docs/cluster/TransformationFrontend.scala
@@ -7,13 +7,13 @@ package scala.docs.cluster
 import language.postfixOps
 import scala.util.Success
 import scala.concurrent.duration._
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.pattern.ask
-import akka.util.Timeout
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.Props
+import org.apache.pekko.actor.Terminated
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.util.Timeout
 import com.typesafe.config.ConfigFactory
 import java.util.concurrent.atomic.AtomicInteger
 
diff --git a/akka-docs/src/test/scala/docs/cluster/singleton/ClusterSingletonSupervision.scala b/akka-docs/src/test/scala/docs/cluster/singleton/ClusterSingletonSupervision.scala
index fa4ff486ab..db484619f6 100644
--- a/akka-docs/src/test/scala/docs/cluster/singleton/ClusterSingletonSupervision.scala
+++ b/akka-docs/src/test/scala/docs/cluster/singleton/ClusterSingletonSupervision.scala
@@ -5,7 +5,7 @@
 package docs.cluster.singleton
 
 //#singleton-supervisor-actor
-import akka.actor.{ Actor, Props, SupervisorStrategy }
+import org.apache.pekko.actor.{ Actor, Props, SupervisorStrategy }
 class SupervisorActor(childProps: Props, override val supervisorStrategy: SupervisorStrategy) extends Actor {
   val child = context.actorOf(childProps, "supervised-child")
 
@@ -15,13 +15,14 @@ class SupervisorActor(childProps: Props, override val supervisorStrategy: Superv
 }
 //#singleton-supervisor-actor
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 abstract class ClusterSingletonSupervision extends Actor {
-  import akka.actor.{ ActorRef, Props, SupervisorStrategy }
+  import org.apache.pekko.actor.{ ActorRef, Props, SupervisorStrategy }
   def createSingleton(name: String, props: Props, supervisorStrategy: SupervisorStrategy): ActorRef = {
     // #singleton-supervisor-actor-usage
-    import akka.actor.{ PoisonPill, Props }
-    import akka.cluster.singleton.{ ClusterSingletonManager, ClusterSingletonManagerSettings }
+    import org.apache.pekko
+    import pekko.actor.{ PoisonPill, Props }
+    import pekko.cluster.singleton.{ ClusterSingletonManager, ClusterSingletonManagerSettings }
     context.system.actorOf(
       ClusterSingletonManager.props(
         singletonProps = Props(classOf[SupervisorActor], props, supervisorStrategy),
diff --git a/akka-docs/src/test/scala/docs/config/ConfigDocSpec.scala b/akka-docs/src/test/scala/docs/config/ConfigDocSpec.scala
index 309e948386..105e957570 100644
--- a/akka-docs/src/test/scala/docs/config/ConfigDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/config/ConfigDocSpec.scala
@@ -4,13 +4,13 @@
 
 package docs.config
 
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit
+import org.apache.pekko.actor.typed.scaladsl.Behaviors
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
 //#imports
-import akka.actor.typed.ActorSystem
+import org.apache.pekko.actor.typed.ActorSystem
 import com.typesafe.config.ConfigFactory
 //#imports
 
diff --git a/akka-docs/src/test/scala/docs/coordination/LeaseDocSpec.scala b/akka-docs/src/test/scala/docs/coordination/LeaseDocSpec.scala
index eec7b46bde..6f00c7817d 100644
--- a/akka-docs/src/test/scala/docs/coordination/LeaseDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/coordination/LeaseDocSpec.scala
@@ -8,11 +8,11 @@ import scala.concurrent.Future
 
 import com.typesafe.config.ConfigFactory
 
-import akka.cluster.Cluster
-import akka.coordination.lease.LeaseSettings
-import akka.coordination.lease.scaladsl.Lease
-import akka.coordination.lease.scaladsl.LeaseProvider
-import akka.testkit.AkkaSpec
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.coordination.lease.LeaseSettings
+import org.apache.pekko.coordination.lease.scaladsl.Lease
+import org.apache.pekko.coordination.lease.scaladsl.LeaseProvider
+import org.apache.pekko.testkit.AkkaSpec
 
 //#lease-example
 class SampleLease(settings: LeaseSettings) extends Lease(settings) {
diff --git a/akka-docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala b/akka-docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala
index 361fca6e98..806ad25b71 100644
--- a/akka-docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala
@@ -6,12 +6,12 @@ package docs.ddata
 
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.cluster.ddata._
-import akka.testkit.AkkaSpec
-import akka.testkit.TestProbe
-import akka.actor.ActorRef
-import akka.serialization.SerializationExtension
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.cluster.ddata._
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.testkit.TestProbe
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.serialization.SerializationExtension
 import jdocs.ddata
 
 object DistributedDataDocSpec {
@@ -46,14 +46,15 @@ object DistributedDataDocSpec {
 
   // #data-bot
   import java.util.concurrent.ThreadLocalRandom
-  import akka.actor.Actor
-  import akka.actor.ActorLogging
-  import akka.cluster.Cluster
-  import akka.cluster.ddata.DistributedData
-  import akka.cluster.ddata.ORSet
-  import akka.cluster.ddata.ORSetKey
-  import akka.cluster.ddata.Replicator
-  import akka.cluster.ddata.Replicator._
+  import org.apache.pekko
+  import pekko.actor.Actor
+  import pekko.actor.ActorLogging
+  import pekko.cluster.Cluster
+  import pekko.cluster.ddata.DistributedData
+  import pekko.cluster.ddata.ORSet
+  import pekko.cluster.ddata.ORSetKey
+  import pekko.cluster.ddata.Replicator
+  import pekko.cluster.ddata.Replicator._
 
   object DataBot {
     private case object Tick
@@ -399,7 +400,7 @@ class DistributedDataDocSpec extends AkkaSpec(DistributedDataDocSpec.config) {
   }
 
   "test japi.TwoPhaseSetSerializer" in {
-    import akka.util.ccompat.JavaConverters._
+    import org.apache.pekko.util.ccompat.JavaConverters._
     val s1 = ddata.TwoPhaseSet.create().add("a").add("b").add("c").remove("b")
     s1.getElements.asScala should be(Set("a", "c"))
     val serializer = SerializationExtension(system).findSerializerFor(s1)
diff --git a/akka-docs/src/test/scala/docs/ddata/ShoppingCart.scala b/akka-docs/src/test/scala/docs/ddata/ShoppingCart.scala
index d0fec41016..9791b17e97 100644
--- a/akka-docs/src/test/scala/docs/ddata/ShoppingCart.scala
+++ b/akka-docs/src/test/scala/docs/ddata/ShoppingCart.scala
@@ -6,16 +6,16 @@ package scala.docs.ddata
 
 import scala.concurrent.duration._
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.cluster.ddata.DistributedData
-import akka.cluster.ddata.LWWMap
-import akka.cluster.ddata.LWWMapKey
-import akka.cluster.ddata.SelfUniqueAddress
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.actor.Props
+import org.apache.pekko.cluster.ddata.DistributedData
+import org.apache.pekko.cluster.ddata.LWWMap
+import org.apache.pekko.cluster.ddata.LWWMapKey
+import org.apache.pekko.cluster.ddata.SelfUniqueAddress
 
 object ShoppingCart {
-  import akka.cluster.ddata.Replicator._
+  import org.apache.pekko.cluster.ddata.Replicator._
 
   def props(userId: String): Props = Props(new ShoppingCart(userId))
 
@@ -36,7 +36,7 @@ object ShoppingCart {
 
 class ShoppingCart(userId: String) extends Actor {
   import ShoppingCart._
-  import akka.cluster.ddata.Replicator._
+  import org.apache.pekko.cluster.ddata.Replicator._
 
   val replicator = DistributedData(context.system).replicator
   implicit val node: SelfUniqueAddress = DistributedData(context.system).selfUniqueAddress
diff --git a/akka-docs/src/test/scala/docs/ddata/TwoPhaseSet.scala b/akka-docs/src/test/scala/docs/ddata/TwoPhaseSet.scala
index 254a7181b7..900acb83e6 100644
--- a/akka-docs/src/test/scala/docs/ddata/TwoPhaseSet.scala
+++ b/akka-docs/src/test/scala/docs/ddata/TwoPhaseSet.scala
@@ -4,8 +4,8 @@
 
 package docs.ddata
 
-import akka.cluster.ddata.ReplicatedData
-import akka.cluster.ddata.GSet
+import org.apache.pekko.cluster.ddata.ReplicatedData
+import org.apache.pekko.cluster.ddata.GSet
 
 //#twophaseset
 case class TwoPhaseSet(adds: GSet[String] = GSet.empty, removals: GSet[String] = GSet.empty) extends ReplicatedData {
diff --git a/akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala b/akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala
index 4fea2ccf80..ba60fc8215 100644
--- a/akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala
+++ b/akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala
@@ -7,11 +7,12 @@ package docs.ddata.protobuf
 //#serializer
 import java.util.ArrayList
 import java.util.Collections
-import akka.util.ccompat.JavaConverters._
-import akka.actor.ExtendedActorSystem
-import akka.cluster.ddata.GSet
-import akka.cluster.ddata.protobuf.SerializationSupport
-import akka.serialization.Serializer
+import org.apache.pekko
+import pekko.util.ccompat.JavaConverters._
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.ddata.GSet
+import pekko.cluster.ddata.protobuf.SerializationSupport
+import pekko.serialization.Serializer
 import docs.ddata.TwoPhaseSet
 import docs.ddata.protobuf.msg.TwoPhaseSetMessages
 
diff --git a/akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer2.scala b/akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer2.scala
index 792ac9820b..4358518190 100644
--- a/akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer2.scala
+++ b/akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer2.scala
@@ -5,10 +5,11 @@
 package docs.ddata.protobuf
 
 //#serializer
-import akka.actor.ExtendedActorSystem
-import akka.cluster.ddata.GSet
-import akka.cluster.ddata.protobuf.SerializationSupport
-import akka.serialization.Serializer
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.cluster.ddata.GSet
+import pekko.cluster.ddata.protobuf.SerializationSupport
+import pekko.serialization.Serializer
 import docs.ddata.TwoPhaseSet
 import docs.ddata.protobuf.msg.TwoPhaseSetMessages
 
diff --git a/akka-docs/src/test/scala/docs/discovery/DnsDiscoveryDocSpec.scala b/akka-docs/src/test/scala/docs/discovery/DnsDiscoveryDocSpec.scala
index ede518e1e5..6c950ec0ca 100644
--- a/akka-docs/src/test/scala/docs/discovery/DnsDiscoveryDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/discovery/DnsDiscoveryDocSpec.scala
@@ -4,7 +4,7 @@
 
 package docs.discovery
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 import com.typesafe.config.ConfigFactory
 
 import scala.concurrent.duration._
@@ -27,8 +27,9 @@ class DnsDiscoveryDocSpec extends AkkaSpec(DnsDiscoveryDocSpec.config) {
   "DNS Discovery" should {
     "find akka.io" in {
       // #lookup-dns
-      import akka.discovery.Discovery
-      import akka.discovery.ServiceDiscovery
+      import org.apache.pekko
+      import pekko.discovery.Discovery
+      import pekko.discovery.ServiceDiscovery
 
       val discovery: ServiceDiscovery = Discovery(system).discovery
       // ...
diff --git a/akka-docs/src/test/scala/docs/dispatcher/DispatcherDocSpec.scala b/akka-docs/src/test/scala/docs/dispatcher/DispatcherDocSpec.scala
index c920120bab..a643749917 100644
--- a/akka-docs/src/test/scala/docs/dispatcher/DispatcherDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/dispatcher/DispatcherDocSpec.scala
@@ -6,10 +6,10 @@ package docs.dispatcher
 
 import language.postfixOps
 
-import akka.testkit.AkkaSpec
-import akka.event.Logging
-import akka.event.LoggingAdapter
-import akka.actor._
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.event.Logging
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.actor._
 
 object DispatcherDocSpec {
   val javaConfig = """
@@ -192,7 +192,7 @@ object DispatcherDocSpec {
 
     //#bounded-mailbox-config
     bounded-mailbox {
-      mailbox-type = "akka.dispatch.NonBlockingBoundedMailbox"
+      mailbox-type = "org.apache.pekko.dispatch.NonBlockingBoundedMailbox"
       mailbox-capacity = 1000 
     }
     //#bounded-mailbox-config
@@ -200,7 +200,7 @@ object DispatcherDocSpec {
     //#required-mailbox-config
 
     akka.actor.mailbox.requirements {
-      "akka.dispatch.BoundedMessageQueueSemantics" = bounded-mailbox
+      "org.apache.pekko.dispatch.BoundedMessageQueueSemantics" = bounded-mailbox
     }
     //#required-mailbox-config
 
@@ -222,7 +222,7 @@ object DispatcherDocSpec {
 
     //#control-aware-mailbox-config
     control-aware-dispatcher {
-      mailbox-type = "akka.dispatch.UnboundedControlAwareMailbox"
+      mailbox-type = "org.apache.pekko.dispatch.UnboundedControlAwareMailbox"
       //Other dispatcher configuration goes here
     }
     //#control-aware-mailbox-config
@@ -230,8 +230,9 @@ object DispatcherDocSpec {
   """
 
   // #prio-mailbox
-  import akka.dispatch.PriorityGenerator
-  import akka.dispatch.UnboundedStablePriorityMailbox
+  import org.apache.pekko
+  import pekko.dispatch.PriorityGenerator
+  import pekko.dispatch.UnboundedStablePriorityMailbox
   import com.typesafe.config.Config
 
   // We inherit, in this case, from UnboundedStablePriorityMailbox
@@ -255,7 +256,7 @@ object DispatcherDocSpec {
   // #prio-mailbox
 
   // #control-aware-mailbox-messages
-  import akka.dispatch.ControlMessage
+  import org.apache.pekko.dispatch.ControlMessage
 
   case object MyControlMessage extends ControlMessage
   // #control-aware-mailbox-messages
@@ -267,8 +268,9 @@ object DispatcherDocSpec {
   }
 
   // #required-mailbox-class
-  import akka.dispatch.RequiresMessageQueue
-  import akka.dispatch.BoundedMessageQueueSemantics
+  import org.apache.pekko
+  import pekko.dispatch.RequiresMessageQueue
+  import pekko.dispatch.BoundedMessageQueueSemantics
 
   class MyBoundedActor extends MyActor with RequiresMessageQueue[BoundedMessageQueueSemantics]
   // #required-mailbox-class
@@ -292,7 +294,7 @@ class DispatcherDocSpec extends AkkaSpec(DispatcherDocSpec.config) {
   "defining dispatcher in config" in {
     val context = system
     // #defining-dispatcher-in-config
-    import akka.actor.Props
+    import org.apache.pekko.actor.Props
     val myActor = context.actorOf(Props[MyActor](), "myactor")
     // #defining-dispatcher-in-config
   }
@@ -300,7 +302,7 @@ class DispatcherDocSpec extends AkkaSpec(DispatcherDocSpec.config) {
   "defining dispatcher in code" in {
     val context = system
     // #defining-dispatcher-in-code
-    import akka.actor.Props
+    import org.apache.pekko.actor.Props
     val myActor =
       context.actorOf(Props[MyActor]().withDispatcher("my-dispatcher"), "myactor1")
     // #defining-dispatcher-in-code
@@ -344,7 +346,7 @@ class DispatcherDocSpec extends AkkaSpec(DispatcherDocSpec.config) {
   "defining mailbox in config" in {
     val context = system
     // #defining-mailbox-in-config
-    import akka.actor.Props
+    import org.apache.pekko.actor.Props
     val myActor = context.actorOf(Props[MyActor](), "priomailboxactor")
     // #defining-mailbox-in-config
   }
@@ -352,7 +354,7 @@ class DispatcherDocSpec extends AkkaSpec(DispatcherDocSpec.config) {
   "defining mailbox in code" in {
     val context = system
     // #defining-mailbox-in-code
-    import akka.actor.Props
+    import org.apache.pekko.actor.Props
     val myActor = context.actorOf(Props[MyActor]().withMailbox("prio-mailbox"))
     // #defining-mailbox-in-code
   }
diff --git a/akka-docs/src/test/scala/docs/dispatcher/MyUnboundedMailbox.scala b/akka-docs/src/test/scala/docs/dispatcher/MyUnboundedMailbox.scala
index f5d78cf613..a22c69c0d9 100644
--- a/akka-docs/src/test/scala/docs/dispatcher/MyUnboundedMailbox.scala
+++ b/akka-docs/src/test/scala/docs/dispatcher/MyUnboundedMailbox.scala
@@ -5,12 +5,13 @@
 package docs.dispatcher
 
 //#mailbox-implementation-example
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.dispatch.Envelope
-import akka.dispatch.MailboxType
-import akka.dispatch.MessageQueue
-import akka.dispatch.ProducesMessageQueue
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.dispatch.Envelope
+import pekko.dispatch.MailboxType
+import pekko.dispatch.MessageQueue
+import pekko.dispatch.ProducesMessageQueue
 import com.typesafe.config.Config
 import java.util.concurrent.ConcurrentLinkedQueue
 import scala.Option
diff --git a/akka-docs/src/test/scala/docs/event/EventBusDocSpec.scala b/akka-docs/src/test/scala/docs/event/EventBusDocSpec.scala
index edf1e2a806..a49b870137 100644
--- a/akka-docs/src/test/scala/docs/event/EventBusDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/event/EventBusDocSpec.scala
@@ -5,15 +5,16 @@
 package docs.event
 
 import scala.concurrent.duration._
-import akka.testkit.AkkaSpec
-import akka.actor.{ ActorRef, ActorSystem }
-import akka.testkit.TestProbe
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.actor.{ ActorRef, ActorSystem }
+import org.apache.pekko.testkit.TestProbe
 
 object EventBusDocSpec {
 
   // #lookup-bus
-  import akka.event.EventBus
-  import akka.event.LookupClassification
+  import org.apache.pekko
+  import pekko.event.EventBus
+  import pekko.event.LookupClassification
 
   final case class MsgEnvelope(topic: String, payload: Any)
 
@@ -49,7 +50,7 @@ object EventBusDocSpec {
   // #lookup-bus
 
   // #subchannel-bus
-  import akka.util.Subclassification
+  import org.apache.pekko.util.Subclassification
 
   class StartsWithSubclassification extends Subclassification[String] {
     override def isEqual(x: String, y: String): Boolean =
@@ -59,7 +60,7 @@ object EventBusDocSpec {
       x.startsWith(y)
   }
 
-  import akka.event.SubchannelClassification
+  import pekko.event.SubchannelClassification
 
   /**
    * Publishes the payload of the MsgEnvelope when the topic of the
@@ -87,7 +88,7 @@ object EventBusDocSpec {
   // #subchannel-bus
 
   // #scanning-bus
-  import akka.event.ScanningClassification
+  import org.apache.pekko.event.ScanningClassification
 
   /**
    * Publishes String messages with length less than or equal to the length
@@ -121,9 +122,10 @@ object EventBusDocSpec {
   // #scanning-bus
 
   // #actor-bus
-  import akka.event.ActorEventBus
-  import akka.event.ManagedActorClassification
-  import akka.event.ActorClassifier
+  import org.apache.pekko
+  import pekko.event.ActorEventBus
+  import pekko.event.ManagedActorClassification
+  import pekko.event.ActorClassifier
 
   final case class Notification(ref: ActorRef, id: Int)
 
diff --git a/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala b/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala
index 59bf72b999..a75dec72a5 100644
--- a/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala
@@ -4,13 +4,14 @@
 
 package docs.event
 
-import akka.actor.{ Actor, DeadLetter, Props }
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.{ Actor, DeadLetter, Props }
+import pekko.testkit.AkkaSpec
 
 object LoggingDocSpec {
 
   // #my-actor
-  import akka.event.Logging
+  import org.apache.pekko.event.Logging
 
   class MyActor extends Actor {
     val log = Logging(context.system, this)
@@ -27,7 +28,7 @@ object LoggingDocSpec {
   }
   // #my-actor
 
-  import akka.event.Logging
+  import org.apache.pekko.event.Logging
 
   class MdcActor extends Actor {
     val log = Logging(this)
@@ -52,7 +53,7 @@ object LoggingDocSpec {
 
   final case class Req(work: String, visitorId: Int)
 
-  class MdcActorMixin extends Actor with akka.actor.DiagnosticActorLogging {
+  class MdcActorMixin extends Actor with pekko.actor.DiagnosticActorLogging {
     var reqId = 0
 
     override def mdc(currentMessage: Any): MDC = {
@@ -75,12 +76,13 @@ object LoggingDocSpec {
   // #mdc-actor
 
   // #my-event-listener
-  import akka.event.Logging.Debug
-  import akka.event.Logging.Error
-  import akka.event.Logging.Info
-  import akka.event.Logging.InitializeLogger
-  import akka.event.Logging.LoggerInitialized
-  import akka.event.Logging.Warning
+  import org.apache.pekko
+  import pekko.event.Logging.Debug
+  import pekko.event.Logging.Error
+  import pekko.event.Logging.Info
+  import pekko.event.Logging.InitializeLogger
+  import pekko.event.Logging.LoggerInitialized
+  import pekko.event.Logging.Warning
 
   class MyEventListener extends Actor {
     def receive = {
@@ -94,8 +96,9 @@ object LoggingDocSpec {
   // #my-event-listener
 
   // #my-source
-  import akka.actor.ActorSystem
-  import akka.event.LogSource
+  import org.apache.pekko
+  import pekko.actor.ActorSystem
+  import pekko.event.LogSource
 
   object MyType {
     implicit val logSource: LogSource[AnyRef] = new LogSource[AnyRef] {
@@ -106,7 +109,7 @@ object LoggingDocSpec {
 
   class MyType(system: ActorSystem) {
     import MyType._
-    import akka.event.Logging
+    import pekko.event.Logging
 
     val log = Logging(system, this)
   }
@@ -116,7 +119,7 @@ object LoggingDocSpec {
     def println(s: Any) = ()
 
     // #deadletters
-    import akka.actor.{ Actor, DeadLetter, Props }
+    import org.apache.pekko.actor.{ Actor, DeadLetter, Props }
 
     class DeadLetterListener extends Actor {
       def receive = {
@@ -187,16 +190,16 @@ class LoggingDocSpec extends AkkaSpec {
   }
 
   "allow registration to suppressed dead letters" in {
-    import akka.actor.Props
+    import org.apache.pekko.actor.Props
     val listener = system.actorOf(Props[MyActor]())
 
     // #suppressed-deadletters
-    import akka.actor.SuppressedDeadLetter
+    import org.apache.pekko.actor.SuppressedDeadLetter
     system.eventStream.subscribe(listener, classOf[SuppressedDeadLetter])
     // #suppressed-deadletters
 
     // #all-deadletters
-    import akka.actor.AllDeadLetters
+    import org.apache.pekko.actor.AllDeadLetters
     system.eventStream.subscribe(listener, classOf[AllDeadLetters])
     // #all-deadletters
   }
diff --git a/akka-docs/src/test/scala/docs/extension/ExtensionDocSpec.scala b/akka-docs/src/test/scala/docs/extension/ExtensionDocSpec.scala
index 414a2e2e7f..20fd773eba 100644
--- a/akka-docs/src/test/scala/docs/extension/ExtensionDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/extension/ExtensionDocSpec.scala
@@ -6,12 +6,12 @@ package docs.extension
 
 import java.util.concurrent.atomic.AtomicLong
 
-import akka.actor.Actor
-import akka.actor.ClassicActorSystemProvider
-import akka.testkit.AkkaSpec
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.testkit.AkkaSpec
 
 //#extension
-import akka.actor.Extension
+import org.apache.pekko.actor.Extension
 
 class CountExtensionImpl extends Extension {
   // Since this Extension is a shared instance
@@ -24,10 +24,11 @@ class CountExtensionImpl extends Extension {
 //#extension
 
 //#extensionid
-import akka.actor.ActorSystem
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.actor.ExtendedActorSystem
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.actor.ExtendedActorSystem
 
 object CountExtension extends ExtensionId[CountExtensionImpl] with ExtensionIdProvider {
   // The lookup method is required by ExtensionIdProvider,
diff --git a/akka-docs/src/test/scala/docs/extension/SettingsExtensionDocSpec.scala b/akka-docs/src/test/scala/docs/extension/SettingsExtensionDocSpec.scala
index a141bc673a..2feb8e7816 100644
--- a/akka-docs/src/test/scala/docs/extension/SettingsExtensionDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/extension/SettingsExtensionDocSpec.scala
@@ -5,22 +5,23 @@
 package docs.extension
 
 //#imports
-import akka.actor.ActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.actor.ExtendedActorSystem
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.actor.ExtendedActorSystem
 
 import scala.concurrent.duration.Duration
 import com.typesafe.config.Config
 import java.util.concurrent.TimeUnit
 
-import akka.actor.ClassicActorSystemProvider
+import pekko.actor.ClassicActorSystemProvider
 
 //#imports
 
-import akka.actor.Actor
-import akka.testkit.AkkaSpec
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.testkit.AkkaSpec
 
 //#extension
 class SettingsImpl(config: Config) extends Extension {
diff --git a/akka-docs/src/test/scala/docs/faq/Faq.scala b/akka-docs/src/test/scala/docs/faq/Faq.scala
index 7f87969ba8..12acd9c5f6 100644
--- a/akka-docs/src/test/scala/docs/faq/Faq.scala
+++ b/akka-docs/src/test/scala/docs/faq/Faq.scala
@@ -4,7 +4,7 @@
 
 package docs.faq
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 
 //#exhaustiveness-check
 object MyActor {
diff --git a/akka-docs/src/test/scala/docs/future/FutureDocSpec.scala b/akka-docs/src/test/scala/docs/future/FutureDocSpec.scala
index a314f80835..be3efbf095 100644
--- a/akka-docs/src/test/scala/docs/future/FutureDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/future/FutureDocSpec.scala
@@ -5,14 +5,15 @@
 package docs.future
 
 import language.postfixOps
-import akka.testkit._
-import akka.actor.{ Actor, ActorRef, Props, Status }
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.testkit._
+import pekko.actor.{ Actor, ActorRef, Props, Status }
+import pekko.util.Timeout
 
 import scala.concurrent.duration._
 import java.lang.IllegalStateException
 
-import akka.actor.typed.ActorSystem
+import pekko.actor.typed.ActorSystem
 
 import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
 import scala.util.{ Failure, Success }
@@ -41,7 +42,7 @@ object FutureDocSpec {
   // #pipe-to-usage
   class ActorUsingPipeTo(target: ActorRef) extends Actor {
     // akka.pattern.pipe needs to be imported
-    import akka.pattern.{ ask, pipe }
+    import org.apache.pekko.pattern.{ ask, pipe }
     // implicit ExecutionContext should be in scope
     implicit val ec: ExecutionContext = context.dispatcher
     implicit val timeout: Timeout = 5.seconds
@@ -83,7 +84,7 @@ object FutureDocSpec {
   }
 
   class UserActivityActor(val userId: String, repository: UserActivityRepository) extends Actor {
-    import akka.pattern.pipe
+    import org.apache.pekko.pattern.pipe
     import UserActivityActor._
     implicit val ec: ExecutionContext = context.dispatcher
 
@@ -103,7 +104,7 @@ object FutureDocSpec {
   // #pipe-to-proxy-actor
   class UserProxyActor(userData: ActorRef, userActivities: ActorRef) extends Actor {
     import UserProxyActor._
-    import akka.pattern.{ ask, pipe }
+    import org.apache.pekko.pattern.{ ask, pipe }
     implicit val ec: ExecutionContext = context.dispatcher
 
     implicit val timeout: Timeout = Timeout(5 seconds)
@@ -154,8 +155,8 @@ class FutureDocSpec extends AkkaSpec {
     val msg = "hello"
     // #ask-blocking
     import scala.concurrent.Await
-    import akka.pattern.ask
-    import akka.util.Timeout
+    import org.apache.pekko.pattern.ask
+    import org.apache.pekko.util.Timeout
     import scala.concurrent.duration._
 
     implicit val timeout: Timeout = 5.seconds
@@ -172,7 +173,7 @@ class FutureDocSpec extends AkkaSpec {
     implicit val timeout: Timeout = 5.seconds
     // #map-to
     import scala.concurrent.Future
-    import akka.pattern.ask
+    import org.apache.pekko.pattern.ask
 
     val future: Future[String] = ask(actor, msg).mapTo[String]
     // #map-to
@@ -287,7 +288,7 @@ class FutureDocSpec extends AkkaSpec {
     val msg2 = 2
     implicit val timeout: Timeout = 5.seconds
     import scala.concurrent.Await
-    import akka.pattern.ask
+    import org.apache.pekko.pattern.ask
     // #composing-wrong
 
     val f1 = ask(actor1, msg1)
@@ -311,7 +312,7 @@ class FutureDocSpec extends AkkaSpec {
     val msg2 = 2
     implicit val timeout: Timeout = 5.seconds
     import scala.concurrent.Await
-    import akka.pattern.ask
+    import org.apache.pekko.pattern.ask
     // #composing
 
     val f1 = ask(actor1, msg1)
@@ -334,7 +335,7 @@ class FutureDocSpec extends AkkaSpec {
     val oddActor = system.actorOf(Props[OddActor]())
     // #sequence-ask
     // oddActor returns odd numbers sequentially from 1 as a List[Future[Int]]
-    val listOfFutures = List.fill(100)(akka.pattern.ask(oddActor, GetNext).mapTo[Int])
+    val listOfFutures = List.fill(100)(pekko.pattern.ask(oddActor, GetNext).mapTo[Int])
 
     // now we have a Future[List[Int]]
     val futureList = Future.sequence(listOfFutures)
@@ -389,7 +390,7 @@ class FutureDocSpec extends AkkaSpec {
     val actor = system.actorOf(Props[MyActor]())
     val msg1 = -1
     // #recover
-    val future = akka.pattern.ask(actor, msg1).recover {
+    val future = pekko.pattern.ask(actor, msg1).recover {
       case e: ArithmeticException => 0
     }
     future.foreach(println)
@@ -402,7 +403,7 @@ class FutureDocSpec extends AkkaSpec {
     val actor = system.actorOf(Props[MyActor]())
     val msg1 = -1
     // #try-recover
-    val future = akka.pattern.ask(actor, msg1).recoverWith {
+    val future = pekko.pattern.ask(actor, msg1).recoverWith {
       case e: ArithmeticException => Future.successful(0)
       case foo: IllegalArgumentException =>
         Future.failed[Int](new IllegalStateException("All br0ken!"))
@@ -482,11 +483,11 @@ class FutureDocSpec extends AkkaSpec {
   }
 
   "demonstrate usage of pattern.after" in {
-    import akka.actor.typed.scaladsl.adapter.ClassicActorSystemOps
+    import org.apache.pekko.actor.typed.scaladsl.adapter.ClassicActorSystemOps
     implicit val system: ActorSystem[Nothing] = this.system.toTyped
     // #after
     val delayed =
-      akka.pattern.after(200.millis)(Future.failed(new IllegalStateException("OHNOES")))
+      pekko.pattern.after(200.millis)(Future.failed(new IllegalStateException("OHNOES")))
 
     val future = Future { Thread.sleep(1000); "foo" }
     val result = Future.firstCompletedOf(Seq(future, delayed))
@@ -495,11 +496,12 @@ class FutureDocSpec extends AkkaSpec {
   }
 
   "demonstrate pattern.retry" in {
-    import akka.actor.typed.scaladsl.adapter.ClassicActorSystemOps
+    import pekko.actor.typed.scaladsl.adapter.ClassicActorSystemOps
     val system: ActorSystem[Nothing] = this.system.toTyped
     // #retry
-    import akka.actor.typed.scaladsl.adapter._
-    implicit val scheduler: akka.actor.Scheduler = system.scheduler.toClassic
+    import org.apache.pekko
+    import pekko.actor.typed.scaladsl.adapter._
+    implicit val scheduler: pekko.actor.Scheduler = system.scheduler.toClassic
     implicit val ec: ExecutionContext = system.executionContext
 
     // Given some future that will succeed eventually
@@ -512,7 +514,7 @@ class FutureDocSpec extends AkkaSpec {
     }
 
     // Return a new future that will retry up to 10 times
-    val retried: Future[Int] = akka.pattern.retry(() => futureToAttempt(), attempts = 10, 100 milliseconds)
+    val retried: Future[Int] = pekko.pattern.retry(() => futureToAttempt(), attempts = 10, 100 milliseconds)
     // #retry
 
     Await.result(retried, 1 second) should ===(5)
diff --git a/akka-docs/src/test/scala/docs/io/EchoServer.scala b/akka-docs/src/test/scala/docs/io/EchoServer.scala
index 0043ec2227..2133c11910 100644
--- a/akka-docs/src/test/scala/docs/io/EchoServer.scala
+++ b/akka-docs/src/test/scala/docs/io/EchoServer.scala
@@ -7,9 +7,9 @@ package docs.io
 import java.net.InetSocketAddress
 
 import com.typesafe.config.ConfigFactory
-import akka.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, Props, SupervisorStrategy }
-import akka.io.{ IO, Tcp }
-import akka.util.ByteString
+import org.apache.pekko.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, Props, SupervisorStrategy }
+import org.apache.pekko.io.{ IO, Tcp }
+import org.apache.pekko.util.ByteString
 
 import scala.io.StdIn
 
diff --git a/akka-docs/src/test/scala/docs/io/IODocSpec.scala b/akka-docs/src/test/scala/docs/io/IODocSpec.scala
index 96edbad732..758623e126 100644
--- a/akka-docs/src/test/scala/docs/io/IODocSpec.scala
+++ b/akka-docs/src/test/scala/docs/io/IODocSpec.scala
@@ -5,18 +5,19 @@
 package docs.io
 
 //#imports
-import akka.actor.{ Actor, ActorRef, Props }
-import akka.io.{ IO, Tcp }
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, Props }
+import pekko.io.{ IO, Tcp }
+import pekko.util.ByteString
 import java.net.InetSocketAddress
 //#imports
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 import scala.concurrent.duration._
 
 class DemoActor extends Actor {
   // #manager
-  import akka.io.{ IO, Tcp }
+  import org.apache.pekko.io.{ IO, Tcp }
   import context.system // implicitly used by IO(Tcp)
 
   val manager = IO(Tcp)
diff --git a/akka-docs/src/test/scala/docs/io/ReadBackPressure.scala b/akka-docs/src/test/scala/docs/io/ReadBackPressure.scala
index 519c7bd492..95b457002d 100644
--- a/akka-docs/src/test/scala/docs/io/ReadBackPressure.scala
+++ b/akka-docs/src/test/scala/docs/io/ReadBackPressure.scala
@@ -4,12 +4,12 @@
 
 package docs.io
 
-import akka.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, Props }
-import akka.io.Tcp._
-import akka.io.{ IO, Tcp }
+import org.apache.pekko.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, Props }
+import org.apache.pekko.io.Tcp._
+import org.apache.pekko.io.{ IO, Tcp }
 import java.net.InetSocketAddress
-import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
-import akka.util.ByteString
+import org.apache.pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
+import org.apache.pekko.util.ByteString
 
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
diff --git a/akka-docs/src/test/scala/docs/io/ScalaUdpMulticast.scala b/akka-docs/src/test/scala/docs/io/ScalaUdpMulticast.scala
index 196bd58c98..93cc9d9505 100644
--- a/akka-docs/src/test/scala/docs/io/ScalaUdpMulticast.scala
+++ b/akka-docs/src/test/scala/docs/io/ScalaUdpMulticast.scala
@@ -8,10 +8,10 @@ import java.net.{ InetAddress, InetSocketAddress, NetworkInterface, StandardProt
 import java.net.DatagramSocket
 import java.nio.channels.DatagramChannel
 
-import akka.actor.{ Actor, ActorLogging, ActorRef }
-import akka.io.Inet.{ DatagramChannelCreator, SocketOptionV2 }
-import akka.io.{ IO, Udp }
-import akka.util.ByteString
+import org.apache.pekko.actor.{ Actor, ActorLogging, ActorRef }
+import org.apache.pekko.io.Inet.{ DatagramChannelCreator, SocketOptionV2 }
+import org.apache.pekko.io.{ IO, Udp }
+import org.apache.pekko.util.ByteString
 
 //#inet6-protocol-family
 final case class Inet6ProtocolFamily() extends DatagramChannelCreator {
diff --git a/akka-docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala b/akka-docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala
index f292985e62..6b4a106090 100644
--- a/akka-docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala
+++ b/akka-docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala
@@ -7,12 +7,12 @@ package docs.io
 import java.net.Inet6Address
 import java.net.NetworkInterface
 
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.io.Udp
-import akka.testkit.SocketUtil
-import akka.testkit.TestKit
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.Props
+import org.apache.pekko.io.Udp
+import org.apache.pekko.testkit.SocketUtil
+import org.apache.pekko.testkit.TestKit
+import org.apache.pekko.util.ccompat.JavaConverters._
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
diff --git a/akka-docs/src/test/scala/docs/io/UdpDocSpec.scala b/akka-docs/src/test/scala/docs/io/UdpDocSpec.scala
index 4fea5eb164..5e8e5b4f49 100644
--- a/akka-docs/src/test/scala/docs/io/UdpDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/io/UdpDocSpec.scala
@@ -4,18 +4,18 @@
 
 package docs.io
 
-import akka.testkit.AkkaSpec
-import akka.actor.Actor
-import akka.io.IO
-import akka.io.Udp
-import akka.actor.ActorRef
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.io.IO
+import org.apache.pekko.io.Udp
+import org.apache.pekko.actor.ActorRef
 import java.net.InetSocketAddress
-import akka.util.ByteString
-import akka.testkit.TestProbe
-import akka.actor.Props
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.testkit.TestProbe
+import org.apache.pekko.actor.Props
 import scala.concurrent.duration._
-import akka.actor.PoisonPill
-import akka.io.UdpConnected
+import org.apache.pekko.actor.PoisonPill
+import org.apache.pekko.io.UdpConnected
 
 object ScalaUdpDocSpec {
 
diff --git a/akka-docs/src/test/scala/docs/pattern/BackoffSupervisorDocSpec.scala b/akka-docs/src/test/scala/docs/pattern/BackoffSupervisorDocSpec.scala
index 9941667de2..15a307beea 100644
--- a/akka-docs/src/test/scala/docs/pattern/BackoffSupervisorDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/pattern/BackoffSupervisorDocSpec.scala
@@ -4,10 +4,10 @@
 
 package docs.pattern
 
-import akka.actor.{ ActorContext, ActorSystem, OneForOneStrategy, Props, SupervisorStrategy }
-import akka.cluster.sharding.ShardRegion.Passivate
-import akka.pattern.{ BackoffOpts, BackoffSupervisor }
-import akka.testkit.TestActors.EchoActor
+import org.apache.pekko.actor.{ ActorContext, ActorSystem, OneForOneStrategy, Props, SupervisorStrategy }
+import org.apache.pekko.cluster.sharding.ShardRegion.Passivate
+import org.apache.pekko.pattern.{ BackoffOpts, BackoffSupervisor }
+import org.apache.pekko.testkit.TestActors.EchoActor
 
 class BackoffSupervisorDocSpec {
 
diff --git a/akka-docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala
index b5b197dd5b..9f37a935f4 100644
--- a/akka-docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/persistence/PersistenceDocSpec.scala
@@ -4,9 +4,9 @@
 
 package docs.persistence
 
-import akka.actor._
-import akka.pattern.{ BackoffOpts, BackoffSupervisor }
-import akka.persistence._
+import org.apache.pekko.actor._
+import org.apache.pekko.pattern.{ BackoffOpts, BackoffSupervisor }
+import org.apache.pekko.persistence._
 
 import scala.concurrent.duration._
 import scala.language.postfixOps
@@ -105,8 +105,9 @@ object PersistenceDocSpec {
 
   object AtLeastOnce {
     // #at-least-once-example
-    import akka.actor.{ Actor, ActorSelection }
-    import akka.persistence.AtLeastOnceDelivery
+    import org.apache.pekko
+    import pekko.actor.{ Actor, ActorSelection }
+    import pekko.persistence.AtLeastOnceDelivery
 
     case class Msg(deliveryId: Long, s: String)
     case class Confirm(deliveryId: Long)
diff --git a/akka-docs/src/test/scala/docs/persistence/PersistenceEventAdapterDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/PersistenceEventAdapterDocSpec.scala
index 97b2897d4f..28797febca 100644
--- a/akka-docs/src/test/scala/docs/persistence/PersistenceEventAdapterDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/persistence/PersistenceEventAdapterDocSpec.scala
@@ -4,10 +4,10 @@
 
 package docs.persistence
 
-import akka.actor.{ ExtendedActorSystem, Props }
-import akka.persistence.journal.{ EventAdapter, EventSeq }
-import akka.persistence.{ PersistentActor, RecoveryCompleted }
-import akka.testkit.{ AkkaSpec, TestProbe }
+import org.apache.pekko.actor.{ ExtendedActorSystem, Props }
+import org.apache.pekko.persistence.journal.{ EventAdapter, EventSeq }
+import org.apache.pekko.persistence.{ PersistentActor, RecoveryCompleted }
+import org.apache.pekko.testkit.{ AkkaSpec, TestProbe }
 import com.google.gson.{ Gson, JsonElement }
 
 import scala.collection.immutable
@@ -39,7 +39,7 @@ class PersistenceEventAdapterDocSpec(config: String) extends AkkaSpec(config) {
 
       akka.persistence.journal {
         auto-json-store {
-          class = "akka.persistence.journal.inmem.InmemJournal" # reuse inmem, as an example
+          class = "org.apache.pekko.persistence.journal.inmem.InmemJournal" # reuse inmem, as an example
 
           event-adapters {
             auto-json = "docs.persistence.MyAutoJsonEventAdapter"
@@ -52,7 +52,7 @@ class PersistenceEventAdapterDocSpec(config: String) extends AkkaSpec(config) {
         }
 
         manual-json-store {
-          class = "akka.persistence.journal.inmem.InmemJournal" # reuse inmem, as an example
+          class = "org.apache.pekko.persistence.journal.inmem.InmemJournal" # reuse inmem, as an example
 
           event-adapters {
             manual-json    = "docs.persistence.MyManualJsonEventAdapter"
diff --git a/akka-docs/src/test/scala/docs/persistence/PersistenceMultiDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/PersistenceMultiDocSpec.scala
index 009512e044..fa28a4fe0a 100644
--- a/akka-docs/src/test/scala/docs/persistence/PersistenceMultiDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/persistence/PersistenceMultiDocSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-import akka.persistence.{ PersistentActor, RuntimePluginConfig }
+import org.apache.pekko.persistence.{ PersistentActor, RuntimePluginConfig }
 import com.typesafe.config.ConfigFactory
 
 object PersistenceMultiDocSpec {
@@ -30,14 +30,14 @@ object PersistenceMultiDocSpec {
   # Configuration entry for the custom journal plugin, see `journalPluginId`.
   akka.persistence.chronicle.journal {
     # Standard persistence extension property: provider FQCN.
-    class = "akka.persistence.chronicle.ChronicleSyncJournal"
+    class = "org.apache.pekko.persistence.chronicle.ChronicleSyncJournal"
     # Custom setting specific for the journal `ChronicleSyncJournal`.
     folder = $${user.dir}/store/journal
   }
   # Configuration entry for the custom snapshot store plugin, see `snapshotPluginId`.
   akka.persistence.chronicle.snapshot-store {
     # Standard persistence extension property: provider FQCN.
-    class = "akka.persistence.chronicle.ChronicleSnapshotStore"
+    class = "org.apache.pekko.persistence.chronicle.ChronicleSnapshotStore"
     # Custom setting specific for the snapshot store `ChronicleSnapshotStore`.
     folder = $${user.dir}/store/snapshot
   }
diff --git a/akka-docs/src/test/scala/docs/persistence/PersistencePluginDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/PersistencePluginDocSpec.scala
index 8ca429a3fe..18acc7783e 100644
--- a/akka-docs/src/test/scala/docs/persistence/PersistencePluginDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/persistence/PersistencePluginDocSpec.scala
@@ -5,8 +5,8 @@
 package docs.persistence
 
 import scala.collection.immutable
-import akka.actor.ActorSystem
-import akka.testkit.TestKit
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.testkit.TestKit
 import com.typesafe.config._
 import org.scalatest.wordspec.AnyWordSpec
 
@@ -15,9 +15,10 @@ import scala.util.Try
 import scala.concurrent.duration._
 
 //#plugin-imports
-import akka.persistence._
-import akka.persistence.journal._
-import akka.persistence.snapshot._
+import org.apache.pekko
+import pekko.persistence._
+import pekko.persistence.journal._
+import pekko.persistence.snapshot._
 
 //#plugin-imports
 
@@ -106,8 +107,8 @@ class PersistencePluginDocSpec extends AnyWordSpec {
 }
 
 object SharedLeveldbPluginDocSpec {
-  import akka.actor._
-  import akka.persistence.journal.leveldb.SharedLeveldbJournal
+  import org.apache.pekko.actor._
+  import org.apache.pekko.persistence.journal.leveldb.SharedLeveldbJournal
 
   val config =
     """
@@ -143,9 +144,9 @@ trait SharedLeveldbPluginDocSpec {
   val system: ActorSystem
 
   {
-    import akka.actor._
+    import org.apache.pekko.actor._
     // #shared-store-creation
-    import akka.persistence.journal.leveldb.SharedLeveldbStore
+    import org.apache.pekko.persistence.journal.leveldb.SharedLeveldbStore
 
     val store = system.actorOf(Props[SharedLeveldbStore](), "store")
     // #shared-store-creation
@@ -182,7 +183,7 @@ class MySnapshotStore extends SnapshotStore {
 
 object PersistenceTCKDoc {
   object example1 {
-    import akka.persistence.journal.JournalSpec
+    import org.apache.pekko.persistence.journal.JournalSpec
 
     // #journal-tck-scala
     class MyJournalSpec
@@ -198,7 +199,7 @@ object PersistenceTCKDoc {
     // #journal-tck-scala
   }
   object example2 {
-    import akka.persistence.snapshot.SnapshotStoreSpec
+    import org.apache.pekko.persistence.snapshot.SnapshotStoreSpec
 
     // #snapshot-store-tck-scala
     class MySnapshotStoreSpec
@@ -215,7 +216,7 @@ object PersistenceTCKDoc {
   object example3 {
     import java.io.File
 
-    import akka.persistence.journal.JournalSpec
+    import org.apache.pekko.persistence.journal.JournalSpec
     import org.iq80.leveldb.util.FileUtils
 
     // #journal-tck-before-after-scala
diff --git a/akka-docs/src/test/scala/docs/persistence/PersistenceSchemaEvolutionDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/PersistenceSchemaEvolutionDocSpec.scala
index 7ec054e6fc..b6faba678c 100644
--- a/akka-docs/src/test/scala/docs/persistence/PersistenceSchemaEvolutionDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/persistence/PersistenceSchemaEvolutionDocSpec.scala
@@ -7,10 +7,10 @@ package docs.persistence
 import java.io.NotSerializableException
 import java.nio.charset.Charset
 
-import akka.actor.ActorSystem
-import akka.persistence.journal.{ EventAdapter, EventSeq }
-import akka.serialization.{ SerializationExtension, SerializerWithStringManifest }
-import akka.testkit.TestKit
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.persistence.journal.{ EventAdapter, EventSeq }
+import org.apache.pekko.serialization.{ SerializationExtension, SerializerWithStringManifest }
+import org.apache.pekko.testkit.TestKit
 import com.typesafe.config._
 import org.scalatest.wordspec.AnyWordSpec
 import spray.json.JsObject
diff --git a/akka-docs/src/test/scala/docs/persistence/PersistenceSerializerDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/PersistenceSerializerDocSpec.scala
index 309df4755d..d51a3850b2 100644
--- a/akka-docs/src/test/scala/docs/persistence/PersistenceSerializerDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/persistence/PersistenceSerializerDocSpec.scala
@@ -8,9 +8,9 @@ import com.typesafe.config._
 
 import scala.concurrent.duration._
 import org.scalatest.wordspec.AnyWordSpec
-import akka.actor.ActorSystem
-import akka.serialization.{ SerializationExtension, Serializer }
-import akka.testkit.TestKit
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.serialization.{ SerializationExtension, Serializer }
+import org.apache.pekko.testkit.TestKit
 
 class PersistenceSerializerDocSpec extends AnyWordSpec {
 
diff --git a/akka-docs/src/test/scala/docs/persistence/PersistentActorExample.scala b/akka-docs/src/test/scala/docs/persistence/PersistentActorExample.scala
index 45dc3ed882..389423957c 100644
--- a/akka-docs/src/test/scala/docs/persistence/PersistentActorExample.scala
+++ b/akka-docs/src/test/scala/docs/persistence/PersistentActorExample.scala
@@ -5,8 +5,9 @@
 package scala.docs.persistence
 
 //#persistent-actor-example
-import akka.actor._
-import akka.persistence._
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence._
 
 case class Cmd(data: String)
 case class Evt(data: String)
diff --git a/akka-docs/src/test/scala/docs/persistence/query/LeveldbPersistenceQueryDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/query/LeveldbPersistenceQueryDocSpec.scala
index c7af2c2511..ed5a30f46e 100644
--- a/akka-docs/src/test/scala/docs/persistence/query/LeveldbPersistenceQueryDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/persistence/query/LeveldbPersistenceQueryDocSpec.scala
@@ -4,16 +4,17 @@
 
 package docs.persistence.query
 
-import akka.NotUsed
-import akka.testkit.AkkaSpec
-import akka.persistence.query.{ EventEnvelope, PersistenceQuery, Sequence }
-import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.persistence.query.{ EventEnvelope, PersistenceQuery, Sequence }
+import org.apache.pekko.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
+import org.apache.pekko.stream.scaladsl.Source
 
 object LeveldbPersistenceQueryDocSpec {
   // #tagger
-  import akka.persistence.journal.WriteEventAdapter
-  import akka.persistence.journal.Tagged
+  import org.apache.pekko
+  import pekko.persistence.journal.WriteEventAdapter
+  import pekko.persistence.journal.Tagged
 
   class MyTaggingEventAdapter extends WriteEventAdapter {
     val colors = Set("green", "black", "blue")
@@ -38,8 +39,9 @@ class LeveldbPersistenceQueryDocSpec
   "LeveldbPersistentQuery" must {
     "demonstrate how get ReadJournal" in {
       // #get-read-journal
-      import akka.persistence.query.PersistenceQuery
-      import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
+      import org.apache.pekko
+      import pekko.persistence.query.PersistenceQuery
+      import pekko.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
 
       val queries = PersistenceQuery(system).readJournalFor[LeveldbReadJournal](LeveldbReadJournal.Identifier)
       // #get-read-journal
diff --git a/akka-docs/src/test/scala/docs/persistence/query/MyEventsByTagSource.scala b/akka-docs/src/test/scala/docs/persistence/query/MyEventsByTagSource.scala
index 7fcf7a06ef..7a6503d2dd 100644
--- a/akka-docs/src/test/scala/docs/persistence/query/MyEventsByTagSource.scala
+++ b/akka-docs/src/test/scala/docs/persistence/query/MyEventsByTagSource.scala
@@ -4,10 +4,10 @@
 
 package docs.persistence.query
 
-import akka.persistence.query.{ EventEnvelope, Offset }
-import akka.serialization.SerializationExtension
-import akka.stream.{ ActorAttributes, ActorMaterializer, Attributes, Outlet, SourceShape }
-import akka.stream.stage.{ GraphStage, GraphStageLogic, OutHandler, TimerGraphStageLogic }
+import org.apache.pekko.persistence.query.{ EventEnvelope, Offset }
+import org.apache.pekko.serialization.SerializationExtension
+import org.apache.pekko.stream.{ ActorAttributes, ActorMaterializer, Attributes, Outlet, SourceShape }
+import org.apache.pekko.stream.stage.{ GraphStage, GraphStageLogic, OutHandler, TimerGraphStageLogic }
 
 import scala.concurrent.duration.FiniteDuration
 import scala.util.control.NonFatal
diff --git a/akka-docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala
index 2096426bc0..405d81ef25 100644
--- a/akka-docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala
@@ -4,22 +4,23 @@
 
 package docs.persistence.query
 
-import akka.NotUsed
-import akka.actor._
-import akka.persistence.query._
-import akka.stream.scaladsl.{ Flow, Sink, Source }
-import akka.stream.javadsl
-import akka.testkit.AkkaSpec
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor._
+import pekko.persistence.query._
+import pekko.stream.scaladsl.{ Flow, Sink, Source }
+import pekko.stream.javadsl
+import pekko.testkit.AkkaSpec
+import pekko.util.Timeout
 import org.reactivestreams.Subscriber
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.duration._
 
-import akka.Done
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
+import pekko.Done
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
 import com.typesafe.config.Config
 
 object PersistenceQueryDocSpec {
@@ -34,6 +35,7 @@ object PersistenceQueryDocSpec {
   // #advanced-journal-query-types
 
   // #my-read-journal
+  import org.apache.pekko
   class MyReadJournalProvider(system: ExtendedActorSystem, config: Config) extends ReadJournalProvider {
 
     private val readJournal: MyScaladslReadJournal =
@@ -47,11 +49,11 @@ object PersistenceQueryDocSpec {
   }
 
   class MyScaladslReadJournal(system: ExtendedActorSystem, config: Config)
-      extends akka.persistence.query.scaladsl.ReadJournal
-      with akka.persistence.query.scaladsl.EventsByTagQuery
-      with akka.persistence.query.scaladsl.EventsByPersistenceIdQuery
-      with akka.persistence.query.scaladsl.PersistenceIdsQuery
-      with akka.persistence.query.scaladsl.CurrentPersistenceIdsQuery {
+      extends pekko.persistence.query.scaladsl.ReadJournal
+      with pekko.persistence.query.scaladsl.EventsByTagQuery
+      with pekko.persistence.query.scaladsl.EventsByPersistenceIdQuery
+      with pekko.persistence.query.scaladsl.PersistenceIdsQuery
+      with pekko.persistence.query.scaladsl.CurrentPersistenceIdsQuery {
 
     private val refreshInterval: FiniteDuration =
       config.getDuration("refresh-interval", MILLISECONDS).millis
@@ -60,7 +62,7 @@ object PersistenceQueryDocSpec {
      * You can use `NoOffset` to retrieve all events with a given tag or retrieve a subset of all
      * events by specifying a `Sequence` `offset`. The `offset` corresponds to an ordered sequence number for
      * the specific tag. Note that the corresponding offset of each event is provided in the
-     * [[akka.persistence.query.EventEnvelope]], which makes it possible to resume the
+     * [[pekko.persistence.query.EventEnvelope]], which makes it possible to resume the
      * stream at a later point from a given offset.
      *
      * The `offset` is exclusive, i.e. the event with the exact same sequence number will not be included
@@ -105,11 +107,11 @@ object PersistenceQueryDocSpec {
   }
 
   class MyJavadslReadJournal(scaladslReadJournal: MyScaladslReadJournal)
-      extends akka.persistence.query.javadsl.ReadJournal
-      with akka.persistence.query.javadsl.EventsByTagQuery
-      with akka.persistence.query.javadsl.EventsByPersistenceIdQuery
-      with akka.persistence.query.javadsl.PersistenceIdsQuery
-      with akka.persistence.query.javadsl.CurrentPersistenceIdsQuery {
+      extends pekko.persistence.query.javadsl.ReadJournal
+      with pekko.persistence.query.javadsl.EventsByTagQuery
+      with pekko.persistence.query.javadsl.EventsByPersistenceIdQuery
+      with pekko.persistence.query.javadsl.PersistenceIdsQuery
+      with pekko.persistence.query.javadsl.CurrentPersistenceIdsQuery {
 
     override def eventsByTag(tag: String, offset: Offset = Sequence(0L)): javadsl.Source[EventEnvelope, NotUsed] =
       scaladslReadJournal.eventsByTag(tag, offset).asJava
@@ -129,7 +131,7 @@ object PersistenceQueryDocSpec {
     // possibility to add more plugin specific queries
 
     def byTagsWithMeta(tags: java.util.Set[String]): javadsl.Source[RichEvent, QueryMetadata] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       scaladslReadJournal.byTagsWithMeta(tags.asScala.toSet).asJava
     }
   }
diff --git a/akka-docs/src/test/scala/docs/persistence/testkit/Configuration.scala b/akka-docs/src/test/scala/docs/persistence/testkit/Configuration.scala
index 205fc922ab..7571bceb6b 100644
--- a/akka-docs/src/test/scala/docs/persistence/testkit/Configuration.scala
+++ b/akka-docs/src/test/scala/docs/persistence/testkit/Configuration.scala
@@ -4,9 +4,9 @@
 
 package docs.persistence.testkit
 
-import akka.actor.typed.ActorSystem
-import akka.persistence.testkit.{ PersistenceTestKitPlugin, PersistenceTestKitSnapshotPlugin }
-import akka.persistence.testkit.scaladsl.{ PersistenceTestKit, SnapshotTestKit }
+import org.apache.pekko.actor.typed.ActorSystem
+import org.apache.pekko.persistence.testkit.{ PersistenceTestKitPlugin, PersistenceTestKitSnapshotPlugin }
+import org.apache.pekko.persistence.testkit.scaladsl.{ PersistenceTestKit, SnapshotTestKit }
 import com.typesafe.config.ConfigFactory
 
 object TestKitTypedConf {
diff --git a/akka-docs/src/test/scala/docs/persistence/testkit/PersistenceInitSpec.scala b/akka-docs/src/test/scala/docs/persistence/testkit/PersistenceInitSpec.scala
index d60917e18b..8285b06183 100644
--- a/akka-docs/src/test/scala/docs/persistence/testkit/PersistenceInitSpec.scala
+++ b/akka-docs/src/test/scala/docs/persistence/testkit/PersistenceInitSpec.scala
@@ -6,12 +6,12 @@ package docs.persistence.testkit
 
 import java.util.UUID
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.Done
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 
 //#imports
-import akka.persistence.testkit.scaladsl.PersistenceInit
+import org.apache.pekko.persistence.testkit.scaladsl.PersistenceInit
 
 import scala.concurrent.Await
 import scala.concurrent.Future
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 0d80a00a9a..8f5ff2c53f 100644
--- a/akka-docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala
+++ b/akka-docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala
@@ -4,10 +4,10 @@
 
 package docs.persistence.testkit
 
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko.persistence.typed.PersistenceId
+import org.apache.pekko.persistence.typed.scaladsl.Effect
+import org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import org.apache.pekko.serialization.jackson.CborSerializable
 import com.typesafe.config.ConfigFactory
 import docs.persistence.testkit.PersistenceTestKitSampleSpec.{ Cmd, Evt, _ }
 import org.scalatest.BeforeAndAfterEach
@@ -25,9 +25,10 @@ object PersistenceTestKitSampleSpec {
 }
 
 //#test
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.scaladsl.PersistenceTestKit
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.scaladsl.PersistenceTestKit
 
 class PersistenceTestKitSampleSpec
     extends ScalaTestWithActorTestKit(PersistenceTestKitPlugin.config.withFallback(ConfigFactory.defaultApplication()))
@@ -64,7 +65,7 @@ class PersistenceTestKitSampleSpec
 //#test
 
 //#set-event-storage-policy
-import akka.persistence.testkit._
+import org.apache.pekko.persistence.testkit._
 
 class SampleEventStoragePolicy extends EventStorage.JournalPolicies.PolicyType {
 
diff --git a/akka-docs/src/test/scala/docs/remoting/RemoteDeploymentDocSpec.scala b/akka-docs/src/test/scala/docs/remoting/RemoteDeploymentDocSpec.scala
index 8d879199a6..2eb7ef2cba 100644
--- a/akka-docs/src/test/scala/docs/remoting/RemoteDeploymentDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/remoting/RemoteDeploymentDocSpec.scala
@@ -4,11 +4,12 @@
 
 package docs.remoting
 
-import akka.actor.{ Actor, ActorRef, ActorSystem, ExtendedActorSystem }
-import akka.testkit.{ AkkaSpec, ImplicitSender }
+import org.apache.pekko.actor.{ Actor, ActorRef, ActorSystem, ExtendedActorSystem }
+import org.apache.pekko.testkit.{ AkkaSpec, ImplicitSender }
 //#import
-import akka.actor.{ Address, AddressFromURIString, Deploy, Props }
-import akka.remote.RemoteScope
+import org.apache.pekko
+import pekko.actor.{ Address, AddressFromURIString, Deploy, Props }
+import pekko.remote.RemoteScope
 //#import
 
 object RemoteDeploymentDocSpec {
diff --git a/akka-docs/src/test/scala/docs/routing/ConsistentHashingRouterDocSpec.scala b/akka-docs/src/test/scala/docs/routing/ConsistentHashingRouterDocSpec.scala
index a28a35298f..ed17e8791e 100644
--- a/akka-docs/src/test/scala/docs/routing/ConsistentHashingRouterDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/routing/ConsistentHashingRouterDocSpec.scala
@@ -4,16 +4,17 @@
 
 package docs.routing
 
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.routing.FromConfig
-import akka.actor.ActorRef
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.testkit.ImplicitSender
+import org.apache.pekko.routing.FromConfig
+import org.apache.pekko.actor.ActorRef
 
 object ConsistentHashingRouterDocSpec {
 
   // #cache-actor
-  import akka.actor.Actor
-  import akka.routing.ConsistentHashingRouter.ConsistentHashable
+  import org.apache.pekko
+  import pekko.actor.Actor
+  import pekko.routing.ConsistentHashingRouter.ConsistentHashable
 
   class Cache extends Actor {
     var cache = Map.empty[String, String]
@@ -45,10 +46,11 @@ class ConsistentHashingRouterDocSpec extends AkkaSpec with ImplicitSender {
     def context = system
 
     // #consistent-hashing-router
-    import akka.actor.Props
-    import akka.routing.ConsistentHashingPool
-    import akka.routing.ConsistentHashingRouter.ConsistentHashMapping
-    import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope
+    import org.apache.pekko
+    import pekko.actor.Props
+    import pekko.routing.ConsistentHashingPool
+    import pekko.routing.ConsistentHashingRouter.ConsistentHashMapping
+    import pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope
 
     def hashMapping: ConsistentHashMapping = {
       case Evict(key) => key
diff --git a/akka-docs/src/test/scala/docs/routing/CustomRouterDocSpec.scala b/akka-docs/src/test/scala/docs/routing/CustomRouterDocSpec.scala
index 9623ad4a15..8a2e474280 100644
--- a/akka-docs/src/test/scala/docs/routing/CustomRouterDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/routing/CustomRouterDocSpec.scala
@@ -4,15 +4,15 @@
 
 package docs.routing
 
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
-import akka.actor.Actor
-import akka.actor.Props
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.testkit.ImplicitSender
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.Props
 import CustomRouterDocSpec.RedundancyRoutingLogic
 import scala.collection.immutable
-import akka.actor.ActorSystem
-import akka.routing.FromConfig
-import akka.actor.ActorRef
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.routing.FromConfig
+import org.apache.pekko.actor.ActorRef
 
 object CustomRouterDocSpec {
 
@@ -43,10 +43,11 @@ akka.actor.deployment {
   // #routing-logic
   import scala.collection.immutable
   import java.util.concurrent.ThreadLocalRandom
-  import akka.routing.RoundRobinRoutingLogic
-  import akka.routing.RoutingLogic
-  import akka.routing.Routee
-  import akka.routing.SeveralRoutees
+  import org.apache.pekko
+  import pekko.routing.RoundRobinRoutingLogic
+  import pekko.routing.RoutingLogic
+  import pekko.routing.Routee
+  import pekko.routing.SeveralRoutees
 
   class RedundancyRoutingLogic(nbrCopies: Int) extends RoutingLogic {
     val roundRobin = RoundRobinRoutingLogic()
@@ -72,10 +73,11 @@ akka.actor.deployment {
 }
 
 //#group
-import akka.dispatch.Dispatchers
-import akka.routing.Group
-import akka.routing.Router
-import akka.japi.Util.immutableSeq
+import org.apache.pekko
+import pekko.dispatch.Dispatchers
+import pekko.routing.Group
+import pekko.routing.Router
+import pekko.japi.Util.immutableSeq
 import com.typesafe.config.Config
 
 final case class RedundancyGroup(routeePaths: immutable.Iterable[String], nbrCopies: Int) extends Group {
@@ -95,7 +97,7 @@ final case class RedundancyGroup(routeePaths: immutable.Iterable[String], nbrCop
 class CustomRouterDocSpec extends AkkaSpec(CustomRouterDocSpec.config) with ImplicitSender {
 
   import CustomRouterDocSpec._
-  import akka.routing.SeveralRoutees
+  import org.apache.pekko.routing.SeveralRoutees
 
   "unit test routing logic" in {
     // #unit-test-logic
diff --git a/akka-docs/src/test/scala/docs/routing/RouterDocSpec.scala b/akka-docs/src/test/scala/docs/routing/RouterDocSpec.scala
index de5a7e2079..c198f4f56f 100644
--- a/akka-docs/src/test/scala/docs/routing/RouterDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/routing/RouterDocSpec.scala
@@ -5,26 +5,26 @@
 package docs.routing
 
 import scala.concurrent.duration._
-import akka.testkit._
-import akka.actor.{ Actor, ActorRef, Props }
-import akka.actor.Terminated
-import akka.routing.FromConfig
-import akka.routing.RoundRobinPool
-import akka.routing.RandomPool
-import akka.routing.RoundRobinGroup
-import akka.routing.SmallestMailboxPool
-import akka.routing.BroadcastPool
-import akka.routing.BroadcastGroup
-import akka.routing.ConsistentHashingGroup
-import akka.routing.ConsistentHashingPool
-import akka.routing.DefaultResizer
-import akka.routing.ScatterGatherFirstCompletedGroup
-import akka.routing.RandomGroup
-import akka.routing.ScatterGatherFirstCompletedPool
-import akka.routing.BalancingPool
-import akka.routing.TailChoppingGroup
-import akka.routing.TailChoppingPool
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko.testkit._
+import org.apache.pekko.actor.{ Actor, ActorRef, Props }
+import org.apache.pekko.actor.Terminated
+import org.apache.pekko.routing.FromConfig
+import org.apache.pekko.routing.RoundRobinPool
+import org.apache.pekko.routing.RandomPool
+import org.apache.pekko.routing.RoundRobinGroup
+import org.apache.pekko.routing.SmallestMailboxPool
+import org.apache.pekko.routing.BroadcastPool
+import org.apache.pekko.routing.BroadcastGroup
+import org.apache.pekko.routing.ConsistentHashingGroup
+import org.apache.pekko.routing.ConsistentHashingPool
+import org.apache.pekko.routing.DefaultResizer
+import org.apache.pekko.routing.ScatterGatherFirstCompletedGroup
+import org.apache.pekko.routing.RandomGroup
+import org.apache.pekko.routing.ScatterGatherFirstCompletedPool
+import org.apache.pekko.routing.BalancingPool
+import org.apache.pekko.routing.TailChoppingGroup
+import org.apache.pekko.routing.TailChoppingPool
+import org.apache.pekko.util.ccompat.JavaConverters._
 
 object RouterDocSpec {
 
@@ -294,7 +294,7 @@ router-dispatcher {}
   final case class Work(payload: String)
 
   // #router-in-actor
-  import akka.routing.{ ActorRefRoutee, RoundRobinRoutingLogic, Router }
+  import org.apache.pekko.routing.{ ActorRefRoutee, RoundRobinRoutingLogic, Router }
 
   class Master extends Actor {
     var router = {
@@ -548,7 +548,7 @@ class RouterDocSpec extends AkkaSpec(RouterDocSpec.config) with ImplicitSender {
   "demonstrate broadcast" in {
     val router = system.actorOf(RoundRobinPool(nrOfInstances = 5).props(Props[Echo]()))
     // #broadcastDavyJonesWarning
-    import akka.routing.Broadcast
+    import org.apache.pekko.routing.Broadcast
     router ! Broadcast("Watch out for Davy Jones' locker")
     // #broadcastDavyJonesWarning
     (receiveN(5, 5.seconds.dilated) should have).length(5)
@@ -557,7 +557,7 @@ class RouterDocSpec extends AkkaSpec(RouterDocSpec.config) with ImplicitSender {
   "demonstrate PoisonPill" in {
     val router = watch(system.actorOf(RoundRobinPool(nrOfInstances = 5).props(Props[Echo]())))
     // #poisonPill
-    import akka.actor.PoisonPill
+    import org.apache.pekko.actor.PoisonPill
     router ! PoisonPill
     // #poisonPill
     expectTerminated(router)
@@ -566,8 +566,9 @@ class RouterDocSpec extends AkkaSpec(RouterDocSpec.config) with ImplicitSender {
   "demonstrate broadcast of PoisonPill" in {
     val router = watch(system.actorOf(RoundRobinPool(nrOfInstances = 5).props(Props[Echo]())))
     // #broadcastPoisonPill
-    import akka.actor.PoisonPill
-    import akka.routing.Broadcast
+    import org.apache.pekko
+    import pekko.actor.PoisonPill
+    import pekko.routing.Broadcast
     router ! Broadcast(PoisonPill)
     // #broadcastPoisonPill
     expectTerminated(router)
@@ -576,7 +577,7 @@ class RouterDocSpec extends AkkaSpec(RouterDocSpec.config) with ImplicitSender {
   "demonstrate Kill" in {
     val router = watch(system.actorOf(RoundRobinPool(nrOfInstances = 5).props(Props[Echo]())))
     // #kill
-    import akka.actor.Kill
+    import org.apache.pekko.actor.Kill
     router ! Kill
     // #kill
     expectTerminated(router)
@@ -585,8 +586,9 @@ class RouterDocSpec extends AkkaSpec(RouterDocSpec.config) with ImplicitSender {
   "demonstrate broadcast of Kill" in {
     val router = watch(system.actorOf(RoundRobinPool(nrOfInstances = 5).props(Props[Echo]())))
     // #broadcastKill
-    import akka.actor.Kill
-    import akka.routing.Broadcast
+    import org.apache.pekko
+    import pekko.actor.Kill
+    import pekko.routing.Broadcast
     router ! Broadcast(Kill)
     // #broadcastKill
     expectTerminated(router)
@@ -594,8 +596,9 @@ class RouterDocSpec extends AkkaSpec(RouterDocSpec.config) with ImplicitSender {
 
   "demonstrate remote deploy" in {
     // #remoteRoutees
-    import akka.actor.{ Address, AddressFromURIString }
-    import akka.remote.routing.RemoteRouterConfig
+    import org.apache.pekko
+    import pekko.actor.{ Address, AddressFromURIString }
+    import pekko.remote.routing.RemoteRouterConfig
     val addresses =
       Seq(Address("akka", "remotesys", "otherhost", 1234), AddressFromURIString("akka://othersys@anotherhost:1234"))
     val routerRemote = system.actorOf(RemoteRouterConfig(RoundRobinPool(5), addresses).props(Props[Echo]()))
@@ -605,8 +608,9 @@ class RouterDocSpec extends AkkaSpec(RouterDocSpec.config) with ImplicitSender {
   // only compile test
   def demonstrateRemoteDeployWithArtery(): Unit = {
     // #remoteRoutees-artery
-    import akka.actor.{ Address, AddressFromURIString }
-    import akka.remote.routing.RemoteRouterConfig
+    import org.apache.pekko
+    import pekko.actor.{ Address, AddressFromURIString }
+    import pekko.remote.routing.RemoteRouterConfig
     val addresses =
       Seq(Address("akka", "remotesys", "otherhost", 1234), AddressFromURIString("akka://othersys@anotherhost:1234"))
     val routerRemote = system.actorOf(RemoteRouterConfig(RoundRobinPool(5), addresses).props(Props[Echo]()))
diff --git a/akka-docs/src/test/scala/docs/serialization/SerializationDocSpec.scala b/akka-docs/src/test/scala/docs/serialization/SerializationDocSpec.scala
index c624cde69f..2d6a46efc0 100644
--- a/akka-docs/src/test/scala/docs/serialization/SerializationDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/serialization/SerializationDocSpec.scala
@@ -5,16 +5,17 @@
 package docs.serialization {
 
   // #imports
-  import akka.actor._
-  import akka.actor.typed.scaladsl.Behaviors
-  import akka.cluster.Cluster
-  import akka.serialization._
+  import org.apache.pekko
+  import pekko.actor._
+  import pekko.actor.typed.scaladsl.Behaviors
+  import pekko.cluster.Cluster
+  import pekko.serialization._
 
   // #imports
 
-  import akka.testkit._
+  import org.apache.pekko.testkit._
   import com.typesafe.config.ConfigFactory
-  import akka.actor.ExtendedActorSystem
+  import org.apache.pekko.actor.ExtendedActorSystem
   import java.nio.charset.StandardCharsets
 
   // #my-own-serializer
@@ -161,9 +162,9 @@ package docs.serialization {
       akka {
         actor {
           serializers {
-            jackson-json = "akka.serialization.jackson.JacksonJsonSerializer"
-            jackson-cbor = "akka.serialization.jackson.JacksonCborSerializer"
-            proto = "akka.remote.serialization.ProtobufSerializer"
+            jackson-json = "org.apache.pekko.serialization.jackson.JacksonJsonSerializer"
+            jackson-cbor = "org.apache.pekko.serialization.jackson.JacksonCborSerializer"
+            proto = "org.apache.pekko.remote.serialization.ProtobufSerializer"
             myown = "docs.serialization.MyOwnSerializer"
           }
         }
@@ -180,9 +181,9 @@ package docs.serialization {
       akka {
         actor {
           serializers {
-            jackson-json = "akka.serialization.jackson.JacksonJsonSerializer"
-            jackson-cbor = "akka.serialization.jackson.JacksonCborSerializer"
-            proto = "akka.remote.serialization.ProtobufSerializer"
+            jackson-json = "org.apache.pekko.serialization.jackson.JacksonJsonSerializer"
+            jackson-cbor = "org.apache.pekko.serialization.jackson.JacksonCborSerializer"
+            proto = "org.apache.pekko.remote.serialization.ProtobufSerializer"
             myown = "docs.serialization.MyOwnSerializer"
           }
 
@@ -228,7 +229,7 @@ package docs.serialization {
 
     def demonstrateTypedActorSystem(): Unit = {
       // #programmatic-typed
-      import akka.actor.typed.ActorSystem
+      import org.apache.pekko.actor.typed.ActorSystem
 
       val system = ActorSystem(Behaviors.empty, "example")
 
diff --git a/akka-docs/src/test/scala/docs/stream/BidiFlowDocSpec.scala b/akka-docs/src/test/scala/docs/stream/BidiFlowDocSpec.scala
index b24a5a7e65..4a684b6c8a 100644
--- a/akka-docs/src/test/scala/docs/stream/BidiFlowDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/BidiFlowDocSpec.scala
@@ -4,12 +4,12 @@
 
 package docs.stream
 
-import akka.testkit.AkkaSpec
-import akka.stream.scaladsl._
-import akka.stream._
-import akka.util.ByteString
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream._
+import org.apache.pekko.util.ByteString
 import java.nio.ByteOrder
-import akka.stream.stage._
+import org.apache.pekko.stream.stage._
 import scala.concurrent.duration._
 import scala.concurrent.Await
 
diff --git a/akka-docs/src/test/scala/docs/stream/CompositionDocSpec.scala b/akka-docs/src/test/scala/docs/stream/CompositionDocSpec.scala
index e225355607..566acdc63b 100644
--- a/akka-docs/src/test/scala/docs/stream/CompositionDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/CompositionDocSpec.scala
@@ -4,12 +4,12 @@
 
 package docs.stream
 
-import akka.NotUsed
-import akka.stream._
-import akka.stream.scaladsl.Tcp.OutgoingConnection
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.scaladsl.Tcp.OutgoingConnection
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.util.ByteString
 
 import scala.concurrent.{ Future, Promise }
 import scala.concurrent.ExecutionContext
diff --git a/akka-docs/src/test/scala/docs/stream/FlowDocSpec.scala b/akka-docs/src/test/scala/docs/stream/FlowDocSpec.scala
index b233aa329f..f2a79c14ad 100644
--- a/akka-docs/src/test/scala/docs/stream/FlowDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/FlowDocSpec.scala
@@ -4,14 +4,14 @@
 
 package docs.stream
 
-import akka.Done
-import akka.NotUsed
-import akka.actor.{ Actor, ActorSystem, Cancellable }
-import akka.stream.CompletionStrategy
-import akka.stream.Materializer
-import akka.stream.{ ClosedShape, FlowShape, OverflowStrategy }
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.Done
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.{ Actor, ActorSystem, Cancellable }
+import org.apache.pekko.stream.CompletionStrategy
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.{ ClosedShape, FlowShape, OverflowStrategy }
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
 import docs.CompileOnlySpec
 
 import scala.concurrent.{ Future, Promise }
diff --git a/akka-docs/src/test/scala/docs/stream/FlowErrorDocSpec.scala b/akka-docs/src/test/scala/docs/stream/FlowErrorDocSpec.scala
index 8da9d17323..20cbc60ed5 100644
--- a/akka-docs/src/test/scala/docs/stream/FlowErrorDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/FlowErrorDocSpec.scala
@@ -5,10 +5,10 @@
 package docs.stream
 
 import scala.concurrent.Await
-import akka.stream.Supervision
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
-import akka.stream.ActorAttributes
+import org.apache.pekko.stream.Supervision
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.stream.ActorAttributes
 import scala.concurrent.duration._
 
 class FlowErrorDocSpec extends AkkaSpec {
diff --git a/akka-docs/src/test/scala/docs/stream/FlowParallelismDocSpec.scala b/akka-docs/src/test/scala/docs/stream/FlowParallelismDocSpec.scala
index 97c1545812..0fa22d1a7a 100644
--- a/akka-docs/src/test/scala/docs/stream/FlowParallelismDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/FlowParallelismDocSpec.scala
@@ -4,10 +4,10 @@
 
 package docs.stream
 
-import akka.NotUsed
-import akka.stream.FlowShape
-import akka.stream.scaladsl.{ Balance, Flow, GraphDSL, Merge, Source }
-import akka.testkit.AkkaSpec
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.FlowShape
+import org.apache.pekko.stream.scaladsl.{ Balance, Flow, GraphDSL, Merge, Source }
+import org.apache.pekko.testkit.AkkaSpec
 
 class FlowParallelismDocSpec extends AkkaSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/FlowStreamRefsDocSpec.scala b/akka-docs/src/test/scala/docs/stream/FlowStreamRefsDocSpec.scala
index 0281e6e02f..9f1dccda4c 100644
--- a/akka-docs/src/test/scala/docs/stream/FlowStreamRefsDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/FlowStreamRefsDocSpec.scala
@@ -4,18 +4,19 @@
 
 package docs.stream
 
-import akka.NotUsed
-import akka.actor.{ Actor, Props }
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.{ Actor, Props }
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
 import docs.CompileOnlySpec
 
 class FlowStreamRefsDocSpec extends AkkaSpec with CompileOnlySpec {
 
   "offer a source ref" in compileOnlySpec {
     // #offer-source
-    import akka.stream.SourceRef
-    import akka.pattern.pipe
+    import org.apache.pekko
+    import pekko.stream.SourceRef
+    import pekko.pattern.pipe
 
     case class RequestLogs(streamId: Int)
     case class LogsOffer(streamId: Int, sourceRef: SourceRef[String])
@@ -57,7 +58,7 @@ class FlowStreamRefsDocSpec extends AkkaSpec with CompileOnlySpec {
 
   "offer a sink ref" in compileOnlySpec {
     // #offer-sink
-    import akka.stream.SinkRef
+    import org.apache.pekko.stream.SinkRef
 
     case class PrepareUpload(id: String)
     case class MeasurementsSinkReady(id: String, sinkRef: SinkRef[String])
@@ -101,7 +102,7 @@ class FlowStreamRefsDocSpec extends AkkaSpec with CompileOnlySpec {
     // #attr-sub-timeout
     // configure the timeout for source
     import scala.concurrent.duration._
-    import akka.stream.StreamRefAttributes
+    import org.apache.pekko.stream.StreamRefAttributes
 
     // configuring Sink.sourceRef (notice that we apply the attributes to the Sink!):
     Source
diff --git a/akka-docs/src/test/scala/docs/stream/GraphCyclesSpec.scala b/akka-docs/src/test/scala/docs/stream/GraphCyclesSpec.scala
index 989a13b15d..4bef7f7b78 100644
--- a/akka-docs/src/test/scala/docs/stream/GraphCyclesSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/GraphCyclesSpec.scala
@@ -4,9 +4,9 @@
 
 package docs.stream
 
-import akka.stream.{ ClosedShape, OverflowStrategy }
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.stream.{ ClosedShape, OverflowStrategy }
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
 
 class GraphCyclesSpec extends AkkaSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/GraphDSLDocSpec.scala b/akka-docs/src/test/scala/docs/stream/GraphDSLDocSpec.scala
index 892183bcfd..8f539e2b7d 100644
--- a/akka-docs/src/test/scala/docs/stream/GraphDSLDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/GraphDSLDocSpec.scala
@@ -4,10 +4,10 @@
 
 package docs.stream
 
-import akka.NotUsed
-import akka.stream._
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
 
 import scala.collection.immutable
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/stream/GraphStageDocSpec.scala b/akka-docs/src/test/scala/docs/stream/GraphStageDocSpec.scala
index 0e6bc509ab..0449cdecf4 100644
--- a/akka-docs/src/test/scala/docs/stream/GraphStageDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/GraphStageDocSpec.scala
@@ -4,12 +4,12 @@
 
 package docs.stream
 
-import akka.NotUsed
-import akka.stream.scaladsl.{ Flow, Keep, Sink, Source }
-import akka.stream.stage._
-import akka.stream._
-import akka.stream.testkit.{ TestPublisher, TestSubscriber }
-import akka.testkit.{ AkkaSpec, TestLatch }
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
+import org.apache.pekko.stream.stage._
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.testkit.{ TestPublisher, TestSubscriber }
+import org.apache.pekko.testkit.{ AkkaSpec, TestLatch }
 
 import scala.collection.mutable
 import scala.concurrent.{ Await, Future, Promise }
@@ -20,8 +20,8 @@ class GraphStageDocSpec extends AkkaSpec {
 
   "Demonstrate creation of GraphStage boilerplate" in {
     // #boilerplate-example
-    import akka.stream.SourceShape
-    import akka.stream.stage.GraphStage
+    import org.apache.pekko
+    import pekko.stream.stage.GraphStage
 
     class NumbersSource extends GraphStage[SourceShape[Int]] {
       // Define the (sole) output port of this stage
@@ -38,12 +38,13 @@ class GraphStageDocSpec extends AkkaSpec {
 
   "Demonstrate creation of GraphStage Source" in {
     // #custom-source-example
-    import akka.stream.Attributes
-    import akka.stream.Outlet
-    import akka.stream.SourceShape
-    import akka.stream.stage.GraphStage
-    import akka.stream.stage.GraphStageLogic
-    import akka.stream.stage.OutHandler
+    import org.apache.pekko
+    import pekko.stream.Attributes
+    import pekko.stream.Outlet
+    import pekko.stream.SourceShape
+    import pekko.stream.stage.GraphStage
+    import pekko.stream.stage.GraphStageLogic
+    import pekko.stream.stage.OutHandler
 
     class NumbersSource extends GraphStage[SourceShape[Int]] {
       val out: Outlet[Int] = Outlet("NumbersSource")
@@ -89,12 +90,13 @@ class GraphStageDocSpec extends AkkaSpec {
 
   "Demonstrate creation of GraphStage Sink" in {
     // #custom-sink-example
-    import akka.stream.Attributes
-    import akka.stream.Inlet
-    import akka.stream.SinkShape
-    import akka.stream.stage.GraphStage
-    import akka.stream.stage.GraphStageLogic
-    import akka.stream.stage.InHandler
+    import org.apache.pekko
+    import pekko.stream.Attributes
+    import pekko.stream.Inlet
+    import pekko.stream.SinkShape
+    import pekko.stream.stage.GraphStage
+    import pekko.stream.stage.GraphStageLogic
+    import pekko.stream.stage.InHandler
 
     class StdoutSink extends GraphStage[SinkShape[Int]] {
       val in: Inlet[Int] = Inlet("StdoutSink")
diff --git a/akka-docs/src/test/scala/docs/stream/GraphStageLoggingDocSpec.scala b/akka-docs/src/test/scala/docs/stream/GraphStageLoggingDocSpec.scala
index e7f2085692..f6e2ebb594 100644
--- a/akka-docs/src/test/scala/docs/stream/GraphStageLoggingDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/GraphStageLoggingDocSpec.scala
@@ -6,9 +6,9 @@ package docs.stream
 
 import java.util.concurrent.ThreadLocalRandom
 
-import akka.stream._
-import akka.stream.scaladsl._
-import akka.testkit.{ AkkaSpec, EventFilter }
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.{ AkkaSpec, EventFilter }
 import scala.concurrent.ExecutionContext
 
 class GraphStageLoggingDocSpec extends AkkaSpec("akka.loglevel = DEBUG") {
@@ -16,7 +16,7 @@ class GraphStageLoggingDocSpec extends AkkaSpec("akka.loglevel = DEBUG") {
   implicit val ec: ExecutionContext = system.dispatcher
 
   // #operator-with-logging
-  import akka.stream.stage.{ GraphStage, GraphStageLogic, OutHandler, StageLogging }
+  import org.apache.pekko.stream.stage.{ GraphStage, GraphStageLogic, OutHandler, StageLogging }
 
   final class RandomLettersSource extends GraphStage[SourceShape[String]] {
     val out = Outlet[String]("RandomLettersSource.out")
diff --git a/akka-docs/src/test/scala/docs/stream/HubsDocSpec.scala b/akka-docs/src/test/scala/docs/stream/HubsDocSpec.scala
index ec7055b2ee..c9c98bb057 100644
--- a/akka-docs/src/test/scala/docs/stream/HubsDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/HubsDocSpec.scala
@@ -4,14 +4,14 @@
 
 package docs.stream
 
-import akka.NotUsed
-import akka.stream.{ KillSwitches, UniqueKillSwitch }
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.{ KillSwitches, UniqueKillSwitch }
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
 import docs.CompileOnlySpec
 
 import scala.concurrent.duration._
-import akka.stream.ThrottleMode
+import org.apache.pekko.stream.ThrottleMode
 
 class HubsDocSpec extends AkkaSpec with CompileOnlySpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/IntegrationDocSpec.scala b/akka-docs/src/test/scala/docs/stream/IntegrationDocSpec.scala
index a8cf6675ee..d0dcef8772 100644
--- a/akka-docs/src/test/scala/docs/stream/IntegrationDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/IntegrationDocSpec.scala
@@ -6,22 +6,22 @@ package docs.stream
 
 import scala.concurrent.duration._
 
-import akka.Done
-import akka.NotUsed
-import akka.testkit.AkkaSpec
-import akka.stream.scaladsl._
-import akka.stream._
+import org.apache.pekko.Done
+import org.apache.pekko.NotUsed
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream._
 
 import scala.concurrent.Future
-import akka.testkit.TestProbe
-import akka.actor.{ Actor, ActorLogging, ActorRef, Props }
+import org.apache.pekko.testkit.TestProbe
+import org.apache.pekko.actor.{ Actor, ActorLogging, ActorRef, Props }
 import com.typesafe.config.ConfigFactory
-import akka.util.Timeout
+import org.apache.pekko.util.Timeout
 
 import scala.concurrent.ExecutionContext
 import java.util.concurrent.atomic.AtomicInteger
 
-import akka.stream.scaladsl.Flow
+import org.apache.pekko.stream.scaladsl.Flow
 import org.scalacheck.Gen.const
 
 object IntegrationDocSpec {
@@ -38,7 +38,7 @@ object IntegrationDocSpec {
     }
     #//#blocking-dispatcher-config
 
-    akka.actor.default-mailbox.mailbox-type = akka.dispatch.UnboundedMailbox
+    akka.actor.default-mailbox.mailbox-type = org.apache.pekko.dispatch.UnboundedMailbox
     """)
 
   class AddressSystem {
@@ -380,7 +380,7 @@ class IntegrationDocSpec extends AkkaSpec(IntegrationDocSpec.config) {
     val database = system.actorOf(Props(classOf[DatabaseService], probe.ref), "db")
 
     // #save-tweets
-    import akka.pattern.ask
+    import org.apache.pekko.pattern.ask
 
     val akkaTweets: Source[Tweet, NotUsed] = tweets.filter(_.hashtags.contains(akkaTag))
 
diff --git a/akka-docs/src/test/scala/docs/stream/KillSwitchDocSpec.scala b/akka-docs/src/test/scala/docs/stream/KillSwitchDocSpec.scala
index ef7df55dda..3ba3980bf9 100644
--- a/akka-docs/src/test/scala/docs/stream/KillSwitchDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/KillSwitchDocSpec.scala
@@ -4,9 +4,9 @@
 
 package docs.stream
 
-import akka.stream.scaladsl._
-import akka.stream.{ DelayOverflowStrategy, KillSwitches }
-import akka.testkit.AkkaSpec
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream.{ DelayOverflowStrategy, KillSwitches }
+import org.apache.pekko.testkit.AkkaSpec
 import docs.CompileOnlySpec
 
 import scala.concurrent.Await
diff --git a/akka-docs/src/test/scala/docs/stream/MigrationsScala.scala b/akka-docs/src/test/scala/docs/stream/MigrationsScala.scala
index 5e4ab7096a..14e50ffbc2 100644
--- a/akka-docs/src/test/scala/docs/stream/MigrationsScala.scala
+++ b/akka-docs/src/test/scala/docs/stream/MigrationsScala.scala
@@ -4,8 +4,8 @@
 
 package docs.stream
 
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
 
 class MigrationsScala extends AkkaSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/QuickStartDocSpec.scala b/akka-docs/src/test/scala/docs/stream/QuickStartDocSpec.scala
index 27c98e5175..78d63d2599 100644
--- a/akka-docs/src/test/scala/docs/stream/QuickStartDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/QuickStartDocSpec.scala
@@ -5,14 +5,15 @@
 package docs.stream
 
 //#stream-imports
-import akka.stream._
-import akka.stream.scaladsl._
+import org.apache.pekko
+import pekko.stream._
+import pekko.stream.scaladsl._
 //#stream-imports
 
 //#other-imports
-import akka.{ Done, NotUsed }
-import akka.actor.ActorSystem
-import akka.util.ByteString
+import pekko.{ Done, NotUsed }
+import pekko.actor.ActorSystem
+import pekko.util.ByteString
 import scala.concurrent._
 import scala.concurrent.duration._
 import java.nio.file.Paths
diff --git a/akka-docs/src/test/scala/docs/stream/RateTransformationDocSpec.scala b/akka-docs/src/test/scala/docs/stream/RateTransformationDocSpec.scala
index de5f2f66d5..3a51c393db 100644
--- a/akka-docs/src/test/scala/docs/stream/RateTransformationDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/RateTransformationDocSpec.scala
@@ -4,14 +4,14 @@
 
 package docs.stream
 
-import akka.stream.scaladsl._
-import akka.stream.testkit.scaladsl._
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream.testkit.scaladsl._
 
 import scala.util.Random
 import scala.math._
 import scala.concurrent.duration._
 import scala.collection.immutable
-import akka.testkit.{ AkkaSpec, TestLatch }
+import org.apache.pekko.testkit.{ AkkaSpec, TestLatch }
 
 import scala.concurrent.Await
 
diff --git a/akka-docs/src/test/scala/docs/stream/ReactiveStreamsDocSpec.scala b/akka-docs/src/test/scala/docs/stream/ReactiveStreamsDocSpec.scala
index 44e8e6c65e..6f9d5a58da 100644
--- a/akka-docs/src/test/scala/docs/stream/ReactiveStreamsDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/ReactiveStreamsDocSpec.scala
@@ -4,10 +4,10 @@
 
 package docs.stream
 
-import akka.NotUsed
-import akka.stream.scaladsl.{ Flow, Sink, Source }
-import akka.stream.testkit._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.{ Flow, Sink, Source }
+import org.apache.pekko.stream.testkit._
+import org.apache.pekko.testkit.AkkaSpec
 
 class ReactiveStreamsDocSpec extends AkkaSpec {
   import TwitterStreamQuickstartDocSpec._
diff --git a/akka-docs/src/test/scala/docs/stream/RestartDocSpec.scala b/akka-docs/src/test/scala/docs/stream/RestartDocSpec.scala
index 51f589ccca..1715a005d5 100644
--- a/akka-docs/src/test/scala/docs/stream/RestartDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/RestartDocSpec.scala
@@ -4,10 +4,10 @@
 
 package docs.stream
 
-import akka.NotUsed
-import akka.stream.{ KillSwitches, RestartSettings }
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.{ KillSwitches, RestartSettings }
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
 import docs.CompileOnlySpec
 
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/stream/SinkRecipeDocSpec.scala b/akka-docs/src/test/scala/docs/stream/SinkRecipeDocSpec.scala
index 0e6a2aecf3..ed2539e7fd 100644
--- a/akka-docs/src/test/scala/docs/stream/SinkRecipeDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/SinkRecipeDocSpec.scala
@@ -4,7 +4,7 @@
 
 package docs.stream
 
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 import docs.stream.cookbook.RecipeSpec
 
 import scala.concurrent.Future
diff --git a/akka-docs/src/test/scala/docs/stream/StreamBuffersRateSpec.scala b/akka-docs/src/test/scala/docs/stream/StreamBuffersRateSpec.scala
index c064ec3293..a63caeee42 100644
--- a/akka-docs/src/test/scala/docs/stream/StreamBuffersRateSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/StreamBuffersRateSpec.scala
@@ -4,10 +4,10 @@
 
 package docs.stream
 
-import akka.NotUsed
-import akka.stream._
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
 
 class StreamBuffersRateSpec extends AkkaSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/StreamPartialGraphDSLDocSpec.scala b/akka-docs/src/test/scala/docs/stream/StreamPartialGraphDSLDocSpec.scala
index bd417b38ab..e3970a875c 100644
--- a/akka-docs/src/test/scala/docs/stream/StreamPartialGraphDSLDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/StreamPartialGraphDSLDocSpec.scala
@@ -4,10 +4,10 @@
 
 package docs.stream
 
-import akka.actor.ActorRef
-import akka.stream._
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
 
 import scala.concurrent.{ Await, Future }
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/stream/StreamTestKitDocSpec.scala b/akka-docs/src/test/scala/docs/stream/StreamTestKitDocSpec.scala
index d66a5d29c1..a8ef8cc969 100644
--- a/akka-docs/src/test/scala/docs/stream/StreamTestKitDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/StreamTestKitDocSpec.scala
@@ -8,12 +8,12 @@ import scala.util._
 import scala.concurrent.duration._
 import scala.concurrent._
 
-import akka.Done
-import akka.stream._
-import akka.stream.scaladsl._
-import akka.stream.testkit.scaladsl._
-import akka.testkit.{ AkkaSpec, TestProbe }
-import akka.pattern
+import org.apache.pekko.Done
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream.testkit.scaladsl._
+import org.apache.pekko.testkit.{ AkkaSpec, TestProbe }
+import org.apache.pekko.pattern
 
 class StreamTestKitDocSpec extends AkkaSpec {
 
@@ -31,7 +31,7 @@ class StreamTestKitDocSpec extends AkkaSpec {
   "grouped part of infinite stream" in {
     // #grouped-infinite
     import system.dispatcher
-    import akka.pattern.pipe
+    import org.apache.pekko.pattern.pipe
 
     val sourceUnderTest = Source.repeat(1).map(_ * 2)
 
@@ -54,7 +54,7 @@ class StreamTestKitDocSpec extends AkkaSpec {
   "pipe to test probe" in {
     // #pipeto-testprobe
     import system.dispatcher
-    import akka.pattern.pipe
+    import org.apache.pekko.pattern.pipe
 
     val sourceUnderTest = Source(1 to 4).grouped(2)
 
diff --git a/akka-docs/src/test/scala/docs/stream/SubstreamDocSpec.scala b/akka-docs/src/test/scala/docs/stream/SubstreamDocSpec.scala
index f2fe669340..18ded56feb 100644
--- a/akka-docs/src/test/scala/docs/stream/SubstreamDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/SubstreamDocSpec.scala
@@ -4,9 +4,9 @@
 
 package docs.stream
 
-import akka.stream.scaladsl.{ Sink, Source }
-import akka.stream.SubstreamCancelStrategy
-import akka.testkit.AkkaSpec
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.stream.SubstreamCancelStrategy
+import org.apache.pekko.testkit.AkkaSpec
 
 class SubstreamDocSpec extends AkkaSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala b/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala
index 16425b01d9..4f6f069dd6 100644
--- a/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala
@@ -6,24 +6,25 @@ package docs.stream
 
 //#imports
 
-import akka.{ Done, NotUsed }
-import akka.actor.ActorSystem
-import akka.stream.{ ClosedShape, OverflowStrategy }
-import akka.stream.scaladsl._
+import org.apache.pekko.{ Done, NotUsed }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.{ ClosedShape, OverflowStrategy }
+import org.apache.pekko.stream.scaladsl._
 import scala.concurrent.Await
 import scala.concurrent.Future
 import scala.io.StdIn.readLine
 
 //#imports
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 import scala.concurrent.ExecutionContext
 
 object TwitterStreamQuickstartDocSpec {
   // #fiddle_code
-  import akka.NotUsed
-  import akka.actor.ActorSystem
-  import akka.stream.scaladsl._
+  import org.apache.pekko
+  import pekko.NotUsed
+  import pekko.actor.ActorSystem
+  import pekko.stream.scaladsl._
 
   // #model
   final case class Author(handle: String)
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeAdhocSource.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeAdhocSource.scala
index d5dbfa642d..e72f010c33 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeAdhocSource.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeAdhocSource.scala
@@ -6,10 +6,10 @@ package docs.stream.cookbook
 
 import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger }
 
-import akka.stream.scaladsl.Source
-import akka.stream.testkit.scaladsl.TestSink
-import akka.testkit.TimingTest
-import akka.{ Done, NotUsed }
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.stream.testkit.scaladsl.TestSink
+import org.apache.pekko.testkit.TimingTest
+import org.apache.pekko.{ Done, NotUsed }
 
 import scala.concurrent._
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeByteStrings.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeByteStrings.scala
index 03b3387e2b..375aa8c6cf 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeByteStrings.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeByteStrings.scala
@@ -4,10 +4,10 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.stream.{ Attributes, FlowShape, Inlet, Outlet }
-import akka.stream.scaladsl.{ Flow, Sink, Source }
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.{ Attributes, FlowShape, Inlet, Outlet }
+import org.apache.pekko.stream.scaladsl.{ Flow, Sink, Source }
+import org.apache.pekko.util.ByteString
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -21,7 +21,7 @@ class RecipeByteStrings extends RecipeSpec {
       val ChunkLimit = 2
 
       // #bytestring-chunker
-      import akka.stream.stage._
+      import org.apache.pekko.stream.stage._
 
       class Chunker(val chunkSize: Int) extends GraphStage[FlowShape[ByteString, ByteString]] {
         val in = Inlet[ByteString]("Chunker.in")
@@ -86,7 +86,7 @@ class RecipeByteStrings extends RecipeSpec {
       val SizeLimit = 9
 
       // #bytes-limiter
-      import akka.stream.stage._
+      import org.apache.pekko.stream.stage._
       class ByteLimiter(val maximumBytes: Long) extends GraphStage[FlowShape[ByteString, ByteString]] {
         val in = Inlet[ByteString]("ByteLimiter.in")
         val out = Outlet[ByteString]("ByteLimiter.out")
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDecompress.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDecompress.scala
index 8b28034175..8188627af4 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDecompress.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDecompress.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.cookbook
 
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -15,7 +15,7 @@ class RecipeDecompress extends RecipeSpec {
   "Recipe for decompressing a Gzip stream" must {
     "work" in {
       // #decompress-gzip
-      import akka.stream.scaladsl.Compression
+      import org.apache.pekko.stream.scaladsl.Compression
       // #decompress-gzip
 
       val compressed =
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDigest.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDigest.scala
index 1c68ebd086..2702fd7c67 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDigest.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDigest.scala
@@ -16,12 +16,13 @@ class RecipeDigest extends RecipeSpec {
       // #calculating-digest
       import java.security.MessageDigest
 
-      import akka.NotUsed
-      import akka.stream.{ Attributes, FlowShape, Inlet, Outlet }
-      import akka.stream.scaladsl.{ Sink, Source }
-      import akka.util.ByteString
+      import org.apache.pekko
+      import pekko.NotUsed
+      import pekko.stream.{ Attributes, FlowShape, Inlet, Outlet }
+      import pekko.stream.scaladsl.{ Sink, Source }
+      import pekko.util.ByteString
 
-      import akka.stream.stage._
+      import pekko.stream.stage._
 
       val data: Source[ByteString, NotUsed] = Source.single(ByteString("abc"))
 
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDroppyBroadcast.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDroppyBroadcast.scala
index a3189e862f..67cb182e75 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDroppyBroadcast.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeDroppyBroadcast.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.cookbook
 
-import akka.stream.{ ClosedShape, OverflowStrategy }
-import akka.stream.scaladsl._
-import akka.stream.testkit._
+import org.apache.pekko.stream.{ ClosedShape, OverflowStrategy }
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream.testkit._
 
 class RecipeDroppyBroadcast extends RecipeSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeFlattenSeq.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeFlattenSeq.scala
index 74168c1beb..f2871294e4 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeFlattenSeq.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeFlattenSeq.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeGlobalRateLimit.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeGlobalRateLimit.scala
index 6b16d2e6a9..19f4bc2c04 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeGlobalRateLimit.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeGlobalRateLimit.scala
@@ -4,12 +4,12 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.actor.{ Actor, ActorRef, Props }
-import akka.stream.ClosedShape
-import akka.stream.scaladsl._
-import akka.stream.testkit._
-import akka.testkit._
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.{ Actor, ActorRef, Props }
+import org.apache.pekko.stream.ClosedShape
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream.testkit._
+import org.apache.pekko.testkit._
 
 import scala.collection.immutable
 import scala.concurrent.duration._
@@ -33,7 +33,7 @@ class RecipeGlobalRateLimit extends RecipeSpec {
         extends Actor {
       import Limiter._
       import context.dispatcher
-      import akka.actor.Status
+      import org.apache.pekko.actor.Status
 
       private var waitQueue = immutable.Queue.empty[ActorRef]
       private var permitTokens = maxAvailableTokens
@@ -81,8 +81,9 @@ class RecipeGlobalRateLimit extends RecipeSpec {
 
       // #global-limiter-flow
       def limitGlobal[T](limiter: ActorRef, maxAllowedWait: FiniteDuration): Flow[T, T, NotUsed] = {
-        import akka.pattern.ask
-        import akka.util.Timeout
+        import org.apache.pekko
+        import pekko.pattern.ask
+        import pekko.util.Timeout
         Flow[T].mapAsync(4)((element: T) => {
           import system.dispatcher
           implicit val triggerTimeout = Timeout(maxAllowedWait)
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeHold.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeHold.scala
index 14c0430adc..44b970f5c5 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeHold.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeHold.scala
@@ -4,16 +4,17 @@
 
 package docs.stream.cookbook
 
-import akka.stream.Attributes
-import akka.stream.scaladsl.{ Sink, Source }
-import akka.stream.testkit._
+import org.apache.pekko.stream.Attributes
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.stream.testkit._
 
 import scala.concurrent.duration._
 
 object HoldOps {
   // #hold-version-1
-  import akka.stream._
-  import akka.stream.stage._
+  import org.apache.pekko
+  import pekko.stream._
+  import pekko.stream.stage._
   final class HoldWithInitial[T](initial: T) extends GraphStage[FlowShape[T, T]] {
     val in = Inlet[T]("HoldWithInitial.in")
     val out = Outlet[T]("HoldWithInitial.out")
@@ -44,8 +45,9 @@ object HoldOps {
   // #hold-version-1
 
   // #hold-version-2
-  import akka.stream._
-  import akka.stream.stage._
+  import org.apache.pekko
+  import pekko.stream._
+  import pekko.stream.stage._
   final class HoldWithWait[T] extends GraphStage[FlowShape[T, T]] {
     val in = Inlet[T]("HoldWithWait.in")
     val out = Outlet[T]("HoldWithWait.out")
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeKeepAlive.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeKeepAlive.scala
index d39b70ecd8..b75bdade2a 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeKeepAlive.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeKeepAlive.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.stream.scaladsl._
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.util.ByteString
 
 class RecipeKeepAlive extends RecipeSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeLoggingElements.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeLoggingElements.scala
index 334181caed..5c8c476c42 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeLoggingElements.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeLoggingElements.scala
@@ -4,11 +4,11 @@
 
 package docs.stream.cookbook
 
-import akka.event.Logging
-import akka.event.LoggingAdapter
-import akka.stream.Attributes
-import akka.stream.scaladsl.{ Sink, Source }
-import akka.testkit.{ EventFilter, TestProbe }
+import org.apache.pekko.event.Logging
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.stream.Attributes
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.testkit.{ EventFilter, TestProbe }
 
 class RecipeLoggingElements extends RecipeSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeManualTrigger.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeManualTrigger.scala
index 220f30f0a3..5b06ea6b70 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeManualTrigger.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeManualTrigger.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.cookbook
 
-import akka.stream.ClosedShape
-import akka.stream.scaladsl._
-import akka.stream.testkit._
+import org.apache.pekko.stream.ClosedShape
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream.testkit._
 import scala.concurrent.duration._
 
 class RecipeManualTrigger extends RecipeSpec {
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMissedTicks.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMissedTicks.scala
index b0178e522f..cd4fdf4a18 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMissedTicks.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMissedTicks.scala
@@ -4,11 +4,11 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.stream.scaladsl._
-import akka.stream.testkit._
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream.testkit._
 import scala.concurrent.duration._
-import akka.testkit.TestLatch
+import org.apache.pekko.testkit.TestLatch
 import scala.concurrent.Await
 
 class RecipeMissedTicks extends RecipeSpec {
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMultiGroupBy.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMultiGroupBy.scala
index 61e37158bd..dbb62e7de0 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMultiGroupBy.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMultiGroupBy.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 
 import scala.collection.immutable
 import scala.concurrent.Await
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeParseLines.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeParseLines.scala
index 10012a00a1..d450cfc0f6 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeParseLines.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeParseLines.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.cookbook
 
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -25,7 +25,7 @@ class RecipeParseLines extends RecipeSpec {
           ByteString("\r\n\r\n")))
 
       // #parse-lines
-      import akka.stream.scaladsl.Framing
+      import org.apache.pekko.stream.scaladsl.Framing
       val linesStream = rawData
         .via(Framing.delimiter(ByteString("\r\n"), maximumFrameLength = 100, allowTruncation = true))
         .map(_.utf8String)
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeReduceByKey.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeReduceByKey.scala
index b34d14d375..9d973d6e71 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeReduceByKey.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeReduceByKey.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.stream.scaladsl._
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl._
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSeq.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSeq.scala
index fccd347b61..10d3174656 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSeq.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSeq.scala
@@ -4,7 +4,7 @@
 
 package docs.stream.cookbook
 
-import akka.stream.scaladsl._
+import org.apache.pekko.stream.scaladsl._
 import scala.concurrent.Future
 
 class RecipeSeq extends RecipeSpec {
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSimpleDrop.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSimpleDrop.scala
index afa466d913..e1f445e10b 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSimpleDrop.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSimpleDrop.scala
@@ -4,11 +4,11 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.stream.scaladsl.{ Flow, Sink, Source }
-import akka.stream.testkit._
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.{ Flow, Sink, Source }
+import org.apache.pekko.stream.testkit._
 import scala.concurrent.duration._
-import akka.testkit.TestLatch
+import org.apache.pekko.testkit.TestLatch
 import scala.concurrent.Await
 
 class RecipeSimpleDrop extends RecipeSpec {
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSourceFromFunction.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSourceFromFunction.scala
index aa3a978542..1860feca44 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSourceFromFunction.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSourceFromFunction.scala
@@ -6,8 +6,8 @@ package docs.stream.cookbook
 
 import java.util.UUID
 
-import akka.NotUsed
-import akka.stream.scaladsl._
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl._
 
 class RecipeSourceFromFunction extends RecipeSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSpec.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSpec.scala
index bc52139459..96ac627989 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSpec.scala
@@ -4,7 +4,7 @@
 
 package docs.stream.cookbook
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 
 trait RecipeSpec extends AkkaSpec {
 
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSplitter.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSplitter.scala
index 430e0d2397..18cee7f92a 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSplitter.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSplitter.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeWorkerPool.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeWorkerPool.scala
index a2aa4197e1..17f4a31ef4 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeWorkerPool.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeWorkerPool.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.cookbook
 
-import akka.NotUsed
-import akka.stream.FlowShape
-import akka.stream.scaladsl._
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.FlowShape
+import org.apache.pekko.stream.scaladsl._
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/stream/io/StreamFileDocSpec.scala b/akka-docs/src/test/scala/docs/stream/io/StreamFileDocSpec.scala
index aa3034a54b..a0c11aed49 100644
--- a/akka-docs/src/test/scala/docs/stream/io/StreamFileDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/io/StreamFileDocSpec.scala
@@ -6,11 +6,11 @@ package docs.stream.io
 
 import java.nio.file.{ Files, Paths }
 
-import akka.stream._
-import akka.stream.scaladsl.{ FileIO, Sink, Source }
-import akka.stream.testkit.Utils._
-import akka.util.ByteString
-import akka.testkit.AkkaSpec
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.scaladsl.{ FileIO, Sink, Source }
+import org.apache.pekko.stream.testkit.Utils._
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.testkit.AkkaSpec
 
 import scala.concurrent.Future
 import scala.concurrent.ExecutionContext
@@ -28,7 +28,7 @@ class StreamFileDocSpec extends AkkaSpec(UnboundedMailboxConfig) {
 
   {
     // #file-source
-    import akka.stream.scaladsl._
+    import org.apache.pekko.stream.scaladsl._
     // #file-source
     Thread.sleep(0) // needs a statement here for valid syntax and to avoid "unused" warnings
   }
diff --git a/akka-docs/src/test/scala/docs/stream/io/StreamTcpDocSpec.scala b/akka-docs/src/test/scala/docs/stream/io/StreamTcpDocSpec.scala
index b372369802..bb0dfac00d 100644
--- a/akka-docs/src/test/scala/docs/stream/io/StreamTcpDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/io/StreamTcpDocSpec.scala
@@ -6,14 +6,14 @@ package docs.stream.io
 
 import java.util.concurrent.atomic.AtomicReference
 
-import akka.stream.scaladsl.Tcp._
-import akka.stream.scaladsl._
-import akka.testkit.AkkaSpec
-import akka.testkit.TestProbe
-import akka.util.ByteString
+import org.apache.pekko.stream.scaladsl.Tcp._
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.testkit.TestProbe
+import org.apache.pekko.util.ByteString
 
 import scala.concurrent.Future
-import akka.testkit.SocketUtil
+import org.apache.pekko.testkit.SocketUtil
 import scala.concurrent.ExecutionContext
 
 class StreamTcpDocSpec extends AkkaSpec {
@@ -39,7 +39,7 @@ class StreamTcpDocSpec extends AkkaSpec {
     {
       val (host, port) = SocketUtil.temporaryServerHostnameAndPort()
       // #echo-server-simple-handle
-      import akka.stream.scaladsl.Framing
+      import org.apache.pekko.stream.scaladsl.Framing
 
       val connections: Source[IncomingConnection, Future[ServerBinding]] =
         Tcp(system).bind(host, port)
@@ -64,7 +64,7 @@ class StreamTcpDocSpec extends AkkaSpec {
     val connections = Tcp(system).bind(localhost.getHostString, localhost.getPort)
     val serverProbe = TestProbe()
 
-    import akka.stream.scaladsl.Framing
+    import org.apache.pekko.stream.scaladsl.Framing
     val binding =
       // #welcome-banner-chat-server
       connections
@@ -98,7 +98,7 @@ class StreamTcpDocSpec extends AkkaSpec {
     // make sure server is started before we connect
     binding.futureValue
 
-    import akka.stream.scaladsl.Framing
+    import org.apache.pekko.stream.scaladsl.Framing
 
     val input = new AtomicReference("Hello world" :: "What a lovely day" :: Nil)
     def readLine(prompt: String): String = {
diff --git a/akka-docs/src/test/scala/docs/stream/operators/BroadcastDocExample.scala b/akka-docs/src/test/scala/docs/stream/operators/BroadcastDocExample.scala
index de65a3e84f..f19f2c1ae3 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/BroadcastDocExample.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/BroadcastDocExample.scala
@@ -8,20 +8,21 @@ import java.util.concurrent.ThreadLocalRandom
 
 import scala.concurrent.Future
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Broadcast
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Broadcast
 
 object BroadcastDocExample {
 
   implicit val system: ActorSystem = ActorSystem("BroadcastDocExample")
 
   // #broadcast
-  import akka.NotUsed
-  import akka.stream.ClosedShape
-  import akka.stream.scaladsl.GraphDSL
-  import akka.stream.scaladsl.RunnableGraph
-  import akka.stream.scaladsl.Sink
-  import akka.stream.scaladsl.Source
+  import org.apache.pekko
+  import pekko.NotUsed
+  import pekko.stream.ClosedShape
+  import pekko.stream.scaladsl.GraphDSL
+  import pekko.stream.scaladsl.RunnableGraph
+  import pekko.stream.scaladsl.Sink
+  import pekko.stream.scaladsl.Source
 
   val source: Source[Int, NotUsed] =
     Source.fromIterator(() => Iterator.continually(ThreadLocalRandom.current().nextInt(100))).take(100)
diff --git a/akka-docs/src/test/scala/docs/stream/operators/Map.scala b/akka-docs/src/test/scala/docs/stream/operators/Map.scala
index 3bf84ce759..700632b0ee 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/Map.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/Map.scala
@@ -5,8 +5,9 @@
 package docs.stream.operators
 
 //#imports
-import akka.NotUsed
-import akka.stream.scaladsl._
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.scaladsl._
 
 //#imports
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/MergeSequenceDocExample.scala b/akka-docs/src/test/scala/docs/stream/operators/MergeSequenceDocExample.scala
index a98dd25514..033a31a17e 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/MergeSequenceDocExample.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/MergeSequenceDocExample.scala
@@ -4,16 +4,17 @@
 
 package docs.stream.operators
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 
 object MergeSequenceDocExample {
 
   implicit val system: ActorSystem = ???
 
   // #merge-sequence
-  import akka.NotUsed
-  import akka.stream.ClosedShape
-  import akka.stream.scaladsl.{ Flow, GraphDSL, MergeSequence, Partition, RunnableGraph, Sink, Source }
+  import org.apache.pekko
+  import pekko.NotUsed
+  import pekko.stream.ClosedShape
+  import pekko.stream.scaladsl.{ Flow, GraphDSL, MergeSequence, Partition, RunnableGraph, Sink, Source }
 
   val subscription: Source[Message, NotUsed] = createSubscription()
   val messageProcessor: Flow[(Message, Long), (Message, Long), NotUsed] =
diff --git a/akka-docs/src/test/scala/docs/stream/operators/PartitionDocExample.scala b/akka-docs/src/test/scala/docs/stream/operators/PartitionDocExample.scala
index 54db58f254..0fa8a22893 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/PartitionDocExample.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/PartitionDocExample.scala
@@ -4,23 +4,24 @@
 
 package docs.stream.operators
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 
 object PartitionDocExample {
 
   implicit val system: ActorSystem = ???
 
   // #partition
-  import akka.NotUsed
-  import akka.stream.Attributes
-  import akka.stream.Attributes.LogLevels
-  import akka.stream.ClosedShape
-  import akka.stream.scaladsl.Flow
-  import akka.stream.scaladsl.GraphDSL
-  import akka.stream.scaladsl.Partition
-  import akka.stream.scaladsl.RunnableGraph
-  import akka.stream.scaladsl.Sink
-  import akka.stream.scaladsl.Source
+  import org.apache.pekko
+  import pekko.NotUsed
+  import pekko.stream.Attributes
+  import pekko.stream.Attributes.LogLevels
+  import pekko.stream.ClosedShape
+  import pekko.stream.scaladsl.Flow
+  import pekko.stream.scaladsl.GraphDSL
+  import pekko.stream.scaladsl.Partition
+  import pekko.stream.scaladsl.RunnableGraph
+  import pekko.stream.scaladsl.Sink
+  import pekko.stream.scaladsl.Source
 
   val source: Source[Int, NotUsed] = Source(1 to 10)
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/SourceOperators.scala b/akka-docs/src/test/scala/docs/stream/operators/SourceOperators.scala
index ea6fbab627..4a2854191a 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/SourceOperators.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/SourceOperators.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators
 
-import akka.actor.ActorSystem
-import akka.testkit.TestProbe
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.testkit.TestProbe
 
 object SourceOperators {
 
@@ -14,9 +14,10 @@ object SourceOperators {
   def fromFuture(): Unit = {
     // #sourceFromFuture
 
-    import akka.actor.ActorSystem
-    import akka.stream.scaladsl._
-    import akka.{ Done, NotUsed }
+    import org.apache.pekko
+    import pekko.actor.ActorSystem
+    import pekko.stream.scaladsl._
+    import pekko.{ Done, NotUsed }
 
     import scala.concurrent.Future
 
@@ -29,11 +30,12 @@ object SourceOperators {
 
   def actorRef(): Unit = {
     // #actorRef
-    import akka.Done
-    import akka.actor.ActorRef
-    import akka.stream.OverflowStrategy
-    import akka.stream.CompletionStrategy
-    import akka.stream.scaladsl._
+    import org.apache.pekko
+    import pekko.Done
+    import pekko.actor.ActorRef
+    import pekko.stream.OverflowStrategy
+    import pekko.stream.CompletionStrategy
+    import pekko.stream.scaladsl._
 
     val source: Source[Any, ActorRef] = Source.actorRef(
       completionMatcher = {
@@ -58,10 +60,11 @@ object SourceOperators {
   def actorRefWithBackpressure(): Unit = {
     // #actorRefWithBackpressure
 
-    import akka.actor.Status.Success
-    import akka.actor.ActorRef
-    import akka.stream.CompletionStrategy
-    import akka.stream.scaladsl._
+    import org.apache.pekko
+    import pekko.actor.Status.Success
+    import pekko.actor.ActorRef
+    import pekko.stream.CompletionStrategy
+    import pekko.stream.scaladsl._
 
     val probe = TestProbe()
 
@@ -87,7 +90,7 @@ object SourceOperators {
 
   def maybe(): Unit = {
     // #maybe
-    import akka.stream.scaladsl._
+    import org.apache.pekko.stream.scaladsl._
     import scala.concurrent.Promise
 
     val source = Source.maybe[Int].to(Sink.foreach(elem => println(elem)))
diff --git a/akka-docs/src/test/scala/docs/stream/operators/WithContextSpec.scala b/akka-docs/src/test/scala/docs/stream/operators/WithContextSpec.scala
index fe737ee7ce..a0ea8d2d35 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/WithContextSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/WithContextSpec.scala
@@ -4,15 +4,16 @@
 
 package docs.stream.operators
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 
 class WithContextSpec extends AkkaSpec {
 
   "use asSourceWithContext" in {
     // #asSourceWithContext
-    import akka.NotUsed
-    import akka.stream.scaladsl.Source
-    import akka.stream.scaladsl.SourceWithContext
+    import org.apache.pekko
+    import pekko.NotUsed
+    import pekko.stream.scaladsl.Source
+    import pekko.stream.scaladsl.SourceWithContext
     import scala.collection.immutable
 
     // values with their contexts as tuples
@@ -32,7 +33,7 @@ class WithContextSpec extends AkkaSpec {
       .map(s => s.reverse)
 
     // running the source and asserting the outcome
-    import akka.stream.scaladsl.Sink
+    import org.apache.pekko.stream.scaladsl.Sink
     val result = mapped.runWith(Sink.seq)
     result.futureValue should contain theSameElementsInOrderAs immutable.Seq("snie" -> 1, "iewz" -> 2, "ierd" -> 3)
     // #asSourceWithContext
@@ -40,9 +41,10 @@ class WithContextSpec extends AkkaSpec {
 
   "use asFlowWithContext" in {
     // #asFlowWithContext
-    import akka.NotUsed
-    import akka.stream.scaladsl.Flow
-    import akka.stream.scaladsl.FlowWithContext
+    import org.apache.pekko
+    import pekko.NotUsed
+    import pekko.stream.scaladsl.Flow
+    import pekko.stream.scaladsl.FlowWithContext
     // a regular flow with pairs as elements
     val flow: Flow[(String, Int), (String, Int), NotUsed] = // ???
       // #asFlowWithContext
@@ -67,8 +69,8 @@ class WithContextSpec extends AkkaSpec {
       .map(_.reverse)
 
     // running the flow with some sample data and asserting the outcome
-    import akka.stream.scaladsl.Source
-    import akka.stream.scaladsl.Sink
+    import pekko.stream.scaladsl.Source
+    import pekko.stream.scaladsl.Sink
     import scala.collection.immutable
 
     val values: immutable.Seq[(String, Int)] = immutable.Seq("eins" -> 1, "zwei" -> 2, "drei" -> 3)
diff --git a/akka-docs/src/test/scala/docs/stream/operators/converters/StreamConvertersToJava.scala b/akka-docs/src/test/scala/docs/stream/operators/converters/StreamConvertersToJava.scala
index 9f9d45ca0d..8f6c291d06 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/converters/StreamConvertersToJava.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/converters/StreamConvertersToJava.scala
@@ -8,13 +8,14 @@ package docs.stream.operators.converters
 import java.util.stream
 import java.util.stream.IntStream
 
-import akka.NotUsed
-import akka.stream.scaladsl.Keep
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.stream.scaladsl.StreamConverters
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.scaladsl.Keep
+import pekko.stream.scaladsl.Sink
+import pekko.stream.scaladsl.Source
+import pekko.stream.scaladsl.StreamConverters
 // #import
-import akka.testkit.AkkaSpec
+import pekko.testkit.AkkaSpec
 import org.scalatest.concurrent.Futures
 
 import scala.collection.immutable
diff --git a/akka-docs/src/test/scala/docs/stream/operators/converters/ToFromJavaIOStreams.scala b/akka-docs/src/test/scala/docs/stream/operators/converters/ToFromJavaIOStreams.scala
index 361920294b..7e5ca16335 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/converters/ToFromJavaIOStreams.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/converters/ToFromJavaIOStreams.scala
@@ -7,14 +7,14 @@ package docs.stream.operators.converters
 // #import
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, InputStream, OutputStream }
 
-import akka.NotUsed
-import akka.stream.IOResult
-import akka.stream.scaladsl.{ Flow, Keep, Sink, Source, StreamConverters }
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.IOResult
+import org.apache.pekko.stream.scaladsl.{ Flow, Keep, Sink, Source, StreamConverters }
+import org.apache.pekko.util.ByteString
 
 import scala.util.Random
 // #import
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 import org.scalatest.concurrent.Futures
 
 import scala.concurrent.Future
diff --git a/akka-docs/src/test/scala/docs/stream/operators/flow/FromSinkAndSource.scala b/akka-docs/src/test/scala/docs/stream/operators/flow/FromSinkAndSource.scala
index 6e0a9f5f61..bcc2c0026f 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/flow/FromSinkAndSource.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/flow/FromSinkAndSource.scala
@@ -4,19 +4,19 @@
 
 package docs.stream.operators.flow
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.BroadcastHub
-import akka.stream.scaladsl.Flow
-import akka.stream.scaladsl.Framing
-import akka.stream.scaladsl.Keep
-import akka.stream.scaladsl.MergeHub
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.stream.scaladsl.Tcp
-import akka.stream.testkit.TestPublisher
-import akka.stream.testkit.TestSubscriber
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.BroadcastHub
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.stream.scaladsl.Framing
+import org.apache.pekko.stream.scaladsl.Keep
+import org.apache.pekko.stream.scaladsl.MergeHub
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Tcp
+import org.apache.pekko.stream.testkit.TestPublisher
+import org.apache.pekko.stream.testkit.TestSubscriber
+import org.apache.pekko.util.ByteString
 
 import scala.concurrent.duration._
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/flow/FutureFlow.scala b/akka-docs/src/test/scala/docs/stream/operators/flow/FutureFlow.scala
index db9de9fa3d..46573026dc 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/flow/FutureFlow.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/flow/FutureFlow.scala
@@ -4,10 +4,10 @@
 
 package docs.stream.operators.flow
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Flow
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.stream.scaladsl.Source
 
 import scala.concurrent.Future
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/flow/Lazy.scala b/akka-docs/src/test/scala/docs/stream/operators/flow/Lazy.scala
index 462655c4f4..97d6bdbf3c 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/flow/Lazy.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/flow/Lazy.scala
@@ -6,10 +6,10 @@ package docs.stream.operators.flow
 
 import java.util
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Flow
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
 
 object Lazy {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/flow/StatefulMap.scala b/akka-docs/src/test/scala/docs/stream/operators/flow/StatefulMap.scala
index bee0f5d1e1..d5af187a31 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/flow/StatefulMap.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/flow/StatefulMap.scala
@@ -3,8 +3,8 @@
  */
 
 package docs.stream.operators.flow
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object StatefulMap {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/flow/StatefulMapConcat.scala b/akka-docs/src/test/scala/docs/stream/operators/flow/StatefulMapConcat.scala
index 1f327264be..7f4d3c71b2 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/flow/StatefulMapConcat.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/flow/StatefulMapConcat.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.operators.flow
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Flow
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.stream.scaladsl.Source
 
 class StatefulMapConcat {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sink/AsPublisher.scala b/akka-docs/src/test/scala/docs/stream/operators/sink/AsPublisher.scala
index 7041c4ca76..920fd57457 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sink/AsPublisher.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sink/AsPublisher.scala
@@ -5,8 +5,8 @@
 package docs.stream.operators.sink
 
 import scala.concurrent.{ ExecutionContextExecutor, Future }
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 
 object AsPublisher {
   implicit val system: ActorSystem = ???
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sink/Cancelled.scala b/akka-docs/src/test/scala/docs/stream/operators/sink/Cancelled.scala
index 0614c832f1..17f59aea1c 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sink/Cancelled.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sink/Cancelled.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.operators.sink
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 
 import scala.concurrent.ExecutionContextExecutor
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sink/Collection.scala b/akka-docs/src/test/scala/docs/stream/operators/sink/Collection.scala
index 129ccf4057..293be5f0cc 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sink/Collection.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sink/Collection.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.sink
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 
 import scala.concurrent.{ ExecutionContextExecutor, Future }
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sink/Fold.scala b/akka-docs/src/test/scala/docs/stream/operators/sink/Fold.scala
index 35cb62fbf3..66a8f9b4a9 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sink/Fold.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sink/Fold.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.sink
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 
 import scala.concurrent.{ ExecutionContextExecutor, Future }
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sink/HeadOption.scala b/akka-docs/src/test/scala/docs/stream/operators/sink/HeadOption.scala
index 6ec188e9db..8c9838c8ba 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sink/HeadOption.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sink/HeadOption.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.sink
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 
 import scala.concurrent.{ ExecutionContextExecutor, Future }
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sink/Ignore.scala b/akka-docs/src/test/scala/docs/stream/operators/sink/Ignore.scala
index 40f94f5d1e..6ff19b607f 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sink/Ignore.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sink/Ignore.scala
@@ -8,10 +8,10 @@ import java.util.UUID
 
 import scala.concurrent.Future
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
 
 object Ignore {
   implicit val system: ActorSystem = ???
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sink/Lazy.scala b/akka-docs/src/test/scala/docs/stream/operators/sink/Lazy.scala
index 6555b4bb82..fdac98073b 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sink/Lazy.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sink/Lazy.scala
@@ -4,10 +4,10 @@
 
 package docs.stream.operators.sink
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Keep
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Keep
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
 
 object Lazy {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/Combine.scala b/akka-docs/src/test/scala/docs/stream/operators/source/Combine.scala
index a0c74bc14b..6234c37449 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/Combine.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/Combine.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.operators.source
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 // #imports
-import akka.stream.scaladsl.{ Concat, Merge, Source }
+import org.apache.pekko.stream.scaladsl.{ Concat, Merge, Source }
 // ...
 
 // #imports
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/From.scala b/akka-docs/src/test/scala/docs/stream/operators/source/From.scala
index 5861499933..f320fe26c1 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/From.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/From.scala
@@ -6,8 +6,8 @@ package docs.stream.operators.source
 
 import java.util.stream.IntStream
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object From {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/FutureSource.scala b/akka-docs/src/test/scala/docs/stream/operators/source/FutureSource.scala
index 80511fd49e..72931e9218 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/FutureSource.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/FutureSource.scala
@@ -6,8 +6,9 @@ package docs.stream.operators.source
 
 // #sourceFutureSource
 
-import akka.NotUsed
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.scaladsl.Source
 
 import scala.concurrent.Future
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/Lazy.scala b/akka-docs/src/test/scala/docs/stream/operators/source/Lazy.scala
index f716d1556a..c7c87ab0ff 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/Lazy.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/Lazy.scala
@@ -4,10 +4,10 @@
 
 package docs.stream.operators.source
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
 
 object Lazy {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/Restart.scala b/akka-docs/src/test/scala/docs/stream/operators/source/Restart.scala
index 7a1efddbd0..4f3e5be323 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/Restart.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/Restart.scala
@@ -4,17 +4,17 @@
 
 package docs.stream.operators.source
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.{ KillSwitches, RestartSettings, UniqueKillSwitch }
-import akka.stream.scaladsl.Keep
-import akka.stream.scaladsl.RestartSource
-import akka.stream.scaladsl.Sink
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.{ KillSwitches, RestartSettings, UniqueKillSwitch }
+import org.apache.pekko.stream.scaladsl.Keep
+import org.apache.pekko.stream.scaladsl.RestartSource
+import org.apache.pekko.stream.scaladsl.Sink
 
 import scala.concurrent.duration._
 import scala.util.control.NoStackTrace
 // #imports
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Source
 // #imports
 
 object Restart extends App {
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/Tick.scala b/akka-docs/src/test/scala/docs/stream/operators/source/Tick.scala
index 0ced8ad0cb..0a3e6c490b 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/Tick.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/Tick.scala
@@ -4,14 +4,14 @@
 
 package docs.stream.operators.source
 
-import akka.NotUsed
-import akka.actor.Cancellable
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.stream.scaladsl.Source
-import akka.actor.typed.scaladsl.AskPattern._
-import akka.stream.scaladsl.Flow
-import akka.util.Timeout
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.Cancellable
+import org.apache.pekko.actor.typed.ActorRef
+import org.apache.pekko.actor.typed.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.actor.typed.scaladsl.AskPattern._
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.util.Timeout
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/Unfold.scala b/akka-docs/src/test/scala/docs/stream/operators/source/Unfold.scala
index 192b2079c3..319257463b 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/Unfold.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/Unfold.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.source
 
-import akka.NotUsed
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.Source
 
 object Unfold {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldAsync.scala b/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldAsync.scala
index 31253becb2..0032c11394 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldAsync.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldAsync.scala
@@ -4,13 +4,13 @@
 
 package docs.stream.operators.source
 
-import akka.NotUsed
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
-import akka.actor.typed.scaladsl.AskPattern._
-import akka.util.Timeout
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.ActorRef
+import org.apache.pekko.actor.typed.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.actor.typed.scaladsl.AskPattern._
+import org.apache.pekko.util.Timeout
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldResource.scala b/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldResource.scala
index 062eba3e7e..3b188a179f 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldResource.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldResource.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.operators.source
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object UnfoldResource {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldResourceAsync.scala b/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldResourceAsync.scala
index d3dbc3592d..7a42cd9a6f 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldResourceAsync.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/UnfoldResourceAsync.scala
@@ -4,10 +4,10 @@
 
 package docs.stream.operators.source
 
-import akka.Done
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.Done
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 import scala.concurrent.Future
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/source/Zip.scala b/akka-docs/src/test/scala/docs/stream/operators/source/Zip.scala
index 85f3e4c754..3838421398 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/source/Zip.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/source/Zip.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.source
 
-import akka.actor.typed.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.typed.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object Zip {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Collect.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Collect.scala
index f862d2e1e8..5ce60d993a 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Collect.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Collect.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.stream.scaladsl.Flow
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.Flow
 
 object Collect {
   // #collect-elements
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/CompletionTimeout.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/CompletionTimeout.scala
index 39d4ca1839..f88a11b750 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/CompletionTimeout.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/CompletionTimeout.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.Done
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.{ Flow, Sink, Source }
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.{ Flow, Sink, Source }
 
 import scala.concurrent.duration._
 import scala.concurrent.{ ExecutionContextExecutor, Future }
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Conflate.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Conflate.scala
index 5d6e792e60..9266f042d2 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Conflate.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Conflate.scala
@@ -6,7 +6,7 @@ package docs.stream.operators.sourceorflow
 
 //#conflate
 //#conflateWithSeed
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Source
 
 //#conflateWithSeed
 //#conflate
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Drop.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Drop.scala
index 65407d9c7d..e5c36b49de 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Drop.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Drop.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object Drop {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/ExtrapolateAndExpand.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/ExtrapolateAndExpand.scala
index 3801801f8c..adf7b15796 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/ExtrapolateAndExpand.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/ExtrapolateAndExpand.scala
@@ -4,15 +4,15 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.actor.Cancellable
-import akka.stream.DelayOverflowStrategy
-import akka.stream.scaladsl.DelayStrategy
-import akka.stream.scaladsl.Flow
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.Cancellable
+import org.apache.pekko.stream.DelayOverflowStrategy
+import org.apache.pekko.stream.scaladsl.DelayStrategy
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import docs.stream.operators.sourceorflow.ExtrapolateAndExpand.fps
 import docs.stream.operators.sourceorflow.ExtrapolateAndExpand.nowInSeconds
 import docs.stream.operators.sourceorflow.ExtrapolateAndExpand.periodInMillis
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Filter.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Filter.scala
index 5254e75799..badce98b84 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Filter.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Filter.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object Filter {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FlatMapConcat.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FlatMapConcat.scala
index 7dab8ed812..e4af8dfb58 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FlatMapConcat.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FlatMapConcat.scala
@@ -3,9 +3,9 @@
  */
 
 package docs.stream.operators.sourceorflow
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object FlatMapConcat {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FlatMapMerge.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FlatMapMerge.scala
index a03b93c553..28c7f27c5c 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FlatMapMerge.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FlatMapMerge.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object FlatMapMerge {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Fold.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Fold.scala
index 566c2578a3..e8923021be 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Fold.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Fold.scala
@@ -5,8 +5,9 @@
 package docs.stream.operators.sourceorflow
 
 //#imports
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.stream.scaladsl.Source
 
 //#imports
 object Fold extends App {
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FoldAsync.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FoldAsync.scala
index 4001f0620a..18ba78d0d1 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FoldAsync.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/FoldAsync.scala
@@ -5,8 +5,9 @@
 package docs.stream.operators.sourceorflow
 
 //#imports
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.stream.scaladsl.Source
 
 import scala.concurrent.{ ExecutionContext, Future }
 //#imports
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/GroupBy.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/GroupBy.scala
index 5888d1d564..8c13ffe90a 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/GroupBy.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/GroupBy.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object GroupBy {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Grouped.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Grouped.scala
index 5351434ccb..1f78812c38 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Grouped.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Grouped.scala
@@ -3,11 +3,11 @@
  */
 
 package docs.stream.operators.sourceorflow
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Source
 
 object Grouped {
   def groupedExample(): Unit = {
-    import akka.actor.ActorSystem
+    import org.apache.pekko.actor.ActorSystem
 
     implicit val system: ActorSystem = ActorSystem()
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/GroupedWeighted.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/GroupedWeighted.scala
index 42d32d919a..06f468dbd5 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/GroupedWeighted.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/GroupedWeighted.scala
@@ -3,12 +3,12 @@
  */
 
 package docs.stream.operators.sourceorflow
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Source
 import scala.collection.immutable
 
 object GroupedWeighted {
   def groupedWeightedExample(): Unit = {
-    import akka.actor.ActorSystem
+    import org.apache.pekko.actor.ActorSystem
 
     implicit val system: ActorSystem = ActorSystem()
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Intersperse.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Intersperse.scala
index bc47ff86ea..d738b683d5 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Intersperse.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Intersperse.scala
@@ -4,11 +4,11 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
 
 object Intersperse extends App {
-  import akka.actor.ActorSystem
+  import org.apache.pekko.actor.ActorSystem
 
   implicit val system: ActorSystem = ActorSystem()
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Limit.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Limit.scala
index 06ac753aca..2a5fa90469 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Limit.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Limit.scala
@@ -4,10 +4,10 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.typed.ActorSystem
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.ActorSystem
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
 
 import scala.concurrent.Future
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/LimitWeighted.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/LimitWeighted.scala
index 4697355fe2..86875baadd 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/LimitWeighted.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/LimitWeighted.scala
@@ -4,10 +4,10 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.typed.ActorSystem
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 
 import scala.concurrent.Future
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Log.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Log.scala
index d07ec8ae7d..9834126d47 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Log.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Log.scala
@@ -4,9 +4,9 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.stream.scaladsl.Flow
+import org.apache.pekko.stream.scaladsl.Flow
 //#log
-import akka.stream.Attributes
+import org.apache.pekko.stream.Attributes
 
 //#log
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/LogWithMarker.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/LogWithMarker.scala
index b4e981b54b..94f39f065d 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/LogWithMarker.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/LogWithMarker.scala
@@ -4,10 +4,11 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.stream.scaladsl.Flow
+import org.apache.pekko.stream.scaladsl.Flow
 //#logWithMarker
-import akka.event.LogMarker
-import akka.stream.Attributes
+import org.apache.pekko
+import pekko.event.LogMarker
+import pekko.stream.Attributes
 
 //#logWithMarker
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapAsyncs.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapAsyncs.scala
index 9bcfd42883..cf0d2fcd92 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapAsyncs.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapAsyncs.scala
@@ -4,11 +4,12 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ActorSystem
+import pekko.stream.scaladsl.Sink
+import pekko.stream.scaladsl.Source
+import pekko.util.Timeout
 
 import scala.concurrent.ExecutionContextExecutor
 import scala.concurrent.Future
@@ -48,7 +49,7 @@ object CommonMapAsync {
     // #mapasyncunordered
     val result =
       if (Random.nextInt(5) == 0) {
-        akka.pattern.after(500.millis)(Future.successful(event.sequenceNumber))
+        pekko.pattern.after(500.millis)(Future.successful(event.sequenceNumber))
       } else {
         Future.successful(event.sequenceNumber)
       }
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapConcat.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapConcat.scala
index eecd24e3f7..5e21393f95 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapConcat.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapConcat.scala
@@ -4,14 +4,14 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Source
 
 import scala.concurrent.ExecutionContext
 
 object MapConcat {
 
   def mapConcat(): Unit = {
-    import akka.actor.ActorSystem
+    import org.apache.pekko.actor.ActorSystem
 
     implicit val system: ActorSystem = ActorSystem()
     implicit val ec: ExecutionContext = system.dispatcher
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapError.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapError.scala
index a3058e3cd2..c215ef24ff 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapError.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MapError.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 
 import scala.concurrent.ExecutionContext
 import scala.util.control.NoStackTrace
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MergeLatest.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MergeLatest.scala
index 4cc4545768..624b5886e9 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MergeLatest.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/MergeLatest.scala
@@ -3,8 +3,8 @@
  */
 
 package docs.stream.operators.sourceorflow
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 object MergeLatest extends App {
   implicit val system: ActorSystem = ActorSystem()
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Monitor.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Monitor.scala
index e13e584db8..835a2f39eb 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Monitor.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Monitor.scala
@@ -4,13 +4,13 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.FlowMonitor
-import akka.stream.FlowMonitorState
-import akka.stream.scaladsl.Keep
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.FlowMonitor
+import org.apache.pekko.stream.FlowMonitorState
+import org.apache.pekko.stream.scaladsl.Keep
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
 
 import scala.concurrent.ExecutionContextExecutor
 import scala.concurrent.duration._
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Reduce.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Reduce.scala
index f478e23ec0..00304faaa8 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Reduce.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Reduce.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.sink
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
 
 import scala.concurrent.{ ExecutionContextExecutor, Future }
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Scan.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Scan.scala
index eac882ab5c..9f1d1a4cdb 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Scan.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Scan.scala
@@ -3,11 +3,11 @@
  */
 
 package docs.stream.operators.sourceorflow
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Source
 
 object Scan {
   def scanExample(): Unit = {
-    import akka.actor.ActorSystem
+    import org.apache.pekko.actor.ActorSystem
 
     implicit val system: ActorSystem = ActorSystem()
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/ScanAsync.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/ScanAsync.scala
index 2be552e1c2..48cf878390 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/ScanAsync.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/ScanAsync.scala
@@ -4,7 +4,7 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Source
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
@@ -12,7 +12,7 @@ import scala.concurrent.Future
 object ScanAsync {
 
   def scanAsyncExample(): Unit = {
-    import akka.actor.ActorSystem
+    import org.apache.pekko.actor.ActorSystem
 
     implicit val system: ActorSystem = ActorSystem()
     implicit val ec: ExecutionContext = system.dispatcher
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Sliding.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Sliding.scala
index f4cec91f2b..1b99f69385 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Sliding.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Sliding.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.stream.scaladsl.Source
-import akka.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
 
 object Sliding {
   implicit val system: ActorSystem = ???
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Split.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Split.scala
index f46b48fcca..ce9627720e 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Split.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Split.scala
@@ -10,12 +10,12 @@ import java.time.ZoneOffset
 
 import scala.concurrent.duration._
 
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
 
 object Split {
   def splitWhenExample(args: Array[String]): Unit = {
-    import akka.actor.ActorSystem
+    import org.apache.pekko.actor.ActorSystem
 
     implicit val system: ActorSystem = ActorSystem()
 
@@ -58,7 +58,7 @@ object Split {
   }
 
   def splitAfterExample(args: Array[String]): Unit = {
-    import akka.actor.ActorSystem
+    import org.apache.pekko.actor.ActorSystem
 
     implicit val system: ActorSystem = ActorSystem()
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Take.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Take.scala
index e213d51733..bce0007a86 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Take.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Take.scala
@@ -6,8 +6,8 @@ package docs.stream.operators.sourceorflow
 
 object Take {
   def takeExample(): Unit = {
-    import akka.actor.ActorSystem
-    import akka.stream.scaladsl.Source
+    import org.apache.pekko.actor.ActorSystem
+    import org.apache.pekko.stream.scaladsl.Source
 
     implicit val system: ActorSystem = ActorSystem()
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/TakeWhile.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/TakeWhile.scala
index 75cdf0e370..e8534d749a 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/TakeWhile.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/TakeWhile.scala
@@ -6,8 +6,8 @@ package docs.stream.operators.sourceorflow
 
 object TakeWhile {
   def takeWhileExample(): Unit = {
-    import akka.actor.ActorSystem
-    import akka.stream.scaladsl.Source
+    import org.apache.pekko.actor.ActorSystem
+    import org.apache.pekko.stream.scaladsl.Source
 
     implicit val system: ActorSystem = ActorSystem()
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Throttle.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Throttle.scala
index ef74cfaff9..2b70572a36 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Throttle.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Throttle.scala
@@ -4,11 +4,11 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.ThrottleMode
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.ThrottleMode
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
 
 import scala.concurrent.duration._
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Watch.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Watch.scala
index 0c7b31f9ff..609151ac5b 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Watch.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/Watch.scala
@@ -4,10 +4,10 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.NotUsed
-import akka.actor.ActorRef
-import akka.stream.WatchedActorTerminatedException
-import akka.stream.scaladsl.Flow
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.stream.WatchedActorTerminatedException
+import org.apache.pekko.stream.scaladsl.Flow
 
 object Watch {
 
diff --git a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/WatchTermination.scala b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/WatchTermination.scala
index aee36119ce..24a2033ac8 100644
--- a/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/WatchTermination.scala
+++ b/akka-docs/src/test/scala/docs/stream/operators/sourceorflow/WatchTermination.scala
@@ -4,8 +4,8 @@
 
 package docs.stream.operators.sourceorflow
 
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Source
 
 import scala.concurrent.ExecutionContext
 import scala.util.{ Failure, Success }
diff --git a/akka-docs/src/test/scala/docs/testkit/ParentChildSpec.scala b/akka-docs/src/test/scala/docs/testkit/ParentChildSpec.scala
index 767a4eba53..fc1436f6c0 100644
--- a/akka-docs/src/test/scala/docs/testkit/ParentChildSpec.scala
+++ b/akka-docs/src/test/scala/docs/testkit/ParentChildSpec.scala
@@ -6,14 +6,14 @@ package docs.testkit
 
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.matchers.should.Matchers
-import akka.testkit.TestKitBase
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.testkit.TestProbe
-import akka.actor.ActorRefFactory
-import akka.testkit.TestKit
+import org.apache.pekko.testkit.TestKitBase
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.Props
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.testkit.TestProbe
+import org.apache.pekko.actor.ActorRefFactory
+import org.apache.pekko.testkit.TestKit
 import org.scalatest.BeforeAndAfterAll
 
 /**
diff --git a/akka-docs/src/test/scala/docs/testkit/PlainWordSpec.scala b/akka-docs/src/test/scala/docs/testkit/PlainWordSpec.scala
index 7ae20465df..f10acdb5e7 100644
--- a/akka-docs/src/test/scala/docs/testkit/PlainWordSpec.scala
+++ b/akka-docs/src/test/scala/docs/testkit/PlainWordSpec.scala
@@ -5,8 +5,9 @@
 package docs.testkit
 
 //#plain-spec
-import akka.actor.ActorSystem
-import akka.testkit.{ ImplicitSender, TestActors, TestKit }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.testkit.{ ImplicitSender, TestActors, TestKit }
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
diff --git a/akka-docs/src/test/scala/docs/testkit/TestKitUsageSpec.scala b/akka-docs/src/test/scala/docs/testkit/TestKitUsageSpec.scala
index e4a82964a8..e68f565d8f 100644
--- a/akka-docs/src/test/scala/docs/testkit/TestKitUsageSpec.scala
+++ b/akka-docs/src/test/scala/docs/testkit/TestKitUsageSpec.scala
@@ -15,11 +15,12 @@ import org.scalatest.matchers.should.Matchers
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Props
-import akka.testkit.{ DefaultTimeout, ImplicitSender, TestActors, TestKit }
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Props
+import pekko.testkit.{ DefaultTimeout, ImplicitSender, TestActors, TestKit }
 import scala.concurrent.duration._
 import scala.collection.immutable
 
diff --git a/akka-docs/src/test/scala/docs/testkit/TestkitDocSpec.scala b/akka-docs/src/test/scala/docs/testkit/TestkitDocSpec.scala
index 41442e20c6..12c4dbe657 100644
--- a/akka-docs/src/test/scala/docs/testkit/TestkitDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/testkit/TestkitDocSpec.scala
@@ -6,12 +6,12 @@ package docs.testkit
 
 import language.postfixOps
 import scala.util.Success
-import akka.testkit._
+import org.apache.pekko.testkit._
 
 //#imports-test-probe
 import scala.concurrent.duration._
-import akka.actor._
-import akka.testkit.TestProbe
+import org.apache.pekko.actor._
+import org.apache.pekko.testkit.TestProbe
 
 //#imports-test-probe
 
@@ -89,7 +89,7 @@ object TestKitDocSpec {
 
   class LoggingActor extends Actor {
     // #logging-receive
-    import akka.event.LoggingReceive
+    import org.apache.pekko.event.LoggingReceive
     def receive = LoggingReceive {
       case msg => // Do something ...
     }
@@ -105,7 +105,7 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate usage of TestActorRef" in {
     // #test-actor-ref
-    import akka.testkit.TestActorRef
+    import org.apache.pekko.testkit.TestActorRef
 
     val actorRef = TestActorRef[MyActor]
     val actor = actorRef.underlyingActor
@@ -138,7 +138,7 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate usage of TestFSMRef" in {
     // #test-fsm-ref
-    import akka.testkit.TestFSMRef
+    import org.apache.pekko.testkit.TestFSMRef
     import scala.concurrent.duration._
 
     val fsm = TestFSMRef(new TestFsmActor)
@@ -165,8 +165,9 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
   "demonstrate testing of behavior" in {
 
     // #test-behavior
-    import akka.testkit.TestActorRef
-    import akka.pattern.ask
+    import org.apache.pekko
+    import pekko.testkit.TestActorRef
+    import pekko.pattern.ask
 
     val actorRef = TestActorRef(new MyActor)
     // hypothetical message stimulating a '42' answer
@@ -177,7 +178,7 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate unhandled message" in {
     // #test-unhandled
-    import akka.testkit.TestActorRef
+    import org.apache.pekko.testkit.TestActorRef
     system.eventStream.subscribe(testActor, classOf[UnhandledMessage])
     val ref = TestActorRef[MyActor]
     ref.receive(Unknown)
@@ -187,7 +188,7 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate expecting exceptions" in {
     // #test-expecting-exceptions
-    import akka.testkit.TestActorRef
+    import org.apache.pekko.testkit.TestActorRef
 
     val actorRef = TestActorRef(new Actor {
       def receive = {
@@ -201,7 +202,7 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
   "demonstrate within" in {
     type Worker = MyActor
     // #test-within
-    import akka.actor.Props
+    import org.apache.pekko.actor.Props
     import scala.concurrent.duration._
 
     val worker = system.actorOf(Props[Worker]())
@@ -217,7 +218,7 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
   "demonstrate dilated duration" in {
     // #duration-dilation
     import scala.concurrent.duration._
-    import akka.testkit._
+    import org.apache.pekko.testkit._
     10.milliseconds.dilated
     // #duration-dilation
   }
@@ -258,7 +259,7 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
   }
 
   "demonstrate probe watch" in {
-    import akka.testkit.TestProbe
+    import org.apache.pekko.testkit.TestProbe
     val target = system.actorOf(Props.empty)
     // #test-probe-watch
     val probe = TestProbe()
@@ -269,9 +270,9 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
   }
 
   "demonstrate probe reply" in {
-    import akka.testkit.TestProbe
+    import org.apache.pekko.testkit.TestProbe
     import scala.concurrent.duration._
-    import akka.pattern.ask
+    import org.apache.pekko.pattern.ask
     // #test-probe-reply
     val probe = TestProbe()
     val future = probe.ref ? "hello"
@@ -282,8 +283,8 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
   }
 
   "demonstrate probe forward" in {
-    import akka.testkit.TestProbe
-    import akka.actor.Props
+    import org.apache.pekko.testkit.TestProbe
+    import org.apache.pekko.actor.Props
     // #test-probe-forward
     val probe = TestProbe()
     val source = system.actorOf(Props(classOf[Source], probe.ref))
@@ -296,8 +297,9 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate using inheritance to test timers" in {
     // #timer-test
-    import akka.testkit.TestProbe
-    import akka.actor.Props
+    import org.apache.pekko
+    import pekko.testkit.TestProbe
+    import pekko.actor.Props
 
     val probe = TestProbe()
     val actor = system.actorOf(Props(new TestTimerActor() {
@@ -312,20 +314,20 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate calling thread dispatcher" in {
     // #calling-thread-dispatcher
-    import akka.testkit.CallingThreadDispatcher
+    import org.apache.pekko.testkit.CallingThreadDispatcher
     val ref = system.actorOf(Props[MyActor]().withDispatcher(CallingThreadDispatcher.Id))
     // #calling-thread-dispatcher
   }
 
   "demonstrate EventFilter" in {
     // #event-filter
-    import akka.testkit.EventFilter
+    import org.apache.pekko.testkit.EventFilter
     import com.typesafe.config.ConfigFactory
 
     implicit val system: ActorSystem = ActorSystem(
       "testsystem",
       ConfigFactory.parseString("""
-      akka.loggers = ["akka.testkit.TestEventListener"]
+      akka.loggers = ["org.apache.pekko.testkit.TestEventListener"]
       """))
     try {
       val actor = system.actorOf(Props.empty)
@@ -340,7 +342,7 @@ class TestKitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate TestKitBase" in {
     // #test-kit-base
-    import akka.testkit.TestKitBase
+    import org.apache.pekko.testkit.TestKitBase
 
     class MyTest extends TestKitBase {
       implicit lazy val system: ActorSystem = ActorSystem()
diff --git a/akka-docs/src/test/scala/typed/tutorial_1/ActorHierarchyExperiments.scala b/akka-docs/src/test/scala/typed/tutorial_1/ActorHierarchyExperiments.scala
index 16c98bd25c..ba51ce89c4 100644
--- a/akka-docs/src/test/scala/typed/tutorial_1/ActorHierarchyExperiments.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_1/ActorHierarchyExperiments.scala
@@ -11,19 +11,20 @@ package com.example
 //#print-refs
  */
 
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
-import akka.actor.typed.PostStop
-import akka.actor.typed.PreRestart
-import akka.actor.typed.Signal
-import akka.actor.typed.SupervisorStrategy
+import org.apache.pekko.actor.typed.PostStop
+import org.apache.pekko.actor.typed.PreRestart
+import org.apache.pekko.actor.typed.Signal
+import org.apache.pekko.actor.typed.SupervisorStrategy
 
 //#print-refs
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
 
 object PrintMyActorRefActor {
   def apply(): Behavior[String] =
diff --git a/akka-docs/src/test/scala/typed/tutorial_2/IotApp.scala b/akka-docs/src/test/scala/typed/tutorial_2/IotApp.scala
index a41c2ff91d..108e800bb5 100644
--- a/akka-docs/src/test/scala/typed/tutorial_2/IotApp.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_2/IotApp.scala
@@ -12,7 +12,7 @@ package com.example
  */
 
 //#iot-app
-import akka.actor.typed.ActorSystem
+import org.apache.pekko.actor.typed.ActorSystem
 
 object IotApp {
 
diff --git a/akka-docs/src/test/scala/typed/tutorial_2/IotSupervisor.scala b/akka-docs/src/test/scala/typed/tutorial_2/IotSupervisor.scala
index f1862df557..30c3b31c73 100644
--- a/akka-docs/src/test/scala/typed/tutorial_2/IotSupervisor.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_2/IotSupervisor.scala
@@ -12,12 +12,13 @@ package com.example
  */
 
 //#iot-supervisor
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
 
 object IotSupervisor {
   def apply(): Behavior[Nothing] =
diff --git a/akka-docs/src/test/scala/typed/tutorial_3/Device.scala b/akka-docs/src/test/scala/typed/tutorial_3/Device.scala
index e7fcb551e2..1145de96fd 100644
--- a/akka-docs/src/test/scala/typed/tutorial_3/Device.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_3/Device.scala
@@ -5,14 +5,15 @@
 package typed.tutorial_3
 
 //#full-device
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
 
 object Device {
   def apply(groupId: String, deviceId: String): Behavior[Command] =
diff --git a/akka-docs/src/test/scala/typed/tutorial_3/DeviceInProgress.scala b/akka-docs/src/test/scala/typed/tutorial_3/DeviceInProgress.scala
index c093320ea2..2ab8be78cb 100644
--- a/akka-docs/src/test/scala/typed/tutorial_3/DeviceInProgress.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_3/DeviceInProgress.scala
@@ -11,13 +11,13 @@ package com.example
 //#read-protocol-1
  */
 
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
+import org.apache.pekko.actor.typed.PostStop
+import org.apache.pekko.actor.typed.Signal
 
 object DeviceInProgress1 {
 
   // #read-protocol-1
-  import akka.actor.typed.ActorRef
+  import org.apache.pekko.actor.typed.ActorRef
 
   object Device {
     sealed trait Command
@@ -29,14 +29,15 @@ object DeviceInProgress1 {
 }
 
 object DeviceInProgress2 {
-  import akka.actor.typed.ActorRef
+  import org.apache.pekko.actor.typed.ActorRef
 
   // #device-with-read
-  import akka.actor.typed.Behavior
-  import akka.actor.typed.scaladsl.AbstractBehavior
-  import akka.actor.typed.scaladsl.ActorContext
-  import akka.actor.typed.scaladsl.Behaviors
-  import akka.actor.typed.scaladsl.LoggerOps
+  import org.apache.pekko
+  import pekko.actor.typed.Behavior
+  import pekko.actor.typed.scaladsl.AbstractBehavior
+  import pekko.actor.typed.scaladsl.ActorContext
+  import pekko.actor.typed.scaladsl.Behaviors
+  import pekko.actor.typed.scaladsl.LoggerOps
 
   object Device {
     def apply(groupId: String, deviceId: String): Behavior[Command] =
diff --git a/akka-docs/src/test/scala/typed/tutorial_3/DeviceSpec.scala b/akka-docs/src/test/scala/typed/tutorial_3/DeviceSpec.scala
index 96b5478aeb..5e99bf796d 100644
--- a/akka-docs/src/test/scala/typed/tutorial_3/DeviceSpec.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_3/DeviceSpec.scala
@@ -5,7 +5,7 @@
 package typed.tutorial_3
 
 //#device-read-test
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 
 class DeviceSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
diff --git a/akka-docs/src/test/scala/typed/tutorial_4/Device.scala b/akka-docs/src/test/scala/typed/tutorial_4/Device.scala
index 5895d2ad15..500e6ce537 100644
--- a/akka-docs/src/test/scala/typed/tutorial_4/Device.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_4/Device.scala
@@ -5,14 +5,15 @@
 package typed.tutorial_4
 
 //#device-with-passivate
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
 
 object Device {
   def apply(groupId: String, deviceId: String): Behavior[Command] =
diff --git a/akka-docs/src/test/scala/typed/tutorial_4/DeviceGroup.scala b/akka-docs/src/test/scala/typed/tutorial_4/DeviceGroup.scala
index 5273ece13c..831d4c476d 100644
--- a/akka-docs/src/test/scala/typed/tutorial_4/DeviceGroup.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_4/DeviceGroup.scala
@@ -4,14 +4,14 @@
 
 package typed.tutorial_4
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
+import org.apache.pekko.actor.typed.ActorRef
+import org.apache.pekko.actor.typed.Behavior
+import org.apache.pekko.actor.typed.PostStop
+import org.apache.pekko.actor.typed.Signal
+import org.apache.pekko.actor.typed.scaladsl.AbstractBehavior
+import org.apache.pekko.actor.typed.scaladsl.ActorContext
+import org.apache.pekko.actor.typed.scaladsl.Behaviors
+import org.apache.pekko.actor.typed.scaladsl.LoggerOps
 
 //#device-group-full
 //#device-group-register
diff --git a/akka-docs/src/test/scala/typed/tutorial_4/DeviceGroupSpec.scala b/akka-docs/src/test/scala/typed/tutorial_4/DeviceGroupSpec.scala
index cefcf1ec2b..691c040e7f 100644
--- a/akka-docs/src/test/scala/typed/tutorial_4/DeviceGroupSpec.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_4/DeviceGroupSpec.scala
@@ -5,7 +5,7 @@
 package typed.tutorial_4
 
 import scala.concurrent.duration._
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import typed.tutorial_4.Device._
 import typed.tutorial_4.DeviceManager._
diff --git a/akka-docs/src/test/scala/typed/tutorial_4/DeviceManager.scala b/akka-docs/src/test/scala/typed/tutorial_4/DeviceManager.scala
index 67de161e7e..b6d4eeb33d 100644
--- a/akka-docs/src/test/scala/typed/tutorial_4/DeviceManager.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_4/DeviceManager.scala
@@ -4,13 +4,13 @@
 
 package typed.tutorial_4
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko.actor.typed.ActorRef
+import org.apache.pekko.actor.typed.Behavior
+import org.apache.pekko.actor.typed.PostStop
+import org.apache.pekko.actor.typed.Signal
+import org.apache.pekko.actor.typed.scaladsl.AbstractBehavior
+import org.apache.pekko.actor.typed.scaladsl.ActorContext
+import org.apache.pekko.actor.typed.scaladsl.Behaviors
 
 //#device-manager-full
 object DeviceManager {
diff --git a/akka-docs/src/test/scala/typed/tutorial_4/DeviceManagerSpec.scala b/akka-docs/src/test/scala/typed/tutorial_4/DeviceManagerSpec.scala
index 196dbe6bdf..0398122dca 100644
--- a/akka-docs/src/test/scala/typed/tutorial_4/DeviceManagerSpec.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_4/DeviceManagerSpec.scala
@@ -4,7 +4,7 @@
 
 package typed.tutorial_4
 
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import typed.tutorial_4.DeviceManager._
 
diff --git a/akka-docs/src/test/scala/typed/tutorial_4/DeviceSpec.scala b/akka-docs/src/test/scala/typed/tutorial_4/DeviceSpec.scala
index b83ffbdb43..7ea4fa45f1 100644
--- a/akka-docs/src/test/scala/typed/tutorial_4/DeviceSpec.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_4/DeviceSpec.scala
@@ -4,7 +4,7 @@
 
 package typed.tutorial_4
 
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 
 class DeviceSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
diff --git a/akka-docs/src/test/scala/typed/tutorial_5/Device.scala b/akka-docs/src/test/scala/typed/tutorial_5/Device.scala
index 628cc8b88f..eba06f4dee 100644
--- a/akka-docs/src/test/scala/typed/tutorial_5/Device.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_5/Device.scala
@@ -5,14 +5,15 @@
 package typed.tutorial_5
 
 //#device-with-passivate
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
 
 object Device {
   def apply(groupId: String, deviceId: String): Behavior[Command] =
diff --git a/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroup.scala b/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroup.scala
index 17a9de5e6e..4c6eb5ca1d 100644
--- a/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroup.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroup.scala
@@ -5,14 +5,15 @@
 package typed.tutorial_5
 
 import scala.concurrent.duration._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
 
 object DeviceGroup {
   def apply(groupId: String): Behavior[Command] =
diff --git a/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupQuery.scala b/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupQuery.scala
index fdf8a88981..5252be3c7f 100644
--- a/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupQuery.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupQuery.scala
@@ -6,12 +6,13 @@ package typed.tutorial_5
 
 import scala.concurrent.duration._
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.TimerScheduler
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.TimerScheduler
 
 //#query-full
 //#query-outline
diff --git a/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupQuerySpec.scala b/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupQuerySpec.scala
index 8a10b5fc2e..b848cfc179 100644
--- a/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupQuerySpec.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupQuerySpec.scala
@@ -5,7 +5,7 @@
 package typed.tutorial_5
 
 import scala.concurrent.duration._
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import typed.tutorial_5.Device.Command
 import typed.tutorial_5.DeviceGroupQuery.WrappedRespondTemperature
diff --git a/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupSpec.scala b/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupSpec.scala
index d64363dc41..8ca8bdb572 100644
--- a/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupSpec.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupSpec.scala
@@ -5,7 +5,7 @@
 package typed.tutorial_5
 
 import scala.concurrent.duration._
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import typed.tutorial_5.Device._
 import typed.tutorial_5.DeviceManager._
diff --git a/akka-docs/src/test/scala/typed/tutorial_5/DeviceManager.scala b/akka-docs/src/test/scala/typed/tutorial_5/DeviceManager.scala
index a5abbab9e9..5e5bdb8725 100644
--- a/akka-docs/src/test/scala/typed/tutorial_5/DeviceManager.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_5/DeviceManager.scala
@@ -4,13 +4,14 @@
 
 package typed.tutorial_5
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
 
 //#device-manager-full
 object DeviceManager {
diff --git a/akka-docs/src/test/scala/typed/tutorial_5/DeviceManagerSpec.scala b/akka-docs/src/test/scala/typed/tutorial_5/DeviceManagerSpec.scala
index 824ff60794..b5505fa510 100644
--- a/akka-docs/src/test/scala/typed/tutorial_5/DeviceManagerSpec.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_5/DeviceManagerSpec.scala
@@ -4,7 +4,7 @@
 
 package typed.tutorial_5
 
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import typed.tutorial_5.DeviceManager._
 
diff --git a/akka-docs/src/test/scala/typed/tutorial_5/DeviceSpec.scala b/akka-docs/src/test/scala/typed/tutorial_5/DeviceSpec.scala
index b828403941..cdef3316d9 100644
--- a/akka-docs/src/test/scala/typed/tutorial_5/DeviceSpec.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_5/DeviceSpec.scala
@@ -4,7 +4,7 @@
 
 package typed.tutorial_5
 
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 
 class DeviceSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
diff --git a/akka-multi-node-testkit/src/main/java/akka/remote/testconductor/TestConductorProtocol.java b/akka-multi-node-testkit/src/main/java/org/apache/pekko/remote/testconductor/TestConductorProtocol.java
similarity index 60%
rename from akka-multi-node-testkit/src/main/java/akka/remote/testconductor/TestConductorProtocol.java
rename to akka-multi-node-testkit/src/main/java/org/apache/pekko/remote/testconductor/TestConductorProtocol.java
index 2c857baec3..bca30fe1c8 100644
--- a/akka-multi-node-testkit/src/main/java/akka/remote/testconductor/TestConductorProtocol.java
+++ b/akka-multi-node-testkit/src/main/java/org/apache/pekko/remote/testconductor/TestConductorProtocol.java
@@ -5,24 +5,24 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: TestConductorProtocol.proto
 
-package akka.remote.testconductor;
+package org.apache.pekko.remote.testconductor;
 
 public final class TestConductorProtocol {
   private TestConductorProtocol() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   /**
    * Protobuf enum {@code BarrierOp}
    */
   public enum BarrierOp
-      implements akka.protobufv3.internal.ProtocolMessageEnum {
+      implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
     /**
      * Enter = 1;
      */
@@ -87,35 +87,35 @@ public final class TestConductorProtocol {
       }
     }
 
-    public static akka.protobufv3.internal.Internal.EnumLiteMap
+    public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalGetValueMap() {
       return internalValueMap;
     }
-    private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+    private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
         BarrierOp> internalValueMap =
-          new akka.protobufv3.internal.Internal.EnumLiteMap() {
+          new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
             public BarrierOp findValueByNumber(int number) {
               return BarrierOp.forNumber(number);
             }
           };
 
-    public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.remote.testconductor.TestConductorProtocol.getDescriptor().getEnumTypes().get(0);
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final BarrierOp[] VALUES = values();
 
     public static BarrierOp valueOf(
-        akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+        org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
         throw new java.lang.IllegalArgumentException(
           "EnumValueDescriptor is not for this type.");
@@ -136,7 +136,7 @@ public final class TestConductorProtocol {
    * Protobuf enum {@code FailType}
    */
   public enum FailType
-      implements akka.protobufv3.internal.ProtocolMessageEnum {
+      implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
     /**
      * Throttle = 1;
      */
@@ -219,35 +219,35 @@ public final class TestConductorProtocol {
       }
     }
 
-    public static akka.protobufv3.internal.Internal.EnumLiteMap
+    public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalGetValueMap() {
       return internalValueMap;
     }
-    private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+    private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
         FailType> internalValueMap =
-          new akka.protobufv3.internal.Internal.EnumLiteMap() {
+          new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
             public FailType findValueByNumber(int number) {
               return FailType.forNumber(number);
             }
           };
 
-    public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.remote.testconductor.TestConductorProtocol.getDescriptor().getEnumTypes().get(1);
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.getDescriptor().getEnumTypes().get(1);
     }
 
     private static final FailType[] VALUES = values();
 
     public static FailType valueOf(
-        akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+        org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
         throw new java.lang.IllegalArgumentException(
           "EnumValueDescriptor is not for this type.");
@@ -268,7 +268,7 @@ public final class TestConductorProtocol {
    * Protobuf enum {@code Direction}
    */
   public enum Direction
-      implements akka.protobufv3.internal.ProtocolMessageEnum {
+      implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
     /**
      * Send = 1;
      */
@@ -324,35 +324,35 @@ public final class TestConductorProtocol {
       }
     }
 
-    public static akka.protobufv3.internal.Internal.EnumLiteMap
+    public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalGetValueMap() {
       return internalValueMap;
     }
-    private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+    private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
         Direction> internalValueMap =
-          new akka.protobufv3.internal.Internal.EnumLiteMap() {
+          new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
             public Direction findValueByNumber(int number) {
               return Direction.forNumber(number);
             }
           };
 
-    public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.remote.testconductor.TestConductorProtocol.getDescriptor().getEnumTypes().get(2);
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.getDescriptor().getEnumTypes().get(2);
     }
 
     private static final Direction[] VALUES = values();
 
     public static Direction valueOf(
-        akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+        org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
         throw new java.lang.IllegalArgumentException(
           "EnumValueDescriptor is not for this type.");
@@ -371,7 +371,7 @@ public final class TestConductorProtocol {
 
   public interface WrapperOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Wrapper)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * optional .Hello hello = 1;
@@ -382,11 +382,11 @@ public final class TestConductorProtocol {
      * optional .Hello hello = 1;
      * @return The hello.
      */
-    akka.remote.testconductor.TestConductorProtocol.Hello getHello();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello getHello();
     /**
      * optional .Hello hello = 1;
      */
-    akka.remote.testconductor.TestConductorProtocol.HelloOrBuilder getHelloOrBuilder();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.HelloOrBuilder getHelloOrBuilder();
 
     /**
      * optional .EnterBarrier barrier = 2;
@@ -397,11 +397,11 @@ public final class TestConductorProtocol {
      * optional .EnterBarrier barrier = 2;
      * @return The barrier.
      */
-    akka.remote.testconductor.TestConductorProtocol.EnterBarrier getBarrier();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier getBarrier();
     /**
      * optional .EnterBarrier barrier = 2;
      */
-    akka.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder getBarrierOrBuilder();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder getBarrierOrBuilder();
 
     /**
      * optional .InjectFailure failure = 3;
@@ -412,11 +412,11 @@ public final class TestConductorProtocol {
      * optional .InjectFailure failure = 3;
      * @return The failure.
      */
-    akka.remote.testconductor.TestConductorProtocol.InjectFailure getFailure();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure getFailure();
     /**
      * optional .InjectFailure failure = 3;
      */
-    akka.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder getFailureOrBuilder();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder getFailureOrBuilder();
 
     /**
      * optional string done = 4;
@@ -432,7 +432,7 @@ public final class TestConductorProtocol {
      * optional string done = 4;
      * @return The bytes for done.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getDoneBytes();
 
     /**
@@ -444,22 +444,22 @@ public final class TestConductorProtocol {
      * optional .AddressRequest addr = 5;
      * @return The addr.
      */
-    akka.remote.testconductor.TestConductorProtocol.AddressRequest getAddr();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest getAddr();
     /**
      * optional .AddressRequest addr = 5;
      */
-    akka.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder getAddrOrBuilder();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder getAddrOrBuilder();
   }
   /**
    * Protobuf type {@code Wrapper}
    */
   public  static final class Wrapper extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Wrapper)
       WrapperOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Wrapper.newBuilder() to construct.
-    private Wrapper(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Wrapper(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Wrapper() {
@@ -469,26 +469,26 @@ public final class TestConductorProtocol {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Wrapper();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Wrapper(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -498,11 +498,11 @@ public final class TestConductorProtocol {
               done = true;
               break;
             case 10: {
-              akka.remote.testconductor.TestConductorProtocol.Hello.Builder subBuilder = null;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = hello_.toBuilder();
               }
-              hello_ = input.readMessage(akka.remote.testconductor.TestConductorProtocol.Hello.PARSER, extensionRegistry);
+              hello_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(hello_);
                 hello_ = subBuilder.buildPartial();
@@ -511,11 +511,11 @@ public final class TestConductorProtocol {
               break;
             }
             case 18: {
-              akka.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder subBuilder = null;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = barrier_.toBuilder();
               }
-              barrier_ = input.readMessage(akka.remote.testconductor.TestConductorProtocol.EnterBarrier.PARSER, extensionRegistry);
+              barrier_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(barrier_);
                 barrier_ = subBuilder.buildPartial();
@@ -524,11 +524,11 @@ public final class TestConductorProtocol {
               break;
             }
             case 26: {
-              akka.remote.testconductor.TestConductorProtocol.InjectFailure.Builder subBuilder = null;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) != 0)) {
                 subBuilder = failure_.toBuilder();
               }
-              failure_ = input.readMessage(akka.remote.testconductor.TestConductorProtocol.InjectFailure.PARSER, extensionRegistry);
+              failure_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(failure_);
                 failure_ = subBuilder.buildPartial();
@@ -537,17 +537,17 @@ public final class TestConductorProtocol {
               break;
             }
             case 34: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000008;
               done_ = bs;
               break;
             }
             case 42: {
-              akka.remote.testconductor.TestConductorProtocol.AddressRequest.Builder subBuilder = null;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) != 0)) {
                 subBuilder = addr_.toBuilder();
               }
-              addr_ = input.readMessage(akka.remote.testconductor.TestConductorProtocol.AddressRequest.PARSER, extensionRegistry);
+              addr_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(addr_);
                 addr_ = subBuilder.buildPartial();
@@ -564,32 +564,32 @@ public final class TestConductorProtocol {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_descriptor;
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_fieldAccessorTable
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.testconductor.TestConductorProtocol.Wrapper.class, akka.remote.testconductor.TestConductorProtocol.Wrapper.Builder.class);
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper.Builder.class);
     }
 
     private int bitField0_;
     public static final int HELLO_FIELD_NUMBER = 1;
-    private akka.remote.testconductor.TestConductorProtocol.Hello hello_;
+    private org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello hello_;
     /**
      * optional .Hello hello = 1;
      * @return Whether the hello field is set.
@@ -601,18 +601,18 @@ public final class TestConductorProtocol {
      * optional .Hello hello = 1;
      * @return The hello.
      */
-    public akka.remote.testconductor.TestConductorProtocol.Hello getHello() {
-      return hello_ == null ? akka.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello getHello() {
+      return hello_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
     }
     /**
      * optional .Hello hello = 1;
      */
-    public akka.remote.testconductor.TestConductorProtocol.HelloOrBuilder getHelloOrBuilder() {
-      return hello_ == null ? akka.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.HelloOrBuilder getHelloOrBuilder() {
+      return hello_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
     }
 
     public static final int BARRIER_FIELD_NUMBER = 2;
-    private akka.remote.testconductor.TestConductorProtocol.EnterBarrier barrier_;
+    private org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier barrier_;
     /**
      * optional .EnterBarrier barrier = 2;
      * @return Whether the barrier field is set.
@@ -624,18 +624,18 @@ public final class TestConductorProtocol {
      * optional .EnterBarrier barrier = 2;
      * @return The barrier.
      */
-    public akka.remote.testconductor.TestConductorProtocol.EnterBarrier getBarrier() {
-      return barrier_ == null ? akka.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier getBarrier() {
+      return barrier_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
     }
     /**
      * optional .EnterBarrier barrier = 2;
      */
-    public akka.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder getBarrierOrBuilder() {
-      return barrier_ == null ? akka.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder getBarrierOrBuilder() {
+      return barrier_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
     }
 
     public static final int FAILURE_FIELD_NUMBER = 3;
-    private akka.remote.testconductor.TestConductorProtocol.InjectFailure failure_;
+    private org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure failure_;
     /**
      * optional .InjectFailure failure = 3;
      * @return Whether the failure field is set.
@@ -647,14 +647,14 @@ public final class TestConductorProtocol {
      * optional .InjectFailure failure = 3;
      * @return The failure.
      */
-    public akka.remote.testconductor.TestConductorProtocol.InjectFailure getFailure() {
-      return failure_ == null ? akka.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure getFailure() {
+      return failure_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
     }
     /**
      * optional .InjectFailure failure = 3;
      */
-    public akka.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder getFailureOrBuilder() {
-      return failure_ == null ? akka.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder getFailureOrBuilder() {
+      return failure_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
     }
 
     public static final int DONE_FIELD_NUMBER = 4;
@@ -675,8 +675,8 @@ public final class TestConductorProtocol {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           done_ = s;
@@ -688,22 +688,22 @@ public final class TestConductorProtocol {
      * optional string done = 4;
      * @return The bytes for done.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getDoneBytes() {
       java.lang.Object ref = done_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         done_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int ADDR_FIELD_NUMBER = 5;
-    private akka.remote.testconductor.TestConductorProtocol.AddressRequest addr_;
+    private org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest addr_;
     /**
      * optional .AddressRequest addr = 5;
      * @return Whether the addr field is set.
@@ -715,14 +715,14 @@ public final class TestConductorProtocol {
      * optional .AddressRequest addr = 5;
      * @return The addr.
      */
-    public akka.remote.testconductor.TestConductorProtocol.AddressRequest getAddr() {
-      return addr_ == null ? akka.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest getAddr() {
+      return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
     }
     /**
      * optional .AddressRequest addr = 5;
      */
-    public akka.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder getAddrOrBuilder() {
-      return addr_ == null ? akka.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder getAddrOrBuilder() {
+      return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -761,7 +761,7 @@ public final class TestConductorProtocol {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getHello());
@@ -773,7 +773,7 @@ public final class TestConductorProtocol {
         output.writeMessage(3, getFailure());
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, done_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, done_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
         output.writeMessage(5, getAddr());
@@ -788,22 +788,22 @@ public final class TestConductorProtocol {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getHello());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getBarrier());
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getFailure());
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, done_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, done_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(5, getAddr());
       }
       size += unknownFields.getSerializedSize();
@@ -816,10 +816,10 @@ public final class TestConductorProtocol {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.testconductor.TestConductorProtocol.Wrapper)) {
+      if (!(obj instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper)) {
         return super.equals(obj);
       }
-      akka.remote.testconductor.TestConductorProtocol.Wrapper other = (akka.remote.testconductor.TestConductorProtocol.Wrapper) obj;
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper other = (org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper) obj;
 
       if (hasHello() != other.hasHello()) return false;
       if (hasHello()) {
@@ -882,73 +882,73 @@ public final class TestConductorProtocol {
       return hash;
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseDelimitedFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -957,7 +957,7 @@ public final class TestConductorProtocol {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.testconductor.TestConductorProtocol.Wrapper prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -968,7 +968,7 @@ public final class TestConductorProtocol {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -976,34 +976,34 @@ public final class TestConductorProtocol {
      * Protobuf type {@code Wrapper}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Wrapper)
-        akka.remote.testconductor.TestConductorProtocol.WrapperOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.WrapperOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_fieldAccessorTable
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.testconductor.TestConductorProtocol.Wrapper.class, akka.remote.testconductor.TestConductorProtocol.Wrapper.Builder.class);
+                org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper.Builder.class);
       }
 
-      // Construct using akka.remote.testconductor.TestConductorProtocol.Wrapper.newBuilder()
+      // Construct using org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getHelloFieldBuilder();
           getBarrierFieldBuilder();
@@ -1044,19 +1044,19 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Wrapper_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.Wrapper getDefaultInstanceForType() {
-        return akka.remote.testconductor.TestConductorProtocol.Wrapper.getDefaultInstance();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper getDefaultInstanceForType() {
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.Wrapper build() {
-        akka.remote.testconductor.TestConductorProtocol.Wrapper result = buildPartial();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper build() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1064,8 +1064,8 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.Wrapper buildPartial() {
-        akka.remote.testconductor.TestConductorProtocol.Wrapper result = new akka.remote.testconductor.TestConductorProtocol.Wrapper(this);
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper buildPartial() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1115,44 +1115,44 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.testconductor.TestConductorProtocol.Wrapper) {
-          return mergeFrom((akka.remote.testconductor.TestConductorProtocol.Wrapper)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper) {
+          return mergeFrom((org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.testconductor.TestConductorProtocol.Wrapper other) {
-        if (other == akka.remote.testconductor.TestConductorProtocol.Wrapper.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper other) {
+        if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper.getDefaultInstance()) return this;
         if (other.hasHello()) {
           mergeHello(other.getHello());
         }
@@ -1202,14 +1202,14 @@ public final class TestConductorProtocol {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.testconductor.TestConductorProtocol.Wrapper parsedMessage = null;
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.testconductor.TestConductorProtocol.Wrapper) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1220,9 +1220,9 @@ public final class TestConductorProtocol {
       }
       private int bitField0_;
 
-      private akka.remote.testconductor.TestConductorProtocol.Hello hello_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.Hello, akka.remote.testconductor.TestConductorProtocol.Hello.Builder, akka.remote.testconductor.TestConductorProtocol.HelloOrBuilder> helloBuilder_;
+      private org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello hello_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello, org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.HelloOrBuilder> helloBuilder_;
       /**
        * optional .Hello hello = 1;
        * @return Whether the hello field is set.
@@ -1234,9 +1234,9 @@ public final class TestConductorProtocol {
        * optional .Hello hello = 1;
        * @return The hello.
        */
-      public akka.remote.testconductor.TestConductorProtocol.Hello getHello() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello getHello() {
         if (helloBuilder_ == null) {
-          return hello_ == null ? akka.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
+          return hello_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
         } else {
           return helloBuilder_.getMessage();
         }
@@ -1244,7 +1244,7 @@ public final class TestConductorProtocol {
       /**
        * optional .Hello hello = 1;
        */
-      public Builder setHello(akka.remote.testconductor.TestConductorProtocol.Hello value) {
+      public Builder setHello(org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello value) {
         if (helloBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1261,7 +1261,7 @@ public final class TestConductorProtocol {
        * optional .Hello hello = 1;
        */
       public Builder setHello(
-          akka.remote.testconductor.TestConductorProtocol.Hello.Builder builderForValue) {
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder builderForValue) {
         if (helloBuilder_ == null) {
           hello_ = builderForValue.build();
           onChanged();
@@ -1274,13 +1274,13 @@ public final class TestConductorProtocol {
       /**
        * optional .Hello hello = 1;
        */
-      public Builder mergeHello(akka.remote.testconductor.TestConductorProtocol.Hello value) {
+      public Builder mergeHello(org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello value) {
         if (helloBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               hello_ != null &&
-              hello_ != akka.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance()) {
+              hello_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance()) {
             hello_ =
-              akka.remote.testconductor.TestConductorProtocol.Hello.newBuilder(hello_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.newBuilder(hello_).mergeFrom(value).buildPartial();
           } else {
             hello_ = value;
           }
@@ -1307,7 +1307,7 @@ public final class TestConductorProtocol {
       /**
        * optional .Hello hello = 1;
        */
-      public akka.remote.testconductor.TestConductorProtocol.Hello.Builder getHelloBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder getHelloBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getHelloFieldBuilder().getBuilder();
@@ -1315,23 +1315,23 @@ public final class TestConductorProtocol {
       /**
        * optional .Hello hello = 1;
        */
-      public akka.remote.testconductor.TestConductorProtocol.HelloOrBuilder getHelloOrBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.HelloOrBuilder getHelloOrBuilder() {
         if (helloBuilder_ != null) {
           return helloBuilder_.getMessageOrBuilder();
         } else {
           return hello_ == null ?
-              akka.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance() : hello_;
         }
       }
       /**
        * optional .Hello hello = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.Hello, akka.remote.testconductor.TestConductorProtocol.Hello.Builder, akka.remote.testconductor.TestConductorProtocol.HelloOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello, org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.HelloOrBuilder> 
           getHelloFieldBuilder() {
         if (helloBuilder_ == null) {
-          helloBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.testconductor.TestConductorProtocol.Hello, akka.remote.testconductor.TestConductorProtocol.Hello.Builder, akka.remote.testconductor.TestConductorProtocol.HelloOrBuilder>(
+          helloBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello, org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.HelloOrBuilder>(
                   getHello(),
                   getParentForChildren(),
                   isClean());
@@ -1340,9 +1340,9 @@ public final class TestConductorProtocol {
         return helloBuilder_;
       }
 
-      private akka.remote.testconductor.TestConductorProtocol.EnterBarrier barrier_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.EnterBarrier, akka.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder, akka.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder> barrierBuilder_;
+      private org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier barrier_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier, org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder> barrierBuilder_;
       /**
        * optional .EnterBarrier barrier = 2;
        * @return Whether the barrier field is set.
@@ -1354,9 +1354,9 @@ public final class TestConductorProtocol {
        * optional .EnterBarrier barrier = 2;
        * @return The barrier.
        */
-      public akka.remote.testconductor.TestConductorProtocol.EnterBarrier getBarrier() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier getBarrier() {
         if (barrierBuilder_ == null) {
-          return barrier_ == null ? akka.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
+          return barrier_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
         } else {
           return barrierBuilder_.getMessage();
         }
@@ -1364,7 +1364,7 @@ public final class TestConductorProtocol {
       /**
        * optional .EnterBarrier barrier = 2;
        */
-      public Builder setBarrier(akka.remote.testconductor.TestConductorProtocol.EnterBarrier value) {
+      public Builder setBarrier(org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier value) {
         if (barrierBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1381,7 +1381,7 @@ public final class TestConductorProtocol {
        * optional .EnterBarrier barrier = 2;
        */
       public Builder setBarrier(
-          akka.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder builderForValue) {
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder builderForValue) {
         if (barrierBuilder_ == null) {
           barrier_ = builderForValue.build();
           onChanged();
@@ -1394,13 +1394,13 @@ public final class TestConductorProtocol {
       /**
        * optional .EnterBarrier barrier = 2;
        */
-      public Builder mergeBarrier(akka.remote.testconductor.TestConductorProtocol.EnterBarrier value) {
+      public Builder mergeBarrier(org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier value) {
         if (barrierBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               barrier_ != null &&
-              barrier_ != akka.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance()) {
+              barrier_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance()) {
             barrier_ =
-              akka.remote.testconductor.TestConductorProtocol.EnterBarrier.newBuilder(barrier_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.newBuilder(barrier_).mergeFrom(value).buildPartial();
           } else {
             barrier_ = value;
           }
@@ -1427,7 +1427,7 @@ public final class TestConductorProtocol {
       /**
        * optional .EnterBarrier barrier = 2;
        */
-      public akka.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder getBarrierBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder getBarrierBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getBarrierFieldBuilder().getBuilder();
@@ -1435,23 +1435,23 @@ public final class TestConductorProtocol {
       /**
        * optional .EnterBarrier barrier = 2;
        */
-      public akka.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder getBarrierOrBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder getBarrierOrBuilder() {
         if (barrierBuilder_ != null) {
           return barrierBuilder_.getMessageOrBuilder();
         } else {
           return barrier_ == null ?
-              akka.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance() : barrier_;
         }
       }
       /**
        * optional .EnterBarrier barrier = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.EnterBarrier, akka.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder, akka.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier, org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder> 
           getBarrierFieldBuilder() {
         if (barrierBuilder_ == null) {
-          barrierBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.testconductor.TestConductorProtocol.EnterBarrier, akka.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder, akka.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder>(
+          barrierBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier, org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder>(
                   getBarrier(),
                   getParentForChildren(),
                   isClean());
@@ -1460,9 +1460,9 @@ public final class TestConductorProtocol {
         return barrierBuilder_;
       }
 
-      private akka.remote.testconductor.TestConductorProtocol.InjectFailure failure_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.InjectFailure, akka.remote.testconductor.TestConductorProtocol.InjectFailure.Builder, akka.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder> failureBuilder_;
+      private org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure failure_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure, org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder> failureBuilder_;
       /**
        * optional .InjectFailure failure = 3;
        * @return Whether the failure field is set.
@@ -1474,9 +1474,9 @@ public final class TestConductorProtocol {
        * optional .InjectFailure failure = 3;
        * @return The failure.
        */
-      public akka.remote.testconductor.TestConductorProtocol.InjectFailure getFailure() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure getFailure() {
         if (failureBuilder_ == null) {
-          return failure_ == null ? akka.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
+          return failure_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
         } else {
           return failureBuilder_.getMessage();
         }
@@ -1484,7 +1484,7 @@ public final class TestConductorProtocol {
       /**
        * optional .InjectFailure failure = 3;
        */
-      public Builder setFailure(akka.remote.testconductor.TestConductorProtocol.InjectFailure value) {
+      public Builder setFailure(org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure value) {
         if (failureBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1501,7 +1501,7 @@ public final class TestConductorProtocol {
        * optional .InjectFailure failure = 3;
        */
       public Builder setFailure(
-          akka.remote.testconductor.TestConductorProtocol.InjectFailure.Builder builderForValue) {
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder builderForValue) {
         if (failureBuilder_ == null) {
           failure_ = builderForValue.build();
           onChanged();
@@ -1514,13 +1514,13 @@ public final class TestConductorProtocol {
       /**
        * optional .InjectFailure failure = 3;
        */
-      public Builder mergeFailure(akka.remote.testconductor.TestConductorProtocol.InjectFailure value) {
+      public Builder mergeFailure(org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure value) {
         if (failureBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
               failure_ != null &&
-              failure_ != akka.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance()) {
+              failure_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance()) {
             failure_ =
-              akka.remote.testconductor.TestConductorProtocol.InjectFailure.newBuilder(failure_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.newBuilder(failure_).mergeFrom(value).buildPartial();
           } else {
             failure_ = value;
           }
@@ -1547,7 +1547,7 @@ public final class TestConductorProtocol {
       /**
        * optional .InjectFailure failure = 3;
        */
-      public akka.remote.testconductor.TestConductorProtocol.InjectFailure.Builder getFailureBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder getFailureBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getFailureFieldBuilder().getBuilder();
@@ -1555,23 +1555,23 @@ public final class TestConductorProtocol {
       /**
        * optional .InjectFailure failure = 3;
        */
-      public akka.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder getFailureOrBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder getFailureOrBuilder() {
         if (failureBuilder_ != null) {
           return failureBuilder_.getMessageOrBuilder();
         } else {
           return failure_ == null ?
-              akka.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance() : failure_;
         }
       }
       /**
        * optional .InjectFailure failure = 3;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.InjectFailure, akka.remote.testconductor.TestConductorProtocol.InjectFailure.Builder, akka.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure, org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder> 
           getFailureFieldBuilder() {
         if (failureBuilder_ == null) {
-          failureBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.testconductor.TestConductorProtocol.InjectFailure, akka.remote.testconductor.TestConductorProtocol.InjectFailure.Builder, akka.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder>(
+          failureBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure, org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder>(
                   getFailure(),
                   getParentForChildren(),
                   isClean());
@@ -1595,8 +1595,8 @@ public final class TestConductorProtocol {
       public java.lang.String getDone() {
         java.lang.Object ref = done_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             done_ = s;
@@ -1610,17 +1610,17 @@ public final class TestConductorProtocol {
        * optional string done = 4;
        * @return The bytes for done.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getDoneBytes() {
         java.lang.Object ref = done_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           done_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1654,7 +1654,7 @@ public final class TestConductorProtocol {
        * @return This builder for chaining.
        */
       public Builder setDoneBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1664,9 +1664,9 @@ public final class TestConductorProtocol {
         return this;
       }
 
-      private akka.remote.testconductor.TestConductorProtocol.AddressRequest addr_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.AddressRequest, akka.remote.testconductor.TestConductorProtocol.AddressRequest.Builder, akka.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder> addrBuilder_;
+      private org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest addr_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder> addrBuilder_;
       /**
        * optional .AddressRequest addr = 5;
        * @return Whether the addr field is set.
@@ -1678,9 +1678,9 @@ public final class TestConductorProtocol {
        * optional .AddressRequest addr = 5;
        * @return The addr.
        */
-      public akka.remote.testconductor.TestConductorProtocol.AddressRequest getAddr() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest getAddr() {
         if (addrBuilder_ == null) {
-          return addr_ == null ? akka.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
+          return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
         } else {
           return addrBuilder_.getMessage();
         }
@@ -1688,7 +1688,7 @@ public final class TestConductorProtocol {
       /**
        * optional .AddressRequest addr = 5;
        */
-      public Builder setAddr(akka.remote.testconductor.TestConductorProtocol.AddressRequest value) {
+      public Builder setAddr(org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest value) {
         if (addrBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1705,7 +1705,7 @@ public final class TestConductorProtocol {
        * optional .AddressRequest addr = 5;
        */
       public Builder setAddr(
-          akka.remote.testconductor.TestConductorProtocol.AddressRequest.Builder builderForValue) {
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder builderForValue) {
         if (addrBuilder_ == null) {
           addr_ = builderForValue.build();
           onChanged();
@@ -1718,13 +1718,13 @@ public final class TestConductorProtocol {
       /**
        * optional .AddressRequest addr = 5;
        */
-      public Builder mergeAddr(akka.remote.testconductor.TestConductorProtocol.AddressRequest value) {
+      public Builder mergeAddr(org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest value) {
         if (addrBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
               addr_ != null &&
-              addr_ != akka.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance()) {
+              addr_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance()) {
             addr_ =
-              akka.remote.testconductor.TestConductorProtocol.AddressRequest.newBuilder(addr_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.newBuilder(addr_).mergeFrom(value).buildPartial();
           } else {
             addr_ = value;
           }
@@ -1751,7 +1751,7 @@ public final class TestConductorProtocol {
       /**
        * optional .AddressRequest addr = 5;
        */
-      public akka.remote.testconductor.TestConductorProtocol.AddressRequest.Builder getAddrBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder getAddrBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getAddrFieldBuilder().getBuilder();
@@ -1759,23 +1759,23 @@ public final class TestConductorProtocol {
       /**
        * optional .AddressRequest addr = 5;
        */
-      public akka.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder getAddrOrBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder getAddrOrBuilder() {
         if (addrBuilder_ != null) {
           return addrBuilder_.getMessageOrBuilder();
         } else {
           return addr_ == null ?
-              akka.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance() : addr_;
         }
       }
       /**
        * optional .AddressRequest addr = 5;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.AddressRequest, akka.remote.testconductor.TestConductorProtocol.AddressRequest.Builder, akka.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder> 
           getAddrFieldBuilder() {
         if (addrBuilder_ == null) {
-          addrBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.testconductor.TestConductorProtocol.AddressRequest, akka.remote.testconductor.TestConductorProtocol.AddressRequest.Builder, akka.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder>(
+          addrBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder>(
                   getAddr(),
                   getParentForChildren(),
                   isClean());
@@ -1785,13 +1785,13 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -1800,37 +1800,37 @@ public final class TestConductorProtocol {
     }
 
     // @@protoc_insertion_point(class_scope:Wrapper)
-    private static final akka.remote.testconductor.TestConductorProtocol.Wrapper DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.testconductor.TestConductorProtocol.Wrapper();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper();
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.Wrapper getDefaultInstance() {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Wrapper parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Wrapper(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.testconductor.TestConductorProtocol.Wrapper getDefaultInstanceForType() {
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.Wrapper getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1838,7 +1838,7 @@ public final class TestConductorProtocol {
 
   public interface HelloOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Hello)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string name = 1;
@@ -1854,7 +1854,7 @@ public final class TestConductorProtocol {
      * required string name = 1;
      * @return The bytes for name.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes();
 
     /**
@@ -1866,22 +1866,22 @@ public final class TestConductorProtocol {
      * required .Address address = 2;
      * @return The address.
      */
-    akka.remote.testconductor.TestConductorProtocol.Address getAddress();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddress();
     /**
      * required .Address address = 2;
      */
-    akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder();
   }
   /**
    * Protobuf type {@code Hello}
    */
   public  static final class Hello extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Hello)
       HelloOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Hello.newBuilder() to construct.
-    private Hello(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Hello(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Hello() {
@@ -1891,26 +1891,26 @@ public final class TestConductorProtocol {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Hello();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Hello(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1920,17 +1920,17 @@ public final class TestConductorProtocol {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               name_ = bs;
               break;
             }
             case 18: {
-              akka.remote.testconductor.TestConductorProtocol.Address.Builder subBuilder = null;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = address_.toBuilder();
               }
-              address_ = input.readMessage(akka.remote.testconductor.TestConductorProtocol.Address.PARSER, extensionRegistry);
+              address_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(address_);
                 address_ = subBuilder.buildPartial();
@@ -1947,27 +1947,27 @@ public final class TestConductorProtocol {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_Hello_descriptor;
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Hello_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_Hello_fieldAccessorTable
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Hello_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.testconductor.TestConductorProtocol.Hello.class, akka.remote.testconductor.TestConductorProtocol.Hello.Builder.class);
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder.class);
     }
 
     private int bitField0_;
@@ -1989,8 +1989,8 @@ public final class TestConductorProtocol {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           name_ = s;
@@ -2002,22 +2002,22 @@ public final class TestConductorProtocol {
      * required string name = 1;
      * @return The bytes for name.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int ADDRESS_FIELD_NUMBER = 2;
-    private akka.remote.testconductor.TestConductorProtocol.Address address_;
+    private org.apache.pekko.remote.testconductor.TestConductorProtocol.Address address_;
     /**
      * required .Address address = 2;
      * @return Whether the address field is set.
@@ -2029,14 +2029,14 @@ public final class TestConductorProtocol {
      * required .Address address = 2;
      * @return The address.
      */
-    public akka.remote.testconductor.TestConductorProtocol.Address getAddress() {
-      return address_ == null ? akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddress() {
+      return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 2;
      */
-    public akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
-      return address_ == null ? akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
+      return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -2063,10 +2063,10 @@ public final class TestConductorProtocol {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, name_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, name_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getAddress());
@@ -2081,10 +2081,10 @@ public final class TestConductorProtocol {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, name_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, name_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getAddress());
       }
       size += unknownFields.getSerializedSize();
@@ -2097,10 +2097,10 @@ public final class TestConductorProtocol {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.testconductor.TestConductorProtocol.Hello)) {
+      if (!(obj instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello)) {
         return super.equals(obj);
       }
-      akka.remote.testconductor.TestConductorProtocol.Hello other = (akka.remote.testconductor.TestConductorProtocol.Hello) obj;
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello other = (org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello) obj;
 
       if (hasName() != other.hasName()) return false;
       if (hasName()) {
@@ -2136,73 +2136,73 @@ public final class TestConductorProtocol {
       return hash;
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseDelimitedFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Hello parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -2211,7 +2211,7 @@ public final class TestConductorProtocol {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.testconductor.TestConductorProtocol.Hello prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2222,7 +2222,7 @@ public final class TestConductorProtocol {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2230,34 +2230,34 @@ public final class TestConductorProtocol {
      * Protobuf type {@code Hello}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Hello)
-        akka.remote.testconductor.TestConductorProtocol.HelloOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.HelloOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_Hello_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Hello_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_Hello_fieldAccessorTable
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Hello_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.testconductor.TestConductorProtocol.Hello.class, akka.remote.testconductor.TestConductorProtocol.Hello.Builder.class);
+                org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.Builder.class);
       }
 
-      // Construct using akka.remote.testconductor.TestConductorProtocol.Hello.newBuilder()
+      // Construct using org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAddressFieldBuilder();
         }
@@ -2277,19 +2277,19 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_Hello_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Hello_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.Hello getDefaultInstanceForType() {
-        return akka.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello getDefaultInstanceForType() {
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.Hello build() {
-        akka.remote.testconductor.TestConductorProtocol.Hello result = buildPartial();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello build() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2297,8 +2297,8 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.Hello buildPartial() {
-        akka.remote.testconductor.TestConductorProtocol.Hello result = new akka.remote.testconductor.TestConductorProtocol.Hello(this);
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello buildPartial() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2324,44 +2324,44 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.testconductor.TestConductorProtocol.Hello) {
-          return mergeFrom((akka.remote.testconductor.TestConductorProtocol.Hello)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello) {
+          return mergeFrom((org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.testconductor.TestConductorProtocol.Hello other) {
-        if (other == akka.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello other) {
+        if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello.getDefaultInstance()) return this;
         if (other.hasName()) {
           bitField0_ |= 0x00000001;
           name_ = other.name_;
@@ -2391,14 +2391,14 @@ public final class TestConductorProtocol {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.testconductor.TestConductorProtocol.Hello parsedMessage = null;
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.testconductor.TestConductorProtocol.Hello) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2424,8 +2424,8 @@ public final class TestConductorProtocol {
       public java.lang.String getName() {
         java.lang.Object ref = name_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             name_ = s;
@@ -2439,17 +2439,17 @@ public final class TestConductorProtocol {
        * required string name = 1;
        * @return The bytes for name.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -2483,7 +2483,7 @@ public final class TestConductorProtocol {
        * @return This builder for chaining.
        */
       public Builder setNameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2493,9 +2493,9 @@ public final class TestConductorProtocol {
         return this;
       }
 
-      private akka.remote.testconductor.TestConductorProtocol.Address address_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.Address, akka.remote.testconductor.TestConductorProtocol.Address.Builder, akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder> addressBuilder_;
+      private org.apache.pekko.remote.testconductor.TestConductorProtocol.Address address_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Address, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder> addressBuilder_;
       /**
        * required .Address address = 2;
        * @return Whether the address field is set.
@@ -2507,9 +2507,9 @@ public final class TestConductorProtocol {
        * required .Address address = 2;
        * @return The address.
        */
-      public akka.remote.testconductor.TestConductorProtocol.Address getAddress() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddress() {
         if (addressBuilder_ == null) {
-          return address_ == null ? akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
+          return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
         } else {
           return addressBuilder_.getMessage();
         }
@@ -2517,7 +2517,7 @@ public final class TestConductorProtocol {
       /**
        * required .Address address = 2;
        */
-      public Builder setAddress(akka.remote.testconductor.TestConductorProtocol.Address value) {
+      public Builder setAddress(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address value) {
         if (addressBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2534,7 +2534,7 @@ public final class TestConductorProtocol {
        * required .Address address = 2;
        */
       public Builder setAddress(
-          akka.remote.testconductor.TestConductorProtocol.Address.Builder builderForValue) {
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
           onChanged();
@@ -2547,13 +2547,13 @@ public final class TestConductorProtocol {
       /**
        * required .Address address = 2;
        */
-      public Builder mergeAddress(akka.remote.testconductor.TestConductorProtocol.Address value) {
+      public Builder mergeAddress(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               address_ != null &&
-              address_ != akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
+              address_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
             address_ =
-              akka.remote.testconductor.TestConductorProtocol.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.newBuilder(address_).mergeFrom(value).buildPartial();
           } else {
             address_ = value;
           }
@@ -2580,7 +2580,7 @@ public final class TestConductorProtocol {
       /**
        * required .Address address = 2;
        */
-      public akka.remote.testconductor.TestConductorProtocol.Address.Builder getAddressBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder getAddressBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getAddressFieldBuilder().getBuilder();
@@ -2588,23 +2588,23 @@ public final class TestConductorProtocol {
       /**
        * required .Address address = 2;
        */
-      public akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
         if (addressBuilder_ != null) {
           return addressBuilder_.getMessageOrBuilder();
         } else {
           return address_ == null ?
-              akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
         }
       }
       /**
        * required .Address address = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.Address, akka.remote.testconductor.TestConductorProtocol.Address.Builder, akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Address, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder> 
           getAddressFieldBuilder() {
         if (addressBuilder_ == null) {
-          addressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.testconductor.TestConductorProtocol.Address, akka.remote.testconductor.TestConductorProtocol.Address.Builder, akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder>(
+          addressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder>(
                   getAddress(),
                   getParentForChildren(),
                   isClean());
@@ -2614,13 +2614,13 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2629,37 +2629,37 @@ public final class TestConductorProtocol {
     }
 
     // @@protoc_insertion_point(class_scope:Hello)
-    private static final akka.remote.testconductor.TestConductorProtocol.Hello DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.testconductor.TestConductorProtocol.Hello();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello();
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.Hello getDefaultInstance() {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Hello parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Hello(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.testconductor.TestConductorProtocol.Hello getDefaultInstanceForType() {
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.Hello getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2667,7 +2667,7 @@ public final class TestConductorProtocol {
 
   public interface EnterBarrierOrBuilder extends
       // @@protoc_insertion_point(interface_extends:EnterBarrier)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string name = 1;
@@ -2683,7 +2683,7 @@ public final class TestConductorProtocol {
      * required string name = 1;
      * @return The bytes for name.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes();
 
     /**
@@ -2695,7 +2695,7 @@ public final class TestConductorProtocol {
      * required .BarrierOp op = 2;
      * @return The op.
      */
-    akka.remote.testconductor.TestConductorProtocol.BarrierOp getOp();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp getOp();
 
     /**
      * optional int64 timeout = 3;
@@ -2712,12 +2712,12 @@ public final class TestConductorProtocol {
    * Protobuf type {@code EnterBarrier}
    */
   public  static final class EnterBarrier extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:EnterBarrier)
       EnterBarrierOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use EnterBarrier.newBuilder() to construct.
-    private EnterBarrier(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private EnterBarrier(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private EnterBarrier() {
@@ -2728,26 +2728,26 @@ public final class TestConductorProtocol {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new EnterBarrier();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private EnterBarrier(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2757,7 +2757,7 @@ public final class TestConductorProtocol {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               name_ = bs;
               break;
@@ -2765,7 +2765,7 @@ public final class TestConductorProtocol {
             case 16: {
               int rawValue = input.readEnum();
                 @SuppressWarnings("deprecation")
-              akka.remote.testconductor.TestConductorProtocol.BarrierOp value = akka.remote.testconductor.TestConductorProtocol.BarrierOp.valueOf(rawValue);
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp value = org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(2, rawValue);
               } else {
@@ -2788,27 +2788,27 @@ public final class TestConductorProtocol {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_descriptor;
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_fieldAccessorTable
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.testconductor.TestConductorProtocol.EnterBarrier.class, akka.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder.class);
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder.class);
     }
 
     private int bitField0_;
@@ -2830,8 +2830,8 @@ public final class TestConductorProtocol {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           name_ = s;
@@ -2843,17 +2843,17 @@ public final class TestConductorProtocol {
      * required string name = 1;
      * @return The bytes for name.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -2870,10 +2870,10 @@ public final class TestConductorProtocol {
      * required .BarrierOp op = 2;
      * @return The op.
      */
-    public akka.remote.testconductor.TestConductorProtocol.BarrierOp getOp() {
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp getOp() {
       @SuppressWarnings("deprecation")
-      akka.remote.testconductor.TestConductorProtocol.BarrierOp result = akka.remote.testconductor.TestConductorProtocol.BarrierOp.valueOf(op_);
-      return result == null ? akka.remote.testconductor.TestConductorProtocol.BarrierOp.Enter : result;
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp result = org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.valueOf(op_);
+      return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.Enter : result;
     }
 
     public static final int TIMEOUT_FIELD_NUMBER = 3;
@@ -2913,10 +2913,10 @@ public final class TestConductorProtocol {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, name_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, name_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeEnum(2, op_);
@@ -2934,14 +2934,14 @@ public final class TestConductorProtocol {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, name_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, name_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeEnumSize(2, op_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt64Size(3, timeout_);
       }
       size += unknownFields.getSerializedSize();
@@ -2954,10 +2954,10 @@ public final class TestConductorProtocol {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.testconductor.TestConductorProtocol.EnterBarrier)) {
+      if (!(obj instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier)) {
         return super.equals(obj);
       }
-      akka.remote.testconductor.TestConductorProtocol.EnterBarrier other = (akka.remote.testconductor.TestConductorProtocol.EnterBarrier) obj;
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier other = (org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier) obj;
 
       if (hasName() != other.hasName()) return false;
       if (hasName()) {
@@ -2994,7 +2994,7 @@ public final class TestConductorProtocol {
       }
       if (hasTimeout()) {
         hash = (37 * hash) + TIMEOUT_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getTimeout());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -3002,73 +3002,73 @@ public final class TestConductorProtocol {
       return hash;
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseDelimitedFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3077,7 +3077,7 @@ public final class TestConductorProtocol {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.testconductor.TestConductorProtocol.EnterBarrier prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3088,7 +3088,7 @@ public final class TestConductorProtocol {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3096,34 +3096,34 @@ public final class TestConductorProtocol {
      * Protobuf type {@code EnterBarrier}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:EnterBarrier)
-        akka.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrierOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_fieldAccessorTable
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.testconductor.TestConductorProtocol.EnterBarrier.class, akka.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder.class);
+                org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.Builder.class);
       }
 
-      // Construct using akka.remote.testconductor.TestConductorProtocol.EnterBarrier.newBuilder()
+      // Construct using org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -3140,19 +3140,19 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_EnterBarrier_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.EnterBarrier getDefaultInstanceForType() {
-        return akka.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier getDefaultInstanceForType() {
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.EnterBarrier build() {
-        akka.remote.testconductor.TestConductorProtocol.EnterBarrier result = buildPartial();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier build() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3160,8 +3160,8 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.EnterBarrier buildPartial() {
-        akka.remote.testconductor.TestConductorProtocol.EnterBarrier result = new akka.remote.testconductor.TestConductorProtocol.EnterBarrier(this);
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier buildPartial() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3187,44 +3187,44 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.testconductor.TestConductorProtocol.EnterBarrier) {
-          return mergeFrom((akka.remote.testconductor.TestConductorProtocol.EnterBarrier)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier) {
+          return mergeFrom((org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.testconductor.TestConductorProtocol.EnterBarrier other) {
-        if (other == akka.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier other) {
+        if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier.getDefaultInstance()) return this;
         if (other.hasName()) {
           bitField0_ |= 0x00000001;
           name_ = other.name_;
@@ -3254,14 +3254,14 @@ public final class TestConductorProtocol {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.testconductor.TestConductorProtocol.EnterBarrier parsedMessage = null;
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.testconductor.TestConductorProtocol.EnterBarrier) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3287,8 +3287,8 @@ public final class TestConductorProtocol {
       public java.lang.String getName() {
         java.lang.Object ref = name_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             name_ = s;
@@ -3302,17 +3302,17 @@ public final class TestConductorProtocol {
        * required string name = 1;
        * @return The bytes for name.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -3346,7 +3346,7 @@ public final class TestConductorProtocol {
        * @return This builder for chaining.
        */
       public Builder setNameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -3368,17 +3368,17 @@ public final class TestConductorProtocol {
        * required .BarrierOp op = 2;
        * @return The op.
        */
-      public akka.remote.testconductor.TestConductorProtocol.BarrierOp getOp() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp getOp() {
         @SuppressWarnings("deprecation")
-        akka.remote.testconductor.TestConductorProtocol.BarrierOp result = akka.remote.testconductor.TestConductorProtocol.BarrierOp.valueOf(op_);
-        return result == null ? akka.remote.testconductor.TestConductorProtocol.BarrierOp.Enter : result;
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp result = org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.valueOf(op_);
+        return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp.Enter : result;
       }
       /**
        * required .BarrierOp op = 2;
        * @param value The op to set.
        * @return This builder for chaining.
        */
-      public Builder setOp(akka.remote.testconductor.TestConductorProtocol.BarrierOp value) {
+      public Builder setOp(org.apache.pekko.remote.testconductor.TestConductorProtocol.BarrierOp value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3436,13 +3436,13 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -3451,37 +3451,37 @@ public final class TestConductorProtocol {
     }
 
     // @@protoc_insertion_point(class_scope:EnterBarrier)
-    private static final akka.remote.testconductor.TestConductorProtocol.EnterBarrier DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.testconductor.TestConductorProtocol.EnterBarrier();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier();
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.EnterBarrier getDefaultInstance() {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public EnterBarrier parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new EnterBarrier(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.testconductor.TestConductorProtocol.EnterBarrier getDefaultInstanceForType() {
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.EnterBarrier getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3489,7 +3489,7 @@ public final class TestConductorProtocol {
 
   public interface AddressRequestOrBuilder extends
       // @@protoc_insertion_point(interface_extends:AddressRequest)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string node = 1;
@@ -3505,7 +3505,7 @@ public final class TestConductorProtocol {
      * required string node = 1;
      * @return The bytes for node.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getNodeBytes();
 
     /**
@@ -3517,22 +3517,22 @@ public final class TestConductorProtocol {
      * optional .Address addr = 2;
      * @return The addr.
      */
-    akka.remote.testconductor.TestConductorProtocol.Address getAddr();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddr();
     /**
      * optional .Address addr = 2;
      */
-    akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddrOrBuilder();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddrOrBuilder();
   }
   /**
    * Protobuf type {@code AddressRequest}
    */
   public  static final class AddressRequest extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:AddressRequest)
       AddressRequestOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use AddressRequest.newBuilder() to construct.
-    private AddressRequest(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private AddressRequest(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private AddressRequest() {
@@ -3542,26 +3542,26 @@ public final class TestConductorProtocol {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new AddressRequest();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private AddressRequest(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3571,17 +3571,17 @@ public final class TestConductorProtocol {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               node_ = bs;
               break;
             }
             case 18: {
-              akka.remote.testconductor.TestConductorProtocol.Address.Builder subBuilder = null;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = addr_.toBuilder();
               }
-              addr_ = input.readMessage(akka.remote.testconductor.TestConductorProtocol.Address.PARSER, extensionRegistry);
+              addr_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(addr_);
                 addr_ = subBuilder.buildPartial();
@@ -3598,27 +3598,27 @@ public final class TestConductorProtocol {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_descriptor;
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_fieldAccessorTable
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.testconductor.TestConductorProtocol.AddressRequest.class, akka.remote.testconductor.TestConductorProtocol.AddressRequest.Builder.class);
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder.class);
     }
 
     private int bitField0_;
@@ -3640,8 +3640,8 @@ public final class TestConductorProtocol {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           node_ = s;
@@ -3653,22 +3653,22 @@ public final class TestConductorProtocol {
      * required string node = 1;
      * @return The bytes for node.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getNodeBytes() {
       java.lang.Object ref = node_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         node_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int ADDR_FIELD_NUMBER = 2;
-    private akka.remote.testconductor.TestConductorProtocol.Address addr_;
+    private org.apache.pekko.remote.testconductor.TestConductorProtocol.Address addr_;
     /**
      * optional .Address addr = 2;
      * @return Whether the addr field is set.
@@ -3680,14 +3680,14 @@ public final class TestConductorProtocol {
      * optional .Address addr = 2;
      * @return The addr.
      */
-    public akka.remote.testconductor.TestConductorProtocol.Address getAddr() {
-      return addr_ == null ? akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddr() {
+      return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
     }
     /**
      * optional .Address addr = 2;
      */
-    public akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddrOrBuilder() {
-      return addr_ == null ? akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddrOrBuilder() {
+      return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -3712,10 +3712,10 @@ public final class TestConductorProtocol {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, node_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, node_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getAddr());
@@ -3730,10 +3730,10 @@ public final class TestConductorProtocol {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, node_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, node_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getAddr());
       }
       size += unknownFields.getSerializedSize();
@@ -3746,10 +3746,10 @@ public final class TestConductorProtocol {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.testconductor.TestConductorProtocol.AddressRequest)) {
+      if (!(obj instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest)) {
         return super.equals(obj);
       }
-      akka.remote.testconductor.TestConductorProtocol.AddressRequest other = (akka.remote.testconductor.TestConductorProtocol.AddressRequest) obj;
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest other = (org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest) obj;
 
       if (hasNode() != other.hasNode()) return false;
       if (hasNode()) {
@@ -3785,73 +3785,73 @@ public final class TestConductorProtocol {
       return hash;
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseDelimitedFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3860,7 +3860,7 @@ public final class TestConductorProtocol {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.testconductor.TestConductorProtocol.AddressRequest prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3871,7 +3871,7 @@ public final class TestConductorProtocol {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3879,34 +3879,34 @@ public final class TestConductorProtocol {
      * Protobuf type {@code AddressRequest}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:AddressRequest)
-        akka.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequestOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_fieldAccessorTable
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.testconductor.TestConductorProtocol.AddressRequest.class, akka.remote.testconductor.TestConductorProtocol.AddressRequest.Builder.class);
+                org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.Builder.class);
       }
 
-      // Construct using akka.remote.testconductor.TestConductorProtocol.AddressRequest.newBuilder()
+      // Construct using org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAddrFieldBuilder();
         }
@@ -3926,19 +3926,19 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_AddressRequest_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.AddressRequest getDefaultInstanceForType() {
-        return akka.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest getDefaultInstanceForType() {
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.AddressRequest build() {
-        akka.remote.testconductor.TestConductorProtocol.AddressRequest result = buildPartial();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest build() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3946,8 +3946,8 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.AddressRequest buildPartial() {
-        akka.remote.testconductor.TestConductorProtocol.AddressRequest result = new akka.remote.testconductor.TestConductorProtocol.AddressRequest(this);
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest buildPartial() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3973,44 +3973,44 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.testconductor.TestConductorProtocol.AddressRequest) {
-          return mergeFrom((akka.remote.testconductor.TestConductorProtocol.AddressRequest)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest) {
+          return mergeFrom((org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.testconductor.TestConductorProtocol.AddressRequest other) {
-        if (other == akka.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest other) {
+        if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest.getDefaultInstance()) return this;
         if (other.hasNode()) {
           bitField0_ |= 0x00000001;
           node_ = other.node_;
@@ -4039,14 +4039,14 @@ public final class TestConductorProtocol {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.testconductor.TestConductorProtocol.AddressRequest parsedMessage = null;
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.testconductor.TestConductorProtocol.AddressRequest) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4072,8 +4072,8 @@ public final class TestConductorProtocol {
       public java.lang.String getNode() {
         java.lang.Object ref = node_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             node_ = s;
@@ -4087,17 +4087,17 @@ public final class TestConductorProtocol {
        * required string node = 1;
        * @return The bytes for node.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getNodeBytes() {
         java.lang.Object ref = node_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           node_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -4131,7 +4131,7 @@ public final class TestConductorProtocol {
        * @return This builder for chaining.
        */
       public Builder setNodeBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -4141,9 +4141,9 @@ public final class TestConductorProtocol {
         return this;
       }
 
-      private akka.remote.testconductor.TestConductorProtocol.Address addr_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.Address, akka.remote.testconductor.TestConductorProtocol.Address.Builder, akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder> addrBuilder_;
+      private org.apache.pekko.remote.testconductor.TestConductorProtocol.Address addr_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Address, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder> addrBuilder_;
       /**
        * optional .Address addr = 2;
        * @return Whether the addr field is set.
@@ -4155,9 +4155,9 @@ public final class TestConductorProtocol {
        * optional .Address addr = 2;
        * @return The addr.
        */
-      public akka.remote.testconductor.TestConductorProtocol.Address getAddr() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddr() {
         if (addrBuilder_ == null) {
-          return addr_ == null ? akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
+          return addr_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
         } else {
           return addrBuilder_.getMessage();
         }
@@ -4165,7 +4165,7 @@ public final class TestConductorProtocol {
       /**
        * optional .Address addr = 2;
        */
-      public Builder setAddr(akka.remote.testconductor.TestConductorProtocol.Address value) {
+      public Builder setAddr(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address value) {
         if (addrBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4182,7 +4182,7 @@ public final class TestConductorProtocol {
        * optional .Address addr = 2;
        */
       public Builder setAddr(
-          akka.remote.testconductor.TestConductorProtocol.Address.Builder builderForValue) {
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder builderForValue) {
         if (addrBuilder_ == null) {
           addr_ = builderForValue.build();
           onChanged();
@@ -4195,13 +4195,13 @@ public final class TestConductorProtocol {
       /**
        * optional .Address addr = 2;
        */
-      public Builder mergeAddr(akka.remote.testconductor.TestConductorProtocol.Address value) {
+      public Builder mergeAddr(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address value) {
         if (addrBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               addr_ != null &&
-              addr_ != akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
+              addr_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
             addr_ =
-              akka.remote.testconductor.TestConductorProtocol.Address.newBuilder(addr_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.newBuilder(addr_).mergeFrom(value).buildPartial();
           } else {
             addr_ = value;
           }
@@ -4228,7 +4228,7 @@ public final class TestConductorProtocol {
       /**
        * optional .Address addr = 2;
        */
-      public akka.remote.testconductor.TestConductorProtocol.Address.Builder getAddrBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder getAddrBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getAddrFieldBuilder().getBuilder();
@@ -4236,23 +4236,23 @@ public final class TestConductorProtocol {
       /**
        * optional .Address addr = 2;
        */
-      public akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddrOrBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddrOrBuilder() {
         if (addrBuilder_ != null) {
           return addrBuilder_.getMessageOrBuilder();
         } else {
           return addr_ == null ?
-              akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : addr_;
         }
       }
       /**
        * optional .Address addr = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.Address, akka.remote.testconductor.TestConductorProtocol.Address.Builder, akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Address, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder> 
           getAddrFieldBuilder() {
         if (addrBuilder_ == null) {
-          addrBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.testconductor.TestConductorProtocol.Address, akka.remote.testconductor.TestConductorProtocol.Address.Builder, akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder>(
+          addrBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder>(
                   getAddr(),
                   getParentForChildren(),
                   isClean());
@@ -4262,13 +4262,13 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -4277,37 +4277,37 @@ public final class TestConductorProtocol {
     }
 
     // @@protoc_insertion_point(class_scope:AddressRequest)
-    private static final akka.remote.testconductor.TestConductorProtocol.AddressRequest DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.testconductor.TestConductorProtocol.AddressRequest();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest();
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.AddressRequest getDefaultInstance() {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public AddressRequest parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new AddressRequest(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.testconductor.TestConductorProtocol.AddressRequest getDefaultInstanceForType() {
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4315,7 +4315,7 @@ public final class TestConductorProtocol {
 
   public interface AddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Address)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string protocol = 1;
@@ -4331,7 +4331,7 @@ public final class TestConductorProtocol {
      * required string protocol = 1;
      * @return The bytes for protocol.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes();
 
     /**
@@ -4348,7 +4348,7 @@ public final class TestConductorProtocol {
      * required string system = 2;
      * @return The bytes for system.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes();
 
     /**
@@ -4365,7 +4365,7 @@ public final class TestConductorProtocol {
      * required string host = 3;
      * @return The bytes for host.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getHostBytes();
 
     /**
@@ -4383,12 +4383,12 @@ public final class TestConductorProtocol {
    * Protobuf type {@code Address}
    */
   public  static final class Address extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Address.newBuilder() to construct.
-    private Address(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Address(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Address() {
@@ -4400,26 +4400,26 @@ public final class TestConductorProtocol {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Address();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Address(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4429,19 +4429,19 @@ public final class TestConductorProtocol {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               protocol_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               system_ = bs;
               break;
             }
             case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000004;
               host_ = bs;
               break;
@@ -4460,27 +4460,27 @@ public final class TestConductorProtocol {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_Address_descriptor;
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Address_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_Address_fieldAccessorTable
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Address_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.testconductor.TestConductorProtocol.Address.class, akka.remote.testconductor.TestConductorProtocol.Address.Builder.class);
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder.class);
     }
 
     private int bitField0_;
@@ -4502,8 +4502,8 @@ public final class TestConductorProtocol {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           protocol_ = s;
@@ -4515,17 +4515,17 @@ public final class TestConductorProtocol {
      * required string protocol = 1;
      * @return The bytes for protocol.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         protocol_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4547,8 +4547,8 @@ public final class TestConductorProtocol {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           system_ = s;
@@ -4560,17 +4560,17 @@ public final class TestConductorProtocol {
      * required string system = 2;
      * @return The bytes for system.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         system_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4592,8 +4592,8 @@ public final class TestConductorProtocol {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           host_ = s;
@@ -4605,17 +4605,17 @@ public final class TestConductorProtocol {
      * required string host = 3;
      * @return The bytes for host.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getHostBytes() {
       java.lang.Object ref = host_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         host_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -4664,16 +4664,16 @@ public final class TestConductorProtocol {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, protocol_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, protocol_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, system_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, system_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, host_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, host_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeInt32(4, port_);
@@ -4688,16 +4688,16 @@ public final class TestConductorProtocol {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, protocol_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, protocol_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, system_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, system_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, host_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, host_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(4, port_);
       }
       size += unknownFields.getSerializedSize();
@@ -4710,10 +4710,10 @@ public final class TestConductorProtocol {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.testconductor.TestConductorProtocol.Address)) {
+      if (!(obj instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.Address)) {
         return super.equals(obj);
       }
-      akka.remote.testconductor.TestConductorProtocol.Address other = (akka.remote.testconductor.TestConductorProtocol.Address) obj;
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.Address other = (org.apache.pekko.remote.testconductor.TestConductorProtocol.Address) obj;
 
       if (hasProtocol() != other.hasProtocol()) return false;
       if (hasProtocol()) {
@@ -4767,73 +4767,73 @@ public final class TestConductorProtocol {
       return hash;
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseDelimitedFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -4842,7 +4842,7 @@ public final class TestConductorProtocol {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.testconductor.TestConductorProtocol.Address prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4853,7 +4853,7 @@ public final class TestConductorProtocol {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4861,34 +4861,34 @@ public final class TestConductorProtocol {
      * Protobuf type {@code Address}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Address)
-        akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_Address_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_Address_fieldAccessorTable
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Address_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.testconductor.TestConductorProtocol.Address.class, akka.remote.testconductor.TestConductorProtocol.Address.Builder.class);
+                org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder.class);
       }
 
-      // Construct using akka.remote.testconductor.TestConductorProtocol.Address.newBuilder()
+      // Construct using org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -4907,19 +4907,19 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_Address_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.Address getDefaultInstanceForType() {
-        return akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getDefaultInstanceForType() {
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.Address build() {
-        akka.remote.testconductor.TestConductorProtocol.Address result = buildPartial();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address build() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Address result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4927,8 +4927,8 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.Address buildPartial() {
-        akka.remote.testconductor.TestConductorProtocol.Address result = new akka.remote.testconductor.TestConductorProtocol.Address(this);
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address buildPartial() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Address result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.Address(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4958,44 +4958,44 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.testconductor.TestConductorProtocol.Address) {
-          return mergeFrom((akka.remote.testconductor.TestConductorProtocol.Address)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.Address) {
+          return mergeFrom((org.apache.pekko.remote.testconductor.TestConductorProtocol.Address)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.testconductor.TestConductorProtocol.Address other) {
-        if (other == akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address other) {
+        if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) return this;
         if (other.hasProtocol()) {
           bitField0_ |= 0x00000001;
           protocol_ = other.protocol_;
@@ -5038,14 +5038,14 @@ public final class TestConductorProtocol {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.testconductor.TestConductorProtocol.Address parsedMessage = null;
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Address parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.testconductor.TestConductorProtocol.Address) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5071,8 +5071,8 @@ public final class TestConductorProtocol {
       public java.lang.String getProtocol() {
         java.lang.Object ref = protocol_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             protocol_ = s;
@@ -5086,17 +5086,17 @@ public final class TestConductorProtocol {
        * required string protocol = 1;
        * @return The bytes for protocol.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getProtocolBytes() {
         java.lang.Object ref = protocol_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           protocol_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -5130,7 +5130,7 @@ public final class TestConductorProtocol {
        * @return This builder for chaining.
        */
       public Builder setProtocolBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5155,8 +5155,8 @@ public final class TestConductorProtocol {
       public java.lang.String getSystem() {
         java.lang.Object ref = system_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             system_ = s;
@@ -5170,17 +5170,17 @@ public final class TestConductorProtocol {
        * required string system = 2;
        * @return The bytes for system.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getSystemBytes() {
         java.lang.Object ref = system_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           system_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -5214,7 +5214,7 @@ public final class TestConductorProtocol {
        * @return This builder for chaining.
        */
       public Builder setSystemBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5239,8 +5239,8 @@ public final class TestConductorProtocol {
       public java.lang.String getHost() {
         java.lang.Object ref = host_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             host_ = s;
@@ -5254,17 +5254,17 @@ public final class TestConductorProtocol {
        * required string host = 3;
        * @return The bytes for host.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getHostBytes() {
         java.lang.Object ref = host_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           host_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -5298,7 +5298,7 @@ public final class TestConductorProtocol {
        * @return This builder for chaining.
        */
       public Builder setHostBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5346,13 +5346,13 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -5361,37 +5361,37 @@ public final class TestConductorProtocol {
     }
 
     // @@protoc_insertion_point(class_scope:Address)
-    private static final akka.remote.testconductor.TestConductorProtocol.Address DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.testconductor.TestConductorProtocol.Address DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.testconductor.TestConductorProtocol.Address();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.testconductor.TestConductorProtocol.Address();
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.Address getDefaultInstance() {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
    
-        PARSER = new akka.protobufv3.internal.AbstractParser
    () {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
    
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser
    () {
       @java.lang.Override
       public Address parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Address(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser
     parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser
     parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser
     getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser
     getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.testconductor.TestConductorProtocol.Address getDefaultInstanceForType() {
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5399,7 +5399,7 @@ public final class TestConductorProtocol {
 
   public interface InjectFailureOrBuilder extends
       // @@protoc_insertion_point(interface_extends:InjectFailure)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .FailType failure = 1;
@@ -5410,7 +5410,7 @@ public final class TestConductorProtocol {
      * required .FailType failure = 1;
      * @return The failure.
      */
-    akka.remote.testconductor.TestConductorProtocol.FailType getFailure();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType getFailure();
 
     /**
      * optional .Direction direction = 2;
@@ -5421,7 +5421,7 @@ public final class TestConductorProtocol {
      * optional .Direction direction = 2;
      * @return The direction.
      */
-    akka.remote.testconductor.TestConductorProtocol.Direction getDirection();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction getDirection();
 
     /**
      * optional .Address address = 3;
@@ -5432,11 +5432,11 @@ public final class TestConductorProtocol {
      * optional .Address address = 3;
      * @return The address.
      */
-    akka.remote.testconductor.TestConductorProtocol.Address getAddress();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddress();
     /**
      * optional .Address address = 3;
      */
-    akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder();
+    org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder();
 
     /**
      * optional float rateMBit = 6;
@@ -5464,12 +5464,12 @@ public final class TestConductorProtocol {
    * Protobuf type {@code InjectFailure}
    */
   public  static final class InjectFailure extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:InjectFailure)
       InjectFailureOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use InjectFailure.newBuilder() to construct.
-    private InjectFailure(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private InjectFailure(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private InjectFailure() {
@@ -5480,26 +5480,26 @@ public final class TestConductorProtocol {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new InjectFailure();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private InjectFailure(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5511,7 +5511,7 @@ public final class TestConductorProtocol {
             case 8: {
               int rawValue = input.readEnum();
                 @SuppressWarnings("deprecation")
-              akka.remote.testconductor.TestConductorProtocol.FailType value = akka.remote.testconductor.TestConductorProtocol.FailType.valueOf(rawValue);
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType value = org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -5523,7 +5523,7 @@ public final class TestConductorProtocol {
             case 16: {
               int rawValue = input.readEnum();
                 @SuppressWarnings("deprecation")
-              akka.remote.testconductor.TestConductorProtocol.Direction value = akka.remote.testconductor.TestConductorProtocol.Direction.valueOf(rawValue);
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction value = org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(2, rawValue);
               } else {
@@ -5533,11 +5533,11 @@ public final class TestConductorProtocol {
               break;
             }
             case 26: {
-              akka.remote.testconductor.TestConductorProtocol.Address.Builder subBuilder = null;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) != 0)) {
                 subBuilder = address_.toBuilder();
               }
-              address_ = input.readMessage(akka.remote.testconductor.TestConductorProtocol.Address.PARSER, extensionRegistry);
+              address_ = input.readMessage(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(address_);
                 address_ = subBuilder.buildPartial();
@@ -5564,27 +5564,27 @@ public final class TestConductorProtocol {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_descriptor;
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_fieldAccessorTable
+      return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.testconductor.TestConductorProtocol.InjectFailure.class, akka.remote.testconductor.TestConductorProtocol.InjectFailure.Builder.class);
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder.class);
     }
 
     private int bitField0_;
@@ -5601,10 +5601,10 @@ public final class TestConductorProtocol {
      * required .FailType failure = 1;
      * @return The failure.
      */
-    public akka.remote.testconductor.TestConductorProtocol.FailType getFailure() {
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType getFailure() {
       @SuppressWarnings("deprecation")
-      akka.remote.testconductor.TestConductorProtocol.FailType result = akka.remote.testconductor.TestConductorProtocol.FailType.valueOf(failure_);
-      return result == null ? akka.remote.testconductor.TestConductorProtocol.FailType.Throttle : result;
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType result = org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.valueOf(failure_);
+      return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.Throttle : result;
     }
 
     public static final int DIRECTION_FIELD_NUMBER = 2;
@@ -5620,14 +5620,14 @@ public final class TestConductorProtocol {
      * optional .Direction direction = 2;
      * @return The direction.
      */
-    public akka.remote.testconductor.TestConductorProtocol.Direction getDirection() {
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction getDirection() {
       @SuppressWarnings("deprecation")
-      akka.remote.testconductor.TestConductorProtocol.Direction result = akka.remote.testconductor.TestConductorProtocol.Direction.valueOf(direction_);
-      return result == null ? akka.remote.testconductor.TestConductorProtocol.Direction.Send : result;
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction result = org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.valueOf(direction_);
+      return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.Send : result;
     }
 
     public static final int ADDRESS_FIELD_NUMBER = 3;
-    private akka.remote.testconductor.TestConductorProtocol.Address address_;
+    private org.apache.pekko.remote.testconductor.TestConductorProtocol.Address address_;
     /**
      * optional .Address address = 3;
      * @return Whether the address field is set.
@@ -5639,14 +5639,14 @@ public final class TestConductorProtocol {
      * optional .Address address = 3;
      * @return The address.
      */
-    public akka.remote.testconductor.TestConductorProtocol.Address getAddress() {
-      return address_ == null ? akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddress() {
+      return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
     }
     /**
      * optional .Address address = 3;
      */
-    public akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
-      return address_ == null ? akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
+      return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
     }
 
     public static final int RATEMBIT_FIELD_NUMBER = 6;
@@ -5705,7 +5705,7 @@ public final class TestConductorProtocol {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeEnum(1, failure_);
@@ -5732,23 +5732,23 @@ public final class TestConductorProtocol {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeEnumSize(1, failure_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeEnumSize(2, direction_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, getAddress());
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeFloatSize(6, rateMBit_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(7, exitValue_);
       }
       size += unknownFields.getSerializedSize();
@@ -5761,10 +5761,10 @@ public final class TestConductorProtocol {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.testconductor.TestConductorProtocol.InjectFailure)) {
+      if (!(obj instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure)) {
         return super.equals(obj);
       }
-      akka.remote.testconductor.TestConductorProtocol.InjectFailure other = (akka.remote.testconductor.TestConductorProtocol.InjectFailure) obj;
+      org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure other = (org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure) obj;
 
       if (hasFailure() != other.hasFailure()) return false;
       if (hasFailure()) {
@@ -5827,73 +5827,73 @@ public final class TestConductorProtocol {
       return hash;
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseDelimitedFrom(
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5902,7 +5902,7 @@ public final class TestConductorProtocol {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.testconductor.TestConductorProtocol.InjectFailure prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5913,7 +5913,7 @@ public final class TestConductorProtocol {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5921,34 +5921,34 @@ public final class TestConductorProtocol {
      * Protobuf type {@code InjectFailure}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:InjectFailure)
-        akka.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailureOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_fieldAccessorTable
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.testconductor.TestConductorProtocol.InjectFailure.class, akka.remote.testconductor.TestConductorProtocol.InjectFailure.Builder.class);
+                org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.class, org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.Builder.class);
       }
 
-      // Construct using akka.remote.testconductor.TestConductorProtocol.InjectFailure.newBuilder()
+      // Construct using org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAddressFieldBuilder();
         }
@@ -5974,19 +5974,19 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_descriptor;
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.internal_static_InjectFailure_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.InjectFailure getDefaultInstanceForType() {
-        return akka.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure getDefaultInstanceForType() {
+        return org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.InjectFailure build() {
-        akka.remote.testconductor.TestConductorProtocol.InjectFailure result = buildPartial();
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure build() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5994,8 +5994,8 @@ public final class TestConductorProtocol {
       }
 
       @java.lang.Override
-      public akka.remote.testconductor.TestConductorProtocol.InjectFailure buildPartial() {
-        akka.remote.testconductor.TestConductorProtocol.InjectFailure result = new akka.remote.testconductor.TestConductorProtocol.InjectFailure(this);
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure buildPartial() {
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure result = new org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6033,44 +6033,44 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.testconductor.TestConductorProtocol.InjectFailure) {
-          return mergeFrom((akka.remote.testconductor.TestConductorProtocol.InjectFailure)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure) {
+          return mergeFrom((org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.testconductor.TestConductorProtocol.InjectFailure other) {
-        if (other == akka.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure other) {
+        if (other == org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure.getDefaultInstance()) return this;
         if (other.hasFailure()) {
           setFailure(other.getFailure());
         }
@@ -6106,14 +6106,14 @@ public final class TestConductorProtocol {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.testconductor.TestConductorProtocol.InjectFailure parsedMessage = null;
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.testconductor.TestConductorProtocol.InjectFailure) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6136,17 +6136,17 @@ public final class TestConductorProtocol {
        * required .FailType failure = 1;
        * @return The failure.
        */
-      public akka.remote.testconductor.TestConductorProtocol.FailType getFailure() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType getFailure() {
         @SuppressWarnings("deprecation")
-        akka.remote.testconductor.TestConductorProtocol.FailType result = akka.remote.testconductor.TestConductorProtocol.FailType.valueOf(failure_);
-        return result == null ? akka.remote.testconductor.TestConductorProtocol.FailType.Throttle : result;
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType result = org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.valueOf(failure_);
+        return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType.Throttle : result;
       }
       /**
        * required .FailType failure = 1;
        * @param value The failure to set.
        * @return This builder for chaining.
        */
-      public Builder setFailure(akka.remote.testconductor.TestConductorProtocol.FailType value) {
+      public Builder setFailure(org.apache.pekko.remote.testconductor.TestConductorProtocol.FailType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6178,17 +6178,17 @@ public final class TestConductorProtocol {
        * optional .Direction direction = 2;
        * @return The direction.
        */
-      public akka.remote.testconductor.TestConductorProtocol.Direction getDirection() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction getDirection() {
         @SuppressWarnings("deprecation")
-        akka.remote.testconductor.TestConductorProtocol.Direction result = akka.remote.testconductor.TestConductorProtocol.Direction.valueOf(direction_);
-        return result == null ? akka.remote.testconductor.TestConductorProtocol.Direction.Send : result;
+        org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction result = org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.valueOf(direction_);
+        return result == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction.Send : result;
       }
       /**
        * optional .Direction direction = 2;
        * @param value The direction to set.
        * @return This builder for chaining.
        */
-      public Builder setDirection(akka.remote.testconductor.TestConductorProtocol.Direction value) {
+      public Builder setDirection(org.apache.pekko.remote.testconductor.TestConductorProtocol.Direction value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6208,9 +6208,9 @@ public final class TestConductorProtocol {
         return this;
       }
 
-      private akka.remote.testconductor.TestConductorProtocol.Address address_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.Address, akka.remote.testconductor.TestConductorProtocol.Address.Builder, akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder> addressBuilder_;
+      private org.apache.pekko.remote.testconductor.TestConductorProtocol.Address address_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Address, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder> addressBuilder_;
       /**
        * optional .Address address = 3;
        * @return Whether the address field is set.
@@ -6222,9 +6222,9 @@ public final class TestConductorProtocol {
        * optional .Address address = 3;
        * @return The address.
        */
-      public akka.remote.testconductor.TestConductorProtocol.Address getAddress() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address getAddress() {
         if (addressBuilder_ == null) {
-          return address_ == null ? akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
+          return address_ == null ? org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
         } else {
           return addressBuilder_.getMessage();
         }
@@ -6232,7 +6232,7 @@ public final class TestConductorProtocol {
       /**
        * optional .Address address = 3;
        */
-      public Builder setAddress(akka.remote.testconductor.TestConductorProtocol.Address value) {
+      public Builder setAddress(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address value) {
         if (addressBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6249,7 +6249,7 @@ public final class TestConductorProtocol {
        * optional .Address address = 3;
        */
       public Builder setAddress(
-          akka.remote.testconductor.TestConductorProtocol.Address.Builder builderForValue) {
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
           onChanged();
@@ -6262,13 +6262,13 @@ public final class TestConductorProtocol {
       /**
        * optional .Address address = 3;
        */
-      public Builder mergeAddress(akka.remote.testconductor.TestConductorProtocol.Address value) {
+      public Builder mergeAddress(org.apache.pekko.remote.testconductor.TestConductorProtocol.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
               address_ != null &&
-              address_ != akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
+              address_ != org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance()) {
             address_ =
-              akka.remote.testconductor.TestConductorProtocol.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.newBuilder(address_).mergeFrom(value).buildPartial();
           } else {
             address_ = value;
           }
@@ -6295,7 +6295,7 @@ public final class TestConductorProtocol {
       /**
        * optional .Address address = 3;
        */
-      public akka.remote.testconductor.TestConductorProtocol.Address.Builder getAddressBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder getAddressBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getAddressFieldBuilder().getBuilder();
@@ -6303,23 +6303,23 @@ public final class TestConductorProtocol {
       /**
        * optional .Address address = 3;
        */
-      public akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
+      public org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder getAddressOrBuilder() {
         if (addressBuilder_ != null) {
           return addressBuilder_.getMessageOrBuilder();
         } else {
           return address_ == null ?
-              akka.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.getDefaultInstance() : address_;
         }
       }
       /**
        * optional .Address address = 3;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.testconductor.TestConductorProtocol.Address, akka.remote.testconductor.TestConductorProtocol.Address.Builder, akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.testconductor.TestConductorProtocol.Address, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder> 
           getAddressFieldBuilder() {
         if (addressBuilder_ == null) {
-          addressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.testconductor.TestConductorProtocol.Address, akka.remote.testconductor.TestConductorProtocol.Address.Builder, akka.remote.testconductor.TestConductorProtocol.AddressOrBuilder>(
+          addressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.testconductor.TestConductorProtocol.Address, org.apache.pekko.remote.testconductor.TestConductorProtocol.Address.Builder, org.apache.pekko.remote.testconductor.TestConductorProtocol.AddressOrBuilder>(
                   getAddress(),
                   getParentForChildren(),
                   isClean());
@@ -6403,13 +6403,13 @@ public final class TestConductorProtocol {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -6418,78 +6418,78 @@ public final class TestConductorProtocol {
     }
 
     // @@protoc_insertion_point(class_scope:InjectFailure)
-    private static final akka.remote.testconductor.TestConductorProtocol.InjectFailure DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.testconductor.TestConductorProtocol.InjectFailure();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure();
     }
 
-    public static akka.remote.testconductor.TestConductorProtocol.InjectFailure getDefaultInstance() {
+    public static org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public InjectFailure parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new InjectFailure(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.testconductor.TestConductorProtocol.InjectFailure getDefaultInstanceForType() {
+    public org.apache.pekko.remote.testconductor.TestConductorProtocol.InjectFailure getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Wrapper_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Wrapper_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Hello_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Hello_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_EnterBarrier_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_EnterBarrier_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_AddressRequest_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_AddressRequest_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Address_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Address_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_InjectFailure_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_InjectFailure_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -6512,46 +6512,46 @@ public final class TestConductorProtocol {
       "\n\010Throttle\020\001\022\016\n\nDisconnect\020\002\022\t\n\005Abort\020\003\022" +
       "\010\n\004Exit\020\004\022\014\n\010Shutdown\020\005\022\022\n\016ShutdownAbrup" +
       "t\020\006*,\n\tDirection\022\010\n\004Send\020\001\022\013\n\007Receive\020\002\022" +
-      "\010\n\004Both\020\003B\035\n\031akka.remote.testconductorH\001"
+      "\010\n\004Both\020\003B\035\n\031org.apache.pekko.remote.testconductorH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_Wrapper_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Wrapper_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Wrapper_descriptor,
         new java.lang.String[] { "Hello", "Barrier", "Failure", "Done", "Addr", });
     internal_static_Hello_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_Hello_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Hello_descriptor,
         new java.lang.String[] { "Name", "Address", });
     internal_static_EnterBarrier_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_EnterBarrier_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterBarrier_descriptor,
         new java.lang.String[] { "Name", "Op", "Timeout", });
     internal_static_AddressRequest_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_AddressRequest_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AddressRequest_descriptor,
         new java.lang.String[] { "Node", "Addr", });
     internal_static_Address_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_Address_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Address_descriptor,
         new java.lang.String[] { "Protocol", "System", "Host", "Port", });
     internal_static_InjectFailure_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_InjectFailure_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_InjectFailure_descriptor,
         new java.lang.String[] { "Failure", "Direction", "Address", "RateMBit", "ExitValue", });
   }
diff --git a/akka-multi-node-testkit/src/main/protobuf/TestConductorProtocol.proto b/akka-multi-node-testkit/src/main/protobuf/TestConductorProtocol.proto
index df133797d9..4e8cd558bd 100644
--- a/akka-multi-node-testkit/src/main/protobuf/TestConductorProtocol.proto
+++ b/akka-multi-node-testkit/src/main/protobuf/TestConductorProtocol.proto
@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-option java_package = "akka.remote.testconductor";
+option java_package = "org.apache.pekko.remote.testconductor";
 option optimize_for = SPEED;
 
 message Wrapper {
diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Conductor.scala
similarity index 94%
rename from akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala
rename to akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Conductor.scala
index bb61b08ebe..dc3fbda80d 100644
--- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala
+++ b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Conductor.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testconductor
+package org.apache.pekko.remote.testconductor
 
 import java.net.InetSocketAddress
 import java.util.concurrent.ConcurrentHashMap
@@ -23,9 +23,10 @@ import org.jboss.netty.channel.{
   SimpleChannelUpstreamHandler
 }
 
-import akka.AkkaException
-import akka.ConfigurationException
-import akka.actor.{
+import org.apache.pekko
+import pekko.AkkaException
+import pekko.ConfigurationException
+import pekko.actor.{
   Actor,
   ActorRef,
   Address,
@@ -38,19 +39,19 @@ import akka.actor.{
   Status,
   SupervisorStrategy
 }
-import akka.event.{ Logging, LoggingAdapter }
-import akka.event.LoggingReceive
-import akka.pattern.ask
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.util.Timeout
+import pekko.event.{ Logging, LoggingAdapter }
+import pekko.event.LoggingReceive
+import pekko.pattern.ask
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.util.Timeout
 
 /**
  * The conductor is the one orchestrating the test: it governs the
- * [[akka.remote.testconductor.Controller]]’s port to which all
- * [[akka.remote.testconductor.Player]]s connect, it issues commands to their
- * `akka.remote.testconductor.NetworkFailureInjector` and provides support
- * for barriers using the [[akka.remote.testconductor.BarrierCoordinator]].
- * All of this is bundled inside the [[akka.remote.testconductor.TestConductorExt]]
+ * [[pekko.remote.testconductor.Controller]]’s port to which all
+ * [[pekko.remote.testconductor.Player]]s connect, it issues commands to their
+ * `org.apache.pekko.remote.testconductor.NetworkFailureInjector` and provides support
+ * for barriers using the [[pekko.remote.testconductor.BarrierCoordinator]].
+ * All of this is bundled inside the [[pekko.remote.testconductor.TestConductorExt]]
  * extension.
  */
 trait Conductor { this: TestConductorExt =>
@@ -64,14 +65,14 @@ trait Conductor { this: TestConductorExt =>
   }
 
   /**
-   * Start the [[akka.remote.testconductor.Controller]], which in turn will
+   * Start the [[pekko.remote.testconductor.Controller]], which in turn will
    * bind to a TCP port as specified in the `akka.testconductor.port` config
    * property, where 0 denotes automatic allocation. Since the latter is
    * actually preferred, a `Future[Int]` is returned which will be completed
    * with the port number actually chosen, so that this can then be communicated
    * to the players for their proper start-up.
    *
-   * This method also invokes [[akka.remote.testconductor.Player]].startClient,
+   * This method also invokes [[pekko.remote.testconductor.Player]].startClient,
    * since it is expected that the conductor participates in barriers for
    * overall coordination. The returned Future will only be completed once the
    * client’s start-up finishes, which in fact waits for all other players to
@@ -276,7 +277,7 @@ trait Conductor { this: TestConductorExt =>
  *
  * INTERNAL API.
  */
-private[akka] class ConductorHandler(_createTimeout: Timeout, controller: ActorRef, log: LoggingAdapter)
+private[pekko] class ConductorHandler(_createTimeout: Timeout, controller: ActorRef, log: LoggingAdapter)
     extends SimpleChannelUpstreamHandler {
 
   implicit val createTimeout: Timeout = _createTimeout
@@ -315,7 +316,7 @@ private[akka] class ConductorHandler(_createTimeout: Timeout, controller: ActorR
 /**
  * INTERNAL API.
  */
-private[akka] object ServerFSM {
+private[pekko] object ServerFSM {
   sealed trait State
   case object Initial extends State
   case object Ready extends State
@@ -324,19 +325,19 @@ private[akka] object ServerFSM {
 /**
  * The server part of each client connection is represented by a ServerFSM.
  * The Initial state handles reception of the new client’s
- * [[akka.remote.testconductor.Hello]] message (which is needed for all subsequent
+ * [[pekko.remote.testconductor.Hello]] message (which is needed for all subsequent
  * node name translations).
  *
  * In the Ready state, messages from the client are forwarded to the controller
  * and `Send` requests are sent, but the latter is
  * treated specially: all client operations are to be confirmed by a
- * [[akka.remote.testconductor.Done]] message, and there can be only one such
+ * [[pekko.remote.testconductor.Done]] message, and there can be only one such
  * request outstanding at a given time (i.e. a Send fails if the previous has
  * not yet been acknowledged).
  *
  * INTERNAL API.
  */
-private[akka] class ServerFSM(val controller: ActorRef, val channel: Channel)
+private[pekko] class ServerFSM(val controller: ActorRef, val channel: Channel)
     extends Actor
     with LoggingFSM[ServerFSM.State, Option[ActorRef]] {
   import Controller._
@@ -404,7 +405,7 @@ private[akka] class ServerFSM(val controller: ActorRef, val channel: Channel)
 /**
  * INTERNAL API.
  */
-private[akka] object Controller {
+private[pekko] object Controller {
   final case class ClientDisconnected(name: RoleName) extends DeadLetterSuppression
   class ClientDisconnectedException(msg: String) extends AkkaException(msg) with NoStackTrace
   case object GetNodes
@@ -416,12 +417,12 @@ private[akka] object Controller {
 
 /**
  * This controls test execution by managing barriers (delegated to
- * [[akka.remote.testconductor.BarrierCoordinator]], its child) and allowing
+ * [[pekko.remote.testconductor.BarrierCoordinator]], its child) and allowing
  * network and other failures to be injected at the test nodes.
  *
  * INTERNAL API.
  */
-private[akka] class Controller(private var initialParticipants: Int, controllerPort: InetSocketAddress) extends Actor {
+private[pekko] class Controller(private var initialParticipants: Int, controllerPort: InetSocketAddress) extends Actor {
   import BarrierCoordinator._
   import Controller._
 
@@ -527,7 +528,7 @@ private[akka] class Controller(private var initialParticipants: Int, controllerP
 /**
  * INTERNAL API.
  */
-private[akka] object BarrierCoordinator {
+private[pekko] object BarrierCoordinator {
   sealed trait State
   case object Idle extends State
   case object Waiting extends State
@@ -577,7 +578,7 @@ private[akka] object BarrierCoordinator {
  *
  * INTERNAL API.
  */
-private[akka] class BarrierCoordinator
+private[pekko] class BarrierCoordinator
     extends Actor
     with LoggingFSM[BarrierCoordinator.State, BarrierCoordinator.Data] {
   import BarrierCoordinator._
diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/DataTypes.scala
similarity index 68%
rename from akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala
rename to akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/DataTypes.scala
index d54fadb573..d962c25330 100644
--- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala
+++ b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/DataTypes.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testconductor
+package org.apache.pekko.remote.testconductor
 
 import scala.concurrent.duration._
 
@@ -12,59 +12,60 @@ import org.jboss.netty.channel.ChannelHandlerContext
 import org.jboss.netty.handler.codec.oneone.OneToOneDecoder
 import org.jboss.netty.handler.codec.oneone.OneToOneEncoder
 
-import akka.actor.Address
-import akka.remote.testconductor.{ TestConductorProtocol => TCP }
-import akka.remote.testconductor.TestConductorProtocol.BarrierOp
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
+import org.apache.pekko
+import pekko.actor.Address
+import pekko.remote.testconductor.{ TestConductorProtocol => TCP }
+import pekko.remote.testconductor.TestConductorProtocol.BarrierOp
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
 
 final case class RoleName(name: String)
 
-private[akka] final case class ToClient(msg: ClientOp with NetworkOp)
-private[akka] final case class ToServer(msg: ServerOp with NetworkOp)
+private[pekko] final case class ToClient(msg: ClientOp with NetworkOp)
+private[pekko] final case class ToServer(msg: ServerOp with NetworkOp)
 
-private[akka] sealed trait ClientOp // messages sent to from Conductor to Player
-private[akka] sealed trait ServerOp // messages sent to from Player to Conductor
-private[akka] sealed trait CommandOp // messages sent from TestConductorExt to Conductor
-private[akka] sealed trait NetworkOp // messages sent over the wire
-private[akka] sealed trait UnconfirmedClientOp extends ClientOp // unconfirmed messages going to the Player
-private[akka] sealed trait ConfirmedClientOp extends ClientOp
+private[pekko] sealed trait ClientOp // messages sent to from Conductor to Player
+private[pekko] sealed trait ServerOp // messages sent to from Player to Conductor
+private[pekko] sealed trait CommandOp // messages sent from TestConductorExt to Conductor
+private[pekko] sealed trait NetworkOp // messages sent over the wire
+private[pekko] sealed trait UnconfirmedClientOp extends ClientOp // unconfirmed messages going to the Player
+private[pekko] sealed trait ConfirmedClientOp extends ClientOp
 
 /**
  * First message of connection sets names straight.
  */
-private[akka] final case class Hello(name: String, addr: Address) extends NetworkOp
+private[pekko] final case class Hello(name: String, addr: Address) extends NetworkOp
 
-private[akka] final case class EnterBarrier(name: String, timeout: Option[FiniteDuration])
+private[pekko] final case class EnterBarrier(name: String, timeout: Option[FiniteDuration])
     extends ServerOp
     with NetworkOp
-private[akka] final case class FailBarrier(name: String) extends ServerOp with NetworkOp
-private[akka] final case class BarrierResult(name: String, success: Boolean) extends UnconfirmedClientOp with NetworkOp
+private[pekko] final case class FailBarrier(name: String) extends ServerOp with NetworkOp
+private[pekko] final case class BarrierResult(name: String, success: Boolean) extends UnconfirmedClientOp with NetworkOp
 
-private[akka] final case class Throttle(node: RoleName, target: RoleName, direction: Direction, rateMBit: Float)
+private[pekko] final case class Throttle(node: RoleName, target: RoleName, direction: Direction, rateMBit: Float)
     extends CommandOp
-private[akka] final case class ThrottleMsg(target: Address, direction: Direction, rateMBit: Float)
+private[pekko] final case class ThrottleMsg(target: Address, direction: Direction, rateMBit: Float)
     extends ConfirmedClientOp
     with NetworkOp
 
-private[akka] final case class Disconnect(node: RoleName, target: RoleName, abort: Boolean) extends CommandOp
-private[akka] final case class DisconnectMsg(target: Address, abort: Boolean) extends ConfirmedClientOp with NetworkOp
+private[pekko] final case class Disconnect(node: RoleName, target: RoleName, abort: Boolean) extends CommandOp
+private[pekko] final case class DisconnectMsg(target: Address, abort: Boolean) extends ConfirmedClientOp with NetworkOp
 
-private[akka] final case class Terminate(node: RoleName, shutdownOrExit: Either[Boolean, Int]) extends CommandOp
-private[akka] final case class TerminateMsg(shutdownOrExit: Either[Boolean, Int])
+private[pekko] final case class Terminate(node: RoleName, shutdownOrExit: Either[Boolean, Int]) extends CommandOp
+private[pekko] final case class TerminateMsg(shutdownOrExit: Either[Boolean, Int])
     extends ConfirmedClientOp
     with NetworkOp
 
-private[akka] final case class GetAddress(node: RoleName) extends ServerOp with NetworkOp
-private[akka] final case class AddressReply(node: RoleName, addr: Address) extends UnconfirmedClientOp with NetworkOp
+private[pekko] final case class GetAddress(node: RoleName) extends ServerOp with NetworkOp
+private[pekko] final case class AddressReply(node: RoleName, addr: Address) extends UnconfirmedClientOp with NetworkOp
 
-private[akka] abstract class Done extends ServerOp with UnconfirmedClientOp with NetworkOp
-private[akka] case object Done extends Done {
+private[pekko] abstract class Done extends ServerOp with UnconfirmedClientOp with NetworkOp
+private[pekko] case object Done extends Done {
   def getInstance: Done = this
 }
 
-private[akka] final case class Remove(node: RoleName) extends CommandOp
+private[pekko] final case class Remove(node: RoleName) extends CommandOp
 
-private[akka] class MsgEncoder extends OneToOneEncoder {
+private[pekko] class MsgEncoder extends OneToOneEncoder {
 
   implicit def address2proto(addr: Address): TCP.Address =
     TCP.Address.newBuilder
@@ -126,7 +127,7 @@ private[akka] class MsgEncoder extends OneToOneEncoder {
   }
 }
 
-private[akka] class MsgDecoder extends OneToOneDecoder {
+private[pekko] class MsgDecoder extends OneToOneDecoder {
 
   implicit def address2scala(addr: TCP.Address): Address =
     Address(addr.getProtocol, addr.getSystem, addr.getHost, addr.getPort)
diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Extension.scala
similarity index 77%
rename from akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala
rename to akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Extension.scala
index 017ef28d29..981fe9c3c2 100644
--- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala
+++ b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Extension.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testconductor
+package org.apache.pekko.remote.testconductor
 
 import com.typesafe.config.Config
 
-import akka.actor.{ ActorContext, ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
-import akka.actor.ClassicActorSystemProvider
-import akka.dispatch.ThreadPoolConfig
-import akka.remote.RemoteActorRefProvider
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.{ ActorContext, ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
+import pekko.actor.ClassicActorSystemProvider
+import pekko.dispatch.ThreadPoolConfig
+import pekko.remote.RemoteActorRefProvider
+import pekko.util.Timeout
 
 /**
- * Access to the [[akka.remote.testconductor.TestConductorExt]] extension:
+ * Access to the [[pekko.remote.testconductor.TestConductorExt]] extension:
  *
  * {{{
  * val tc = TestConductor(system)
@@ -39,14 +40,14 @@ object TestConductor extends ExtensionId[TestConductorExt] with ExtensionIdProvi
 }
 
 /**
- * This binds together the [[akka.remote.testconductor.Conductor]] and
- * [[akka.remote.testconductor.Player]] roles inside an Akka
- * [[akka.actor.Extension]]. Please follow the aforementioned links for
+ * This binds together the [[pekko.remote.testconductor.Conductor]] and
+ * [[pekko.remote.testconductor.Player]] roles inside an Akka
+ * [[pekko.actor.Extension]]. Please follow the aforementioned links for
  * more information.
  *
  * ====Note====
  * This extension requires the `akka.actor.provider`
- * to be a [[akka.remote.RemoteActorRefProvider]].
+ * to be a [[pekko.remote.RemoteActorRefProvider]].
  *
  * To use ``blackhole``, ``passThrough``, and ``throttle`` you must activate the
  * failure injector and throttler transport adapters by specifying `testTransport(on = true)`
@@ -56,7 +57,7 @@ class TestConductorExt(val system: ExtendedActorSystem) extends Extension with C
 
   object Settings {
     val config = system.settings.config.getConfig("akka.testconductor")
-    import akka.util.Helpers.ConfigOps
+    import org.apache.pekko.util.Helpers.ConfigOps
 
     val ConnectTimeout = config.getMillisDuration("connect-timeout")
     val ClientReconnects = config.getInt("client-reconnects")
diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Player.scala
similarity index 92%
rename from akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala
rename to akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Player.scala
index d97d9d5ebe..5602550a24 100644
--- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala
+++ b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/Player.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testconductor
+package org.apache.pekko.remote.testconductor
 
 import java.net.{ ConnectException, InetSocketAddress }
 import java.util.concurrent.TimeoutException
@@ -24,14 +24,15 @@ import org.jboss.netty.channel.{
   WriteCompletionEvent
 }
 
-import akka.actor._
-import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
-import akka.event.{ Logging, LoggingAdapter }
-import akka.pattern.{ ask, AskTimeoutException }
-import akka.remote.testconductor.RemoteConnection.getAddrString
-import akka.remote.transport.ThrottlerTransportAdapter.{ Blackhole, SetThrottle, TokenBucket, Unthrottled }
-import akka.util.Timeout
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor._
+import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
+import pekko.event.{ Logging, LoggingAdapter }
+import pekko.pattern.{ ask, AskTimeoutException }
+import pekko.remote.testconductor.RemoteConnection.getAddrString
+import pekko.remote.transport.ThrottlerTransportAdapter.{ Blackhole, SetThrottle, TokenBucket, Unthrottled }
+import pekko.util.Timeout
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object Player {
@@ -64,8 +65,8 @@ object Player {
 
 /**
  * The Player is the client component of the
- * [[akka.remote.testconductor.TestConductorExt]] extension. It registers with
- * the [[akka.remote.testconductor.Conductor]]’s [[akka.remote.testconductor.Controller]]
+ * [[pekko.remote.testconductor.TestConductorExt]] extension. It registers with
+ * the [[pekko.remote.testconductor.Conductor]]’s [[pekko.remote.testconductor.Controller]]
  * in order to participate in barriers and enable network failure injection.
  */
 trait Player { this: TestConductorExt =>
@@ -86,7 +87,7 @@ trait Player { this: TestConductorExt =>
    * should await completion of the returned Future because that implies that
    * all expected participants of this test have successfully connected (i.e.
    * this is a first barrier in itself). The number of expected participants is
-   * set in [[akka.remote.testconductor.Conductor]]`.startController()`.
+   * set in [[pekko.remote.testconductor.Conductor]]`.startController()`.
    */
   def startClient(name: RoleName, controllerAddr: InetSocketAddress): Future[Done] = {
     import Settings.BarrierTimeout
@@ -141,7 +142,7 @@ trait Player { this: TestConductorExt =>
 /**
  * INTERNAL API.
  */
-private[akka] object ClientFSM {
+private[pekko] object ClientFSM {
   sealed trait State
   case object Connecting extends State
   case object AwaitDone extends State
@@ -156,12 +157,12 @@ private[akka] object ClientFSM {
 }
 
 /**
- * This is the controlling entity on the [[akka.remote.testconductor.Player]]
+ * This is the controlling entity on the [[pekko.remote.testconductor.Player]]
  * side: in a first step it registers itself with a symbolic name and its remote
- * address at the [[akka.remote.testconductor.Controller]], then waits for the
+ * address at the [[pekko.remote.testconductor.Controller]], then waits for the
  * `Done` message which signals that all other expected test participants have
  * done the same. After that, it will pass barrier requests to and from the
- * coordinator and react to the [[akka.remote.testconductor.Conductor]]’s
+ * coordinator and react to the [[pekko.remote.testconductor.Conductor]]’s
  * requests for failure injection.
  *
  * Note that you can't perform requests concurrently, e.g. enter barrier
@@ -169,7 +170,7 @@ private[akka] object ClientFSM {
  *
  * INTERNAL API.
  */
-private[akka] class ClientFSM(name: RoleName, controllerAddr: InetSocketAddress)
+private[pekko] class ClientFSM(name: RoleName, controllerAddr: InetSocketAddress)
     extends Actor
     with LoggingFSM[ClientFSM.State, ClientFSM.Data]
     with RequiresMessageQueue[UnboundedMessageQueueSemantics] {
@@ -317,11 +318,11 @@ private[akka] class ClientFSM(name: RoleName, controllerAddr: InetSocketAddress)
 }
 
 /**
- * This handler only forwards messages received from the conductor to the [[akka.remote.testconductor.ClientFSM]].
+ * This handler only forwards messages received from the conductor to the [[pekko.remote.testconductor.ClientFSM]].
  *
  * INTERNAL API.
  */
-private[akka] class PlayerHandler(
+private[pekko] class PlayerHandler(
     server: InetSocketAddress,
     private var reconnects: Int,
     backoff: FiniteDuration,
diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/RemoteConnection.scala
similarity index 85%
rename from akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala
rename to akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/RemoteConnection.scala
index 9e0e470062..36fb7ba479 100644
--- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala
+++ b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testconductor/RemoteConnection.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testconductor
+package org.apache.pekko.remote.testconductor
 
 import java.net.InetSocketAddress
 import java.util.concurrent.Executors
@@ -23,14 +23,15 @@ import org.jboss.netty.channel.socket.nio.{ NioClientSocketChannelFactory, NioSe
 import org.jboss.netty.handler.codec.frame.{ LengthFieldBasedFrameDecoder, LengthFieldPrepender }
 import org.jboss.netty.handler.codec.oneone.{ OneToOneDecoder, OneToOneEncoder }
 
-import akka.event.Logging
-import akka.protobufv3.internal.Message
-import akka.util.Helpers
+import org.apache.pekko
+import pekko.event.Logging
+import pekko.protobufv3.internal.Message
+import pekko.util.Helpers
 
 /**
  * INTERNAL API.
  */
-private[akka] class ProtobufEncoder extends OneToOneEncoder {
+private[pekko] class ProtobufEncoder extends OneToOneEncoder {
   override def encode(ctx: ChannelHandlerContext, ch: Channel, msg: AnyRef): AnyRef =
     msg match {
       case m: Message =>
@@ -43,7 +44,7 @@ private[akka] class ProtobufEncoder extends OneToOneEncoder {
 /**
  * INTERNAL API.
  */
-private[akka] class ProtobufDecoder(prototype: Message) extends OneToOneDecoder {
+private[pekko] class ProtobufDecoder(prototype: Message) extends OneToOneDecoder {
   override def decode(ctx: ChannelHandlerContext, ch: Channel, obj: AnyRef): AnyRef =
     obj match {
       case buf: ChannelBuffer =>
@@ -58,7 +59,7 @@ private[akka] class ProtobufDecoder(prototype: Message) extends OneToOneDecoder
 /**
  * INTERNAL API.
  */
-private[akka] class TestConductorPipelineFactory(handler: ChannelUpstreamHandler) extends ChannelPipelineFactory {
+private[pekko] class TestConductorPipelineFactory(handler: ChannelUpstreamHandler) extends ChannelPipelineFactory {
   def getPipeline: ChannelPipeline = {
     val encap = List(new LengthFieldPrepender(4), new LengthFieldBasedFrameDecoder(10000, 0, 4, 0, 4))
     val proto = List(new ProtobufEncoder, new ProtobufDecoder(TestConductorProtocol.Wrapper.getDefaultInstance))
@@ -72,22 +73,22 @@ private[akka] class TestConductorPipelineFactory(handler: ChannelUpstreamHandler
 /**
  * INTERNAL API.
  */
-private[akka] sealed trait Role
+private[pekko] sealed trait Role
 
 /**
  * INTERNAL API.
  */
-private[akka] case object Client extends Role
+private[pekko] case object Client extends Role
 
 /**
  * INTERNAL API.
  */
-private[akka] case object Server extends Role
+private[pekko] case object Server extends Role
 
 /**
  * INTERNAL API.
  */
-private[akka] object RemoteConnection {
+private[pekko] object RemoteConnection {
   def apply(role: Role, sockaddr: InetSocketAddress, poolSize: Int, handler: ChannelUpstreamHandler): Channel = {
     role match {
       case Client =>
diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala
similarity index 96%
rename from akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
rename to akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala
index f34f75784a..d2e38034de 100644
--- a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testkit
+package org.apache.pekko.remote.testkit
 
 import java.net.{ InetAddress, InetSocketAddress }
 import scala.collection.immutable
@@ -13,17 +13,18 @@ import com.typesafe.config.{ Config, ConfigFactory, ConfigObject }
 
 import language.implicitConversions
 import org.jboss.netty.channel.ChannelException
-import akka.actor._
-import akka.actor.RootActorPath
-import akka.event.{ Logging, LoggingAdapter }
-import akka.remote.RemoteTransportException
-import akka.remote.testconductor.{ TestConductor, TestConductorExt }
-import akka.remote.testconductor.RoleName
-import akka.testkit._
-import akka.testkit.TestEvent._
-import akka.testkit.TestKit
-import akka.util.Timeout
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor._
+import pekko.actor.RootActorPath
+import pekko.event.{ Logging, LoggingAdapter }
+import pekko.remote.RemoteTransportException
+import pekko.remote.testconductor.{ TestConductor, TestConductorExt }
+import pekko.remote.testconductor.RoleName
+import pekko.testkit._
+import pekko.testkit.TestEvent._
+import pekko.testkit.TestKit
+import pekko.util.Timeout
+import pekko.util.ccompat._
 
 /**
  * Configure the role names and participants of the test, including configuration settings.
@@ -105,7 +106,7 @@ abstract class MultiNodeConfig {
     _roles(MultiNodeSpec.selfIndex)
   }
 
-  private[akka] def config: Config = {
+  private[pekko] def config: Config = {
     val transportConfig =
       if (_testTransport) ConfigFactory.parseString("""
            akka.remote.classic.netty.tcp.applied-adapters = [trttl, gremlin]
@@ -245,7 +246,7 @@ object MultiNodeSpec {
   private[testkit] val baseConfig: Config =
     ConfigFactory.parseString("""
       akka {
-        loggers = ["akka.testkit.TestEventListener"]
+        loggers = ["org.apache.pekko.testkit.TestEventListener"]
         loglevel = "WARNING"
         stdout-loglevel = "WARNING"
         coordinated-shutdown.terminate-actor-system = off
@@ -265,7 +266,7 @@ object MultiNodeSpec {
       """)
 
   private def mapToConfig(map: Map[String, Any]): Config = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     ConfigFactory.parseMap(map.asJava)
   }
 
@@ -512,7 +513,7 @@ abstract class MultiNodeSpec(
               base.replace(tag, replaceWith)
           }
       }
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       ConfigFactory.parseString(deployString).root.asScala.foreach {
         case (key, value: ConfigObject) => deployer.parseConfig(key, value.toConfig).foreach(deployer.deploy)
         case (key, x) =>
diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/PerfFlamesSupport.scala b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/PerfFlamesSupport.scala
similarity index 86%
rename from akka-multi-node-testkit/src/main/scala/akka/remote/testkit/PerfFlamesSupport.scala
rename to akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/PerfFlamesSupport.scala
index 18787830b4..a13bdd2225 100644
--- a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/PerfFlamesSupport.scala
+++ b/akka-multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/PerfFlamesSupport.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.testkit
+package org.apache.pekko.remote.testkit
 
 import java.io.File
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.remote.testconductor.RoleName
+import org.apache.pekko
+import pekko.remote.testconductor.RoleName
 
 /**
  * INTERNAL API: Support trait allowing trivially recording perf metrics from [[MultiNodeSpec]]s
  */
-private[akka] trait PerfFlamesSupport { self: MultiNodeSpec =>
+private[pekko] trait PerfFlamesSupport { self: MultiNodeSpec =>
 
   /**
    * Runs `perf-java-flames` script on given node (JVM process).
@@ -26,7 +27,7 @@ private[akka] trait PerfFlamesSupport { self: MultiNodeSpec =>
     if (isPerfJavaFlamesAvailable && isNode(nodes: _*)) {
       import scala.concurrent.ExecutionContext.Implicits.global
 
-      val afterDelay = akka.pattern.after(delay, system.scheduler)(Future.successful("GO!"))
+      val afterDelay = pekko.pattern.after(delay, system.scheduler)(Future.successful("GO!"))
       afterDelay.onComplete { _ =>
         import java.lang.management._
         val name = ManagementFactory.getRuntimeMXBean.getName
diff --git a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala b/akka-osgi/src/main/scala/org/apache/pekko/osgi/ActorSystemActivator.scala
similarity index 89%
rename from akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
rename to akka-osgi/src/main/scala/org/apache/pekko/osgi/ActorSystemActivator.scala
index f3e8f0a572..6cddbb765e 100644
--- a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
+++ b/akka-osgi/src/main/scala/org/apache/pekko/osgi/ActorSystemActivator.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.osgi
+package org.apache.pekko.osgi
 
 import java.util.{ Dictionary, Properties }
 
@@ -10,17 +10,18 @@ import com.typesafe.config.{ Config, ConfigFactory }
 import org.osgi.framework._
 import org.osgi.service.log.LogService
 
-import akka.actor.{ ActorRefFactory, ActorSystem }
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.{ ActorRefFactory, ActorSystem }
+import pekko.util.unused
 
 /**
  * Abstract bundle activator implementation to bootstrap and configure an actor system in an
  * OSGi environment.  It also provides a convenience method to register the actor system in
  * the OSGi Service Registry for sharing it with other OSGi bundles.
  *
- * This convenience activator is mainly useful for setting up a single [[akka.actor.ActorSystem]] instance and sharing that
+ * This convenience activator is mainly useful for setting up a single [[pekko.actor.ActorSystem]] instance and sharing that
  * with other bundles in the OSGi Framework.  If you want to set up multiple systems in the same bundle context, look at
- * the [[akka.osgi.OsgiActorSystemFactory]] instead.
+ * the [[pekko.osgi.OsgiActorSystemFactory]] instead.
  */
 abstract class ActorSystemActivator extends BundleActivator {
 
@@ -112,8 +113,8 @@ abstract class ActorSystemActivator extends BundleActivator {
   }
 
   /**
-   * By default, the [[akka.actor.ActorSystem]] name will be set to `bundle-<bundle id>-ActorSystem`.  Override this
-   * method to define another name for your [[akka.actor.ActorSystem]] instance.
+   * By default, the [[pekko.actor.ActorSystem]] name will be set to `bundle-<bundle id>-ActorSystem`.  Override this
+   * method to define another name for your [[pekko.actor.ActorSystem]] instance.
    *
    * @param context the bundle context
    * @return the actor system name
@@ -121,7 +122,7 @@ abstract class ActorSystemActivator extends BundleActivator {
   def getActorSystemName(@unused context: BundleContext): String = null
 
   /**
-   * Override this method to define a configuration for your [[akka.actor.ActorSystem]] instance.
+   * 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
diff --git a/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala b/akka-osgi/src/main/scala/org/apache/pekko/osgi/BundleDelegatingClassLoader.scala
similarity index 97%
rename from akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala
rename to akka-osgi/src/main/scala/org/apache/pekko/osgi/BundleDelegatingClassLoader.scala
index b6d7509cb7..cb02ec5f2d 100644
--- a/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala
+++ b/akka-osgi/src/main/scala/org/apache/pekko/osgi/BundleDelegatingClassLoader.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.osgi
+package org.apache.pekko.osgi
 
 import java.net.URL
 import java.util.Enumeration
@@ -15,7 +15,7 @@ import scala.util.Try
 import org.osgi.framework.{ Bundle, BundleContext }
 import org.osgi.framework.wiring.{ BundleRevision, BundleWire, BundleWiring }
 
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
 
 /*
  * Companion object to create bundle delegating ClassLoader instances
diff --git a/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala b/akka-osgi/src/main/scala/org/apache/pekko/osgi/DefaultOSGiLogger.scala
similarity index 94%
rename from akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala
rename to akka-osgi/src/main/scala/org/apache/pekko/osgi/DefaultOSGiLogger.scala
index bedbc51f54..90c3993ae9 100644
--- a/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala
+++ b/akka-osgi/src/main/scala/org/apache/pekko/osgi/DefaultOSGiLogger.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.osgi
+package org.apache.pekko.osgi
 
 import org.osgi.service.log.LogService
 
-import akka.event.Logging
-import akka.event.Logging.{ DefaultLogger, LogEvent }
-import akka.event.Logging.Error.NoCause
+import org.apache.pekko
+import pekko.event.Logging
+import pekko.event.Logging.{ DefaultLogger, LogEvent }
+import pekko.event.Logging.Error.NoCause
 
 /**
  * Logger for OSGi environment.
diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/org/apache/pekko/osgi/OsgiActorSystemFactory.scala
similarity index 87%
rename from akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
rename to akka-osgi/src/main/scala/org/apache/pekko/osgi/OsgiActorSystemFactory.scala
index c252561f37..b721a768ce 100644
--- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
+++ b/akka-osgi/src/main/scala/org/apache/pekko/osgi/OsgiActorSystemFactory.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.osgi
+package org.apache.pekko.osgi
 
 import com.typesafe.config.{ Config, ConfigFactory }
 import org.osgi.framework.BundleContext
 
-import akka.actor.ActorSystem
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.util.unused
 
 /**
  * Factory class to create ActorSystem implementations in an OSGi environment.  This mainly involves dealing with
@@ -25,12 +26,12 @@ class OsgiActorSystemFactory(
   private val classloader = BundleDelegatingClassLoader(context, fallbackClassLoader)
 
   /**
-   * Creates the [[akka.actor.ActorSystem]], using the name specified
+   * Creates the [[pekko.actor.ActorSystem]], using the name specified
    */
   def createActorSystem(name: String): ActorSystem = createActorSystem(Option(name))
 
   /**
-   * Creates the [[akka.actor.ActorSystem]], using the name specified.
+   * Creates the [[pekko.actor.ActorSystem]], using the name specified.
    *
    * A default name (`bundle-<bundle id>-ActorSystem`) is assigned when you pass along [[scala.None]] instead.
    */
@@ -50,7 +51,7 @@ class OsgiActorSystemFactory(
   }
 
   /**
-   * Determine the name for the [[akka.actor.ActorSystem]]
+   * Determine the name for the [[pekko.actor.ActorSystem]]
    * Returns a default value of `bundle-<bundle id>-ActorSystem` is no name is being specified
    */
   def actorSystemName(name: Option[String]): String =
diff --git a/akka-osgi/src/test/scala/docs/osgi/Activator.scala b/akka-osgi/src/test/scala/docs/osgi/Activator.scala
index 737cc99e6d..96e9fe3887 100644
--- a/akka-osgi/src/test/scala/docs/osgi/Activator.scala
+++ b/akka-osgi/src/test/scala/docs/osgi/Activator.scala
@@ -4,16 +4,19 @@
 
 package docs.osgi
 
+import org.apache.pekko
+
 case object SomeMessage
 
-class SomeActor extends akka.actor.Actor {
+class SomeActor extends pekko.actor.Actor {
   def receive = { case SomeMessage => }
 }
 
 //#Activator
-import akka.actor.{ ActorSystem, Props }
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, Props }
 import org.osgi.framework.BundleContext
-import akka.osgi.ActorSystemActivator
+import pekko.osgi.ActorSystemActivator
 
 class Activator extends ActorSystemActivator {
 
diff --git a/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala b/akka-osgi/src/test/scala/org/apache/pekko/osgi/ActorSystemActivatorTest.scala
similarity index 86%
rename from akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala
rename to akka-osgi/src/test/scala/org/apache/pekko/osgi/ActorSystemActivatorTest.scala
index f1499605a2..b6236da926 100644
--- a/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala
+++ b/akka-osgi/src/test/scala/org/apache/pekko/osgi/ActorSystemActivatorTest.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.osgi
+package org.apache.pekko.osgi
 
 import scala.collection.immutable
 import scala.concurrent.Await
@@ -16,18 +16,19 @@ import org.scalatest.wordspec.AnyWordSpec
 import test.{ PingPongActorSystemActivator, RuntimeNameActorSystemActivator, TestActivators }
 import test.PingPong._
 
-import akka.actor.ActorSystem
-import akka.pattern.ask
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.pattern.ask
+import pekko.util.Timeout
 
 /**
- * Test cases for [[akka.osgi.ActorSystemActivator]] in 2 different scenarios:
- * - no name configured for [[akka.actor.ActorSystem]]
+ * Test cases for [[pekko.osgi.ActorSystemActivator]] in 2 different scenarios:
+ * - no name configured for [[pekko.actor.ActorSystem]]
  * - runtime name configuration
  */
 object ActorSystemActivatorTest {
 
-  val TEST_BUNDLE_NAME = "akka.osgi.test.activator"
+  val TEST_BUNDLE_NAME = "org.apache.pekko.osgi.test.activator"
 
 }
 
diff --git a/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala b/akka-osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala
similarity index 98%
rename from akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala
rename to akka-osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala
index bbc2ccdba2..746b3b50a9 100644
--- a/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala
+++ b/akka-osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.osgi
+package org.apache.pekko.osgi
 
 import java.io._
 import java.net.URL
@@ -19,7 +19,7 @@ import org.apache.commons.io.IOUtils.copy
 import org.osgi.framework._
 import org.scalatest.{ BeforeAndAfterAll, Suite }
 
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko.util.ccompat.JavaConverters._
 
 /**
  * Trait that provides support for building akka-osgi tests using PojoSR
diff --git a/akka-osgi/src/test/scala/akka/osgi/test/PingPong.scala b/akka-osgi/src/test/scala/org/apache/pekko/osgi/test/PingPong.scala
similarity index 83%
rename from akka-osgi/src/test/scala/akka/osgi/test/PingPong.scala
rename to akka-osgi/src/test/scala/org/apache/pekko/osgi/test/PingPong.scala
index 198e5d5d52..b5387a2592 100644
--- a/akka-osgi/src/test/scala/akka/osgi/test/PingPong.scala
+++ b/akka-osgi/src/test/scala/org/apache/pekko/osgi/test/PingPong.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.osgi.test
+package org.apache.pekko.osgi.test
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 
 /**
  * Simple ping-pong actor, used for testing
diff --git a/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala b/akka-osgi/src/test/scala/org/apache/pekko/osgi/test/TestActivators.scala
similarity index 73%
rename from akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala
rename to akka-osgi/src/test/scala/org/apache/pekko/osgi/test/TestActivators.scala
index efa5c7a4fa..9082f38abf 100644
--- a/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala
+++ b/akka-osgi/src/test/scala/org/apache/pekko/osgi/test/TestActivators.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.osgi.test
+package org.apache.pekko.osgi.test
 
 import PingPong._
 import org.osgi.framework.BundleContext
 
-import akka.actor.{ ActorSystem, Props }
-import akka.osgi.ActorSystemActivator
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, Props }
+import pekko.osgi.ActorSystemActivator
 
 /**
- * A set of [[akka.osgi.ActorSystemActivator]]s for testing purposes
+ * A set of [[pekko.osgi.ActorSystemActivator]]s for testing purposes
  */
 object TestActivators {
 
@@ -32,7 +33,7 @@ class PingPongActorSystemActivator extends ActorSystemActivator {
 }
 
 /**
- * [[akka.osgi.ActorSystemActivator]] implementation that determines [[akka.actor.ActorSystem]] name at runtime
+ * [[pekko.osgi.ActorSystemActivator]] implementation that determines [[pekko.actor.ActorSystem]] name at runtime
  */
 class RuntimeNameActorSystemActivator extends ActorSystemActivator {
 
diff --git a/akka-persistence-query/src/main/java/akka/persistence/query/internal/protobuf/QueryMessages.java b/akka-persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java
similarity index 66%
rename from akka-persistence-query/src/main/java/akka/persistence/query/internal/protobuf/QueryMessages.java
rename to akka-persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java
index e463e2a7d2..8db06de2f3 100644
--- a/akka-persistence-query/src/main/java/akka/persistence/query/internal/protobuf/QueryMessages.java
+++ b/akka-persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java
@@ -5,22 +5,23 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: QueryMessages.proto
 
-package akka.persistence.query.internal.protobuf;
+package org.apache.pekko.persistence.query.internal.protobuf;
 
 public final class QueryMessages {
   private QueryMessages() {}
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {}
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {}
 
-  public static void registerAllExtensions(akka.protobufv3.internal.ExtensionRegistry registry) {
-    registerAllExtensions((akka.protobufv3.internal.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
+    registerAllExtensions((org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
 
   public interface EventEnvelopeOrBuilder
       extends
-      // @@protoc_insertion_point(interface_extends:akka.persistence.query.EventEnvelope)
-      akka.protobufv3.internal.MessageOrBuilder {
+      // @@protoc_insertion_point(interface_extends:org.apache.pekko.persistence.query.EventEnvelope)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string persistence_id = 1;
@@ -39,7 +40,7 @@ public final class QueryMessages {
      *
      * @return The bytes for persistenceId.
      */
-    akka.protobufv3.internal.ByteString getPersistenceIdBytes();
+    org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes();
 
     /**
      * required string entity_type = 2;
@@ -58,7 +59,7 @@ public final class QueryMessages {
      *
      * @return The bytes for entityType.
      */
-    akka.protobufv3.internal.ByteString getEntityTypeBytes();
+    org.apache.pekko.protobufv3.internal.ByteString getEntityTypeBytes();
 
     /**
      * required int32 slice = 3;
@@ -116,7 +117,7 @@ public final class QueryMessages {
      *
      * @return The bytes for offset.
      */
-    akka.protobufv3.internal.ByteString getOffsetBytes();
+    org.apache.pekko.protobufv3.internal.ByteString getOffsetBytes();
 
     /**
      * required string offset_manifest = 7;
@@ -135,7 +136,7 @@ public final class QueryMessages {
      *
      * @return The bytes for offsetManifest.
      */
-    akka.protobufv3.internal.ByteString getOffsetManifestBytes();
+    org.apache.pekko.protobufv3.internal.ByteString getOffsetManifestBytes();
 
     /**
      * optional .Payload event = 8;
@@ -148,9 +149,9 @@ public final class QueryMessages {
      *
      * @return The event.
      */
-    akka.remote.ContainerFormats.Payload getEvent();
+    org.apache.pekko.remote.ContainerFormats.Payload getEvent();
     /** optional .Payload event = 8; */
-    akka.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder();
 
     /**
      * optional .Payload metadata = 9;
@@ -163,26 +164,28 @@ public final class QueryMessages {
      *
      * @return The metadata.
      */
-    akka.remote.ContainerFormats.Payload getMetadata();
+    org.apache.pekko.remote.ContainerFormats.Payload getMetadata();
     /** optional .Payload metadata = 9; */
-    akka.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder();
   }
   /**
    *
    *
    * 
    -   * for akka.persistence.query.typed.EventEnvelope
+   * for org.apache.pekko.persistence.query.typed.EventEnvelope
    * 
    
    *
-   * Protobuf type {@code akka.persistence.query.EventEnvelope}
+   * Protobuf type {@code org.apache.pekko.persistence.query.EventEnvelope}
    */
-  public static final class EventEnvelope extends akka.protobufv3.internal.GeneratedMessageV3
+  public static final class EventEnvelope
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
-      // @@protoc_insertion_point(message_implements:akka.persistence.query.EventEnvelope)
+      // @@protoc_insertion_point(message_implements:org.apache.pekko.persistence.query.EventEnvelope)
       EventEnvelopeOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use EventEnvelope.newBuilder() to construct.
-    private EventEnvelope(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private EventEnvelope(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
@@ -196,26 +199,26 @@ public final class QueryMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new EventEnvelope();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private EventEnvelope(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -226,14 +229,14 @@ public final class QueryMessages {
               break;
             case 10:
               {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 persistenceId_ = bs;
                 break;
               }
             case 18:
               {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000002;
                 entityType_ = bs;
                 break;
@@ -258,27 +261,27 @@ public final class QueryMessages {
               }
             case 50:
               {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000020;
                 offset_ = bs;
                 break;
               }
             case 58:
               {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000040;
                 offsetManifest_ = bs;
                 break;
               }
             case 66:
               {
-                akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+                org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000080) != 0)) {
                   subBuilder = event_.toBuilder();
                 }
                 event_ =
                     input.readMessage(
-                        akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+                        org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(event_);
                   event_ = subBuilder.buildPartial();
@@ -288,13 +291,13 @@ public final class QueryMessages {
               }
             case 74:
               {
-                akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+                org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000100) != 0)) {
                   subBuilder = metadata_.toBuilder();
                 }
                 metadata_ =
                     input.readMessage(
-                        akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+                        org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(metadata_);
                   metadata_ = subBuilder.buildPartial();
@@ -311,10 +314,10 @@ public final class QueryMessages {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
@@ -322,19 +325,22 @@ public final class QueryMessages {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.query.internal.protobuf.QueryMessages
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
           .internal_static_akka_persistence_query_EventEnvelope_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.query.internal.protobuf.QueryMessages
+      return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
           .internal_static_akka_persistence_query_EventEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope.class,
-              akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope.Builder.class);
+              org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+                  .class,
+              org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+                  .Builder.class);
     }
 
     private int bitField0_;
@@ -358,7 +364,8 @@ public final class QueryMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           persistenceId_ = s;
@@ -371,15 +378,15 @@ public final class QueryMessages {
      *
      * @return The bytes for persistenceId.
      */
-    public akka.protobufv3.internal.ByteString getPersistenceIdBytes() {
+    public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
       java.lang.Object ref = persistenceId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b =
-            akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
         persistenceId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -403,7 +410,8 @@ public final class QueryMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           entityType_ = s;
@@ -416,15 +424,15 @@ public final class QueryMessages {
      *
      * @return The bytes for entityType.
      */
-    public akka.protobufv3.internal.ByteString getEntityTypeBytes() {
+    public org.apache.pekko.protobufv3.internal.ByteString getEntityTypeBytes() {
       java.lang.Object ref = entityType_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b =
-            akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
         entityType_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -505,7 +513,8 @@ public final class QueryMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           offset_ = s;
@@ -518,15 +527,15 @@ public final class QueryMessages {
      *
      * @return The bytes for offset.
      */
-    public akka.protobufv3.internal.ByteString getOffsetBytes() {
+    public org.apache.pekko.protobufv3.internal.ByteString getOffsetBytes() {
       java.lang.Object ref = offset_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b =
-            akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
         offset_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -550,7 +559,8 @@ public final class QueryMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           offsetManifest_ = s;
@@ -563,20 +573,20 @@ public final class QueryMessages {
      *
      * @return The bytes for offsetManifest.
      */
-    public akka.protobufv3.internal.ByteString getOffsetManifestBytes() {
+    public org.apache.pekko.protobufv3.internal.ByteString getOffsetManifestBytes() {
       java.lang.Object ref = offsetManifest_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b =
-            akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
         offsetManifest_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int EVENT_FIELD_NUMBER = 8;
-    private akka.remote.ContainerFormats.Payload event_;
+    private org.apache.pekko.remote.ContainerFormats.Payload event_;
     /**
      * optional .Payload event = 8;
      *
@@ -590,16 +600,20 @@ public final class QueryMessages {
      *
      * @return The event.
      */
-    public akka.remote.ContainerFormats.Payload getEvent() {
-      return event_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : event_;
+    public org.apache.pekko.remote.ContainerFormats.Payload getEvent() {
+      return event_ == null
+          ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
+          : event_;
     }
     /** optional .Payload event = 8; */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder() {
-      return event_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : event_;
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder() {
+      return event_ == null
+          ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
+          : event_;
     }
 
     public static final int METADATA_FIELD_NUMBER = 9;
-    private akka.remote.ContainerFormats.Payload metadata_;
+    private org.apache.pekko.remote.ContainerFormats.Payload metadata_;
     /**
      * optional .Payload metadata = 9;
      *
@@ -613,15 +627,15 @@ public final class QueryMessages {
      *
      * @return The metadata.
      */
-    public akka.remote.ContainerFormats.Payload getMetadata() {
+    public org.apache.pekko.remote.ContainerFormats.Payload getMetadata() {
       return metadata_ == null
-          ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+          ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
           : metadata_;
     }
     /** optional .Payload metadata = 9; */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder() {
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder() {
       return metadata_ == null
-          ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+          ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
           : metadata_;
     }
 
@@ -678,13 +692,14 @@ public final class QueryMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, persistenceId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+            output, 1, persistenceId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, entityType_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, entityType_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt32(3, slice_);
@@ -696,10 +711,11 @@ public final class QueryMessages {
         output.writeInt64(5, timestamp_);
       }
       if (((bitField0_ & 0x00000020) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 6, offset_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 6, offset_);
       }
       if (((bitField0_ & 0x00000040) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 7, offsetManifest_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+            output, 7, offsetManifest_);
       }
       if (((bitField0_ & 0x00000080) != 0)) {
         output.writeMessage(8, getEvent());
@@ -717,31 +733,44 @@ public final class QueryMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, persistenceId_);
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                1, persistenceId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, entityType_);
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                2, entityType_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeInt32Size(3, slice_);
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt32Size(3, slice_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeInt64Size(4, sequenceNr_);
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(4, sequenceNr_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeInt64Size(5, timestamp_);
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(5, timestamp_);
       }
       if (((bitField0_ & 0x00000020) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(6, offset_);
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(6, offset_);
       }
       if (((bitField0_ & 0x00000040) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(7, offsetManifest_);
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                7, offsetManifest_);
       }
       if (((bitField0_ & 0x00000080) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(8, getEvent());
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                8, getEvent());
       }
       if (((bitField0_ & 0x00000100) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(9, getMetadata());
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                9, getMetadata());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -753,11 +782,13 @@ public final class QueryMessages {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope)) {
+      if (!(obj
+          instanceof
+          org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope)) {
         return super.equals(obj);
       }
-      akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope other =
-          (akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope) obj;
+      org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope other =
+          (org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope) obj;
 
       if (hasPersistenceId() != other.hasPersistenceId()) return false;
       if (hasPersistenceId()) {
@@ -820,11 +851,12 @@ public final class QueryMessages {
       }
       if (hasSequenceNr()) {
         hash = (37 * hash) + SEQUENCE_NR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(getSequenceNr());
+        hash =
+            (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getSequenceNr());
       }
       if (hasTimestamp()) {
         hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(getTimestamp());
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getTimestamp());
       }
       if (hasOffset()) {
         hash = (37 * hash) + OFFSET_FIELD_NUMBER;
@@ -847,78 +879,91 @@ public final class QueryMessages {
       return hash;
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        java.nio.ByteBuffer data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(java.nio.ByteBuffer data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        java.nio.ByteBuffer data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(
+            java.nio.ByteBuffer data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        java.io.InputStream input, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
-        parseDelimitedFrom(
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -932,7 +977,8 @@ public final class QueryMessages {
     }
 
     public static Builder newBuilder(
-        akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope prototype) {
+        org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+            prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
@@ -943,7 +989,7 @@ public final class QueryMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -951,44 +997,48 @@ public final class QueryMessages {
      *
      *
      * 
    -     * for akka.persistence.query.typed.EventEnvelope
+     * for org.apache.pekko.persistence.query.typed.EventEnvelope
      * 
    
      *
-     * Protobuf type {@code akka.persistence.query.EventEnvelope}
+     * Protobuf type {@code org.apache.pekko.persistence.query.EventEnvelope}
      */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
-        // @@protoc_insertion_point(builder_implements:akka.persistence.query.EventEnvelope)
-        akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelopeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.query.internal.protobuf.QueryMessages
+        // @@protoc_insertion_point(builder_implements:org.apache.pekko.persistence.query.EventEnvelope)
+        org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelopeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
             .internal_static_akka_persistence_query_EventEnvelope_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.query.internal.protobuf.QueryMessages
+        return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
             .internal_static_akka_persistence_query_EventEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope.class,
-                akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope.Builder.class);
+                org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+                    .class,
+                org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+                    .Builder.class);
       }
 
       // Construct using
-      // akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope.newBuilder()
+      // org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
           getEventFieldBuilder();
           getMetadataFieldBuilder();
         }
@@ -1027,21 +1077,22 @@ public final class QueryMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.query.internal.protobuf.QueryMessages
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
             .internal_static_akka_persistence_query_EventEnvelope_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+      public org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
           getDefaultInstanceForType() {
-        return akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+        return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
             .getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope build() {
-        akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope result =
+      public org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+          build() {
+        org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope result =
             buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
@@ -1050,9 +1101,11 @@ public final class QueryMessages {
       }
 
       @java.lang.Override
-      public akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope buildPartial() {
-        akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope result =
-            new akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope(this);
+      public org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+          buildPartial() {
+        org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope result =
+            new org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope(
+                this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1111,23 +1164,26 @@ public final class QueryMessages {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -1135,15 +1191,19 @@ public final class QueryMessages {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other
+            instanceof
+            org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope) {
           return mergeFrom(
-              (akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope) other);
+              (org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope)
+                  other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -1151,9 +1211,9 @@ public final class QueryMessages {
       }
 
       public Builder mergeFrom(
-          akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope other) {
+          org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope other) {
         if (other
-            == akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+            == org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
                 .getDefaultInstance()) return this;
         if (other.hasPersistenceId()) {
           bitField0_ |= 0x00000001;
@@ -1233,15 +1293,16 @@ public final class QueryMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope parsedMessage = null;
+        org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+            parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope)
+              (org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -1271,7 +1332,8 @@ public final class QueryMessages {
       public java.lang.String getPersistenceId() {
         java.lang.Object ref = persistenceId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             persistenceId_ = s;
@@ -1286,15 +1348,15 @@ public final class QueryMessages {
        *
        * @return The bytes for persistenceId.
        */
-      public akka.protobufv3.internal.ByteString getPersistenceIdBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
         java.lang.Object ref = persistenceId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           persistenceId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1329,7 +1391,7 @@ public final class QueryMessages {
        * @param value The bytes for persistenceId to set.
        * @return This builder for chaining.
        */
-      public Builder setPersistenceIdBytes(akka.protobufv3.internal.ByteString value) {
+      public Builder setPersistenceIdBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1356,7 +1418,8 @@ public final class QueryMessages {
       public java.lang.String getEntityType() {
         java.lang.Object ref = entityType_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             entityType_ = s;
@@ -1371,15 +1434,15 @@ public final class QueryMessages {
        *
        * @return The bytes for entityType.
        */
-      public akka.protobufv3.internal.ByteString getEntityTypeBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getEntityTypeBytes() {
         java.lang.Object ref = entityType_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           entityType_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1414,7 +1477,7 @@ public final class QueryMessages {
        * @param value The bytes for entityType to set.
        * @return This builder for chaining.
        */
-      public Builder setEntityTypeBytes(akka.protobufv3.internal.ByteString value) {
+      public Builder setEntityTypeBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1564,7 +1627,8 @@ public final class QueryMessages {
       public java.lang.String getOffset() {
         java.lang.Object ref = offset_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             offset_ = s;
@@ -1579,15 +1643,15 @@ public final class QueryMessages {
        *
        * @return The bytes for offset.
        */
-      public akka.protobufv3.internal.ByteString getOffsetBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getOffsetBytes() {
         java.lang.Object ref = offset_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           offset_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1622,7 +1686,7 @@ public final class QueryMessages {
        * @param value The bytes for offset to set.
        * @return This builder for chaining.
        */
-      public Builder setOffsetBytes(akka.protobufv3.internal.ByteString value) {
+      public Builder setOffsetBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1649,7 +1713,8 @@ public final class QueryMessages {
       public java.lang.String getOffsetManifest() {
         java.lang.Object ref = offsetManifest_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             offsetManifest_ = s;
@@ -1664,15 +1729,15 @@ public final class QueryMessages {
        *
        * @return The bytes for offsetManifest.
        */
-      public akka.protobufv3.internal.ByteString getOffsetManifestBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getOffsetManifestBytes() {
         java.lang.Object ref = offsetManifest_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           offsetManifest_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1707,7 +1772,7 @@ public final class QueryMessages {
        * @param value The bytes for offsetManifest to set.
        * @return This builder for chaining.
        */
-      public Builder setOffsetManifestBytes(akka.protobufv3.internal.ByteString value) {
+      public Builder setOffsetManifestBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1717,11 +1782,11 @@ public final class QueryMessages {
         return this;
       }
 
-      private akka.remote.ContainerFormats.Payload event_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload,
-              akka.remote.ContainerFormats.Payload.Builder,
-              akka.remote.ContainerFormats.PayloadOrBuilder>
+      private org.apache.pekko.remote.ContainerFormats.Payload event_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload,
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+              org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           eventBuilder_;
       /**
        * optional .Payload event = 8;
@@ -1736,17 +1801,17 @@ public final class QueryMessages {
        *
        * @return The event.
        */
-      public akka.remote.ContainerFormats.Payload getEvent() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getEvent() {
         if (eventBuilder_ == null) {
           return event_ == null
-              ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+              ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
               : event_;
         } else {
           return eventBuilder_.getMessage();
         }
       }
       /** optional .Payload event = 8; */
-      public Builder setEvent(akka.remote.ContainerFormats.Payload value) {
+      public Builder setEvent(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (eventBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1760,7 +1825,8 @@ public final class QueryMessages {
         return this;
       }
       /** optional .Payload event = 8; */
-      public Builder setEvent(akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+      public Builder setEvent(
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (eventBuilder_ == null) {
           event_ = builderForValue.build();
           onChanged();
@@ -1771,13 +1837,13 @@ public final class QueryMessages {
         return this;
       }
       /** optional .Payload event = 8; */
-      public Builder mergeEvent(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergeEvent(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (eventBuilder_ == null) {
           if (((bitField0_ & 0x00000080) != 0)
               && event_ != null
-              && event_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              && event_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             event_ =
-                akka.remote.ContainerFormats.Payload.newBuilder(event_)
+                org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(event_)
                     .mergeFrom(value)
                     .buildPartial();
           } else {
@@ -1802,44 +1868,44 @@ public final class QueryMessages {
         return this;
       }
       /** optional .Payload event = 8; */
-      public akka.remote.ContainerFormats.Payload.Builder getEventBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getEventBuilder() {
         bitField0_ |= 0x00000080;
         onChanged();
         return getEventFieldBuilder().getBuilder();
       }
       /** optional .Payload event = 8; */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder() {
         if (eventBuilder_ != null) {
           return eventBuilder_.getMessageOrBuilder();
         } else {
           return event_ == null
-              ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+              ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
               : event_;
         }
       }
       /** optional .Payload event = 8; */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload,
-              akka.remote.ContainerFormats.Payload.Builder,
-              akka.remote.ContainerFormats.PayloadOrBuilder>
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload,
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+              org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           getEventFieldBuilder() {
         if (eventBuilder_ == null) {
           eventBuilder_ =
-              new akka.protobufv3.internal.SingleFieldBuilderV3<
-                  akka.remote.ContainerFormats.Payload,
-                  akka.remote.ContainerFormats.Payload.Builder,
-                  akka.remote.ContainerFormats.PayloadOrBuilder>(
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.remote.ContainerFormats.Payload,
+                  org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+                  org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getEvent(), getParentForChildren(), isClean());
           event_ = null;
         }
         return eventBuilder_;
       }
 
-      private akka.remote.ContainerFormats.Payload metadata_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload,
-              akka.remote.ContainerFormats.Payload.Builder,
-              akka.remote.ContainerFormats.PayloadOrBuilder>
+      private org.apache.pekko.remote.ContainerFormats.Payload metadata_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload,
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+              org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           metadataBuilder_;
       /**
        * optional .Payload metadata = 9;
@@ -1854,17 +1920,17 @@ public final class QueryMessages {
        *
        * @return The metadata.
        */
-      public akka.remote.ContainerFormats.Payload getMetadata() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getMetadata() {
         if (metadataBuilder_ == null) {
           return metadata_ == null
-              ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+              ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
               : metadata_;
         } else {
           return metadataBuilder_.getMessage();
         }
       }
       /** optional .Payload metadata = 9; */
-      public Builder setMetadata(akka.remote.ContainerFormats.Payload value) {
+      public Builder setMetadata(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (metadataBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1878,7 +1944,8 @@ public final class QueryMessages {
         return this;
       }
       /** optional .Payload metadata = 9; */
-      public Builder setMetadata(akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+      public Builder setMetadata(
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (metadataBuilder_ == null) {
           metadata_ = builderForValue.build();
           onChanged();
@@ -1889,13 +1956,14 @@ public final class QueryMessages {
         return this;
       }
       /** optional .Payload metadata = 9; */
-      public Builder mergeMetadata(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergeMetadata(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (metadataBuilder_ == null) {
           if (((bitField0_ & 0x00000100) != 0)
               && metadata_ != null
-              && metadata_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              && metadata_
+                  != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             metadata_ =
-                akka.remote.ContainerFormats.Payload.newBuilder(metadata_)
+                org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(metadata_)
                     .mergeFrom(value)
                     .buildPartial();
           } else {
@@ -1920,33 +1988,33 @@ public final class QueryMessages {
         return this;
       }
       /** optional .Payload metadata = 9; */
-      public akka.remote.ContainerFormats.Payload.Builder getMetadataBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getMetadataBuilder() {
         bitField0_ |= 0x00000100;
         onChanged();
         return getMetadataFieldBuilder().getBuilder();
       }
       /** optional .Payload metadata = 9; */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder() {
         if (metadataBuilder_ != null) {
           return metadataBuilder_.getMessageOrBuilder();
         } else {
           return metadata_ == null
-              ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+              ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
               : metadata_;
         }
       }
       /** optional .Payload metadata = 9; */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload,
-              akka.remote.ContainerFormats.Payload.Builder,
-              akka.remote.ContainerFormats.PayloadOrBuilder>
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload,
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+              org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ =
-              new akka.protobufv3.internal.SingleFieldBuilderV3<
-                  akka.remote.ContainerFormats.Payload,
-                  akka.remote.ContainerFormats.Payload.Builder,
-                  akka.remote.ContainerFormats.PayloadOrBuilder>(
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.remote.ContainerFormats.Payload,
+                  org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+                  org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getMetadata(), getParentForChildren(), isClean());
           metadata_ = null;
         }
@@ -1955,93 +2023,96 @@ public final class QueryMessages {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
-      // @@protoc_insertion_point(builder_scope:akka.persistence.query.EventEnvelope)
+      // @@protoc_insertion_point(builder_scope:org.apache.pekko.persistence.query.EventEnvelope)
     }
 
-    // @@protoc_insertion_point(class_scope:akka.persistence.query.EventEnvelope)
-    private static final akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+    // @@protoc_insertion_point(class_scope:org.apache.pekko.persistence.query.EventEnvelope)
+    private static final org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
+            .EventEnvelope
         DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope();
+      DEFAULT_INSTANCE =
+          new org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope();
     }
 
-    public static akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+    public static org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
           @java.lang.Override
           public EventEnvelope parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
             return new EventEnvelope(input, extensionRegistry);
           }
         };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
+    public org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_akka_persistence_query_EventEnvelope_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_akka_persistence_query_EventEnvelope_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor getDescriptor() {
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
   }
 
-  private static akka.protobufv3.internal.Descriptors.FileDescriptor descriptor;
+  private static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor descriptor;
 
   static {
     java.lang.String[] descriptorData = {
-      "\n\023QueryMessages.proto\022\026akka.persistence."
+      "\n\023QueryMessages.proto\022\026org.apache.pekko.persistence."
           + "query\032\026ContainerFormats.proto\"\321\001\n\rEventE"
           + "nvelope\022\026\n\016persistence_id\030\001 \002(\t\022\023\n\013entit"
           + "y_type\030\002 \002(\t\022\r\n\005slice\030\003 \002(\005\022\023\n\013sequence_"
           + "nr\030\004 \002(\003\022\021\n\ttimestamp\030\005 \002(\003\022\016\n\006offset\030\006 "
           + "\002(\t\022\027\n\017offset_manifest\030\007 \002(\t\022\027\n\005event\030\010 "
           + "\001(\0132\010.Payload\022\032\n\010metadata\030\t \001(\0132\010.Payloa"
-          + "dB,\n(akka.persistence.query.internal.pro"
+          + "dB,\n(org.apache.pekko.persistence.query.internal.pro"
           + "tobufH\001"
     };
     descriptor =
-        akka.protobufv3.internal.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData,
-            new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
-              akka.remote.ContainerFormats.getDescriptor(),
-            });
+        org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
+            .internalBuildGeneratedFileFrom(
+                descriptorData,
+                new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
+                  org.apache.pekko.remote.ContainerFormats.getDescriptor(),
+                });
     internal_static_akka_persistence_query_EventEnvelope_descriptor =
         getDescriptor().getMessageTypes().get(0);
     internal_static_akka_persistence_query_EventEnvelope_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_akka_persistence_query_EventEnvelope_descriptor,
             new java.lang.String[] {
               "PersistenceId",
@@ -2054,7 +2125,7 @@ public final class QueryMessages {
               "Event",
               "Metadata",
             });
-    akka.remote.ContainerFormats.getDescriptor();
+    org.apache.pekko.remote.ContainerFormats.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/akka-persistence-query/src/main/protobuf/QueryMessages.proto b/akka-persistence-query/src/main/protobuf/QueryMessages.proto
index d1cc194f57..45b41336cb 100644
--- a/akka-persistence-query/src/main/protobuf/QueryMessages.proto
+++ b/akka-persistence-query/src/main/protobuf/QueryMessages.proto
@@ -4,13 +4,13 @@
 
 syntax = "proto2";
 
-package akka.persistence.query;
+package org.apache.pekko.persistence.query;
 
-option java_package = "akka.persistence.query.internal.protobuf";
+option java_package = "org.apache.pekko.persistence.query.internal.protobuf";
 option optimize_for = SPEED;
 import "ContainerFormats.proto";
 
-// for akka.persistence.query.typed.EventEnvelope
+// for org.apache.pekko.persistence.query.typed.EventEnvelope
 message EventEnvelope {
   required string persistence_id = 1;
   required string entity_type = 2;
diff --git a/akka-persistence-query/src/main/resources/reference.conf b/akka-persistence-query/src/main/resources/reference.conf
index 282361ca88..4c29cc60b6 100644
--- a/akka-persistence-query/src/main/resources/reference.conf
+++ b/akka-persistence-query/src/main/resources/reference.conf
@@ -9,7 +9,7 @@
 # Configuration for the LeveldbReadJournal
 akka.persistence.query.journal.leveldb {
   # Implementation class of the LevelDB ReadJournalProvider
-  class = "akka.persistence.query.journal.leveldb.LeveldbReadJournalProvider"
+  class = "org.apache.pekko.persistence.query.journal.leveldb.LeveldbReadJournalProvider"
   
   # Absolute path to the write journal plugin configuration entry that this 
   # query journal will connect to. That must be a LeveldbJournal or SharedLeveldbJournal.
@@ -30,13 +30,13 @@ akka.persistence.query.journal.leveldb {
 
 akka.actor {
   serializers {
-    akka-persistence-query = "akka.persistence.query.internal.QuerySerializer"
+    akka-persistence-query = "org.apache.pekko.persistence.query.internal.QuerySerializer"
   }
   serialization-bindings {
-    "akka.persistence.query.typed.EventEnvelope" = akka-persistence-query
-    "akka.persistence.query.Offset" = akka-persistence-query
+    "org.apache.pekko.persistence.query.typed.EventEnvelope" = akka-persistence-query
+    "org.apache.pekko.persistence.query.Offset" = akka-persistence-query
   }
   serialization-identifiers {
-    "akka.persistence.query.internal.QuerySerializer" = 39
+    "org.apache.pekko.persistence.query.internal.QuerySerializer" = 39
   }
 }
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/DurableStateChange.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/DurableStateChange.scala
similarity index 96%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/DurableStateChange.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/DurableStateChange.scala
index 6d1e24878d..60c9280176 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/DurableStateChange.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/DurableStateChange.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query
+package org.apache.pekko.persistence.query
 
-import akka.annotation.DoNotInherit
+import org.apache.pekko.annotation.DoNotInherit
 
 /**
  * The `DurableStateStoreQuery` stream elements for `DurableStateStoreQuery`.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/EventEnvelope.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/EventEnvelope.scala
similarity index 92%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/EventEnvelope.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/EventEnvelope.scala
index e291c3ec4c..52086ae722 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/EventEnvelope.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/EventEnvelope.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query
+package org.apache.pekko.persistence.query
 
 import java.util.Optional
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 import scala.runtime.AbstractFunction4
-import akka.util.HashCode
+import org.apache.pekko
+import pekko.util.HashCode
 
 // for binary compatibility (used to be a case class)
 object EventEnvelope extends AbstractFunction4[Offset, String, Long, Any, EventEnvelope] {
@@ -36,7 +37,7 @@ object EventEnvelope extends AbstractFunction4[Offset, String, Long, Any, EventE
 
 /**
  * Event wrapper adding meta data for the events in the result stream of
- * [[akka.persistence.query.scaladsl.EventsByTagQuery]] query, or similar queries.
+ * [[pekko.persistence.query.scaladsl.EventsByTagQuery]] query, or similar queries.
  *
  * The `timestamp` is the time the event was stored, in milliseconds since midnight, January 1, 1970 UTC
  * (same as `System.currentTimeMillis`).
@@ -95,7 +96,7 @@ final class EventEnvelope(
     new EventEnvelope(offset, persistenceId, sequenceNr, event, timestamp, this.eventMetadata)
 
   @InternalApi
-  private[akka] def withMetadata(metadata: Any): EventEnvelope =
+  private[pekko] def withMetadata(metadata: Any): EventEnvelope =
     new EventEnvelope(offset, persistenceId, sequenceNr, event, timestamp, Some(metadata))
 
   // Product4, for binary compatibility (used to be a case class)
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/Offset.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala
similarity index 91%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/Offset.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala
index df701b6039..df0095434a 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/Offset.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query
+package org.apache.pekko.persistence.query
 
 import java.time.Instant
 import java.util.UUID
 
-import akka.annotation.ApiMayChange
-import akka.util.UUIDComparator
+import org.apache.pekko
+import pekko.annotation.ApiMayChange
+import pekko.util.UUIDComparator
 
 object Offset {
 
@@ -24,7 +25,7 @@ abstract class Offset
 
 /**
  * Corresponds to an ordered sequence number for the events. Note that the corresponding
- * offset of each event is provided in the [[akka.persistence.query.EventEnvelope]],
+ * offset of each event is provided in the [[pekko.persistence.query.EventEnvelope]],
  * which makes it possible to resume the stream at a later point from a given offset.
  *
  * The `offset` is exclusive, i.e. the event with the exact same sequence number will not be included
@@ -37,7 +38,7 @@ final case class Sequence(value: Long) extends Offset with Ordered[Sequence] {
 
 /**
  * Corresponds to an ordered unique identifier of the events. Note that the corresponding
- * offset of each event is provided in the [[akka.persistence.query.EventEnvelope]],
+ * offset of each event is provided in the [[pekko.persistence.query.EventEnvelope]],
  * which makes it possible to resume the stream at a later point from a given offset.
  *
  * The `offset` is exclusive, i.e. the event with the exact same sequence number will not be included
@@ -96,7 +97,7 @@ final case class TimestampOffset(timestamp: Instant, readTimestamp: Instant, see
 
   /** Java API */
   def getSeen(): java.util.Map[String, java.lang.Long] = {
-    import akka.util.ccompat.JavaConverters._
+    import org.apache.pekko.util.ccompat.JavaConverters._
     seen.map { case (pid, seqNr) => pid -> java.lang.Long.valueOf(seqNr) }.asJava
   }
 
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/PersistenceQuery.scala
similarity index 77%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/PersistenceQuery.scala
index 83ebd90b9a..e0df0c1c95 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/PersistenceQuery.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query
+package org.apache.pekko.persistence.query
 
 import scala.reflect.ClassTag
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.actor._
-import akka.annotation.InternalApi
-import akka.persistence.{ PersistencePlugin, PluginProvider }
-import akka.persistence.query.scaladsl.ReadJournal
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.InternalApi
+import pekko.persistence.{ PersistencePlugin, PluginProvider }
+import pekko.persistence.query.scaladsl.ReadJournal
+import pekko.util.unused
 
 /**
  * Persistence extension for queries.
@@ -27,7 +28,7 @@ object PersistenceQuery extends ExtensionId[PersistenceQuery] with ExtensionIdPr
   def lookup: PersistenceQuery.type = PersistenceQuery
 
   @InternalApi
-  private[akka] val pluginProvider: PluginProvider[ReadJournalProvider, ReadJournal, javadsl.ReadJournal] =
+  private[pekko] val pluginProvider: PluginProvider[ReadJournalProvider, ReadJournal, javadsl.ReadJournal] =
     new PluginProvider[ReadJournalProvider, scaladsl.ReadJournal, javadsl.ReadJournal] {
       override def scalaDsl(t: ReadJournalProvider): ReadJournal = t.scaladslReadJournal()
       override def javaDsl(t: ReadJournalProvider): javadsl.ReadJournal = t.javadslReadJournal()
@@ -42,7 +43,7 @@ class PersistenceQuery(system: ExtendedActorSystem)
     with Extension {
 
   /**
-   * Scala API: Returns the [[akka.persistence.query.scaladsl.ReadJournal]] specified by the given
+   * Scala API: Returns the [[pekko.persistence.query.scaladsl.ReadJournal]] specified by the given
    * read journal configuration entry.
    *
    * The provided readJournalPluginConfig will be used to configure the journal plugin instead of the actor system
@@ -52,14 +53,14 @@ class PersistenceQuery(system: ExtendedActorSystem)
     pluginFor(readJournalPluginId, readJournalPluginConfig).scaladslPlugin.asInstanceOf[T]
 
   /**
-   * Scala API: Returns the [[akka.persistence.query.scaladsl.ReadJournal]] specified by the given
+   * Scala API: Returns the [[pekko.persistence.query.scaladsl.ReadJournal]] specified by the given
    * read journal configuration entry.
    */
   final def readJournalFor[T <: scaladsl.ReadJournal](readJournalPluginId: String): T =
     readJournalFor(readJournalPluginId, ConfigFactory.empty)
 
   /**
-   * Java API: Returns the [[akka.persistence.query.javadsl.ReadJournal]] specified by the given
+   * Java API: Returns the [[pekko.persistence.query.javadsl.ReadJournal]] specified by the given
    * read journal configuration entry.
    */
   final def getReadJournalFor[T <: javadsl.ReadJournal](
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/ReadJournalProvider.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/ReadJournalProvider.scala
similarity index 79%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/ReadJournalProvider.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/ReadJournalProvider.scala
index bde92061e3..a7be3fdfe9 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/ReadJournalProvider.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/ReadJournalProvider.scala
@@ -2,16 +2,16 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query
+package org.apache.pekko.persistence.query
 
 /**
  * A query plugin must implement a class that implements this trait.
  * It provides the concrete implementations for the Java and Scala APIs.
  *
  * A read journal plugin must provide implementations for both
- * `akka.persistence.query.scaladsl.ReadJournal` and `akka.persistence.query.javadsl.ReadJournal`.
+ * `org.apache.pekko.persistence.query.scaladsl.ReadJournal` and `org.apache.pekko.persistence.query.javadsl.ReadJournal`.
  * The plugin must implement both the `scaladsl` and the `javadsl` traits because the
- * `akka.stream.scaladsl.Source` and `akka.stream.javadsl.Source` are different types
+ * `org.apache.pekko.stream.scaladsl.Source` and `org.apache.pekko.stream.javadsl.Source` are different types
  * and even though those types can easily be converted to each other it is most convenient
  * for the end user to get access to the Java or Scala `Source` directly.
  * One of the implementations can delegate to the other.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/internal/QuerySerializer.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/internal/QuerySerializer.scala
similarity index 90%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/internal/QuerySerializer.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/internal/QuerySerializer.scala
index e2030a19ad..aa90c0b5f4 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/internal/QuerySerializer.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/internal/QuerySerializer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.internal
+package org.apache.pekko.persistence.query.internal
 
 import java.io.NotSerializableException
 import java.nio.charset.StandardCharsets.UTF_8
@@ -10,27 +10,28 @@ import java.time.Instant
 import java.util.Base64
 import java.util.UUID
 import scala.util.control.NonFatal
-import akka.annotation.InternalApi
-import akka.event.Logging
-import akka.persistence.query.NoOffset
-import akka.persistence.query.Offset
-import akka.persistence.query.Sequence
-import akka.persistence.query.TimeBasedUUID
-import akka.persistence.query.TimestampOffset
-import akka.persistence.query.internal.protobuf.QueryMessages
-import akka.persistence.query.typed.EventEnvelope
-import akka.remote.serialization.WrappedPayloadSupport.{ deserializePayload, payloadBuilder }
-import akka.serialization.BaseSerializer
-import akka.serialization.SerializationExtension
-import akka.serialization.SerializerWithStringManifest
-import akka.serialization.Serializers
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.event.Logging
+import pekko.persistence.query.NoOffset
+import pekko.persistence.query.Offset
+import pekko.persistence.query.Sequence
+import pekko.persistence.query.TimeBasedUUID
+import pekko.persistence.query.TimestampOffset
+import pekko.persistence.query.internal.protobuf.QueryMessages
+import pekko.persistence.query.typed.EventEnvelope
+import pekko.remote.serialization.WrappedPayloadSupport.{ deserializePayload, payloadBuilder }
+import pekko.serialization.BaseSerializer
+import pekko.serialization.SerializationExtension
+import pekko.serialization.SerializerWithStringManifest
+import pekko.serialization.Serializers
 
 /**
  * INTERNAL API
  *
  * Serializer for [[EventEnvelope]] and [[Offset]].
  */
-@InternalApi private[akka] final class QuerySerializer(val system: akka.actor.ExtendedActorSystem)
+@InternalApi private[pekko] final class QuerySerializer(val system: pekko.actor.ExtendedActorSystem)
     extends SerializerWithStringManifest
     with BaseSerializer {
 
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala
similarity index 79%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala
index ace54b7e84..f80669ee36 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.javadsl
 
-import akka.NotUsed
-import akka.persistence.query.EventEnvelope
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.EventEnvelope
+import pekko.stream.javadsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this interface.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByTagQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/CurrentEventsByTagQuery.scala
similarity index 80%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByTagQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/CurrentEventsByTagQuery.scala
index 3f305cfc92..903bff2ec1 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByTagQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/CurrentEventsByTagQuery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.javadsl
 
-import akka.NotUsed
-import akka.persistence.query.{ EventEnvelope, Offset }
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.{ EventEnvelope, Offset }
+import pekko.stream.javadsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this interface.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentPersistenceIdsQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/CurrentPersistenceIdsQuery.scala
similarity index 80%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentPersistenceIdsQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/CurrentPersistenceIdsQuery.scala
index 622092249d..b85a0d7f9d 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentPersistenceIdsQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/CurrentPersistenceIdsQuery.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.javadsl
 
-import akka.NotUsed
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.javadsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this interface.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala
similarity index 85%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala
index e607c14112..2a24d38295 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStorePagedPersistenceIdsQuery.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.javadsl
 
 import java.util.Optional
 
-import akka.NotUsed
-import akka.persistence.state.javadsl.DurableStateStore
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.state.javadsl.DurableStateStore
+import pekko.stream.javadsl.Source
 
 /**
  * A DurableStateStore may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/DurableStateStoreQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStoreQuery.scala
similarity index 74%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/DurableStateStoreQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStoreQuery.scala
index 74dbc6ecfb..7b2a237249 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/DurableStateStoreQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/DurableStateStoreQuery.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.javadsl
 
-import akka.NotUsed
-import akka.persistence.query.DurableStateChange
-import akka.persistence.state.scaladsl.DurableStateStore
-import akka.persistence.query.Offset
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.state.javadsl.DurableStateStore
+import pekko.persistence.query.DurableStateChange
+import pekko.persistence.query.Offset
+import pekko.stream.javadsl.Source
 
 /**
  * Query API for reading durable state objects.
  *
- * For Java API see [[akka.persistence.query.javadsl.DurableStateStoreQuery]].
+ * For Scala API see [[pekko.persistence.query.scaladsl.DurableStateStoreQuery]].
  */
 trait DurableStateStoreQuery[A] extends DurableStateStore[A] {
 
@@ -26,11 +27,11 @@ trait DurableStateStoreQuery[A] extends DurableStateStore[A] {
    * This will return changes that occurred up to when the `Source` returned by this call is materialized. Changes to
    * objects made since materialization are not guaranteed to be included in the results.
    *
-   * The [[DurableStateChange]] elements can be [[akka.persistence.query.UpdatedDurableState]] or
-   * [[akka.persistence.query.DeletedDurableState]].
+   * The [[DurableStateChange]] elements can be [[pekko.persistence.query.UpdatedDurableState]] or
+   * [[pekko.persistence.query.DeletedDurableState]].
    *
    * @param tag The tag to get changes for.
-   * @param offset The offset to get changes since. Must either be [[akka.persistence.query.NoOffset]] to get
+   * @param offset The offset to get changes since. Must either be [[pekko.persistence.query.NoOffset]] to get
    *               changes since the beginning of time, or an offset that has been previously returned by this query.
    *               Any other offsets are invalid.
    * @return A source of change in state.
@@ -48,11 +49,11 @@ trait DurableStateStoreQuery[A] extends DurableStateStore[A] {
    * in quick succession are likely to be skipped, with only the last update resulting in a change from this
    * source.
    *
-   * The [[DurableStateChange]] elements can be [[akka.persistence.query.UpdatedDurableState]] or
-   * [[akka.persistence.query.DeletedDurableState]].
+   * The [[DurableStateChange]] elements can be [[pekko.persistence.query.UpdatedDurableState]] or
+   * [[pekko.persistence.query.DeletedDurableState]].
    *
    * @param tag The tag to get changes for.
-   * @param offset The offset to get changes since. Must either be [[akka.persistence.query.NoOffset]] to get
+   * @param offset The offset to get changes since. Must either be [[pekko.persistence.query.NoOffset]] to get
    *               changes since the beginning of time, or an offset that has been previously returned by this query.
    *               Any other offsets are invalid.
    * @return A source of change in state.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByPersistenceIdQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/EventsByPersistenceIdQuery.scala
similarity index 86%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByPersistenceIdQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/EventsByPersistenceIdQuery.scala
index 961cbf2298..9b998f2a48 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByPersistenceIdQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/EventsByPersistenceIdQuery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.javadsl
 
-import akka.NotUsed
-import akka.persistence.query.EventEnvelope
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.EventEnvelope
+import pekko.stream.javadsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this interface.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByTagQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/EventsByTagQuery.scala
similarity index 92%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByTagQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/EventsByTagQuery.scala
index 131284c43b..55b7fd3a6d 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByTagQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/EventsByTagQuery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.javadsl
 
-import akka.NotUsed
-import akka.persistence.query.{ EventEnvelope, Offset }
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.{ EventEnvelope, Offset }
+import pekko.stream.javadsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this interface.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/PagedPersistenceIdsQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PagedPersistenceIdsQuery.scala
similarity index 88%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/PagedPersistenceIdsQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PagedPersistenceIdsQuery.scala
index 226d1ed04b..395117d19f 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/PagedPersistenceIdsQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PagedPersistenceIdsQuery.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.javadsl
 
 import java.util.Optional
 
-import akka.NotUsed
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.javadsl.Source
 
 /**
  * A ReadJournal may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/PersistenceIdsQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PersistenceIdsQuery.scala
similarity index 85%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/PersistenceIdsQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PersistenceIdsQuery.scala
index 375037e354..33046baf85 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/PersistenceIdsQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/PersistenceIdsQuery.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.javadsl
 
-import akka.NotUsed
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.javadsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this interface.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/ReadJournal.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/ReadJournal.scala
similarity index 88%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/ReadJournal.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/ReadJournal.scala
index e6045c590c..755a61d3c9 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/ReadJournal.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/javadsl/ReadJournal.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.javadsl
 
 /**
  * API for reading persistent events and information derived
@@ -24,6 +24,6 @@ package akka.persistence.query.javadsl
  * Source events = journal.eventsByTag("mytag", 0L);
  * }}}
  *
- * For Scala API see [[akka.persistence.query.scaladsl.ReadJournal]].
+ * For Scala API see [[org.apache.pekko.persistence.query.scaladsl.ReadJournal]].
  */
 trait ReadJournal
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsStage.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/AllPersistenceIdsStage.scala
similarity index 72%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsStage.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/AllPersistenceIdsStage.scala
index 5b3c71063b..11fa800977 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsStage.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/AllPersistenceIdsStage.scala
@@ -2,26 +2,27 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
-import akka.actor.ActorRef
-import akka.annotation.InternalApi
-import akka.persistence.Persistence
-import akka.persistence.journal.leveldb.LeveldbJournal
-import akka.stream.Attributes
-import akka.stream.Materializer
-import akka.stream.Outlet
-import akka.stream.SourceShape
-import akka.stream.stage.GraphStage
-import akka.stream.stage.GraphStageLogic
-import akka.stream.stage.OutHandler
-import akka.stream.stage.TimerGraphStageLogicWithLogging
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.annotation.InternalApi
+import pekko.persistence.Persistence
+import pekko.persistence.journal.leveldb.LeveldbJournal
+import pekko.stream.Attributes
+import pekko.stream.Materializer
+import pekko.stream.Outlet
+import pekko.stream.SourceShape
+import pekko.stream.stage.GraphStage
+import pekko.stream.stage.GraphStageLogic
+import pekko.stream.stage.OutHandler
+import pekko.stream.stage.TimerGraphStageLogicWithLogging
 
 /**
  * INTERNAL API
  */
 @InternalApi
-final private[akka] class AllPersistenceIdsStage(liveQuery: Boolean, writeJournalPluginId: String, mat: Materializer)
+final private[pekko] class AllPersistenceIdsStage(liveQuery: Boolean, writeJournalPluginId: String, mat: Materializer)
     extends GraphStage[SourceShape[String]] {
 
   val out: Outlet[String] = Outlet("AllPersistenceIds.out")
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/Buffer.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/Buffer.scala
similarity index 73%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/Buffer.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/Buffer.scala
index 69273bfb8b..452835ba4c 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/Buffer.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/Buffer.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
 import java.util
 
-import akka.annotation.InternalApi
-import akka.stream.Outlet
-import akka.stream.stage.GraphStageLogic
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.stream.Outlet
+import pekko.stream.stage.GraphStageLogic
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala
similarity index 79%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala
index b4a55231f8..c93e27ba77 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala
@@ -2,35 +2,36 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
 import scala.concurrent.duration.FiniteDuration
-import akka.actor.ActorRef
-import akka.annotation.InternalApi
-import akka.persistence.JournalProtocol.RecoverySuccess
-import akka.persistence.JournalProtocol.ReplayMessages
-import akka.persistence.JournalProtocol.ReplayMessagesFailure
-import akka.persistence.JournalProtocol.ReplayedMessage
-import akka.persistence.Persistence
-import akka.persistence.journal.leveldb.LeveldbJournal
-import akka.persistence.journal.leveldb.LeveldbJournal.EventAppended
-import akka.persistence.query.EventEnvelope
-import akka.persistence.query.Sequence
-import akka.persistence.query.journal.leveldb.EventsByPersistenceIdStage.Continue
-import akka.stream.Attributes
-import akka.stream.Materializer
-import akka.stream.Outlet
-import akka.stream.SourceShape
-import akka.stream.stage.GraphStage
-import akka.stream.stage.GraphStageLogic
-import akka.stream.stage.OutHandler
-import akka.stream.stage.TimerGraphStageLogicWithLogging
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.annotation.InternalApi
+import pekko.persistence.JournalProtocol.RecoverySuccess
+import pekko.persistence.JournalProtocol.ReplayMessages
+import pekko.persistence.JournalProtocol.ReplayMessagesFailure
+import pekko.persistence.JournalProtocol.ReplayedMessage
+import pekko.persistence.Persistence
+import pekko.persistence.journal.leveldb.LeveldbJournal
+import pekko.persistence.journal.leveldb.LeveldbJournal.EventAppended
+import pekko.persistence.query.EventEnvelope
+import pekko.persistence.query.Sequence
+import pekko.persistence.query.journal.leveldb.EventsByPersistenceIdStage.Continue
+import pekko.stream.Attributes
+import pekko.stream.Materializer
+import pekko.stream.Outlet
+import pekko.stream.SourceShape
+import pekko.stream.stage.GraphStage
+import pekko.stream.stage.GraphStageLogic
+import pekko.stream.stage.OutHandler
+import pekko.stream.stage.TimerGraphStageLogicWithLogging
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object EventsByPersistenceIdStage {
+private[pekko] object EventsByPersistenceIdStage {
   case object Continue
 }
 
@@ -38,7 +39,7 @@ private[akka] object EventsByPersistenceIdStage {
  * INTERNAL API
  */
 @InternalApi
-final private[akka] class EventsByPersistenceIdStage(
+final private[pekko] class EventsByPersistenceIdStage(
     persistenceId: String,
     fromSequenceNr: Long,
     initialToSequenceNr: Long,
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagStage.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByTagStage.scala
similarity index 79%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagStage.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByTagStage.scala
index 34011cf2e2..e9b6407d21 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagStage.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByTagStage.scala
@@ -2,35 +2,36 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
 import scala.concurrent.duration.FiniteDuration
-import akka.actor.ActorRef
-import akka.annotation.InternalApi
-import akka.persistence.JournalProtocol.RecoverySuccess
-import akka.persistence.JournalProtocol.ReplayMessagesFailure
-import akka.persistence.Persistence
-import akka.persistence.journal.leveldb.LeveldbJournal
-import akka.persistence.journal.leveldb.LeveldbJournal.ReplayTaggedMessages
-import akka.persistence.journal.leveldb.LeveldbJournal.ReplayedTaggedMessage
-import akka.persistence.journal.leveldb.LeveldbJournal.TaggedEventAppended
-import akka.persistence.query.EventEnvelope
-import akka.persistence.query.Sequence
-import akka.persistence.query.journal.leveldb.EventsByTagStage.Continue
-import akka.stream.Attributes
-import akka.stream.Materializer
-import akka.stream.Outlet
-import akka.stream.SourceShape
-import akka.stream.stage.GraphStage
-import akka.stream.stage.GraphStageLogic
-import akka.stream.stage.OutHandler
-import akka.stream.stage.TimerGraphStageLogicWithLogging
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.annotation.InternalApi
+import pekko.persistence.JournalProtocol.RecoverySuccess
+import pekko.persistence.JournalProtocol.ReplayMessagesFailure
+import pekko.persistence.Persistence
+import pekko.persistence.journal.leveldb.LeveldbJournal
+import pekko.persistence.journal.leveldb.LeveldbJournal.ReplayTaggedMessages
+import pekko.persistence.journal.leveldb.LeveldbJournal.ReplayedTaggedMessage
+import pekko.persistence.journal.leveldb.LeveldbJournal.TaggedEventAppended
+import pekko.persistence.query.EventEnvelope
+import pekko.persistence.query.Sequence
+import pekko.persistence.query.journal.leveldb.EventsByTagStage.Continue
+import pekko.stream.Attributes
+import pekko.stream.Materializer
+import pekko.stream.Outlet
+import pekko.stream.SourceShape
+import pekko.stream.stage.GraphStage
+import pekko.stream.stage.GraphStageLogic
+import pekko.stream.stage.OutHandler
+import pekko.stream.stage.TimerGraphStageLogicWithLogging
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object EventsByTagStage {
+private[pekko] object EventsByTagStage {
   case object Continue
 }
 
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala
similarity index 59%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala
index 82b7c3fe72..df735c9c94 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
 import com.typesafe.config.Config
-import akka.actor.ExtendedActorSystem
-import akka.persistence.query.ReadJournalProvider
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.persistence.query.ReadJournalProvider
 
 @deprecated("Use another journal/query implementation", "2.6.15")
 class LeveldbReadJournalProvider(system: ExtendedActorSystem, config: Config) extends ReadJournalProvider {
 
   val readJournal: scaladsl.LeveldbReadJournal = new scaladsl.LeveldbReadJournal(system, config)
 
-  override def scaladslReadJournal(): akka.persistence.query.scaladsl.ReadJournal =
+  override def scaladslReadJournal(): pekko.persistence.query.scaladsl.ReadJournal =
     readJournal
 
   val javaReadJournal = new javadsl.LeveldbReadJournal(readJournal)
 
-  override def javadslReadJournal(): akka.persistence.query.javadsl.ReadJournal =
+  override def javadslReadJournal(): pekko.persistence.query.javadsl.ReadJournal =
     javaReadJournal
 
 }
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala
similarity index 87%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala
index b317ab27a3..9019293a1e 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb.javadsl
+package org.apache.pekko.persistence.query.journal.leveldb.javadsl
 
-import akka.NotUsed
-import akka.persistence.query.{ EventEnvelope, Offset }
-import akka.persistence.query.javadsl._
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.{ EventEnvelope, Offset }
+import pekko.persistence.query.javadsl._
+import pekko.stream.javadsl.Source
 
 /**
- * Java API: [[akka.persistence.query.javadsl.ReadJournal]] implementation for LevelDB.
+ * Java API: [[pekko.persistence.query.javadsl.ReadJournal]] implementation for LevelDB.
  *
  * It is retrieved with:
  * {{{
@@ -18,14 +19,14 @@ import akka.stream.javadsl.Source
  *   PersistenceQuery.get(system).getReadJournalFor(LeveldbReadJournal.class, LeveldbReadJournal.Identifier());
  * }}}
  *
- * Corresponding Scala API is in [[akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal]].
+ * Corresponding Scala API is in [[pekko.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal]].
  *
  * Configuration settings can be defined in the configuration section with the
  * absolute path corresponding to the identifier, which is `"akka.persistence.query.journal.leveldb"`
  * for the default [[LeveldbReadJournal#Identifier]]. See `reference.conf`.
  */
 @deprecated("Use another journal implementation", "2.6.15")
-class LeveldbReadJournal(scaladslReadJournal: akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal)
+class LeveldbReadJournal(scaladslReadJournal: pekko.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal)
     extends ReadJournal
     with PersistenceIdsQuery
     with CurrentPersistenceIdsQuery
@@ -70,7 +71,7 @@ class LeveldbReadJournal(scaladslReadJournal: akka.persistence.query.journal.lev
    * You can retrieve a subset of all events by specifying `fromSequenceNr` and `toSequenceNr`
    * or use `0L` and `Long.MaxValue` respectively to retrieve all events. Note that
    * the corresponding sequence number of each event is provided in the
-   * [[akka.persistence.query.EventEnvelope]], which makes it possible to resume the
+   * [[pekko.persistence.query.EventEnvelope]], which makes it possible to resume the
    * stream at a later point from a given sequence number.
    *
    * The returned event stream is ordered by sequence number, i.e. the same order as the
@@ -110,13 +111,13 @@ class LeveldbReadJournal(scaladslReadJournal: akka.persistence.query.journal.lev
    * `eventsByTag` is used for retrieving events that were marked with
    * a given tag, e.g. all events of an Aggregate Root type.
    *
-   * To tag events you create an [[akka.persistence.journal.EventAdapter]] that wraps the events
-   * in a [[akka.persistence.journal.Tagged]] with the given `tags`.
+   * To tag events you create an [[pekko.persistence.journal.EventAdapter]] that wraps the events
+   * in a [[pekko.persistence.journal.Tagged]] with the given `tags`.
    *
    * You can retrieve a subset of all events by specifying `offset`, or use `0L` to retrieve all
    * events with a given tag. The `offset` corresponds to an ordered sequence number for
    * the specific tag. Note that the corresponding offset of each event is provided in the
-   * [[akka.persistence.query.EventEnvelope]], which makes it possible to resume the
+   * [[pekko.persistence.query.EventEnvelope]], which makes it possible to resume the
    * stream at a later point from a given offset.
    *
    * In addition to the `offset` the `EventEnvelope` also provides `persistenceId` and `sequenceNr`
@@ -162,10 +163,10 @@ object LeveldbReadJournal {
 
   /**
    * The default identifier for [[LeveldbReadJournal]] to be used with
-   * [[akka.persistence.query.PersistenceQuery#getReadJournalFor]].
+   * [[pekko.persistence.query.PersistenceQuery#getReadJournalFor]].
    *
    * The value is `"akka.persistence.query.journal.leveldb"` and corresponds
    * to the absolute path to the read journal configuration entry.
    */
-  final val Identifier = akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal.Identifier
+  final val Identifier = pekko.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal.Identifier
 }
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
similarity index 88%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
index 30fe7fafa9..0bab74ea1c 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb.scaladsl
+package org.apache.pekko.persistence.query.journal.leveldb.scaladsl
 
 import java.net.URLEncoder
 
@@ -10,30 +10,31 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.NotUsed
-import akka.actor.ExtendedActorSystem
-import akka.event.Logging
-import akka.persistence.query.EventEnvelope
-import akka.persistence.query.NoOffset
-import akka.persistence.query.Offset
-import akka.persistence.query.Sequence
-import akka.persistence.query.journal.leveldb.AllPersistenceIdsStage
-import akka.persistence.query.journal.leveldb.EventsByPersistenceIdStage
-import akka.persistence.query.journal.leveldb.EventsByTagStage
-import akka.persistence.query.scaladsl._
-import akka.persistence.query.scaladsl.ReadJournal
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ExtendedActorSystem
+import pekko.event.Logging
+import pekko.persistence.query.EventEnvelope
+import pekko.persistence.query.NoOffset
+import pekko.persistence.query.Offset
+import pekko.persistence.query.Sequence
+import pekko.persistence.query.journal.leveldb.AllPersistenceIdsStage
+import pekko.persistence.query.journal.leveldb.EventsByPersistenceIdStage
+import pekko.persistence.query.journal.leveldb.EventsByTagStage
+import pekko.persistence.query.scaladsl._
+import pekko.persistence.query.scaladsl.ReadJournal
+import pekko.stream.scaladsl.Source
+import pekko.util.ByteString
 
 /**
- * Scala API [[akka.persistence.query.scaladsl.ReadJournal]] implementation for LevelDB.
+ * Scala API [[pekko.persistence.query.scaladsl.ReadJournal]] implementation for LevelDB.
  *
  * It is retrieved with:
  * {{{
  * val queries = PersistenceQuery(system).readJournalFor[LeveldbReadJournal](LeveldbReadJournal.Identifier)
  * }}}
  *
- * Corresponding Java API is in [[akka.persistence.query.journal.leveldb.javadsl.LeveldbReadJournal]].
+ * Corresponding Java API is in [[pekko.persistence.query.journal.leveldb.javadsl.LeveldbReadJournal]].
  *
  * Configuration settings can be defined in the configuration section with the
  * absolute path corresponding to the identifier, which is `"akka.persistence.query.journal.leveldb"`
@@ -61,7 +62,7 @@ class LeveldbReadJournal(system: ExtendedActorSystem, config: Config)
   require(
     resolvedWriteJournalPluginId.nonEmpty && system.settings.config
       .getConfig(resolvedWriteJournalPluginId)
-      .getString("class") == "akka.persistence.journal.leveldb.LeveldbJournal",
+      .getString("class") == "org.apache.pekko.persistence.journal.leveldb.LeveldbJournal",
     s"Leveldb read journal can only work with a Leveldb write journal. Current plugin [$resolvedWriteJournalPluginId] is not a LeveldbJournal")
 
   /**
@@ -113,7 +114,7 @@ class LeveldbReadJournal(system: ExtendedActorSystem, config: Config)
    * You can retrieve a subset of all events by specifying `fromSequenceNr` and `toSequenceNr`
    * or use `0L` and `Long.MaxValue` respectively to retrieve all events. Note that
    * the corresponding sequence number of each event is provided in the
-   * [[akka.persistence.query.EventEnvelope]], which makes it possible to resume the
+   * [[pekko.persistence.query.EventEnvelope]], which makes it possible to resume the
    * stream at a later point from a given sequence number.
    *
    * The returned event stream is ordered by sequence number, i.e. the same order as the
@@ -184,13 +185,13 @@ class LeveldbReadJournal(system: ExtendedActorSystem, config: Config)
    * `eventsByTag` is used for retrieving events that were marked with
    * a given tag, e.g. all events of an Aggregate Root type.
    *
-   * To tag events you create an [[akka.persistence.journal.EventAdapter]] that wraps the events
-   * in a [[akka.persistence.journal.Tagged]] with the given `tags`.
+   * To tag events you create an [[pekko.persistence.journal.EventAdapter]] that wraps the events
+   * in a [[pekko.persistence.journal.Tagged]] with the given `tags`.
    *
    * You can use `NoOffset` to retrieve all events with a given tag or retrieve a subset of all
    * events by specifying a `Sequence` `offset`. The `offset` corresponds to an ordered sequence number for
    * the specific tag. Note that the corresponding offset of each event is provided in the
-   * [[akka.persistence.query.EventEnvelope]], which makes it possible to resume the
+   * [[pekko.persistence.query.EventEnvelope]], which makes it possible to resume the
    * stream at a later point from a given offset.
    *
    * The `offset` is exclusive, i.e. the event with the exact same sequence number will not be included
@@ -272,7 +273,7 @@ object LeveldbReadJournal {
 
   /**
    * The default identifier for [[LeveldbReadJournal]] to be used with
-   * [[akka.persistence.query.PersistenceQuery#readJournalFor]].
+   * [[pekko.persistence.query.PersistenceQuery#readJournalFor]].
    *
    * The value is `"akka.persistence.query.journal.leveldb"` and corresponds
    * to the absolute path to the read journal configuration entry.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala
similarity index 78%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala
index fb58c64b31..e760350c1e 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.scaladsl
 
-import akka.NotUsed
-import akka.persistence.query.EventEnvelope
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.EventEnvelope
+import pekko.stream.scaladsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByTagQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/CurrentEventsByTagQuery.scala
similarity index 80%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByTagQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/CurrentEventsByTagQuery.scala
index 5d2666a10c..871f7f085c 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByTagQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/CurrentEventsByTagQuery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.scaladsl
 
-import akka.NotUsed
-import akka.persistence.query.{ EventEnvelope, Offset }
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.{ EventEnvelope, Offset }
+import pekko.stream.scaladsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentPersistenceIdsQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/CurrentPersistenceIdsQuery.scala
similarity index 80%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentPersistenceIdsQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/CurrentPersistenceIdsQuery.scala
index 0c56a0e176..7c8cd9a411 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentPersistenceIdsQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/CurrentPersistenceIdsQuery.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.scaladsl
 
-import akka.NotUsed
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.scaladsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala
similarity index 84%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala
index c7547badf8..27b17a93cb 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStorePagedPersistenceIdsQuery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.scaladsl
 
-import akka.NotUsed
-import akka.persistence.state.scaladsl.DurableStateStore
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.state.scaladsl.DurableStateStore
+import pekko.stream.scaladsl.Source
 
 /**
  * A DurableStateStore may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/DurableStateStoreQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStoreQuery.scala
similarity index 74%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/DurableStateStoreQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStoreQuery.scala
index 44eddea035..25e0ed4db6 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/DurableStateStoreQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/DurableStateStoreQuery.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.javadsl
+package org.apache.pekko.persistence.query.scaladsl
 
-import akka.NotUsed
-import akka.persistence.state.javadsl.DurableStateStore
-import akka.persistence.query.DurableStateChange
-import akka.persistence.query.Offset
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.DurableStateChange
+import pekko.persistence.state.scaladsl.DurableStateStore
+import pekko.persistence.query.Offset
+import pekko.stream.scaladsl.Source
 
 /**
  * Query API for reading durable state objects.
  *
- * For Scala API see [[akka.persistence.query.scaladsl.DurableStateStoreQuery]].
+ * For Java API see [[pekko.persistence.query.javadsl.DurableStateStoreQuery]].
  */
 trait DurableStateStoreQuery[A] extends DurableStateStore[A] {
 
@@ -26,11 +27,11 @@ trait DurableStateStoreQuery[A] extends DurableStateStore[A] {
    * This will return changes that occurred up to when the `Source` returned by this call is materialized. Changes to
    * objects made since materialization are not guaranteed to be included in the results.
    *
-   * The [[DurableStateChange]] elements can be [[akka.persistence.query.UpdatedDurableState]] or
-   * [[akka.persistence.query.DeletedDurableState]].
+   * The [[DurableStateChange]] elements can be [[pekko.persistence.query.UpdatedDurableState]] or
+   * [[pekko.persistence.query.DeletedDurableState]].
    *
    * @param tag The tag to get changes for.
-   * @param offset The offset to get changes since. Must either be [[akka.persistence.query.NoOffset]] to get
+   * @param offset The offset to get changes since. Must either be [[pekko.persistence.query.NoOffset]] to get
    *               changes since the beginning of time, or an offset that has been previously returned by this query.
    *               Any other offsets are invalid.
    * @return A source of change in state.
@@ -48,11 +49,11 @@ trait DurableStateStoreQuery[A] extends DurableStateStore[A] {
    * in quick succession are likely to be skipped, with only the last update resulting in a change from this
    * source.
    *
-   * The [[DurableStateChange]] elements can be [[akka.persistence.query.UpdatedDurableState]] or
-   * [[akka.persistence.query.DeletedDurableState]].
+   * The [[DurableStateChange]] elements can be [[pekko.persistence.query.UpdatedDurableState]] or
+   * [[pekko.persistence.query.DeletedDurableState]].
    *
    * @param tag The tag to get changes for.
-   * @param offset The offset to get changes since. Must either be [[akka.persistence.query.NoOffset]] to get
+   * @param offset The offset to get changes since. Must either be [[pekko.persistence.query.NoOffset]] to get
    *               changes since the beginning of time, or an offset that has been previously returned by this query.
    *               Any other offsets are invalid.
    * @return A source of change in state.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala
similarity index 86%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala
index a92ec1130a..b796aa72cb 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.scaladsl
 
-import akka.NotUsed
-import akka.persistence.query.EventEnvelope
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.EventEnvelope
+import pekko.stream.scaladsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByTagQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/EventsByTagQuery.scala
similarity index 92%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByTagQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/EventsByTagQuery.scala
index 01a60be578..911ac8df34 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByTagQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/EventsByTagQuery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.scaladsl
 
-import akka.NotUsed
-import akka.persistence.query.{ EventEnvelope, Offset }
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.query.{ EventEnvelope, Offset }
+import pekko.stream.scaladsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala
similarity index 88%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala
index 0a0c79dd68..998d46c2cc 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PagedPersistenceIdsQuery.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.scaladsl
 
-import akka.NotUsed
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.scaladsl.Source
 
 /**
  * A plugin ReadJournal may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/PersistenceIdsQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PersistenceIdsQuery.scala
similarity index 85%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/PersistenceIdsQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PersistenceIdsQuery.scala
index 26e1b640f2..40074544b2 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/PersistenceIdsQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/PersistenceIdsQuery.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.scaladsl
 
-import akka.NotUsed
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.stream.scaladsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/ReadJournal.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/ReadJournal.scala
similarity index 88%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/ReadJournal.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/ReadJournal.scala
index 5d89806595..5b5b184298 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/ReadJournal.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/scaladsl/ReadJournal.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.scaladsl
+package org.apache.pekko.persistence.query.scaladsl
 
 /**
  * API for reading persistent events and information derived
@@ -23,6 +23,6 @@ package akka.persistence.query.scaladsl
  * val events = journal.query(EventsByTag("mytag", 0L))
  * }}}
  *
- * For Java API see [[akka.persistence.query.javadsl.ReadJournal]].
+ * For Java API see [[org.apache.pekko.persistence.query.javadsl.ReadJournal]].
  */
 trait ReadJournal
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/EventEnvelope.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/EventEnvelope.scala
similarity index 88%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/EventEnvelope.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/EventEnvelope.scala
index 17e6be7c8e..0862e83144 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/EventEnvelope.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/EventEnvelope.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed
+package org.apache.pekko.persistence.query.typed
 
 import java.util.Optional
 
-import akka.annotation.ApiMayChange
-import akka.persistence.query.Offset
-import akka.util.HashCode
+import org.apache.pekko
+import pekko.annotation.ApiMayChange
+import pekko.persistence.query.Offset
+import pekko.util.HashCode
 
 object EventEnvelope {
   def apply[Event](
@@ -37,15 +38,15 @@ object EventEnvelope {
 
 /**
  * Event wrapper adding meta data for the events in the result stream of
- * [[akka.persistence.query.typed.scaladsl.EventsBySliceQuery]] query, or similar queries.
+ * [[pekko.persistence.query.typed.scaladsl.EventsBySliceQuery]] query, or similar queries.
  *
  * If the `event` is not defined it has not been loaded yet. It can be loaded with
- * [[akka.persistence.query.typed.scaladsl.LoadEventQuery]].
+ * [[pekko.persistence.query.typed.scaladsl.LoadEventQuery]].
  *
  * The `timestamp` is the time the event was stored, in milliseconds since midnight, January 1, 1970 UTC (same as
  * `System.currentTimeMillis`).
  *
- * It is an improved `EventEnvelope` compared to [[akka.persistence.query.EventEnvelope]].
+ * It is an improved `EventEnvelope` compared to [[pekko.persistence.query.EventEnvelope]].
  *
  * API May Change
  */
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/CurrentEventsBySliceQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/CurrentEventsBySliceQuery.scala
similarity index 75%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/CurrentEventsBySliceQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/CurrentEventsBySliceQuery.scala
index 86ca94f80a..a2f0cd3b75 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/CurrentEventsBySliceQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/CurrentEventsBySliceQuery.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.javadsl
+package org.apache.pekko.persistence.query.typed.javadsl
 
-import akka.NotUsed
-import akka.annotation.ApiMayChange
-import akka.japi.Pair
-import akka.persistence.query.Offset
-import akka.persistence.query.javadsl.ReadJournal
-import akka.persistence.query.typed.EventEnvelope
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.annotation.ApiMayChange
+import pekko.japi.Pair
+import pekko.persistence.query.Offset
+import pekko.persistence.query.javadsl.ReadJournal
+import pekko.persistence.query.typed.EventEnvelope
+import pekko.stream.javadsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/DurableStateStoreBySliceQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/DurableStateStoreBySliceQuery.scala
similarity index 77%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/DurableStateStoreBySliceQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/DurableStateStoreBySliceQuery.scala
index eb3d318ddb..a01d7b4453 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/DurableStateStoreBySliceQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/DurableStateStoreBySliceQuery.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.javadsl
+package org.apache.pekko.persistence.query.typed.javadsl
 
-import akka.NotUsed
-import akka.annotation.ApiMayChange
-import akka.japi.Pair
-import akka.persistence.query.DurableStateChange
-import akka.persistence.query.Offset
-import akka.persistence.state.javadsl.DurableStateStore
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.annotation.ApiMayChange
+import pekko.japi.Pair
+import pekko.persistence.query.DurableStateChange
+import pekko.persistence.query.Offset
+import pekko.persistence.state.javadsl.DurableStateStore
+import pekko.stream.javadsl.Source
 
 /**
  * Query API for reading durable state objects.
@@ -34,8 +35,8 @@ trait DurableStateStoreBySliceQuery[A] extends DurableStateStore[A] {
    * This will return changes that occurred up to when the `Source` returned by this call is materialized. Changes to
    * objects made since materialization are not guaranteed to be included in the results.
    *
-   * The [[DurableStateChange]] elements can be [[akka.persistence.query.UpdatedDurableState]] or
-   * [[akka.persistence.query.DeletedDurableState]].
+   * The [[DurableStateChange]] elements can be [[pekko.persistence.query.UpdatedDurableState]] or
+   * [[pekko.persistence.query.DeletedDurableState]].
    */
   def currentChangesBySlices(
       entityType: String,
@@ -56,8 +57,8 @@ trait DurableStateStoreBySliceQuery[A] extends DurableStateStore[A] {
    * change for each object since the offset will be emitted. In particular, multiple updates to a given object in quick
    * succession are likely to be skipped, with only the last update resulting in a change from this source.
    *
-   * The [[DurableStateChange]] elements can be [[akka.persistence.query.UpdatedDurableState]] or
-   * [[akka.persistence.query.DeletedDurableState]].
+   * The [[DurableStateChange]] elements can be [[pekko.persistence.query.UpdatedDurableState]] or
+   * [[pekko.persistence.query.DeletedDurableState]].
    */
   def changesBySlices(
       entityType: String,
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/EventTimestampQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/EventTimestampQuery.scala
similarity index 73%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/EventTimestampQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/EventTimestampQuery.scala
index 9f8b4c6816..9043b4b62f 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/EventTimestampQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/EventTimestampQuery.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.javadsl
+package org.apache.pekko.persistence.query.typed.javadsl
 
 import java.time.Instant
 import java.util.Optional
 import java.util.concurrent.CompletionStage
 
-import akka.annotation.ApiMayChange
-import akka.persistence.query.javadsl.ReadJournal
+import org.apache.pekko
+import pekko.annotation.ApiMayChange
+import pekko.persistence.query.javadsl.ReadJournal
 
 /**
  * [[EventsBySliceQuery]] that is using a timestamp based offset should also implement this query.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/EventsBySliceQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/EventsBySliceQuery.scala
similarity index 88%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/EventsBySliceQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/EventsBySliceQuery.scala
index 19f4ec9062..944b1c5586 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/EventsBySliceQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/EventsBySliceQuery.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.javadsl
+package org.apache.pekko.persistence.query.typed.javadsl
 
-import akka.NotUsed
-import akka.annotation.ApiMayChange
-import akka.japi.Pair
-import akka.persistence.query.Offset
-import akka.persistence.query.javadsl.ReadJournal
-import akka.persistence.query.typed.EventEnvelope
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.annotation.ApiMayChange
+import pekko.japi.Pair
+import pekko.persistence.query.Offset
+import pekko.persistence.query.javadsl.ReadJournal
+import pekko.persistence.query.typed.EventEnvelope
+import pekko.stream.javadsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/LoadEventQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/LoadEventQuery.scala
similarity index 73%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/LoadEventQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/LoadEventQuery.scala
index 9edc37785a..d6189593a1 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/javadsl/LoadEventQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/javadsl/LoadEventQuery.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.javadsl
+package org.apache.pekko.persistence.query.typed.javadsl
 
 import java.util.concurrent.CompletionStage
 
-import akka.annotation.ApiMayChange
-import akka.persistence.query.javadsl.ReadJournal
-import akka.persistence.query.typed.EventEnvelope
+import org.apache.pekko
+import pekko.annotation.ApiMayChange
+import pekko.persistence.query.javadsl.ReadJournal
+import pekko.persistence.query.typed.EventEnvelope
 
 /**
  * [[EventsBySliceQuery]] that is using a timestamp based offset should also implement this query.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/CurrentEventsBySliceQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/CurrentEventsBySliceQuery.scala
similarity index 76%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/CurrentEventsBySliceQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/CurrentEventsBySliceQuery.scala
index d071d71da5..bdd1834f40 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/CurrentEventsBySliceQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/CurrentEventsBySliceQuery.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.scaladsl
+package org.apache.pekko.persistence.query.typed.scaladsl
 
 import scala.collection.immutable
 
-import akka.NotUsed
-import akka.annotation.ApiMayChange
-import akka.persistence.query.Offset
-import akka.persistence.query.scaladsl.ReadJournal
-import akka.persistence.query.typed.EventEnvelope
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.annotation.ApiMayChange
+import pekko.persistence.query.Offset
+import pekko.persistence.query.scaladsl.ReadJournal
+import pekko.persistence.query.typed.EventEnvelope
+import pekko.stream.scaladsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/DurableStateStoreBySliceQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/DurableStateStoreBySliceQuery.scala
similarity index 78%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/DurableStateStoreBySliceQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/DurableStateStoreBySliceQuery.scala
index 8bb0e15ee3..9f7a53f398 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/DurableStateStoreBySliceQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/DurableStateStoreBySliceQuery.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.scaladsl
+package org.apache.pekko.persistence.query.typed.scaladsl
 
 import scala.collection.immutable
 
-import akka.NotUsed
-import akka.annotation.ApiMayChange
-import akka.persistence.query.DurableStateChange
-import akka.persistence.query.Offset
-import akka.persistence.state.scaladsl.DurableStateStore
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.annotation.ApiMayChange
+import pekko.persistence.query.DurableStateChange
+import pekko.persistence.query.Offset
+import pekko.persistence.state.scaladsl.DurableStateStore
+import pekko.stream.scaladsl.Source
 
 /**
  * Query API for reading durable state objects.
@@ -35,8 +36,8 @@ trait DurableStateStoreBySliceQuery[A] extends DurableStateStore[A] {
    * This will return changes that occurred up to when the `Source` returned by this call is materialized. Changes to
    * objects made since materialization are not guaranteed to be included in the results.
    *
-   * The [[DurableStateChange]] elements can be [[akka.persistence.query.UpdatedDurableState]] or
-   * [[akka.persistence.query.DeletedDurableState]].
+   * The [[DurableStateChange]] elements can be [[pekko.persistence.query.UpdatedDurableState]] or
+   * [[pekko.persistence.query.DeletedDurableState]].
    */
   def currentChangesBySlices(
       entityType: String,
@@ -57,8 +58,8 @@ trait DurableStateStoreBySliceQuery[A] extends DurableStateStore[A] {
    * change for each object since the offset will be emitted. In particular, multiple updates to a given object in quick
    * succession are likely to be skipped, with only the last update resulting in a change from this source.
    *
-   * The [[DurableStateChange]] elements can be [[akka.persistence.query.UpdatedDurableState]] or
-   * [[akka.persistence.query.DeletedDurableState]].
+   * The [[DurableStateChange]] elements can be [[pekko.persistence.query.UpdatedDurableState]] or
+   * [[pekko.persistence.query.DeletedDurableState]].
    */
   def changesBySlices(
       entityType: String,
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/EventTimestampQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/EventTimestampQuery.scala
similarity index 70%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/EventTimestampQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/EventTimestampQuery.scala
index c430c01a61..1b4966b8fb 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/EventTimestampQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/EventTimestampQuery.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.scaladsl
+package org.apache.pekko.persistence.query.typed.scaladsl
 
 import java.time.Instant
 
 import scala.concurrent.Future
 
-import akka.annotation.ApiMayChange
-import akka.persistence.query.scaladsl.ReadJournal
+import org.apache.pekko
+import pekko.annotation.ApiMayChange
+import pekko.persistence.query.scaladsl.ReadJournal
 
 /**
  * [[EventsBySliceQuery]] that is using a timestamp based offset should also implement this query.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/EventsBySliceQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/EventsBySliceQuery.scala
similarity index 89%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/EventsBySliceQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/EventsBySliceQuery.scala
index 0b72b7f9cf..e3e8e203e0 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/EventsBySliceQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/EventsBySliceQuery.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.scaladsl
+package org.apache.pekko.persistence.query.typed.scaladsl
 
 import scala.collection.immutable
 
-import akka.NotUsed
-import akka.annotation.ApiMayChange
-import akka.persistence.query.Offset
-import akka.persistence.query.scaladsl.ReadJournal
-import akka.persistence.query.typed.EventEnvelope
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.annotation.ApiMayChange
+import pekko.persistence.query.Offset
+import pekko.persistence.query.scaladsl.ReadJournal
+import pekko.persistence.query.typed.EventEnvelope
+import pekko.stream.scaladsl.Source
 
 /**
  * A plugin may optionally support this query by implementing this trait.
diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/LoadEventQuery.scala b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/LoadEventQuery.scala
similarity index 72%
rename from akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/LoadEventQuery.scala
rename to akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/LoadEventQuery.scala
index 4bd447ef4c..b8a0f80f3c 100644
--- a/akka-persistence-query/src/main/scala/akka/persistence/query/typed/scaladsl/LoadEventQuery.scala
+++ b/akka-persistence-query/src/main/scala/org/apache/pekko/persistence/query/typed/scaladsl/LoadEventQuery.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.typed.scaladsl
+package org.apache.pekko.persistence.query.typed.scaladsl
 
 import scala.concurrent.Future
 
-import akka.annotation.ApiMayChange
-import akka.persistence.query.scaladsl.ReadJournal
-import akka.persistence.query.typed.EventEnvelope
+import org.apache.pekko
+import pekko.annotation.ApiMayChange
+import pekko.persistence.query.scaladsl.ReadJournal
+import pekko.persistence.query.typed.EventEnvelope
 
 /**
  * [[EventsBySliceQuery]] that is using a timestamp based offset should also implement this query.
diff --git a/akka-persistence-query/src/test/java/akka/persistence/query/DummyJavaReadJournal.java b/akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournal.java
similarity index 75%
rename from akka-persistence-query/src/test/java/akka/persistence/query/DummyJavaReadJournal.java
rename to akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournal.java
index 7f90a1389b..8076a4d9ff 100644
--- a/akka-persistence-query/src/test/java/akka/persistence/query/DummyJavaReadJournal.java
+++ b/akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournal.java
@@ -2,14 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query;
+package org.apache.pekko.persistence.query;
 
 import java.util.Iterator;
 
-import akka.NotUsed;
-import akka.persistence.query.javadsl.PersistenceIdsQuery;
-import akka.persistence.query.javadsl.ReadJournal;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.persistence.query.javadsl.PersistenceIdsQuery;
+import org.apache.pekko.persistence.query.javadsl.ReadJournal;
+import org.apache.pekko.stream.javadsl.Source;
 
 /** Use for tests only! Emits infinite stream of strings (representing queried for events). */
 public class DummyJavaReadJournal implements ReadJournal, PersistenceIdsQuery {
diff --git a/akka-persistence-query/src/test/java/akka/persistence/query/DummyJavaReadJournalForScala.java b/akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournalForScala.java
similarity index 63%
rename from akka-persistence-query/src/test/java/akka/persistence/query/DummyJavaReadJournalForScala.java
rename to akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournalForScala.java
index 68cde59f0c..58c27ce3f7 100644
--- a/akka-persistence-query/src/test/java/akka/persistence/query/DummyJavaReadJournalForScala.java
+++ b/akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournalForScala.java
@@ -2,14 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query;
+package org.apache.pekko.persistence.query;
 
-import akka.NotUsed;
+import org.apache.pekko.NotUsed;
 
 /** Use for tests only! Emits infinite stream of strings (representing queried for events). */
 public class DummyJavaReadJournalForScala
-    implements akka.persistence.query.scaladsl.ReadJournal,
-        akka.persistence.query.scaladsl.PersistenceIdsQuery {
+    implements org.apache.pekko.persistence.query.scaladsl.ReadJournal,
+        org.apache.pekko.persistence.query.scaladsl.PersistenceIdsQuery {
 
   public static final String Identifier = DummyJavaReadJournal.Identifier;
 
@@ -20,7 +20,7 @@ public class DummyJavaReadJournalForScala
   }
 
   @Override
-  public akka.stream.scaladsl.Source persistenceIds() {
+  public org.apache.pekko.stream.scaladsl.Source persistenceIds() {
     return readJournal.persistenceIds().asScala();
   }
 }
diff --git a/akka-persistence-query/src/test/java/akka/persistence/query/DummyJavaReadJournalProvider.java b/akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournalProvider.java
similarity index 95%
rename from akka-persistence-query/src/test/java/akka/persistence/query/DummyJavaReadJournalProvider.java
rename to akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournalProvider.java
index 04a738ed2d..7af75a14e2 100644
--- a/akka-persistence-query/src/test/java/akka/persistence/query/DummyJavaReadJournalProvider.java
+++ b/akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournalProvider.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query;
+package org.apache.pekko.persistence.query;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
diff --git a/akka-persistence-query/src/test/java/akka/persistence/query/PersistenceQueryTest.java b/akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/PersistenceQueryTest.java
similarity index 69%
rename from akka-persistence-query/src/test/java/akka/persistence/query/PersistenceQueryTest.java
rename to akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/PersistenceQueryTest.java
index b3ad6eaba1..cb23456951 100644
--- a/akka-persistence-query/src/test/java/akka/persistence/query/PersistenceQueryTest.java
+++ b/akka-persistence-query/src/test/java/org/apache/pekko/persistence/query/PersistenceQueryTest.java
@@ -2,11 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query;
+package org.apache.pekko.persistence.query;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.testkit.AkkaJUnitActorSystemResource;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.testkit.AkkaJUnitActorSystemResource;
 import org.junit.ClassRule;
 
 public class PersistenceQueryTest {
@@ -22,6 +22,7 @@ public class PersistenceQueryTest {
   public void shouldExposeJavaDSLFriendlyQueryJournal() throws Exception {
     final DummyJavaReadJournal readJournal =
         PersistenceQuery.get(system).getReadJournalFor(DummyJavaReadJournal.class, "noop-journal");
-    final akka.stream.javadsl.Source ids = readJournal.persistenceIds();
+    final org.apache.pekko.stream.javadsl.Source ids =
+        readJournal.persistenceIds();
   }
 }
diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/DummyReadJournal.scala
similarity index 90%
rename from akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala
rename to akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/DummyReadJournal.scala
index 806c868140..018174312f 100644
--- a/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala
+++ b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/DummyReadJournal.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query
+package org.apache.pekko.persistence.query
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.NotUsed
-import akka.actor.ExtendedActorSystem
-import akka.stream.scaladsl.Source
-import akka.util.unused
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ExtendedActorSystem
+import pekko.stream.scaladsl.Source
+import pekko.util.unused
 
 /**
  * Use for tests only!
@@ -27,7 +28,7 @@ object DummyReadJournal {
 class DummyReadJournalForJava(readJournal: DummyReadJournal)
     extends javadsl.ReadJournal
     with javadsl.PersistenceIdsQuery {
-  override def persistenceIds(): akka.stream.javadsl.Source[String, NotUsed] =
+  override def persistenceIds(): pekko.stream.javadsl.Source[String, NotUsed] =
     readJournal.persistenceIds().asJava
 }
 
diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/OffsetSpec.scala b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/OffsetSpec.scala
similarity index 96%
rename from akka-persistence-query/src/test/scala/akka/persistence/query/OffsetSpec.scala
rename to akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/OffsetSpec.scala
index 553564ddd1..66f017f2da 100644
--- a/akka-persistence-query/src/test/scala/akka/persistence/query/OffsetSpec.scala
+++ b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/OffsetSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query
+package org.apache.pekko.persistence.query
 
 import java.util.UUID
 
diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/PersistenceQuerySpec.scala b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/PersistenceQuerySpec.scala
similarity index 95%
rename from akka-persistence-query/src/test/scala/akka/persistence/query/PersistenceQuerySpec.scala
rename to akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/PersistenceQuerySpec.scala
index e9a77b8f1e..4c76294e42 100644
--- a/akka-persistence-query/src/test/scala/akka/persistence/query/PersistenceQuerySpec.scala
+++ b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/PersistenceQuerySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query
+package org.apache.pekko.persistence.query
 
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -14,8 +14,9 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ActorSystem
-import akka.persistence.journal.{ EventSeq, ReadEventAdapter }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.persistence.journal.{ EventSeq, ReadEventAdapter }
 
 class PersistenceQuerySpec extends AnyWordSpecLike with Matchers with BeforeAndAfterAll {
 
diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/internal/QuerySerializerSpec.scala b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/internal/QuerySerializerSpec.scala
similarity index 85%
rename from akka-persistence-query/src/test/scala/akka/persistence/query/internal/QuerySerializerSpec.scala
rename to akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/internal/QuerySerializerSpec.scala
index ed8506046c..d15fd156d8 100644
--- a/akka-persistence-query/src/test/scala/akka/persistence/query/internal/QuerySerializerSpec.scala
+++ b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/internal/QuerySerializerSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.internal
+package org.apache.pekko.persistence.query.internal
 
 import java.time.Instant
 import java.util.UUID
 
-import akka.persistence.query.NoOffset
-import akka.persistence.query.Sequence
-import akka.persistence.query.TimeBasedUUID
-import akka.persistence.query.TimestampOffset
-import akka.persistence.query.typed.EventEnvelope
-import akka.serialization.SerializationExtension
-import akka.serialization.SerializerWithStringManifest
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.persistence.query.NoOffset
+import pekko.persistence.query.Sequence
+import pekko.persistence.query.TimeBasedUUID
+import pekko.persistence.query.TimestampOffset
+import pekko.persistence.query.typed.EventEnvelope
+import pekko.serialization.SerializationExtension
+import pekko.serialization.SerializerWithStringManifest
+import pekko.testkit.AkkaSpec
 
 class QuerySerializerSpec extends AkkaSpec {
 
diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala
similarity index 85%
rename from akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala
rename to akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala
index 887946f83d..86eacabcbf 100644
--- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala
+++ b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
 import scala.concurrent.duration._
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
-import akka.persistence.query.scaladsl.PersistenceIdsQuery
-import akka.stream.testkit.scaladsl.TestSink
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
+import pekko.persistence.query.scaladsl.PersistenceIdsQuery
+import pekko.stream.testkit.scaladsl.TestSink
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
 
 import scala.annotation.nowarn
 
diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/Cleanup.scala
similarity index 86%
rename from akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala
rename to akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/Cleanup.scala
index 49d59ee816..ef97dd4a43 100644
--- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala
+++ b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/Cleanup.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
 import java.io.File
 
 import org.apache.commons.io.FileUtils
 
-import akka.testkit.AkkaSpec
+import org.apache.pekko.testkit.AkkaSpec
 
 trait Cleanup { this: AkkaSpec =>
   val storageLocations =
diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala
similarity index 93%
rename from akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala
rename to akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala
index 931ea74ab2..57361f959a 100644
--- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala
+++ b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
 import scala.concurrent.duration._
-import akka.actor.ActorRef
-import akka.persistence.query.EventEnvelope
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
-import akka.persistence.query.scaladsl.EventsByTagQuery
-import akka.stream.testkit.scaladsl.TestSink
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.persistence.query.EventEnvelope
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
+import pekko.persistence.query.scaladsl.EventsByTagQuery
+import pekko.stream.testkit.scaladsl.TestSink
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
 
 import scala.annotation.nowarn
 
diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByTagSpec.scala
similarity index 92%
rename from akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala
rename to akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByTagSpec.scala
index 420793cfae..43737e661b 100644
--- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala
+++ b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/EventsByTagSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
 import scala.concurrent.duration._
-import akka.persistence.journal.Tagged
-import akka.persistence.journal.WriteEventAdapter
-import akka.persistence.query.EventEnvelope
-import akka.persistence.query.NoOffset
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.query.Sequence
-import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
-import akka.persistence.query.scaladsl.EventsByTagQuery
-import akka.stream.testkit.scaladsl.TestSink
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.persistence.journal.Tagged
+import pekko.persistence.journal.WriteEventAdapter
+import pekko.persistence.query.EventEnvelope
+import pekko.persistence.query.NoOffset
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.query.Sequence
+import pekko.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal
+import pekko.persistence.query.scaladsl.EventsByTagQuery
+import pekko.stream.testkit.scaladsl.TestSink
+import pekko.testkit.AkkaSpec
+import pekko.testkit.ImplicitSender
 
 import scala.annotation.nowarn
 
@@ -27,7 +28,7 @@ object EventsByTagSpec {
     akka.persistence.journal.leveldb {
       dir = "target/journal-EventsByTagSpec"
       event-adapters {
-        color-tagger  = akka.persistence.query.journal.leveldb.ColorTagger
+        color-tagger  = org.apache.pekko.persistence.query.journal.leveldb.ColorTagger
       }
       event-adapter-bindings = {
         "java.lang.String" = color-tagger
diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/TestActor.scala
similarity index 81%
rename from akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala
rename to akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/TestActor.scala
index bdc9a800af..1f25369bad 100644
--- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala
+++ b/akka-persistence-query/src/test/scala/org/apache/pekko/persistence/query/journal/leveldb/TestActor.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.query.journal.leveldb
+package org.apache.pekko.persistence.query.journal.leveldb
 
-import akka.actor.Props
-import akka.persistence.PersistentActor
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.PersistentActor
 
 object TestActor {
   def props(persistenceId: String): Props =
diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala b/akka-persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/PersistencePluginProxySpec.scala
similarity index 91%
rename from akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala
rename to akka-persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/PersistencePluginProxySpec.scala
index b077b075a4..74c16ace12 100644
--- a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala
+++ b/akka-persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/PersistencePluginProxySpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.persistence._
-import akka.persistence.journal.PersistencePluginProxy
-import akka.testkit.{ AkkaSpec, TestProbe }
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence._
+import pekko.persistence.journal.PersistencePluginProxy
+import pekko.testkit.{ AkkaSpec, TestProbe }
 
 object PersistencePluginProxySpec {
   lazy val config =
@@ -49,7 +50,7 @@ object PersistencePluginProxySpec {
 
   lazy val startTargetConfig =
     ConfigFactory.parseString("""
-      |akka.extensions = ["akka.persistence.journal.PersistencePluginProxyExtension"]
+      |akka.extensions = ["org.apache.pekko.persistence.journal.PersistencePluginProxyExtension"]
       |akka.persistence {
       |  journal.proxy.start-target-journal = on
       |  snapshot-store.proxy.start-target-snapshot-store = on
@@ -58,7 +59,7 @@ object PersistencePluginProxySpec {
 
   def targetAddressConfig(system: ActorSystem) =
     ConfigFactory.parseString(s"""
-      |akka.extensions = ["akka.persistence.Persistence"]
+      |akka.extensions = ["org.apache.pekko.persistence.Persistence"]
       |akka.persistence.journal.auto-start-journals = [""]
       |akka.persistence.journal.proxy.target-journal-address = "${system
                                   .asInstanceOf[ExtendedActorSystem]
diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala b/akka-persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala
similarity index 93%
rename from akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala
rename to akka-persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala
index 5c3ce8f891..78efdb17ca 100644
--- a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala
+++ b/akka-persistence-shared/src/test/scala/org/apache/pekko/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
-import akka.actor._
-import akka.persistence._
-import akka.testkit.{ AkkaSpec, TestProbe }
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence._
+import pekko.testkit.{ AkkaSpec, TestProbe }
 
 object SharedLeveldbJournalSpec {
   val config = ConfigFactory.parseString(s"""
@@ -27,7 +28,7 @@ object SharedLeveldbJournalSpec {
           }
         }
         remote {
-          enabled-transports = ["akka.remote.classic.netty.tcp"]
+          enabled-transports = ["org.apache.pekko.remote.classic.netty.tcp"]
           classic.netty.tcp {
             hostname = "127.0.0.1"
             port = 0
diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala b/akka-persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala
similarity index 88%
rename from akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala
rename to akka-persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala
index c6523738a6..84f0c2e1ac 100644
--- a/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala
+++ b/akka-persistence-shared/src/test/scala/org/apache/pekko/persistence/serialization/SerializerSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.serialization
+package org.apache.pekko.persistence.serialization
 
 import java.io.NotSerializableException
 import java.util.UUID
@@ -13,32 +13,33 @@ import scala.concurrent.duration.Duration
 import com.typesafe.config._
 import org.apache.commons.codec.binary.Hex.{ decodeHex, encodeHex }
 
-import akka.actor._
-import akka.persistence._
-import akka.persistence.AtLeastOnceDelivery.{ AtLeastOnceDeliverySnapshot, UnconfirmedDelivery }
-import akka.serialization._
-import akka.testkit._
-import akka.util.ByteString.UTF_8
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence._
+import pekko.persistence.AtLeastOnceDelivery.{ AtLeastOnceDeliverySnapshot, UnconfirmedDelivery }
+import pekko.serialization._
+import pekko.testkit._
+import pekko.util.ByteString.UTF_8
 
 object SerializerSpecConfigs {
   val customSerializers =
     ConfigFactory.parseString("""
       akka.actor {
         serializers {
-          my-payload = "akka.persistence.serialization.MyPayloadSerializer"
-          my-payload2 = "akka.persistence.serialization.MyPayload2Serializer"
-          my-snapshot = "akka.persistence.serialization.MySnapshotSerializer"
-          my-snapshot2 = "akka.persistence.serialization.MySnapshotSerializer2"
-          old-payload = "akka.persistence.serialization.OldPayloadSerializer"
+          my-payload = "org.apache.pekko.persistence.serialization.MyPayloadSerializer"
+          my-payload2 = "org.apache.pekko.persistence.serialization.MyPayload2Serializer"
+          my-snapshot = "org.apache.pekko.persistence.serialization.MySnapshotSerializer"
+          my-snapshot2 = "org.apache.pekko.persistence.serialization.MySnapshotSerializer2"
+          old-payload = "org.apache.pekko.persistence.serialization.OldPayloadSerializer"
         }
         serialization-bindings {
-          "akka.persistence.serialization.MyPayload" = my-payload
-          "akka.persistence.serialization.MyPayload2" = my-payload2
-          "akka.persistence.serialization.MySnapshot" = my-snapshot
-          "akka.persistence.serialization.MySnapshot2" = my-snapshot2
+          "org.apache.pekko.persistence.serialization.MyPayload" = my-payload
+          "org.apache.pekko.persistence.serialization.MyPayload2" = my-payload2
+          "org.apache.pekko.persistence.serialization.MySnapshot" = my-snapshot
+          "org.apache.pekko.persistence.serialization.MySnapshot2" = my-snapshot2
           # this entry was used when creating the data for the test
           # "deserialize data when class is removed"
-          #"akka.persistence.serialization.OldPayload" = old-payload
+          #"org.apache.pekko.persistence.serialization.OldPayload" = old-payload
         }
       }
     """)
@@ -70,7 +71,7 @@ object SerializerSpecConfigs {
 
 }
 
-import akka.persistence.serialization.SerializerSpecConfigs._
+import pekko.persistence.serialization.SerializerSpecConfigs._
 
 class SnapshotSerializerPersistenceSpec extends AkkaSpec(customSerializers) {
   val serialization = SerializationExtension(system)
@@ -227,13 +228,13 @@ class MessageSerializerPersistenceSpec extends AkkaSpec(customSerializers) {
         // println(s"encoded OldPayload: " + String.valueOf(encodeHex(serializer.toBinary(old))))
         //
         val oldData =
-          "0a3e08c7da04120d4f6c645061796c6f61642841291a2" +
-          "9616b6b612e70657273697374656e63652e7365726961" +
-          "6c697a6174696f6e2e4f6c645061796c6f6164100d1a0" +
-          "2703120015a45616b6b613a2f2f4d6573736167655365" +
-          "7269616c697a657250657273697374656e63655370656" +
-          "32f73797374656d2f746573744163746f722d31233133" +
-          "3137373931343033"
+          "0a4a08c7da04120d4f6c645061796c6f61642841291a3" +
+          "56f72672e6170616368652e70656b6b6f2e7065727369" +
+          "7374656e63652e73657269616c697a6174696f6e2e4f6" +
+          "c645061796c6f6164100d1a0270315a45616b6b613a2f" +
+          "2f4d65737361676553657269616c697a6572506572736" +
+          "97374656e6365537065632f73797374656d2f74657374" +
+          "4163746f722d312331343738333730393939"
 
         // now the system is updated, OldPayload is replaced by MyPayload, and the
         // OldPayloadSerializer is adjusted to migrate OldPayload
@@ -252,13 +253,13 @@ class MessageSerializerPersistenceSpec extends AkkaSpec(customSerializers) {
         // import org.apache.commons.codec.binary.Hex._
         // println(s"encoded persistent: " + String.valueOf(encodeHex(serializer.toBinary(persistent))))
         val oldData =
-          "0a3208c3da0412022e611a28616b6b612e70657273697374656e63652e73657269616c697a" +
-          "6174696f6e2e4d795061796c6f6164100d1a027031200130033a0263313a02633240014a0c" +
-          "0a02703212026332180e20005244616b6b613a2f2f4d65737361676553657269616c697a65" +
-          "7250657273697374656e6365537065632f73797374656d2f746573744163746f7232232d34" +
-          "34373233313933375a44616b6b613a2f2f4d65737361676553657269616c697a6572506572" +
-          "73697374656e6365537065632f73797374656d2f746573744163746f7232232d3434373233" +
-          "31393337"
+          "0a3e08c3da0412022e611a346f72672e6170616368652e70656b6b6f2e7065727369737465" +
+          "6e63652e73657269616c697a6174696f6e2e4d795061796c6f6164100d1a02703120013003" +
+          "3a0263313a02633240014a0c0a02703212026332180e20005244616b6b613a2f2f4d657373" +
+          "61676553657269616c697a657250657273697374656e6365537065632f73797374656d2f74" +
+          "6573744163746f7232232d3434373233313933375a44616b6b613a2f2f4d65737361676553" +
+          "657269616c697a657250657273697374656e6365537065632f73797374656d2f7465737441" +
+          "63746f7232232d343437323331393337"
 
         val bytes = decodeHex(oldData.toCharArray)
         val expected = PersistentRepr(MyPayload(".a."), 13, "p1", "", true, Actor.noSender)
@@ -462,7 +463,7 @@ class MySnapshotSerializer2 extends SerializerWithStringManifest {
 class OldPayloadSerializer extends SerializerWithStringManifest {
 
   def identifier: Int = 77127
-  val OldPayloadClassName = "akka.persistence.serialization.OldPayload"
+  val OldPayloadClassName = "org.apache.pekko.persistence.serialization.OldPayload"
   val MyPayloadClassName = classOf[MyPayload].getName
 
   def manifest(o: AnyRef): String = o.getClass.getName
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/CapabilityFlags.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/CapabilityFlags.scala
similarity index 98%
rename from akka-persistence-tck/src/main/scala/akka/persistence/CapabilityFlags.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/CapabilityFlags.scala
index 74c3fb2077..9bb64fd91e 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/CapabilityFlags.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/CapabilityFlags.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.language.implicitConversions
 
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/PluginSpec.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/PluginSpec.scala
similarity index 92%
rename from akka-persistence-tck/src/main/scala/akka/persistence/PluginSpec.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/PluginSpec.scala
index bb200b8ec4..5eb7fd1d91 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/PluginSpec.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/PluginSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicInteger
@@ -14,8 +14,9 @@ import org.scalatest._
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor._
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit._
 
 abstract class PluginSpec(val config: Config)
     extends TestKitBase
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/TestSerializer.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/TestSerializer.scala
similarity index 88%
rename from akka-persistence-tck/src/main/scala/akka/persistence/TestSerializer.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/TestSerializer.scala
index 5ae45e4d90..7752c98ff4 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/TestSerializer.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/TestSerializer.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.nio.charset.StandardCharsets
-import akka.actor.ActorRef
-import akka.actor.ExtendedActorSystem
-import akka.serialization.Serialization
-import akka.serialization.SerializerWithStringManifest
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.ExtendedActorSystem
+import pekko.serialization.Serialization
+import pekko.serialization.SerializerWithStringManifest
 
 import java.io.NotSerializableException
 
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalPerfSpec.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalPerfSpec.scala
similarity index 79%
rename from akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalPerfSpec.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalPerfSpec.scala
index c01310eb2e..5939a32e29 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalPerfSpec.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalPerfSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence.japi.journal
+package org.apache.pekko.persistence.japi.journal
 
 import com.typesafe.config.Config
 import org.scalactic.source.Position
 import org.scalatest.Informer
 
-import akka.persistence.CapabilityFlag
-import akka.persistence.journal.JournalPerfSpec
+import org.apache.pekko
+import pekko.persistence.CapabilityFlag
+import pekko.persistence.journal.JournalPerfSpec
 
 /**
  * JAVA API
  *
- * Java / JUnit consumable equivalent of [[akka.persistence.journal.JournalPerfSpec]] and [[akka.persistence.journal.JournalSpec]].
+ * Java / JUnit consumable equivalent of [[pekko.persistence.journal.JournalPerfSpec]] and [[pekko.persistence.journal.JournalSpec]].
  *
- * This spec measures execution times of the basic operations that an [[akka.persistence.PersistentActor]] provides,
+ * This spec measures execution times of the basic operations that an [[pekko.persistence.PersistentActor]] provides,
  * using the provided Journal (plugin).
  *
  * It is *NOT* meant to be a comprehensive benchmark, but rather aims to help plugin developers to easily determine
@@ -40,8 +41,8 @@ import akka.persistence.journal.JournalPerfSpec
  * In case your journal plugin needs some kind of setup or teardown, override the `beforeAll` or `afterAll`
  * methods (don't forget to call `super` in your overridden methods).
  *
- * @see [[akka.persistence.journal.JournalSpec]]
- * @see [[akka.persistence.journal.JournalPerfSpec]]
+ * @see [[pekko.persistence.journal.JournalSpec]]
+ * @see [[pekko.persistence.journal.JournalPerfSpec]]
  * @param config configures the Journal plugin to be tested
  */
 class JavaJournalPerfSpec(config: Config) extends JournalPerfSpec(config) {
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalSpec.scala
similarity index 84%
rename from akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalSpec.scala
index 633de1e696..2690634b2c 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/journal/JavaJournalSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence.japi.journal
+package org.apache.pekko.persistence.japi.journal
 
 import scala.collection.immutable
 
 import com.typesafe.config.Config
-import akka.persistence.CapabilityFlag
-import akka.persistence.journal.JournalSpec
+import org.apache.pekko
+import pekko.persistence.CapabilityFlag
+import pekko.persistence.journal.JournalSpec
 import org.scalatest.{ Args, ConfigMap, Filter, Status, Suite, TestData }
 
 /**
  * JAVA API
  *
- * Java / JUnit API for [[akka.persistence.journal.JournalSpec]].
+ * Java / JUnit API for [[pekko.persistence.journal.JournalSpec]].
  *
  * In case your journal plugin needs some kind of setup or teardown, override the `beforeAll` or `afterAll`
  * methods (don't forget to call `super` in your overridden methods).
  *
- * @see [[akka.persistence.journal.JournalSpec]]
- * @see [[akka.persistence.journal.JournalPerfSpec]]
+ * @see [[pekko.persistence.journal.JournalSpec]]
+ * @see [[pekko.persistence.journal.JournalPerfSpec]]
  * @param config configures the Journal plugin to be tested
  */
 class JavaJournalSpec(config: Config) extends JournalSpec(config) {
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala
similarity index 83%
rename from akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala
index 7e39d4c8c4..53e2aed056 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence.japi.snapshot
+package org.apache.pekko.persistence.japi.snapshot
 
 import scala.collection.immutable
 
 import com.typesafe.config.Config
-import akka.persistence.CapabilityFlag
-import akka.persistence.snapshot.SnapshotStoreSpec
+import org.apache.pekko
+import pekko.persistence.CapabilityFlag
+import pekko.persistence.snapshot.SnapshotStoreSpec
 import org.scalatest.{ Args, ConfigMap, Filter, Status, Suite, TestData }
 
 /**
  * JAVA API
  *
- * This spec aims to verify custom akka-persistence [[akka.persistence.snapshot.SnapshotStore]] implementations.
+ * This spec aims to verify custom akka-persistence [[pekko.persistence.snapshot.SnapshotStore]] implementations.
  * Plugin authors are highly encouraged to include it in their plugin's test suites.
  *
  * In case your snapshot-store plugin needs some kind of setup or teardown, override the `beforeAll` or `afterAll`
  * methods (don't forget to call `super` in your overridden methods).
  *
- * @see [[akka.persistence.snapshot.SnapshotStoreSpec]]
+ * @see [[pekko.persistence.snapshot.SnapshotStoreSpec]]
  */
 class JavaSnapshotStoreSpec(config: Config) extends SnapshotStoreSpec(config) {
   override protected def supportsSerialization: CapabilityFlag = CapabilityFlag.on()
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
similarity index 88%
rename from akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
index c53617930c..9d757fdb40 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalPerfSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import java.nio.charset.StandardCharsets
 
@@ -12,16 +12,17 @@ import scala.concurrent.duration._
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.persistence.PersistentActor
-import akka.persistence.journal.JournalPerfSpec.BenchActor
-import akka.persistence.journal.JournalPerfSpec.Cmd
-import akka.persistence.journal.JournalPerfSpec.ResetCounter
-import akka.serialization.SerializerWithStringManifest
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.persistence.PersistentActor
+import pekko.persistence.journal.JournalPerfSpec.BenchActor
+import pekko.persistence.journal.JournalPerfSpec.Cmd
+import pekko.persistence.journal.JournalPerfSpec.ResetCounter
+import pekko.serialization.SerializerWithStringManifest
+import pekko.testkit.TestProbe
 
 object JournalPerfSpec {
   class BenchActor(override val persistenceId: String, replyTo: ActorRef, replyAfter: Int)
@@ -76,7 +77,7 @@ object JournalPerfSpec {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] class CmdSerializer extends SerializerWithStringManifest {
+  @InternalApi private[pekko] class CmdSerializer extends SerializerWithStringManifest {
     override def identifier: Int = 293562
 
     override def manifest(o: AnyRef): String = ""
@@ -109,7 +110,7 @@ object JournalPerfSpec {
 }
 
 /**
- * This spec measures execution times of the basic operations that an [[akka.persistence.PersistentActor]] provides,
+ * This spec measures execution times of the basic operations that an [[pekko.persistence.PersistentActor]] provides,
  * using the provided Journal (plugin).
  *
  * It is *NOT* meant to be a comprehensive benchmark, but rather aims to help plugin developers to easily determine
@@ -118,9 +119,9 @@ object JournalPerfSpec {
  * In case your journal plugin needs some kind of setup or teardown, override the `beforeAll` or `afterAll`
  * methods (don't forget to call `super` in your overridden methods).
  *
- * For a Java and JUnit consumable version of the TCK please refer to [[akka.persistence.japi.journal.JavaJournalPerfSpec]].
+ * For a Java and JUnit consumable version of the TCK please refer to [[pekko.persistence.japi.journal.JavaJournalPerfSpec]].
  *
- * @see [[akka.persistence.journal.JournalSpec]]
+ * @see [[pekko.persistence.journal.JournalSpec]]
  */
 abstract class JournalPerfSpec(config: Config)
     extends JournalSpec(config.withFallback(JournalPerfSpec.cmdSerializerConfig)) {
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalSpec.scala
similarity index 96%
rename from akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalSpec.scala
index 253b4a0624..b679ee8a37 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/journal/JournalSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import scala.concurrent.duration._
 
 import com.typesafe.config._
 
-import akka.actor._
-import akka.persistence._
-import akka.persistence.JournalProtocol._
-import akka.persistence.scalatest.{ MayVerb, OptionalTests }
-import akka.testkit._
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence._
+import pekko.persistence.JournalProtocol._
+import pekko.persistence.scalatest.{ MayVerb, OptionalTests }
+import pekko.testkit._
+import pekko.util.unused
 
 object JournalSpec {
   val config: Config = ConfigFactory.parseString(s"""
@@ -36,10 +37,10 @@ object JournalSpec {
  * In case your journal plugin needs some kind of setup or teardown, override the `beforeAll` or `afterAll`
  * methods (don't forget to call `super` in your overridden methods).
  *
- * For a Java and JUnit consumable version of the TCK please refer to [[akka.persistence.japi.journal.JavaJournalSpec]].
+ * For a Java and JUnit consumable version of the TCK please refer to [[pekko.persistence.japi.journal.JavaJournalSpec]].
  *
- * @see [[akka.persistence.journal.JournalPerfSpec]]
- * @see [[akka.persistence.japi.journal.JavaJournalPerfSpec]]
+ * @see [[pekko.persistence.journal.JournalPerfSpec]]
+ * @see [[pekko.persistence.japi.journal.JavaJournalPerfSpec]]
  */
 abstract class JournalSpec(config: Config)
     extends PluginSpec(config)
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/MayVerb.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/scalatest/MayVerb.scala
similarity index 97%
rename from akka-persistence-tck/src/main/scala/akka/persistence/scalatest/MayVerb.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/scalatest/MayVerb.scala
index a18e483ebc..cc21b58e77 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/MayVerb.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/scalatest/MayVerb.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence.scalatest
+package org.apache.pekko.persistence.scalatest
 
 import org.scalactic.source.Position
 import org.scalatest.exceptions.TestCanceledException
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/OptionalTests.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/scalatest/OptionalTests.scala
similarity index 89%
rename from akka-persistence-tck/src/main/scala/akka/persistence/scalatest/OptionalTests.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/scalatest/OptionalTests.scala
index 82f723cb53..37ddb0949a 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/OptionalTests.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/scalatest/OptionalTests.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.scalatest
+package org.apache.pekko.persistence.scalatest
 
 import org.scalatest.Informing
 
-import akka.persistence.CapabilityFlag
+import org.apache.pekko.persistence.CapabilityFlag
 
 trait OptionalTests {
   this: Informing =>
diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/snapshot/SnapshotStoreSpec.scala b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStoreSpec.scala
similarity index 96%
rename from akka-persistence-tck/src/main/scala/akka/persistence/snapshot/SnapshotStoreSpec.scala
rename to akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStoreSpec.scala
index 41db0c36bc..700be19657 100644
--- a/akka-persistence-tck/src/main/scala/akka/persistence/snapshot/SnapshotStoreSpec.scala
+++ b/akka-persistence-tck/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStoreSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.snapshot
+package org.apache.pekko.persistence.snapshot
 
 import scala.collection.immutable.Seq
 
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.persistence._
-import akka.persistence.SnapshotProtocol._
-import akka.persistence.scalatest.{ MayVerb, OptionalTests }
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence._
+import pekko.persistence.SnapshotProtocol._
+import pekko.persistence.scalatest.{ MayVerb, OptionalTests }
+import pekko.testkit.TestProbe
 
 object SnapshotStoreSpec {
   val config: Config = ConfigFactory.parseString(s"""
@@ -36,9 +37,9 @@ object SnapshotStoreSpec {
  * In case your journal plugin needs some kind of setup or teardown, override the `beforeAll` or `afterAll`
  * methods (don't forget to call `super` in your overridden methods).
  *
- * For a Java and JUnit consumable version of the TCK please refer to [[akka.persistence.japi.snapshot.JavaSnapshotStoreSpec]].
+ * For a Java and JUnit consumable version of the TCK please refer to [[pekko.persistence.japi.snapshot.JavaSnapshotStoreSpec]].
  *
- * @see [[akka.persistence.japi.snapshot.JavaSnapshotStoreSpec]]
+ * @see [[pekko.persistence.japi.snapshot.JavaSnapshotStoreSpec]]
  */
 abstract class SnapshotStoreSpec(config: Config)
     extends PluginSpec(config)
diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/PluginCleanup.scala
similarity index 94%
rename from akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala
rename to akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/PluginCleanup.scala
index 4fabf617f8..3ed948fefc 100644
--- a/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala
+++ b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/PluginCleanup.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.File
 
diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/japi/JavaJournalSpecSpec.scala b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/japi/JavaJournalSpecSpec.scala
similarity index 77%
rename from akka-persistence-tck/src/test/scala/akka/persistence/japi/JavaJournalSpecSpec.scala
rename to akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/japi/JavaJournalSpecSpec.scala
index 247798b976..ff9c1f7a50 100644
--- a/akka-persistence-tck/src/test/scala/akka/persistence/japi/JavaJournalSpecSpec.scala
+++ b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/japi/JavaJournalSpecSpec.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence.japi
+package org.apache.pekko.persistence.japi
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.DoNotDiscover
 
-import akka.persistence.japi.journal.JavaJournalSpec
+import org.apache.pekko.persistence.japi.journal.JavaJournalSpec
 
 /* Only checking that compilation works with the constructor here as expected (no other abstract fields leaked) */
 @DoNotDiscover
diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/inmem/InmemJournalSpec.scala b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/inmem/InmemJournalSpec.scala
similarity index 59%
rename from akka-persistence-tck/src/test/scala/akka/persistence/journal/inmem/InmemJournalSpec.scala
rename to akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/inmem/InmemJournalSpec.scala
index 7ecdb6ef80..28e4c86d14 100644
--- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/inmem/InmemJournalSpec.scala
+++ b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/inmem/InmemJournalSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.inmem
+package org.apache.pekko.persistence.journal.inmem
 
-import akka.persistence.CapabilityFlag
-import akka.persistence.PersistenceSpec
-import akka.persistence.journal.JournalSpec
+import org.apache.pekko
+import pekko.persistence.CapabilityFlag
+import pekko.persistence.PersistenceSpec
+import pekko.persistence.journal.JournalSpec
 
 class InmemJournalSpec extends JournalSpec(config = PersistenceSpec.config("inmem", "InmemJournalSpec")) {
   override protected def supportsRejectingNonSerializableObjects: CapabilityFlag = CapabilityFlag.off()
diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala
similarity index 75%
rename from akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala
rename to akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala
index df60407e70..e190beeed8 100644
--- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala
+++ b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
-import akka.persistence.{ PersistenceSpec, PluginCleanup }
-import akka.persistence.journal.JournalSpec
+import org.apache.pekko
+import pekko.persistence.{ PersistenceSpec, PluginCleanup }
+import pekko.persistence.journal.JournalSpec
 
 class LeveldbJournalJavaSpec
     extends JournalSpec(
diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala
similarity index 75%
rename from akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala
rename to akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala
index 3430c4a26c..96ac466c7c 100644
--- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala
+++ b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
-import akka.persistence.{ PersistenceSpec, PluginCleanup }
-import akka.persistence.journal.JournalSpec
+import org.apache.pekko
+import pekko.persistence.{ PersistenceSpec, PluginCleanup }
+import pekko.persistence.journal.JournalSpec
 
 class LeveldbJournalNativeSpec
     extends JournalSpec(
diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala
similarity index 81%
rename from akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala
rename to akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala
index 3b692d6e6d..2cb53d40f2 100644
--- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala
+++ b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
-import akka.persistence.{ PersistenceSpec, PluginCleanup }
-import akka.persistence.journal.JournalSpec
+import org.apache.pekko
+import pekko.persistence.{ PersistenceSpec, PluginCleanup }
+import pekko.persistence.journal.JournalSpec
 
 class LeveldbJournalNoAtomicPersistMultipleEventsSpec
     extends JournalSpec(
diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/snapshot/local/LocalSnapshotStoreSpec.scala b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStoreSpec.scala
similarity index 72%
rename from akka-persistence-tck/src/test/scala/akka/persistence/snapshot/local/LocalSnapshotStoreSpec.scala
rename to akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStoreSpec.scala
index 15c1e7f5c4..49e76f1d6a 100644
--- a/akka-persistence-tck/src/test/scala/akka/persistence/snapshot/local/LocalSnapshotStoreSpec.scala
+++ b/akka-persistence-tck/src/test/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStoreSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.snapshot.local
+package org.apache.pekko.persistence.snapshot.local
 
 import com.typesafe.config.ConfigFactory
 
-import akka.persistence.CapabilityFlag
-import akka.persistence.PluginCleanup
-import akka.persistence.snapshot.SnapshotStoreSpec
+import org.apache.pekko
+import pekko.persistence.CapabilityFlag
+import pekko.persistence.PluginCleanup
+import pekko.persistence.snapshot.SnapshotStoreSpec
 
 class LocalSnapshotStoreSpec
     extends SnapshotStoreSpec(
diff --git a/akka-persistence-testkit/src/main/resources/reference.conf b/akka-persistence-testkit/src/main/resources/reference.conf
index f12ca3d3ff..743553faf1 100644
--- a/akka-persistence-testkit/src/main/resources/reference.conf
+++ b/akka-persistence-testkit/src/main/resources/reference.conf
@@ -30,9 +30,9 @@ akka.persistence.testkit {
 }
 
 akka.persistence.testkit.query {
-  class = "akka.persistence.testkit.query.PersistenceTestKitReadJournalProvider"
+  class = "org.apache.pekko.persistence.testkit.query.PersistenceTestKitReadJournalProvider"
 }
 
 akka.persistence.testkit.state {
-  class = "akka.persistence.testkit.state.PersistenceTestKitDurableStateStoreProvider"
+  class = "org.apache.pekko.persistence.testkit.state.PersistenceTestKitDurableStateStoreProvider"
 }
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/EventStorage.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/EventStorage.scala
similarity index 92%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/EventStorage.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/EventStorage.scala
index 41b05e6ee7..fb016028ea 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/EventStorage.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/EventStorage.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit
+package org.apache.pekko.persistence.testkit
 
-import akka.NotUsed
+import org.apache.pekko
+import pekko.NotUsed
 import java.util.{ List => JList }
 
 import scala.collection.immutable
 import scala.util.{ Failure, Success, Try }
 
-import akka.annotation.InternalApi
-import akka.persistence.PersistentRepr
-import akka.persistence.journal.Tagged
-import akka.persistence.testkit.ProcessingPolicy.DefaultPolicies
-import akka.persistence.testkit.internal.TestKitStorage
-import akka.stream.scaladsl.Source
-import akka.util.ccompat.JavaConverters._
+import pekko.annotation.InternalApi
+import pekko.persistence.PersistentRepr
+import pekko.persistence.journal.Tagged
+import pekko.persistence.testkit.ProcessingPolicy.DefaultPolicies
+import pekko.persistence.testkit.internal.TestKitStorage
+import pekko.stream.scaladsl.Source
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API
@@ -159,7 +160,7 @@ object EventStorage {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] implicit val persistentReprOrdering: Ordering[PersistentRepr] =
+  @InternalApi private[pekko] implicit val persistentReprOrdering: Ordering[PersistentRepr] =
     Ordering.fromLessThan[PersistentRepr] { (a, b) =>
       if (a eq b) false
       else if (a.timestamp != b.timestamp) a.timestamp < b.timestamp
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/PersistenceTestKitPlugin.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/PersistenceTestKitPlugin.scala
similarity index 87%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/PersistenceTestKitPlugin.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/PersistenceTestKitPlugin.scala
index 91c8988ff4..03e4d4f4e7 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/PersistenceTestKitPlugin.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/PersistenceTestKitPlugin.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit
+package org.apache.pekko.persistence.testkit
 
-import akka.actor.ActorLogging
+import org.apache.pekko
+import pekko.actor.ActorLogging
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.util.Try
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.annotation.InternalApi
-import akka.persistence._
-import akka.persistence.journal.AsyncWriteJournal
-import akka.persistence.journal.Tagged
-import akka.persistence.snapshot.SnapshotStore
-import akka.persistence.testkit.internal.CurrentTime
-import akka.persistence.testkit.internal.{ InMemStorageExtension, SnapshotStorageEmulatorExtension }
-import akka.util.unused
+import pekko.annotation.InternalApi
+import pekko.persistence._
+import pekko.persistence.journal.AsyncWriteJournal
+import pekko.persistence.journal.Tagged
+import pekko.persistence.snapshot.SnapshotStore
+import pekko.persistence.testkit.internal.CurrentTime
+import pekko.persistence.testkit.internal.{ InMemStorageExtension, SnapshotStorageEmulatorExtension }
+import pekko.util.unused
 
 /**
  * INTERNAL API
@@ -83,7 +84,7 @@ object PersistenceTestKitPlugin {
 
   val PluginId = "akka.persistence.testkit.journal"
 
-  import akka.util.ccompat.JavaConverters._
+  import pekko.util.ccompat.JavaConverters._
 
   def getInstance() = this
 
@@ -124,7 +125,7 @@ object PersistenceTestKitSnapshotPlugin {
 
   val PluginId = "akka.persistence.testkit.snapshotstore.pluginid"
 
-  import akka.util.ccompat.JavaConverters._
+  import pekko.util.ccompat.JavaConverters._
 
   def getInstance() = this
 
@@ -141,7 +142,7 @@ object PersistenceTestKitDurableStateStorePlugin {
 
   val PluginId = "akka.persistence.testkit.state"
 
-  import akka.util.ccompat.JavaConverters._
+  import pekko.util.ccompat.JavaConverters._
 
   def getInstance() = this
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/ProcessingPolicy.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/ProcessingPolicy.scala
similarity index 97%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/ProcessingPolicy.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/ProcessingPolicy.scala
index f65950e48f..faf446a1de 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/ProcessingPolicy.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/ProcessingPolicy.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit
+package org.apache.pekko.persistence.testkit
 
-import akka.annotation.{ ApiMayChange, InternalApi }
+import org.apache.pekko.annotation.{ ApiMayChange, InternalApi }
 
 import scala.util.control.NoStackTrace
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/SnapshotStorage.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/SnapshotStorage.scala
similarity index 91%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/SnapshotStorage.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/SnapshotStorage.scala
index 925594ca48..584978b8d1 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/SnapshotStorage.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/SnapshotStorage.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit
+package org.apache.pekko.persistence.testkit
 
-import akka.actor.Extension
+import org.apache.pekko
+import pekko.actor.Extension
 
 import scala.util.Success
-import akka.annotation.InternalApi
-import akka.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria }
-import akka.persistence.testkit.ProcessingPolicy.DefaultPolicies
-import akka.persistence.testkit.internal.TestKitStorage
+import pekko.annotation.InternalApi
+import pekko.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria }
+import pekko.persistence.testkit.ProcessingPolicy.DefaultPolicies
+import pekko.persistence.testkit.internal.TestKitStorage
 
 /**
  * INTERNAL API
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/CurrentTime.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/CurrentTime.scala
similarity index 78%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/CurrentTime.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/CurrentTime.scala
index b25a03d7d8..0da170133d 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/CurrentTime.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/CurrentTime.scala
@@ -2,16 +2,16 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
 import java.util.concurrent.atomic.AtomicLong
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object CurrentTime {
+@InternalApi private[pekko] object CurrentTime {
   private val previous = new AtomicLong(System.currentTimeMillis())
 
   /**
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala
similarity index 84%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala
index d4557fbf16..777a2982eb 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/EventSourcedBehaviorTestKitImpl.scala
@@ -2,38 +2,39 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
 import scala.collection.immutable
 import scala.concurrent.Await
 import scala.reflect.ClassTag
 import scala.util.control.NonFatal
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
-import akka.actor.testkit.typed.scaladsl.SerializationTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.annotation.InternalApi
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.query.scaladsl.CurrentEventsByPersistenceIdQuery
-import akka.persistence.testkit.SnapshotMeta
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit
-import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit.CommandResult
-import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit.CommandResultWithReply
-import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit.RestartResult
-import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit.SerializationSettings
-import akka.persistence.testkit.scaladsl.PersistenceTestKit
-import akka.persistence.testkit.scaladsl.SnapshotTestKit
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.internal.EventSourcedBehaviorImpl
-import akka.persistence.typed.internal.EventSourcedBehaviorImpl.GetStateReply
-import akka.stream.scaladsl.Sink
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.ActorTestKit
+import pekko.actor.testkit.typed.scaladsl.SerializationTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.annotation.InternalApi
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.query.scaladsl.CurrentEventsByPersistenceIdQuery
+import pekko.persistence.testkit.SnapshotMeta
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit
+import pekko.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit.CommandResult
+import pekko.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit.CommandResultWithReply
+import pekko.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit.RestartResult
+import pekko.persistence.testkit.scaladsl.EventSourcedBehaviorTestKit.SerializationSettings
+import pekko.persistence.testkit.scaladsl.PersistenceTestKit
+import pekko.persistence.testkit.scaladsl.SnapshotTestKit
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.internal.EventSourcedBehaviorImpl
+import pekko.persistence.typed.internal.EventSourcedBehaviorImpl.GetStateReply
+import pekko.stream.scaladsl.Sink
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object EventSourcedBehaviorTestKitImpl {
+@InternalApi private[pekko] object EventSourcedBehaviorTestKitImpl {
   final case class CommandResultImpl[Command, Event, State, Reply](
       command: Command,
       events: immutable.Seq[Event],
@@ -79,7 +80,7 @@ import akka.stream.scaladsl.Sink
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class EventSourcedBehaviorTestKitImpl[Command, Event, State](
+@InternalApi private[pekko] class EventSourcedBehaviorTestKitImpl[Command, Event, State](
     actorTestKit: ActorTestKit,
     behavior: Behavior[Command],
     serializationSettings: SerializationSettings)
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/InMemStorageExtension.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/InMemStorageExtension.scala
similarity index 74%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/InMemStorageExtension.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/InMemStorageExtension.scala
index 2e31507ed9..3200eab41e 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/InMemStorageExtension.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/InMemStorageExtension.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
 import java.util.concurrent.ConcurrentHashMap
 
-import akka.actor.Extension
-import akka.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider }
-import akka.annotation.InternalApi
-import akka.persistence.testkit.EventStorage
-import akka.persistence.testkit.JournalOperation
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.ProcessingPolicy
-import akka.persistence.testkit.scaladsl.PersistenceTestKit
+import org.apache.pekko
+import pekko.actor.Extension
+import pekko.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider }
+import pekko.annotation.InternalApi
+import pekko.persistence.testkit.EventStorage
+import pekko.persistence.testkit.JournalOperation
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.ProcessingPolicy
+import pekko.persistence.testkit.scaladsl.PersistenceTestKit
 
 /**
  * INTERNAL API
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/PersistenceInitImpl.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/PersistenceInitImpl.scala
similarity index 77%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/PersistenceInitImpl.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/PersistenceInitImpl.scala
index 2c4eefa7f8..ceb4edcbf1 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/PersistenceInitImpl.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/PersistenceInitImpl.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
 import java.util.concurrent.TimeUnit
 
-import akka.actor.ActorLogging
-import akka.actor.Props
-import akka.annotation.InternalApi
-import akka.persistence.PersistentActor
-import akka.persistence.RecoveryCompleted
+import org.apache.pekko
+import pekko.actor.ActorLogging
+import pekko.actor.Props
+import pekko.annotation.InternalApi
+import pekko.persistence.PersistentActor
+import pekko.persistence.RecoveryCompleted
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object PersistenceInitImpl {
+@InternalApi private[pekko] object PersistenceInitImpl {
 
   def props(journalPluginId: String, snapshotPluginId: String, persistenceId: String): Props = {
     Props(new PersistenceInitImpl(journalPluginId, snapshotPluginId, persistenceId))
@@ -27,7 +28,7 @@ import akka.persistence.RecoveryCompleted
  * and send any message to it. It will reply to the `sender()` with the same message when
  * recovery has completed.
  */
-@InternalApi private[akka] class PersistenceInitImpl(
+@InternalApi private[pekko] class PersistenceInitImpl(
     override val journalPluginId: String,
     override val snapshotPluginId: String,
     override val persistenceId: String)
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedEventStorageImpl.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SerializedEventStorageImpl.scala
similarity index 83%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedEventStorageImpl.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SerializedEventStorageImpl.scala
index b7a51346cf..8c6081bc0a 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedEventStorageImpl.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SerializedEventStorageImpl.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
-import akka.actor.{ ActorSystem, ExtendedActorSystem }
-import akka.annotation.InternalApi
-import akka.persistence.PersistentRepr
-import akka.persistence.journal.Tagged
-import akka.persistence.testkit.EventStorage
-import akka.persistence.testkit.internal.SerializedEventStorageImpl.Serialized
-import akka.serialization.{ Serialization, SerializationExtension, Serializers }
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, ExtendedActorSystem }
+import pekko.annotation.InternalApi
+import pekko.persistence.PersistentRepr
+import pekko.persistence.journal.Tagged
+import pekko.persistence.testkit.EventStorage
+import pekko.persistence.testkit.internal.SerializedEventStorageImpl.Serialized
+import pekko.serialization.{ Serialization, SerializationExtension, Serializers }
 
 @InternalApi
 private[testkit] object SerializedEventStorageImpl {
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedSnapshotStorageImpl.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SerializedSnapshotStorageImpl.scala
similarity index 74%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedSnapshotStorageImpl.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SerializedSnapshotStorageImpl.scala
index 1f2f0ae9e0..d2e7dc92c5 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedSnapshotStorageImpl.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SerializedSnapshotStorageImpl.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
-import akka.actor.{ ActorSystem, ExtendedActorSystem }
-import akka.annotation.InternalApi
-import akka.persistence.SnapshotMetadata
-import akka.persistence.testkit.SnapshotStorage
-import akka.serialization.{ Serialization, SerializationExtension, Serializers }
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, ExtendedActorSystem }
+import pekko.annotation.InternalApi
+import pekko.persistence.SnapshotMetadata
+import pekko.persistence.testkit.SnapshotStorage
+import pekko.serialization.{ Serialization, SerializationExtension, Serializers }
 
 /**
  * INTERNAL API
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SimpleEventStorageImpl.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SimpleEventStorageImpl.scala
similarity index 67%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SimpleEventStorageImpl.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SimpleEventStorageImpl.scala
index 49ff0955bd..6b89e2d808 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SimpleEventStorageImpl.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SimpleEventStorageImpl.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
-import akka.annotation.InternalApi
-import akka.persistence._
-import akka.persistence.testkit.EventStorage
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence._
+import pekko.persistence.testkit.EventStorage
 
 /**
  * INTERNAL API
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SimpleSnapshotStorageImpl.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SimpleSnapshotStorageImpl.scala
similarity index 68%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SimpleSnapshotStorageImpl.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SimpleSnapshotStorageImpl.scala
index 8ca47c1b7d..3af8a525c4 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SimpleSnapshotStorageImpl.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SimpleSnapshotStorageImpl.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
-import akka.annotation.InternalApi
-import akka.persistence.SnapshotMetadata
-import akka.persistence.testkit.SnapshotStorage
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.SnapshotMetadata
+import pekko.persistence.testkit.SnapshotStorage
 
 /**
  * INTERNAL API
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala
similarity index 65%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala
index ba25f26466..b5ac06cfe5 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
-import akka.actor.Extension
-import akka.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider }
-import akka.annotation.InternalApi
-import akka.persistence.testkit.SnapshotStorage
-import akka.persistence.testkit.scaladsl.SnapshotTestKit
+import org.apache.pekko
+import pekko.actor.Extension
+import pekko.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider }
+import pekko.annotation.InternalApi
+import pekko.persistence.testkit.SnapshotStorage
+import pekko.persistence.testkit.scaladsl.SnapshotTestKit
 
 /**
  * INTERNAL API
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/TestKitStorage.scala
similarity index 96%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/TestKitStorage.scala
index 5c7cfbe231..d41d6e37c0 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/internal/TestKitStorage.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.internal
+package org.apache.pekko.persistence.testkit.internal
 
 import java.util.concurrent.atomic.AtomicReference
 
-import akka.annotation.InternalApi
-import akka.persistence.testkit.ProcessingPolicy
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.testkit.ProcessingPolicy
 
 import scala.collection.immutable
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala
similarity index 95%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala
index 0899d8c8de..9aabe18c53 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
 import java.util.Optional
 import java.util.{ List => JList }
@@ -10,18 +10,19 @@ import java.util.function.{ Function => JFunction }
 
 import scala.reflect.ClassTag
 import com.typesafe.config.Config
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.annotation.ApiMayChange
-import akka.annotation.DoNotInherit
-import akka.persistence.testkit.scaladsl
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.annotation.ApiMayChange
+import pekko.annotation.DoNotInherit
+import pekko.persistence.testkit.scaladsl
+import pekko.util.ccompat.JavaConverters._
 
 import scala.annotation.varargs
 
 /**
- * Testing of [[akka.persistence.typed.javadsl.EventSourcedBehavior]] implementations.
+ * Testing of [[pekko.persistence.typed.javadsl.EventSourcedBehavior]] implementations.
  * It supports running one command at a time and you can assert that the synchronously returned result is as expected.
  * The result contains the events emitted by the command and the new state after applying the events.
  * It also has support for verifying the reply to a command.
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceInit.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceInit.scala
similarity index 85%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceInit.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceInit.scala
index f23b95c7f9..540b36db5f 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceInit.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceInit.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
 import java.time.Duration
 import java.util.concurrent.CompletionStage
 
 import scala.compat.java8.FutureConverters._
 
-import akka.Done
-import akka.actor.ClassicActorSystemProvider
-import akka.persistence.testkit.scaladsl
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ClassicActorSystemProvider
+import pekko.persistence.testkit.scaladsl
+import pekko.util.JavaDurationConverters._
 
 /**
  * Test utility to initialize persistence plugins. Useful when initialization order or coordination
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceTestKit.scala
similarity index 97%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceTestKit.scala
index d98aa34ca2..00da485739 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceTestKit.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
 import java.time.Duration
 import java.util.{ List => JList }
 import java.util.{ function => jf }
 
-import akka.actor.ActorSystem
-import akka.annotation.ApiMayChange
-import akka.persistence.testkit.{ EventStorage, ExpectedFailure, ExpectedRejection, JournalOperation }
-import akka.persistence.testkit.scaladsl.{ PersistenceTestKit => ScalaTestKit }
-import akka.util.JavaDurationConverters._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.annotation.ApiMayChange
+import pekko.persistence.testkit.{ EventStorage, ExpectedFailure, ExpectedRejection, JournalOperation }
+import pekko.persistence.testkit.scaladsl.{ PersistenceTestKit => ScalaTestKit }
+import pekko.util.JavaDurationConverters._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Class for testing persisted events in persistent actors.
@@ -437,7 +438,7 @@ class PersistenceTestKit(scalaTestkit: ScalaTestKit) {
 
 object PersistenceTestKit {
 
-  import akka.actor.typed.{ ActorSystem => TypedActorSystem }
+  import pekko.actor.typed.{ ActorSystem => TypedActorSystem }
 
   def create(system: ActorSystem): PersistenceTestKit = new PersistenceTestKit(system)
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotTestKit.scala
similarity index 95%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotTestKit.scala
index 8fba6c07eb..bc55236d97 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotTestKit.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
 import java.time.Duration
 import java.util.{ List => JList }
 import java.util.{ function => jf }
 
-import akka.actor.ActorSystem
-import akka.annotation.ApiMayChange
-import akka.japi.Pair
-import akka.persistence.testkit.{ ExpectedFailure, SnapshotMeta, SnapshotOperation, SnapshotStorage }
-import akka.persistence.testkit.scaladsl.{ SnapshotTestKit => ScalaTestKit }
-import akka.util.JavaDurationConverters._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.annotation.ApiMayChange
+import pekko.japi.Pair
+import pekko.persistence.testkit.{ ExpectedFailure, SnapshotMeta, SnapshotOperation, SnapshotStorage }
+import pekko.persistence.testkit.scaladsl.{ SnapshotTestKit => ScalaTestKit }
+import pekko.util.JavaDurationConverters._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Class for testing persisted snapshots in persistent actors.
@@ -264,7 +265,7 @@ class SnapshotTestKit(scalaTestkit: ScalaTestKit) {
 
 object SnapshotTestKit {
 
-  import akka.actor.typed.{ ActorSystem => TypedActorSystem }
+  import pekko.actor.typed.{ ActorSystem => TypedActorSystem }
 
   def create(system: ActorSystem): SnapshotTestKit = new SnapshotTestKit(system)
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/PersistenceTestKitReadJournalProvider.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/PersistenceTestKitReadJournalProvider.scala
similarity index 78%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/PersistenceTestKitReadJournalProvider.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/PersistenceTestKitReadJournalProvider.scala
index 17d5fe4af8..cb8fb7da02 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/PersistenceTestKitReadJournalProvider.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/PersistenceTestKitReadJournalProvider.scala
@@ -2,9 +2,10 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.query
-import akka.actor.ExtendedActorSystem
-import akka.persistence.query.ReadJournalProvider
+package org.apache.pekko.persistence.testkit.query
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.persistence.query.ReadJournalProvider
 import com.typesafe.config.Config
 
 class PersistenceTestKitReadJournalProvider(system: ExtendedActorSystem, config: Config, configPath: String)
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/internal/EventsByPersistenceIdStage.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/internal/EventsByPersistenceIdStage.scala
similarity index 80%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/internal/EventsByPersistenceIdStage.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/internal/EventsByPersistenceIdStage.scala
index 6a01ed5182..6cc136848c 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/internal/EventsByPersistenceIdStage.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/internal/EventsByPersistenceIdStage.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.query.internal
-import akka.actor.ActorRef
-import akka.annotation.InternalApi
-import akka.persistence.journal.Tagged
-import akka.persistence.query.{ EventEnvelope, Sequence }
-import akka.persistence.testkit.{ EventStorage, PersistenceTestKitPlugin }
-import akka.stream.{ Attributes, Outlet, SourceShape }
-import akka.stream.stage.{ GraphStage, GraphStageLogic, GraphStageLogicWithLogging, OutHandler }
+package org.apache.pekko.persistence.testkit.query.internal
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.annotation.InternalApi
+import pekko.persistence.journal.Tagged
+import pekko.persistence.query.{ EventEnvelope, Sequence }
+import pekko.persistence.testkit.{ EventStorage, PersistenceTestKitPlugin }
+import pekko.stream.{ Attributes, Outlet, SourceShape }
+import pekko.stream.stage.{ GraphStage, GraphStageLogic, GraphStageLogicWithLogging, OutHandler }
 
 /**
  * INTERNAL API
  */
 @InternalApi
-final private[akka] class EventsByPersistenceIdStage(
+final private[pekko] class EventsByPersistenceIdStage(
     persistenceId: String,
     fromSequenceNr: Long,
     toSequenceNr: Long,
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala
similarity index 78%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala
index fcf5166fe5..e7fba45d1e 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.query.javadsl
+package org.apache.pekko.persistence.testkit.query.javadsl
 
-import akka.NotUsed
-import akka.japi.Pair
-import akka.persistence.query.EventEnvelope
-import akka.persistence.query.Offset
-import akka.persistence.query.javadsl.{
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.japi.Pair
+import pekko.persistence.query.EventEnvelope
+import pekko.persistence.query.Offset
+import pekko.persistence.query.javadsl.{
   CurrentEventsByPersistenceIdQuery,
   CurrentEventsByTagQuery,
   EventsByPersistenceIdQuery,
   ReadJournal
 }
-import akka.persistence.query.typed
-import akka.persistence.query.typed.javadsl.CurrentEventsBySliceQuery
-import akka.stream.javadsl.Source
-import akka.persistence.testkit.query.scaladsl
+import pekko.persistence.query.typed
+import pekko.persistence.query.typed.javadsl.CurrentEventsBySliceQuery
+import pekko.stream.javadsl.Source
+import pekko.persistence.testkit.query.scaladsl
 
 object PersistenceTestKitReadJournal {
   val Identifier = "akka.persistence.testkit.query"
@@ -56,7 +57,7 @@ final class PersistenceTestKitReadJournal(delegate: scaladsl.PersistenceTestKitR
     delegate.sliceForPersistenceId(persistenceId)
 
   override def sliceRanges(numberOfRanges: Int): java.util.List[Pair[Integer, Integer]] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     delegate
       .sliceRanges(numberOfRanges)
       .map(range => Pair(Integer.valueOf(range.min), Integer.valueOf(range.max)))
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
similarity index 85%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
index 722aa9d112..1c78b64753 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala
@@ -2,31 +2,32 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.query.scaladsl
-import akka.NotUsed
-import akka.actor.ExtendedActorSystem
-import akka.persistence.journal.Tagged
-import akka.persistence.query.NoOffset
-import akka.persistence.query.Offset
-import akka.persistence.query.scaladsl.{
+package org.apache.pekko.persistence.testkit.query.scaladsl
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ExtendedActorSystem
+import pekko.persistence.journal.Tagged
+import pekko.persistence.query.NoOffset
+import pekko.persistence.query.Offset
+import pekko.persistence.query.scaladsl.{
   CurrentEventsByPersistenceIdQuery,
   CurrentEventsByTagQuery,
   EventsByPersistenceIdQuery,
   PagedPersistenceIdsQuery,
   ReadJournal
 }
-import akka.persistence.query.{ EventEnvelope, Sequence }
-import akka.persistence.testkit.EventStorage
-import akka.persistence.testkit.internal.InMemStorageExtension
-import akka.persistence.testkit.query.internal.EventsByPersistenceIdStage
-import akka.stream.scaladsl.Source
-import akka.util.unused
+import pekko.persistence.query.{ EventEnvelope, Sequence }
+import pekko.persistence.testkit.EventStorage
+import pekko.persistence.testkit.internal.InMemStorageExtension
+import pekko.persistence.testkit.query.internal.EventsByPersistenceIdStage
+import pekko.stream.scaladsl.Source
+import pekko.util.unused
 import com.typesafe.config.Config
 import org.slf4j.LoggerFactory
-import akka.persistence.Persistence
-import akka.persistence.query.typed
-import akka.persistence.query.typed.scaladsl.CurrentEventsBySliceQuery
-import akka.persistence.typed.PersistenceId
+import pekko.persistence.Persistence
+import pekko.persistence.query.typed
+import pekko.persistence.query.typed.scaladsl.CurrentEventsBySliceQuery
+import pekko.persistence.typed.PersistenceId
 
 import scala.collection.immutable
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKit.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/EventSourcedBehaviorTestKit.scala
similarity index 91%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKit.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/EventSourcedBehaviorTestKit.scala
index 9c0309fd92..f6e650a15d 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKit.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/EventSourcedBehaviorTestKit.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
 import scala.collection.immutable
 import scala.reflect.ClassTag
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.annotation.ApiMayChange
-import akka.annotation.DoNotInherit
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin
-import akka.persistence.testkit.internal.EventSourcedBehaviorTestKitImpl
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.ActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.annotation.ApiMayChange
+import pekko.annotation.DoNotInherit
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.PersistenceTestKitSnapshotPlugin
+import pekko.persistence.testkit.internal.EventSourcedBehaviorTestKitImpl
 
 /**
- * Testing of [[akka.persistence.typed.scaladsl.EventSourcedBehavior]] implementations.
+ * Testing of [[pekko.persistence.typed.scaladsl.EventSourcedBehavior]] implementations.
  * It supports running one command at a time and you can assert that the synchronously returned result is as expected.
  * The result contains the events emitted by the command and the new state after applying the events.
  * It also has support for verifying the reply to a command.
@@ -59,7 +60,7 @@ object EventSourcedBehaviorTestKit {
    * Customization of which serialization checks that are performed.
    * `equals` must be implemented (or using `case class`) when `verifyEquality` is enabled.
    */
-  final class SerializationSettings private[akka] (
+  final class SerializationSettings private[pekko] (
       val enabled: Boolean,
       val verifyEquality: Boolean,
       val verifyCommands: Boolean,
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceInit.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/PersistenceInit.scala
similarity index 84%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceInit.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/PersistenceInit.scala
index 0cb234f543..732eb859d7 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceInit.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/PersistenceInit.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
 import java.util.UUID
 
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
 
-import akka.Done
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.persistence.testkit.internal.PersistenceInitImpl
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.persistence.testkit.internal.PersistenceInitImpl
+import pekko.util.Timeout
 
 /**
  * Test utility to initialize persistence plugins. Useful when initialization order or coordination
@@ -49,7 +50,7 @@ object PersistenceInit {
         persistenceId)
     import extSystem.dispatcher
 
-    import akka.pattern.ask
+    import pekko.pattern.ask
     implicit val askTimeout: Timeout = timeout
     (ref ? "start").map(_ => Done)
   }
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/PersistenceTestKit.scala
similarity index 96%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/PersistenceTestKit.scala
index d27ca1e328..bcd9c4d4dd 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/PersistenceTestKit.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
 import scala.collection.immutable
 import scala.concurrent.duration.FiniteDuration
 import scala.util.Try
 import com.typesafe.config.Config
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.typed.{ ActorSystem => TypedActorSystem }
-import akka.annotation.ApiMayChange
-import akka.persistence.Persistence
-import akka.persistence.PersistentRepr
-import akka.persistence.SnapshotMetadata
-import akka.persistence.journal.Tagged
-import akka.persistence.testkit._
-import akka.persistence.testkit.internal.InMemStorageExtension
-import akka.persistence.testkit.internal.SnapshotStorageEmulatorExtension
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.typed.{ ActorSystem => TypedActorSystem }
+import pekko.annotation.ApiMayChange
+import pekko.persistence.Persistence
+import pekko.persistence.PersistentRepr
+import pekko.persistence.SnapshotMetadata
+import pekko.persistence.journal.Tagged
+import pekko.persistence.testkit._
+import pekko.persistence.testkit.internal.InMemStorageExtension
+import pekko.persistence.testkit.internal.SnapshotStorageEmulatorExtension
+import pekko.testkit.TestProbe
 
 private[testkit] trait CommonTestKitOps[S, P] extends ClearOps with PolicyOpsTestKit[P] {
   this: HasStorage[P, S] =>
@@ -415,7 +416,7 @@ object SnapshotTestKit {
 
   class Settings(config: Config) extends Extension {
 
-    import akka.util.Helpers._
+    import pekko.util.Helpers._
 
     val serialize: Boolean = config.getBoolean("serialize")
     val assertTimeout: FiniteDuration = config.getMillisDuration("assert-timeout")
@@ -529,7 +530,7 @@ object PersistenceTestKit {
 
   class Settings(config: Config) extends Extension {
 
-    import akka.util.Helpers._
+    import pekko.util.Helpers._
 
     val serialize: Boolean = config.getBoolean("serialize")
     val assertTimeout: FiniteDuration = config.getMillisDuration("assert-timeout")
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/TestOps.scala
similarity index 96%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/TestOps.scala
index 70de0d33d9..78f14bcac1 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/scaladsl/TestOps.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
 import scala.collection.immutable
 import scala.concurrent.duration.FiniteDuration
 import scala.reflect.ClassTag
 
-import akka.persistence.testkit.{ ExpectedFailure, ExpectedRejection }
-import akka.persistence.testkit.ProcessingPolicy.DefaultPolicies
-import akka.persistence.testkit.internal.TestKitStorage
-import akka.testkit.TestKitBase
-import akka.util
-import akka.util.BoxedType
+import org.apache.pekko
+import pekko.persistence.testkit.{ ExpectedFailure, ExpectedRejection }
+import pekko.persistence.testkit.ProcessingPolicy.DefaultPolicies
+import pekko.persistence.testkit.internal.TestKitStorage
+import pekko.testkit.TestKitBase
+import pekko.util
+import pekko.util.BoxedType
 
 private[testkit] trait RejectSupport[U] {
   this: PolicyOpsTestKit[U] with HasStorage[U, _] =>
@@ -120,7 +121,7 @@ private[testkit] trait ExpectOps[U] {
 
   import probe._
 
-  import akka.testkit._
+  import pekko.testkit._
 
   private[testkit] def pollInterval: FiniteDuration
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/PersistenceTestKitDurableStateStoreProvider.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/PersistenceTestKitDurableStateStoreProvider.scala
similarity index 60%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/PersistenceTestKitDurableStateStoreProvider.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/PersistenceTestKitDurableStateStoreProvider.scala
index 854204a643..608d6b1950 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/PersistenceTestKitDurableStateStoreProvider.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/PersistenceTestKitDurableStateStoreProvider.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.state
+package org.apache.pekko.persistence.testkit.state
 
-import akka.actor.ExtendedActorSystem
-import akka.persistence.state.DurableStateStoreProvider
-import akka.persistence.state.scaladsl.DurableStateStore
-import akka.persistence.testkit.state.scaladsl.PersistenceTestKitDurableStateStore
-import akka.persistence.state.javadsl.{ DurableStateStore => JDurableStateStore }
-import akka.persistence.testkit.state.javadsl.{
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.persistence.state.DurableStateStoreProvider
+import pekko.persistence.state.scaladsl.DurableStateStore
+import pekko.persistence.testkit.state.scaladsl.PersistenceTestKitDurableStateStore
+import pekko.persistence.state.javadsl.{ DurableStateStore => JDurableStateStore }
+import pekko.persistence.testkit.state.javadsl.{
   PersistenceTestKitDurableStateStore => JPersistenceTestKitDurableStateStore
 }
 
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala
similarity index 73%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala
index f984f7f365..cda991b0f7 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.state.javadsl
+package org.apache.pekko.persistence.testkit.state.javadsl
 
 import java.util.Optional
 import java.util.concurrent.{ CompletableFuture, CompletionStage }
 import scala.compat.java8.FutureConverters._
 import scala.compat.java8.OptionConverters._
-import akka.japi.Pair
-import akka.{ Done, NotUsed }
-import akka.persistence.query.DurableStateChange
-import akka.persistence.query.Offset
-import akka.persistence.query.javadsl.{ DurableStateStorePagedPersistenceIdsQuery, DurableStateStoreQuery }
-import akka.persistence.query.typed.javadsl.DurableStateStoreBySliceQuery
-import akka.persistence.state.javadsl.DurableStateUpdateStore
-import akka.persistence.state.javadsl.GetObjectResult
-import akka.persistence.testkit.state.scaladsl.{ PersistenceTestKitDurableStateStore => SStore }
-import akka.stream.javadsl.Source
+import org.apache.pekko
+import pekko.japi.Pair
+import pekko.{ Done, NotUsed }
+import pekko.persistence.query.DurableStateChange
+import pekko.persistence.query.Offset
+import pekko.persistence.query.javadsl.{ DurableStateStorePagedPersistenceIdsQuery, DurableStateStoreQuery }
+import pekko.persistence.query.typed.javadsl.DurableStateStoreBySliceQuery
+import pekko.persistence.state.javadsl.DurableStateUpdateStore
+import pekko.persistence.state.javadsl.GetObjectResult
+import pekko.persistence.testkit.state.scaladsl.{ PersistenceTestKitDurableStateStore => SStore }
+import pekko.stream.javadsl.Source
 
 object PersistenceTestKitDurableStateStore {
-  val Identifier = akka.persistence.testkit.state.scaladsl.PersistenceTestKitDurableStateStore.Identifier
+  val Identifier = pekko.persistence.testkit.state.scaladsl.PersistenceTestKitDurableStateStore.Identifier
 }
 
 class PersistenceTestKitDurableStateStore[A](stateStore: SStore[A])
@@ -40,10 +41,10 @@ class PersistenceTestKitDurableStateStore[A](stateStore: SStore[A])
   def deleteObject(persistenceId: String, revision: Long): CompletionStage[Done] =
     stateStore.deleteObject(persistenceId, revision).toJava
 
-  def changes(tag: String, offset: Offset): Source[DurableStateChange[A], akka.NotUsed] = {
+  def changes(tag: String, offset: Offset): Source[DurableStateChange[A], pekko.NotUsed] = {
     stateStore.changes(tag, offset).asJava
   }
-  def currentChanges(tag: String, offset: Offset): Source[DurableStateChange[A], akka.NotUsed] = {
+  def currentChanges(tag: String, offset: Offset): Source[DurableStateChange[A], pekko.NotUsed] = {
     stateStore.currentChanges(tag, offset).asJava
   }
 
@@ -65,7 +66,7 @@ class PersistenceTestKitDurableStateStore[A](stateStore: SStore[A])
     stateStore.sliceForPersistenceId(persistenceId)
 
   override def sliceRanges(numberOfRanges: Int): java.util.List[Pair[Integer, Integer]] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     stateStore
       .sliceRanges(numberOfRanges)
       .map(range => Pair(Integer.valueOf(range.min), Integer.valueOf(range.max)))
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
similarity index 89%
rename from akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
rename to akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
index 6f92b09590..22049a5198 100644
--- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
+++ b/akka-persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.state.scaladsl
+package org.apache.pekko.persistence.testkit.state.scaladsl
 
 import java.util.concurrent.atomic.AtomicLong
 
 import scala.concurrent.Future
 
-import akka.{ Done, NotUsed }
-import akka.actor.ExtendedActorSystem
-import akka.persistence.Persistence
-import akka.persistence.query.{
+import org.apache.pekko
+import pekko.{ Done, NotUsed }
+import pekko.actor.ExtendedActorSystem
+import pekko.persistence.Persistence
+import pekko.persistence.query.{
   DeletedDurableState,
   DurableStateChange,
   NoOffset,
@@ -19,15 +20,15 @@ import akka.persistence.query.{
   Sequence,
   UpdatedDurableState
 }
-import akka.persistence.query.scaladsl.{ DurableStateStorePagedPersistenceIdsQuery, DurableStateStoreQuery }
-import akka.persistence.query.typed.scaladsl.DurableStateStoreBySliceQuery
-import akka.persistence.state.scaladsl.{ DurableStateUpdateStore, GetObjectResult }
-import akka.persistence.typed.PersistenceId
-import akka.stream.scaladsl.BroadcastHub
-import akka.stream.scaladsl.Keep
-import akka.stream.scaladsl.Source
-import akka.stream.typed.scaladsl.ActorSource
-import akka.stream.OverflowStrategy
+import pekko.persistence.query.scaladsl.{ DurableStateStorePagedPersistenceIdsQuery, DurableStateStoreQuery }
+import pekko.persistence.query.typed.scaladsl.DurableStateStoreBySliceQuery
+import pekko.persistence.state.scaladsl.{ DurableStateUpdateStore, GetObjectResult }
+import pekko.persistence.typed.PersistenceId
+import pekko.stream.scaladsl.BroadcastHub
+import pekko.stream.scaladsl.Keep
+import pekko.stream.scaladsl.Source
+import pekko.stream.typed.scaladsl.ActorSource
+import pekko.stream.OverflowStrategy
 import scala.collection.immutable
 
 object PersistenceTestKitDurableStateStore {
@@ -85,7 +86,7 @@ class PersistenceTestKitDurableStateStore[A](val system: ExtendedActorSystem)
     store.contains(persistenceId)
   }
 
-  override def changes(tag: String, offset: Offset): Source[DurableStateChange[A], akka.NotUsed] = this.synchronized {
+  override def changes(tag: String, offset: Offset): Source[DurableStateChange[A], pekko.NotUsed] = this.synchronized {
     val fromOffset = offset match {
       case NoOffset             => EarliestOffset
       case Sequence(fromOffset) => fromOffset
@@ -111,7 +112,7 @@ class PersistenceTestKitDurableStateStore[A](val system: ExtendedActorSystem)
       .map(_.toDurableStateChange)
   }
 
-  override def currentChanges(tag: String, offset: Offset): Source[DurableStateChange[A], akka.NotUsed] =
+  override def currentChanges(tag: String, offset: Offset): Source[DurableStateChange[A], pekko.NotUsed] =
     this.synchronized {
       val currentGlobalOffset = lastGlobalOffset.get()
       changes(tag, offset).takeWhile(_.offset match {
diff --git a/akka-persistence-testkit/src/test/resources/logback-test.xml b/akka-persistence-testkit/src/test/resources/logback-test.xml
index 3d08c776bd..e9a7bb1ad0 100644
--- a/akka-persistence-testkit/src/test/resources/logback-test.xml
+++ b/akka-persistence-testkit/src/test/resources/logback-test.xml
@@ -12,16 +12,16 @@
     
-    
+    
 
     
-    
+    
         
     
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/CommonUtils.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/CommonUtils.scala
similarity index 92%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/CommonUtils.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/CommonUtils.scala
index f1500fbfa3..2dddcafe92 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/CommonUtils.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/CommonUtils.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit
+package org.apache.pekko.persistence.testkit
 
 import java.util.UUID
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.{ ActorRef, ActorSystem }
-import akka.persistence._
-import akka.testkit.TestKitBase
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ActorSystem }
+import pekko.persistence._
+import pekko.testkit.TestKitBase
 
 trait CommonUtils extends AnyWordSpecLike with TestKitBase {
 
   protected def randomPid() = UUID.randomUUID().toString
 
-  import akka.util.ccompat.JavaConverters._
+  import pekko.util.ccompat.JavaConverters._
 
   def initSystemWithEnabledPlugin(name: String, serializeMessages: Boolean, serializeSnapshots: Boolean) =
     ActorSystem(
@@ -32,7 +33,7 @@ trait CommonUtils extends AnyWordSpecLike with TestKitBase {
               "akka.actor.allow-java-serialization" -> true,
               "akka.persistence.testkit.events.serialize" -> serializeMessages,
               "akka.persistence.testkit.snapshots.serialize" -> serializeSnapshots).asJava))
-        .withFallback(ConfigFactory.parseString("akka.loggers = [\"akka.testkit.TestEventListener\"]"))
+        .withFallback(ConfigFactory.parseString("akka.loggers = [\"org.apache.pekko.testkit.TestEventListener\"]"))
         .withFallback(ConfigFactory.defaultApplication()))
 
 }
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonSnapshotTests.scala
similarity index 97%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonSnapshotTests.scala
index 8e4d28fb7f..c553b07cd0 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonSnapshotTests.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
 import org.scalatest.matchers.should.Matchers._
 
-import akka.actor.Props
-import akka.actor.typed.javadsl.Adapter
-import akka.japi.Pair
-import akka.persistence._
-import akka.persistence.testkit._
-import akka.testkit.EventFilter
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.actor.typed.javadsl.Adapter
+import pekko.japi.Pair
+import pekko.persistence._
+import pekko.persistence.testkit._
+import pekko.testkit.EventFilter
+import pekko.util.ccompat.JavaConverters._
 
 trait CommonSnapshotTests extends JavaDslUtils {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonTestKitTests.scala
similarity index 97%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonTestKitTests.scala
index 87e46527dd..f01332972a 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonTestKitTests.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
 import org.scalatest.matchers.should.Matchers._
 
-import akka.actor.Props
-import akka.actor.typed.javadsl.Adapter
-import akka.persistence._
-import akka.persistence.testkit._
-import akka.testkit.EventFilter
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.actor.typed.javadsl.Adapter
+import pekko.persistence._
+import pekko.persistence.testkit._
+import pekko.testkit.EventFilter
+import pekko.util.ccompat.JavaConverters._
 
 trait CommonTestKitTests extends JavaDslUtils {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/JavaDslUtils.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/JavaDslUtils.scala
similarity index 78%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/JavaDslUtils.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/JavaDslUtils.scala
index 7c61673448..62e4696c0c 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/JavaDslUtils.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/JavaDslUtils.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
 import java.util
 
-import akka.actor.typed.ActorRef
-import akka.persistence.testkit.{ Cmd, CommonUtils, EmptyState, Evt, Passivate, Recovered, Stopped, TestCommand }
-import akka.persistence.typed.{ PersistenceId, RecoveryCompleted }
-import akka.persistence.typed.javadsl.{ CommandHandler, EventHandler, EventSourcedBehavior, SignalHandler }
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.persistence.testkit.{ Cmd, CommonUtils, EmptyState, Evt, Passivate, Recovered, Stopped, TestCommand }
+import pekko.persistence.typed.{ PersistenceId, RecoveryCompleted }
+import pekko.persistence.typed.javadsl.{ CommandHandler, EventHandler, EventSourcedBehavior, SignalHandler }
 
 trait JavaDslUtils extends CommonUtils {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/SnapshotNotSerializeSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotNotSerializeSpec.scala
similarity index 80%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/SnapshotNotSerializeSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotNotSerializeSpec.scala
index bc0ca4b442..6fccef69d1 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/SnapshotNotSerializeSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotNotSerializeSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.javadsl
 
-import akka.actor.Props
-import akka.persistence.testkit._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.testkit._
 
 class SnapshotNotSerializeSpec extends CommonSnapshotTests {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/SnapshotSerializeSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotSerializeSpec.scala
similarity index 77%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/SnapshotSerializeSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotSerializeSpec.scala
index a496438edf..aa76764061 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/SnapshotSerializeSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotSerializeSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
 import java.io.NotSerializableException
 
-import akka.actor.Props
-import akka.persistence.SaveSnapshotFailure
-import akka.persistence.testkit._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.SaveSnapshotFailure
+import pekko.persistence.testkit._
 
 class SnapshotSerializeSpec extends CommonSnapshotTests {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/TestKitNotSerializeSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/TestKitNotSerializeSpec.scala
similarity index 78%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/TestKitNotSerializeSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/TestKitNotSerializeSpec.scala
index cb1f8f2fc4..30a41e6307 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/TestKitNotSerializeSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/TestKitNotSerializeSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
-import akka.actor.Props
-import akka.persistence.testkit._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.testkit._
 
 class TestKitNotSerializeSpec extends CommonTestKitTests {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/TestKitSerializeSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/TestKitSerializeSpec.scala
similarity index 76%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/TestKitSerializeSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/TestKitSerializeSpec.scala
index 613940f3f8..42df8300bc 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/TestKitSerializeSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/TestKitSerializeSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.javadsl
 
-import akka.actor.Props
-import akka.persistence.testkit._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.testkit._
 
 class TestKitSerializeSpec extends CommonTestKitTests {
   override lazy val system = initSystemWithEnabledPlugin("TestKitSerializeSpec", true, true)
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsBySlicesSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/query/CurrentEventsBySlicesSpec.scala
similarity index 69%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsBySlicesSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/query/CurrentEventsBySlicesSpec.scala
index 6695f53870..0c5f32d09c 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsBySlicesSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/query/CurrentEventsBySlicesSpec.scala
@@ -2,28 +2,29 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.query
+package org.apache.pekko.persistence.testkit.query
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.persistence.Persistence
-import akka.persistence.query.NoOffset
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.testkit.query.EventsByPersistenceIdSpec.Command
-import akka.persistence.testkit.query.EventsByPersistenceIdSpec.testBehaviour
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.stream.scaladsl.Sink
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.persistence.Persistence
+import pekko.persistence.query.NoOffset
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.testkit.query.EventsByPersistenceIdSpec.Command
+import pekko.persistence.testkit.query.EventsByPersistenceIdSpec.testBehaviour
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.stream.scaladsl.Sink
 
 class CurrentEventsBySlicesSpec
     extends ScalaTestWithActorTestKit(EventsByPersistenceIdSpec.config)
     with LogCapturing
     with AnyWordSpecLike {
 
-  implicit val classic: akka.actor.ActorSystem = system.classicSystem
+  implicit val classic: pekko.actor.ActorSystem = system.classicSystem
 
   val queries =
     PersistenceQuery(system).readJournalFor[PersistenceTestKitReadJournal](PersistenceTestKitReadJournal.Identifier)
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsByTagSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/query/CurrentEventsByTagSpec.scala
similarity index 66%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsByTagSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/query/CurrentEventsByTagSpec.scala
index d591cd8414..a9ede6c2de 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsByTagSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/query/CurrentEventsByTagSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.query
+package org.apache.pekko.persistence.testkit.query
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.persistence.query.NoOffset
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.testkit.query.EventsByPersistenceIdSpec.Command
-import akka.persistence.testkit.query.EventsByPersistenceIdSpec.testBehaviour
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.stream.scaladsl.Sink
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.persistence.query.NoOffset
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.testkit.query.EventsByPersistenceIdSpec.Command
+import pekko.persistence.testkit.query.EventsByPersistenceIdSpec.testBehaviour
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.stream.scaladsl.Sink
 import org.scalatest.wordspec.AnyWordSpecLike
 
 class CurrentEventsByTagSpec
@@ -21,7 +22,7 @@ class CurrentEventsByTagSpec
     with LogCapturing
     with AnyWordSpecLike {
 
-  implicit val classic: akka.actor.ActorSystem = system.classicSystem
+  implicit val classic: pekko.actor.ActorSystem = system.classicSystem
 
   private val queries =
     PersistenceQuery(system).readJournalFor[PersistenceTestKitReadJournal](PersistenceTestKitReadJournal.Identifier)
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/EventsByPersistenceIdSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/query/EventsByPersistenceIdSpec.scala
similarity index 83%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/EventsByPersistenceIdSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/query/EventsByPersistenceIdSpec.scala
index 8bf428f7f4..36c2618e0a 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/EventsByPersistenceIdSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/query/EventsByPersistenceIdSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.query
+package org.apache.pekko.persistence.testkit.query
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
-import akka.actor.typed.ActorRef
-import akka.persistence.query.{ EventEnvelope, PersistenceQuery }
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior }
-import akka.stream.testkit.scaladsl.TestSink
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
+import pekko.actor.typed.ActorRef
+import pekko.persistence.query.{ EventEnvelope, PersistenceQuery }
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior }
+import pekko.stream.testkit.scaladsl.TestSink
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
@@ -22,7 +23,7 @@ object EventsByPersistenceIdSpec {
   val config = PersistenceTestKitPlugin.config.withFallback(
     ConfigFactory.parseString("""
     akka.loglevel = DEBUG
-    akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]
+    akka.loggers = ["org.apache.pekko.testkit.SilenceAllTestEventListener"]
     akka.persistence.testkit.events.serialize = off
       """))
 
@@ -48,7 +49,7 @@ class EventsByPersistenceIdSpec
     with AnyWordSpecLike {
   import EventsByPersistenceIdSpec._
 
-  implicit val classic: akka.actor.ActorSystem = system.classicSystem
+  implicit val classic: pekko.actor.ActorSystem = system.classicSystem
 
   val queries =
     PersistenceQuery(system).readJournalFor[PersistenceTestKitReadJournal](PersistenceTestKitReadJournal.Identifier)
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/CommonSnapshotTests.scala
similarity index 97%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/CommonSnapshotTests.scala
index 26130d30fb..be03f6ee86 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/CommonSnapshotTests.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
 import org.scalatest.matchers.should.Matchers._
 
-import akka.actor.Props
-import akka.actor.typed.scaladsl.adapter._
-import akka.persistence._
-import akka.persistence.testkit._
-import akka.persistence.typed.scaladsl.RetentionCriteria
-import akka.testkit.EventFilter
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.persistence._
+import pekko.persistence.testkit._
+import pekko.persistence.typed.scaladsl.RetentionCriteria
+import pekko.testkit.EventFilter
 
 trait CommonSnapshotTests extends ScalaDslUtils {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/CommonTestKitTests.scala
similarity index 97%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/CommonTestKitTests.scala
index f380fec9de..eff911db70 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/CommonTestKitTests.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
 import org.scalatest.matchers.should.Matchers._
 
-import akka.actor.Props
-import akka.actor.typed.scaladsl.adapter._
-import akka.persistence.{ DeleteMessagesFailure, DeleteMessagesSuccess }
-import akka.persistence.testkit._
-import akka.testkit.EventFilter
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.persistence.{ DeleteMessagesFailure, DeleteMessagesSuccess }
+import pekko.persistence.testkit._
+import pekko.testkit.EventFilter
 
 trait CommonTestKitTests extends ScalaDslUtils {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorNoSnapshotTestKitSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/EventSourcedBehaviorNoSnapshotTestKitSpec.scala
similarity index 80%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorNoSnapshotTestKitSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/EventSourcedBehaviorNoSnapshotTestKitSpec.scala
index 1d6468b76f..80e139bc22 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorNoSnapshotTestKitSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/EventSourcedBehaviorNoSnapshotTestKitSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKitSpec.TestCounter
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.scaladsl.EventSourcedBehaviorTestKitSpec.TestCounter
+import pekko.persistence.typed.PersistenceId
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala
similarity index 94%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala
index d6f8f15bb6..15f1b8b7d7 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala
@@ -2,26 +2,30 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
 import java.io.NotSerializableException
 import org.scalatest.wordspec.AnyWordSpecLike
-import akka.Done
-import akka.actor.testkit.typed.TestException
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.LoggingTestKit
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.scaladsl.EventSourcedBehaviorTestKitSpec.TestCounter.{ NotSerializableState, NullState }
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.internal.JournalFailureException
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.serialization.DisabledJavaSerializer
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.TestException
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.scaladsl.EventSourcedBehaviorTestKitSpec.TestCounter.{
+  NotSerializableState,
+  NullState
+}
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.internal.JournalFailureException
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.serialization.DisabledJavaSerializer
+import pekko.serialization.jackson.CborSerializable
 
 object EventSourcedBehaviorTestKitSpec {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/MultipleJournalsSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/MultipleJournalsSpec.scala
similarity index 83%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/MultipleJournalsSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/MultipleJournalsSpec.scala
index 558975ac9c..a56d41e1e5 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/MultipleJournalsSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/MultipleJournalsSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.query.scaladsl.CurrentEventsByPersistenceIdQuery
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.stream.scaladsl.Sink
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.query.scaladsl.CurrentEventsByPersistenceIdQuery
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.stream.scaladsl.Sink
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/PersistenceTestKitJournalCompatSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/PersistenceTestKitJournalCompatSpec.scala
similarity index 74%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/PersistenceTestKitJournalCompatSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/PersistenceTestKitJournalCompatSpec.scala
index 308565a090..cdf1152a49 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/PersistenceTestKitJournalCompatSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/PersistenceTestKitJournalCompatSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
 import java.io.NotSerializableException
 
-import akka.persistence.CapabilityFlag
-import akka.persistence.journal.JournalSpec
-import akka.persistence.snapshot.SnapshotStoreSpec
-import akka.persistence.testkit._
-import akka.persistence.testkit.EventStorage.JournalPolicies
-import akka.persistence.testkit.Reject
-import akka.persistence.testkit.internal.InMemStorageExtension
+import org.apache.pekko
+import pekko.persistence.CapabilityFlag
+import pekko.persistence.journal.JournalSpec
+import pekko.persistence.snapshot.SnapshotStoreSpec
+import pekko.persistence.testkit._
+import pekko.persistence.testkit.EventStorage.JournalPolicies
+import pekko.persistence.testkit.Reject
+import pekko.persistence.testkit.internal.InMemStorageExtension
 
 class PersistenceTestKitJournalCompatSpec extends JournalSpec(config = PersistenceTestKitPlugin.config) {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/ScalaDslUtils.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/ScalaDslUtils.scala
similarity index 81%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/ScalaDslUtils.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/ScalaDslUtils.scala
index d5dfa9b127..f485084bd8 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/ScalaDslUtils.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/ScalaDslUtils.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
-import akka.actor.typed.ActorRef
-import akka.persistence.testkit.{
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.persistence.testkit.{
   Cmd,
   CommonUtils,
   EmptyState,
@@ -16,9 +17,9 @@ import akka.persistence.testkit.{
   Stopped,
   TestCommand
 }
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior }
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior }
 
 trait ScalaDslUtils extends CommonUtils {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/SnapshotNotSerializeSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/SnapshotNotSerializeSpec.scala
similarity index 79%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/SnapshotNotSerializeSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/SnapshotNotSerializeSpec.scala
index a99b797454..02bf9f49fa 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/SnapshotNotSerializeSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/SnapshotNotSerializeSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.javadsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
-import akka.actor.Props
-import akka.persistence.testkit._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.testkit._
 
 class SnapshotNotSerializeSpec extends CommonSnapshotTests {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/SnapshotSerializeSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/SnapshotSerializeSpec.scala
similarity index 77%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/SnapshotSerializeSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/SnapshotSerializeSpec.scala
index c154fb898a..e55b795f01 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/SnapshotSerializeSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/SnapshotSerializeSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
 import java.io.NotSerializableException
 
-import akka.actor.Props
-import akka.persistence.SaveSnapshotFailure
-import akka.persistence.testkit._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.SaveSnapshotFailure
+import pekko.persistence.testkit._
 
 class SnapshotSerializeSpec extends CommonSnapshotTests {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/TestKitNotSerializeSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/TestKitNotSerializeSpec.scala
similarity index 77%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/TestKitNotSerializeSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/TestKitNotSerializeSpec.scala
index 82cde4b10e..f9c851a828 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/TestKitNotSerializeSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/TestKitNotSerializeSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
-import akka.actor.Props
-import akka.persistence.testkit._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.testkit._
 
 class TestKitNotSerializeSpec extends CommonTestKitTests {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/TestKitSerializeSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/TestKitSerializeSpec.scala
similarity index 76%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/TestKitSerializeSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/TestKitSerializeSpec.scala
index 5447dab637..539c69d61e 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/TestKitSerializeSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/TestKitSerializeSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.scaladsl
+package org.apache.pekko.persistence.testkit.scaladsl
 
-import akka.actor.Props
-import akka.persistence.testkit._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.testkit._
 
 class TestKitSerializeSpec extends CommonTestKitTests {
 
diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala
similarity index 93%
rename from akka-persistence-testkit/src/test/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala
rename to akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala
index 0fd4fa44e6..c084c3347f 100644
--- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala
+++ b/akka-persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.testkit.state.scaladsl
+package org.apache.pekko.persistence.testkit.state.scaladsl
 
-import akka.actor.ExtendedActorSystem
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.persistence.query.NoOffset
-import akka.persistence.query.Sequence
-import akka.persistence.query.UpdatedDurableState
-import akka.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
-import akka.stream.scaladsl.Sink
-import akka.stream.testkit.scaladsl.TestSink
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.persistence.query.NoOffset
+import pekko.persistence.query.Sequence
+import pekko.persistence.query.UpdatedDurableState
+import pekko.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
+import pekko.stream.scaladsl.Sink
+import pekko.stream.testkit.scaladsl.TestSink
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
@@ -32,7 +33,7 @@ class PersistenceTestKitDurableStateStoreSpec
 
   import PersistenceTestKitDurableStateStoreSpec._
 
-  implicit val classic: akka.actor.ActorSystem = system.classicSystem
+  implicit val classic: pekko.actor.ActorSystem = system.classicSystem
 
   "Persistent test kit state store" must {
     "find individual objects" in {
diff --git a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/MyReplicatedBehavior.java b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java
similarity index 88%
rename from akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/MyReplicatedBehavior.java
rename to akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java
index def757e61a..f28f24c8e1 100644
--- a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/MyReplicatedBehavior.java
+++ b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java
@@ -2,12 +2,12 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.typed.Behavior;
-import akka.persistence.typed.ReplicaId;
-import akka.persistence.typed.ReplicationId;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.persistence.typed.ReplicaId;
+import org.apache.pekko.persistence.typed.ReplicationId;
+import org.apache.pekko.persistence.typed.javadsl.*;
 
 import java.util.*;
 
diff --git a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java
similarity index 89%
rename from akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java
rename to akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java
index a679a17270..fa4ed86d73 100644
--- a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java
+++ b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java
@@ -2,29 +2,29 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.TimerScheduler;
-import akka.persistence.testkit.PersistenceTestKitPlugin;
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal;
-import akka.persistence.typed.RecoveryCompleted;
-import akka.persistence.typed.ReplicaId;
-import akka.persistence.typed.ReplicationId;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.CommandHandlerBuilder;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.ReplicatedEventSourcedBehavior;
-import akka.persistence.typed.javadsl.ReplicatedEventSourcing;
-import akka.persistence.typed.javadsl.ReplicationContext;
-import akka.persistence.typed.javadsl.SignalHandler;
-import akka.serialization.jackson.CborSerializable;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.TimerScheduler;
+import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin;
+import org.apache.pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal;
+import org.apache.pekko.persistence.typed.RecoveryCompleted;
+import org.apache.pekko.persistence.typed.ReplicaId;
+import org.apache.pekko.persistence.typed.ReplicationId;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandlerBuilder;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior;
+import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcing;
+import org.apache.pekko.persistence.typed.javadsl.ReplicationContext;
+import org.apache.pekko.persistence.typed.javadsl.SignalHandler;
+import org.apache.pekko.serialization.jackson.CborSerializable;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -39,7 +39,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static jdocs.akka.persistence.typed.AuctionEntity.*;
+import static jdocs.org.apache.pekko.persistence.typed.AuctionEntity.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedBlogExample.java b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedBlogExample.java
similarity index 89%
rename from akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedBlogExample.java
rename to akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedBlogExample.java
index 643e465d65..5585fdd95f 100644
--- a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedBlogExample.java
+++ b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedBlogExample.java
@@ -2,23 +2,23 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
-import akka.persistence.typed.ReplicaId;
-import akka.persistence.typed.ReplicationId;
-import akka.persistence.typed.crdt.LwwTime;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.Effect;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.ReplicatedEventSourcedBehavior;
-import akka.persistence.typed.javadsl.ReplicatedEventSourcing;
-import akka.persistence.typed.javadsl.ReplicationContext;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
+import org.apache.pekko.persistence.typed.ReplicaId;
+import org.apache.pekko.persistence.typed.ReplicationId;
+import org.apache.pekko.persistence.typed.crdt.LwwTime;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.Effect;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior;
+import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcing;
+import org.apache.pekko.persistence.typed.javadsl.ReplicationContext;
 
 import java.util.Optional;
 import java.util.Set;
diff --git a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedMovieExample.java b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedMovieExample.java
similarity index 77%
rename from akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedMovieExample.java
rename to akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedMovieExample.java
index 157a76ec4d..67edae169d 100644
--- a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedMovieExample.java
+++ b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedMovieExample.java
@@ -2,19 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
-import akka.persistence.typed.ReplicaId;
-import akka.persistence.typed.ReplicationId;
-import akka.persistence.typed.crdt.ORSet;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.ReplicatedEventSourcedBehavior;
-import akka.persistence.typed.javadsl.ReplicatedEventSourcing;
-import akka.persistence.typed.javadsl.ReplicationContext;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
+import org.apache.pekko.persistence.typed.ReplicaId;
+import org.apache.pekko.persistence.typed.ReplicationId;
+import org.apache.pekko.persistence.typed.crdt.ORSet;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior;
+import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcing;
+import org.apache.pekko.persistence.typed.javadsl.ReplicationContext;
 
 import java.util.Collections;
 import java.util.Set;
diff --git a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedShoppingCartExample.java b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExample.java
similarity index 84%
rename from akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedShoppingCartExample.java
rename to akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExample.java
index dbbc55e6e5..70dc13e00b 100644
--- a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedShoppingCartExample.java
+++ b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExample.java
@@ -2,20 +2,20 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
-import akka.persistence.typed.ReplicaId;
-import akka.persistence.typed.ReplicationId;
-import akka.persistence.typed.crdt.Counter;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.Effect;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.ReplicatedEventSourcedBehavior;
-import akka.persistence.typed.javadsl.ReplicatedEventSourcing;
-import akka.persistence.typed.javadsl.ReplicationContext;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
+import org.apache.pekko.persistence.typed.ReplicaId;
+import org.apache.pekko.persistence.typed.ReplicationId;
+import org.apache.pekko.persistence.typed.crdt.Counter;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.Effect;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior;
+import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcing;
+import org.apache.pekko.persistence.typed.javadsl.ReplicationContext;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedStringSet.java b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedStringSet.java
similarity index 86%
rename from akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedStringSet.java
rename to akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedStringSet.java
index a04620fe26..f52fd1bcfb 100644
--- a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedStringSet.java
+++ b/akka-persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedStringSet.java
@@ -2,13 +2,13 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.typed.Behavior;
-import akka.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
-import akka.persistence.typed.ReplicaId;
-import akka.persistence.typed.ReplicationId;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
+import org.apache.pekko.persistence.typed.ReplicaId;
+import org.apache.pekko.persistence.typed.ReplicationId;
+import org.apache.pekko.persistence.typed.javadsl.*;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/ReplicatedEventSourcingTest.java b/akka-persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTest.java
similarity index 89%
rename from akka-persistence-typed-tests/src/test/java/akka/persistence/typed/ReplicatedEventSourcingTest.java
rename to akka-persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTest.java
index 7fa25fe7e7..6621dfdf5e 100644
--- a/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/ReplicatedEventSourcingTest.java
+++ b/akka-persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTest.java
@@ -2,17 +2,17 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed;
+package org.apache.pekko.persistence.typed;
 
-import akka.Done;
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.persistence.testkit.PersistenceTestKitPlugin;
-import akka.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin;
+import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
+import org.apache.pekko.persistence.typed.javadsl.*;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -21,7 +21,7 @@ import org.scalatestplus.junit.JUnitSuite;
 
 import java.util.*;
 
-import static akka.Done.done;
+import static org.apache.pekko.Done.done;
 import static org.junit.Assert.assertEquals;
 
 public class ReplicatedEventSourcingTest extends JUnitSuite {
@@ -146,7 +146,8 @@ public class ReplicatedEventSourcingTest extends JUnitSuite {
   public static final TestKitJunitResource testKit =
       new TestKitJunitResource(
           ConfigFactory.parseString(
-                  "akka.loglevel = INFO\n" + "akka.loggers = [\"akka.testkit.TestEventListener\"]")
+                  "akka.loglevel = INFO\n"
+                      + "akka.loggers = [\"org.apache.pekko.testkit.TestEventListener\"]")
               .withFallback(PersistenceTestKitPlugin.getInstance().config()));
 
   @Rule public final LogCapturing logCapturing = new LogCapturing();
diff --git a/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/javadsl/EventSourcedActorFailureTest.java b/akka-persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedActorFailureTest.java
similarity index 82%
rename from akka-persistence-typed-tests/src/test/java/akka/persistence/typed/javadsl/EventSourcedActorFailureTest.java
rename to akka-persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedActorFailureTest.java
index a3db8db414..06735becf9 100644
--- a/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/javadsl/EventSourcedActorFailureTest.java
+++ b/akka-persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedActorFailureTest.java
@@ -2,18 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl;
+package org.apache.pekko.persistence.typed.javadsl;
 
-import akka.actor.testkit.typed.TestException;
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.SupervisorStrategy;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.RecoveryCompleted;
-import akka.persistence.typed.RecoveryFailed;
+import org.apache.pekko.actor.testkit.typed.TestException;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.SupervisorStrategy;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.RecoveryCompleted;
+import org.apache.pekko.persistence.typed.RecoveryFailed;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
@@ -23,7 +23,7 @@ import org.scalatestplus.junit.JUnitSuite;
 
 import java.time.Duration;
 
-import static akka.persistence.typed.scaladsl.EventSourcedBehaviorFailureSpec.conf;
+import static org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehaviorFailureSpec.conf;
 
 class FailingEventSourcedActor extends EventSourcedBehavior {
 
diff --git a/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java b/akka-persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java
similarity index 94%
rename from akka-persistence-typed-tests/src/test/java/akka/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java
rename to akka-persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java
index 53d76ed5c0..4cdb9b7753 100644
--- a/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java
+++ b/akka-persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java
@@ -2,28 +2,28 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl;
+package org.apache.pekko.persistence.typed.javadsl;
 
-import akka.Done;
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.LoggingTestKit;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.*;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Adapter;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.japi.Pair;
-import akka.persistence.query.EventEnvelope;
-import akka.persistence.query.NoOffset;
-import akka.persistence.query.PersistenceQuery;
-import akka.persistence.query.Sequence;
-import akka.persistence.testkit.PersistenceTestKitPlugin;
-import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin;
-import akka.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
-import akka.persistence.typed.*;
-import akka.serialization.jackson.CborSerializable;
-import akka.stream.javadsl.Sink;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.LoggingTestKit;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.*;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Adapter;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.persistence.query.EventEnvelope;
+import org.apache.pekko.persistence.query.NoOffset;
+import org.apache.pekko.persistence.query.PersistenceQuery;
+import org.apache.pekko.persistence.query.Sequence;
+import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin;
+import org.apache.pekko.persistence.testkit.PersistenceTestKitSnapshotPlugin;
+import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
+import org.apache.pekko.persistence.typed.*;
+import org.apache.pekko.serialization.jackson.CborSerializable;
+import org.apache.pekko.stream.javadsl.Sink;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -38,7 +38,7 @@ import org.slf4j.event.Level;
 import java.time.Duration;
 import java.util.*;
 
-import static akka.Done.done;
+import static org.apache.pekko.Done.done;
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 
@@ -48,7 +48,8 @@ public class EventSourcedBehaviorJavaDslTest extends JUnitSuite {
   public static final TestKitJunitResource testKit =
       new TestKitJunitResource(
           ConfigFactory.parseString(
-                  "akka.loglevel = INFO\n" + "akka.loggers = [\"akka.testkit.TestEventListener\"]")
+                  "akka.loglevel = INFO\n"
+                      + "akka.loggers = [\"org.apache.pekko.testkit.TestEventListener\"]")
               .withFallback(PersistenceTestKitPlugin.getInstance().config())
               .withFallback(PersistenceTestKitSnapshotPlugin.config()));
 
diff --git a/akka-persistence-typed-tests/src/test/resources/logback-test.xml b/akka-persistence-typed-tests/src/test/resources/logback-test.xml
index df3cd05c69..36885c08d0 100644
--- a/akka-persistence-typed-tests/src/test/resources/logback-test.xml
+++ b/akka-persistence-typed-tests/src/test/resources/logback-test.xml
@@ -12,16 +12,16 @@
     
-    
+    
 
     
-    
+    
         
     
 
diff --git a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala
similarity index 91%
rename from akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala
index 651124a5b3..5a33924271 100644
--- a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleSpec.scala
@@ -2,33 +2,34 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
 import java.time.Instant
 
 import scala.concurrent.duration._
 
-import docs.akka.persistence.typed.ReplicatedAuctionExampleSpec.AuctionEntity
+import docs.org.apache.pekko.persistence.typed.ReplicatedAuctionExampleSpec.AuctionEntity
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.actor.typed.scaladsl.TimerScheduler
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
-import akka.persistence.typed.scaladsl.ReplicationContext
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.actor.typed.scaladsl.TimerScheduler
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
+import pekko.persistence.typed.scaladsl.ReplicationContext
+import pekko.serialization.jackson.CborSerializable
 
 object ReplicatedAuctionExampleSpec {
 
diff --git a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedBlogExampleSpec.scala b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedBlogExampleSpec.scala
similarity index 87%
rename from akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedBlogExampleSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedBlogExampleSpec.scala
index 61b1e76ced..00efc078bb 100644
--- a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedBlogExampleSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedBlogExampleSpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.crdt.LwwTime
-import akka.persistence.typed.scaladsl._
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.crdt.LwwTime
+import pekko.persistence.typed.scaladsl._
+import pekko.serialization.jackson.CborSerializable
 
 object ReplicatedBlogExampleSpec {
 
@@ -148,8 +149,8 @@ class ReplicatedBlogExampleSpec
 
       import scala.concurrent.duration._
 
-      import akka.actor.typed.scaladsl.AskPattern._
-      import akka.util.Timeout
+      import pekko.actor.typed.scaladsl.AskPattern._
+      import pekko.util.Timeout
       implicit val timeout: Timeout = 3.seconds
 
       val content = PostContent("cats are the bets", "yep")
diff --git a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala
similarity index 81%
rename from akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala
rename to akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala
index e0af599547..72b1ee7152 100644
--- a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedEventSourcingCompileOnlySpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
 import scala.annotation.nowarn
 
-import akka.actor.typed.ActorSystem
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
 
 @nowarn("msg=never used")
 object ReplicatedEventSourcingCompileOnlySpec {
diff --git a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedMovieWatchListExampleSpec.scala b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedMovieWatchListExampleSpec.scala
similarity index 81%
rename from akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedMovieWatchListExampleSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedMovieWatchListExampleSpec.scala
index b3c58936c4..8293338f4f 100644
--- a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedMovieWatchListExampleSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedMovieWatchListExampleSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
 import org.scalatest.wordspec.AnyWordSpecLike
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.crdt.ORSet
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.crdt.ORSet
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
 
 object ReplicatedMovieWatchListExampleSpec {
   // #movie-entity
diff --git a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedShoppingCartExampleSpec.scala b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExampleSpec.scala
similarity index 81%
rename from akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedShoppingCartExampleSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExampleSpec.scala
index 728183f064..fefff18981 100644
--- a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedShoppingCartExampleSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/docs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExampleSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
 import java.util.UUID
 
-import docs.akka.persistence.typed.ReplicatedShoppingCartExampleSpec.ShoppingCart.CartItems
+import docs.org.apache.pekko.persistence.typed.ReplicatedShoppingCartExampleSpec.ShoppingCart.CartItems
 import org.scalatest.wordspec.AnyWordSpecLike
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.crdt.Counter
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.crdt.Counter
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
+import pekko.serialization.jackson.CborSerializable
 
 object ReplicatedShoppingCartExampleSpec {
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/EventPublishingSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/EventPublishingSpec.scala
similarity index 82%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/EventPublishingSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/EventPublishingSpec.scala
index 65695ea682..4ddb287ad6 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/EventPublishingSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/EventPublishingSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.eventstream.EventStream
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.eventstream.EventStream
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.serialization.jackson.CborSerializable
 import org.scalatest.wordspec.AnyWordSpecLike
 
 object EventPublishingSpec {
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/EventSourcedBehaviorLoggingSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/EventSourcedBehaviorLoggingSpec.scala
similarity index 65%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/EventSourcedBehaviorLoggingSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/EventSourcedBehaviorLoggingSpec.scala
index 3f0d3ac7c3..0dcb43d6e9 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/EventSourcedBehaviorLoggingSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/EventSourcedBehaviorLoggingSpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.LoggingTestKit
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.typed.EventSourcedBehaviorLoggingSpec.ChattyEventSourcingBehavior.Hello
-import akka.persistence.typed.EventSourcedBehaviorLoggingSpec.ChattyEventSourcingBehavior.Hellos
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.typed.EventSourcedBehaviorLoggingSpec.ChattyEventSourcingBehavior.Hello
+import pekko.persistence.typed.EventSourcedBehaviorLoggingSpec.ChattyEventSourcingBehavior.Hellos
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.serialization.jackson.CborSerializable
 import com.typesafe.config.{ Config, ConfigFactory }
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.Done
-import akka.actor.typed.ActorRef
+import pekko.Done
+import pekko.actor.typed.ActorRef
 
 object EventSourcedBehaviorLoggingSpec {
 
@@ -68,7 +69,8 @@ abstract class EventSourcedBehaviorLoggingSpec(config: Config)
       val doneProbe = createTestProbe[Done]()
       LoggingTestKit
         .info("received message 'Mary'")
-        .withLoggerName("akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$")
+        .withLoggerName(
+          "org.apache.pekko.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$")
         .expect {
           chattyActor ! Hello("Mary", doneProbe.ref)
           doneProbe.receiveMessage()
@@ -79,8 +81,8 @@ abstract class EventSourcedBehaviorLoggingSpec(config: Config)
       val doneProbe = createTestProbe[Done]()
       LoggingTestKit
         .debug(
-          "Handled command [akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Hello], " +
-          "resulting effect: [Persist(akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event)], side effects: [1]")
+          "Handled command [org.apache.pekko.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Hello], " +
+          "resulting effect: [Persist(org.apache.pekko.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event)], side effects: [1]")
         .withLoggerName(loggerName)
         .expect {
           chattyActor ! Hello("Joe", doneProbe.ref)
@@ -92,9 +94,9 @@ abstract class EventSourcedBehaviorLoggingSpec(config: Config)
       val doneProbe = createTestProbe[Done]()
       LoggingTestKit
         .debug(
-          "Handled command [akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Hellos], " +
-          "resulting effect: [PersistAll(akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event," +
-          "akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event)], side effects: [1]")
+          "Handled command [org.apache.pekko.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Hellos], " +
+          "resulting effect: [PersistAll(org.apache.pekko.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event," +
+          "org.apache.pekko.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event)], side effects: [1]")
         .withLoggerName(loggerName)
         .expect {
           chattyActor ! Hellos("Mary", "Joe", doneProbe.ref)
@@ -118,7 +120,7 @@ abstract class EventSourcedBehaviorLoggingSpec(config: Config)
 
 class EventSourcedBehaviorLoggingInternalLoggerSpec
     extends EventSourcedBehaviorLoggingSpec(PersistenceTestKitPlugin.config) {
-  override def loggerName = "akka.persistence.typed.internal.EventSourcedBehaviorImpl"
+  override def loggerName = "org.apache.pekko.persistence.typed.internal.EventSourcedBehaviorImpl"
   override def loggerId = "internal.log"
 }
 
@@ -130,6 +132,7 @@ object EventSourcedBehaviorLoggingContextLoggerSpec {
 }
 class EventSourcedBehaviorLoggingContextLoggerSpec
     extends EventSourcedBehaviorLoggingSpec(EventSourcedBehaviorLoggingContextLoggerSpec.config) {
-  override def loggerName = "akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$"
+  override def loggerName =
+    "org.apache.pekko.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$"
   override def loggerId = "context.log"
 }
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/MultiJournalReplicationSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/MultiJournalReplicationSpec.scala
similarity index 84%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/MultiJournalReplicationSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/MultiJournalReplicationSpec.scala
index efec484717..5c197345de 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/MultiJournalReplicationSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/MultiJournalReplicationSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import java.util.concurrent.atomic.AtomicInteger
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.query.scaladsl.CurrentEventsByPersistenceIdQuery
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.stream.scaladsl.Sink
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.query.scaladsl.CurrentEventsByPersistenceIdQuery
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.stream.scaladsl.Sink
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.Eventually
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventPublishingSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventPublishingSpec.scala
similarity index 92%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventPublishingSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventPublishingSpec.scala
index 892622d29e..53d986bc62 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventPublishingSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventPublishingSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.internal.{ ReplicatedPublishedEventMetaData, VersionVector }
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.internal.{ ReplicatedPublishedEventMetaData, VersionVector }
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
 import org.scalatest.wordspec.AnyWordSpecLike
 
 object ReplicatedEventPublishingSpec {
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingSpec.scala
similarity index 96%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingSpec.scala
index 59b8c5a081..58d46ae66e 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.testkit.scaladsl.PersistenceTestKit
-import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior, ReplicatedEventSourcing, ReplicationContext }
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.testkit.scaladsl.PersistenceTestKit
+import pekko.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior, ReplicatedEventSourcing, ReplicationContext }
+import pekko.serialization.jackson.CborSerializable
 import org.scalatest.concurrent.Eventually
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingTaggingSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTaggingSpec.scala
similarity index 82%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingTaggingSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTaggingSpec.scala
index 401409634f..0319533157 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingTaggingSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTaggingSpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import java.util.concurrent.atomic.AtomicInteger
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.persistence.query.NoOffset
-import akka.persistence.query.scaladsl.CurrentEventsByTagQuery
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
-import akka.stream.scaladsl.Sink
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.persistence.query.NoOffset
+import pekko.persistence.query.scaladsl.CurrentEventsByTagQuery
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
+import pekko.stream.scaladsl.Sink
+import pekko.serialization.jackson.CborSerializable
 import org.scalatest.concurrent.Eventually
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicationBaseSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicationBaseSpec.scala
similarity index 72%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicationBaseSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicationBaseSpec.scala
index c19ce7da57..b6e3ebf076 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicationBaseSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicationBaseSpec.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import java.util.concurrent.atomic.AtomicInteger
 
-import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
-import akka.persistence.testkit.{ PersistenceTestKitPlugin, PersistenceTestKitSnapshotPlugin }
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
+import pekko.persistence.testkit.{ PersistenceTestKitPlugin, PersistenceTestKitSnapshotPlugin }
 import org.scalatest.concurrent.Eventually
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicationIllegalAccessSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicationIllegalAccessSpec.scala
similarity index 87%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicationIllegalAccessSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicationIllegalAccessSpec.scala
index 38081f7da6..5c0be3a44c 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicationIllegalAccessSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicationIllegalAccessSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
-import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
-import akka.actor.typed.{ ActorRef, Behavior }
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior, ReplicatedEventSourcing }
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
+import pekko.actor.typed.{ ActorRef, Behavior }
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior, ReplicatedEventSourcing }
+import pekko.serialization.jackson.CborSerializable
 import org.scalatest.concurrent.Eventually
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicationSnapshotSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicationSnapshotSpec.scala
similarity index 85%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicationSnapshotSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicationSnapshotSpec.scala
index 20d5501376..3dd3d13208 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/ReplicationSnapshotSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/ReplicationSnapshotSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 import java.util.concurrent.atomic.AtomicInteger
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
-import akka.actor.typed.{ ActorRef, Behavior }
-import akka.persistence.testkit.{ PersistenceTestKitPlugin, PersistenceTestKitSnapshotPlugin }
-import akka.persistence.testkit.scaladsl.{ PersistenceTestKit, SnapshotTestKit }
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.internal.{ ReplicatedPublishedEventMetaData, VersionVector }
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit }
+import pekko.actor.typed.{ ActorRef, Behavior }
+import pekko.persistence.testkit.{ PersistenceTestKitPlugin, PersistenceTestKitSnapshotPlugin }
+import pekko.persistence.testkit.scaladsl.{ PersistenceTestKit, SnapshotTestKit }
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.internal.{ ReplicatedPublishedEventMetaData, VersionVector }
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
 import org.scalatest.concurrent.Eventually
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/crdt/CounterSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/crdt/CounterSpec.scala
similarity index 86%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/crdt/CounterSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/crdt/CounterSpec.scala
index 848ef76ae3..00d9a02c26 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/crdt/CounterSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/crdt/CounterSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.crdt
+package org.apache.pekko.persistence.typed.crdt
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.crdt.CounterSpec.PlainCounter.{ Decrement, Get, Increment }
-import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior, ReplicatedEventSourcing }
-import akka.persistence.typed.{ ReplicaId, ReplicationBaseSpec }
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.crdt.CounterSpec.PlainCounter.{ Decrement, Get, Increment }
+import pekko.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior, ReplicatedEventSourcing }
+import pekko.persistence.typed.{ ReplicaId, ReplicationBaseSpec }
 
 object CounterSpec {
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/crdt/LwwSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/crdt/LwwSpec.scala
similarity index 86%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/crdt/LwwSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/crdt/LwwSpec.scala
index ac47d05c1d..77b72e0ec5 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/crdt/LwwSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/crdt/LwwSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.crdt
+package org.apache.pekko.persistence.typed.crdt
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.ReplicatedEventSourcing
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationBaseSpec
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.ReplicatedEventSourcing
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationBaseSpec
+import pekko.serialization.jackson.CborSerializable
 
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/crdt/ORSetSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/crdt/ORSetSpec.scala
similarity index 83%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/crdt/ORSetSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/crdt/ORSetSpec.scala
index 9ee784b1d3..4d369a2554 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/crdt/ORSetSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/crdt/ORSetSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.crdt
+package org.apache.pekko.persistence.typed.crdt
 
-import akka.actor.typed.{ ActorRef, Behavior }
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior, ReplicatedEventSourcing }
-import akka.persistence.typed.{ ReplicaId, ReplicationBaseSpec }
+import org.apache.pekko
+import pekko.actor.typed.{ ActorRef, Behavior }
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior, ReplicatedEventSourcing }
+import pekko.persistence.typed.{ ReplicaId, ReplicationBaseSpec }
 import ORSetSpec.ORSetEntity._
-import akka.persistence.typed.ReplicationBaseSpec.{ R1, R2 }
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.crdt.ORSetSpec.ORSetEntity
+import pekko.persistence.typed.ReplicationBaseSpec.{ R1, R2 }
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.crdt.ORSetSpec.ORSetEntity
 
 import scala.util.Random
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala
similarity index 73%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala
index 4f64521d20..a4f912d4a2 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.jackson
+package org.apache.pekko.persistence.typed.jackson
 
-import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit, SerializationTestKit }
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.crdt.{ Counter, LwwTime, ORSet }
-import akka.persistence.typed.jackson.ReplicatedEventSourcingJacksonSpec.{ WithCounter, WithLwwTime, WithOrSet }
-import akka.serialization.jackson.{ AkkaSerializationDeserializer, AkkaSerializationSerializer, JsonSerializable }
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit, SerializationTestKit }
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.crdt.{ Counter, LwwTime, ORSet }
+import pekko.persistence.typed.jackson.ReplicatedEventSourcingJacksonSpec.{ WithCounter, WithLwwTime, WithOrSet }
+import pekko.serialization.jackson.{ AkkaSerializationDeserializer, AkkaSerializationSerializer, JsonSerializable }
 import com.fasterxml.jackson.databind.annotation.{ JsonDeserialize, JsonSerialize }
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala
similarity index 92%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala
index 309fbaf379..e8d54b5eae 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.TestException
-import akka.actor.testkit.typed.TestKitSettings
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.PostStop
-import akka.actor.typed.PreRestart
-import akka.actor.typed.Signal
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.persistence.AtomicWrite
-import akka.persistence.journal.inmem.InmemJournal
-import akka.persistence.typed.EventRejectedException
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.RecoveryFailed
-import akka.persistence.typed.internal.JournalFailureException
+import org.apache.pekko
+import pekko.actor.testkit.typed.TestException
+import pekko.actor.testkit.typed.TestKitSettings
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.PreRestart
+import pekko.actor.typed.Signal
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.persistence.AtomicWrite
+import pekko.persistence.journal.inmem.InmemJournal
+import pekko.persistence.typed.EventRejectedException
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.RecoveryFailed
+import pekko.persistence.typed.internal.JournalFailureException
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
@@ -74,7 +75,7 @@ object EventSourcedBehaviorFailureSpec {
       akka.persistence.journal.plugin = "failure-journal"
       failure-journal = $${akka.persistence.journal.inmem}
       failure-journal {
-        class = "akka.persistence.typed.scaladsl.ChaosJournal"
+        class = "org.apache.pekko.persistence.typed.scaladsl.ChaosJournal"
       }
     """).withFallback(ConfigFactory.defaultReference()).resolve()
 }
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala
similarity index 87%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala
index 5adff5d6c2..42b69599e3 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.BehaviorInterceptor
-import akka.actor.typed.TypedActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.BehaviorInterceptor
+import pekko.actor.typed.TypedActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.typed.PersistenceId
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala
similarity index 82%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala
index 50e3aabb88..5f06c0ba97 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.RecoveryTimedOut
-import akka.persistence.journal.SteppingInmemJournal
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryFailed
-import akka.persistence.typed.internal.JournalFailureException
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.RecoveryTimedOut
+import pekko.persistence.journal.SteppingInmemJournal
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryFailed
+import pekko.persistence.typed.internal.JournalFailureException
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
@@ -58,9 +59,9 @@ class EventSourcedBehaviorRecoveryTimeoutSpec
   val pidCounter = new AtomicInteger(0)
   private def nextPid(): PersistenceId = PersistenceId.ofUniqueId(s"c${pidCounter.incrementAndGet()})")
 
-  import akka.actor.typed.scaladsl.adapter._
+  import org.apache.pekko.actor.typed.scaladsl.adapter._
   // needed for SteppingInmemJournal.step
-  private implicit val classicSystem: akka.actor.ActorSystem = system.toClassic
+  private implicit val classicSystem: pekko.actor.ActorSystem = system.toClassic
 
   "The recovery timeout" must {
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala
similarity index 87%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala
index 50e15b365f..d7c66e9e5c 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.typed.PersistenceId
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.typed.PersistenceId
+import pekko.serialization.jackson.CborSerializable
 import org.scalatest.wordspec.AnyWordSpecLike
 
 import java.util.concurrent.atomic.AtomicInteger
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala
similarity index 96%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala
index 8d8c569c70..1d643c26f1 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin
-import akka.persistence.typed.DeleteEventsCompleted
-import akka.persistence.typed.DeleteSnapshotsCompleted
-import akka.persistence.typed.DeleteSnapshotsFailed
-import akka.persistence.typed.DeletionTarget
-import akka.persistence.typed.EventSourcedSignal
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.SnapshotCompleted
-import akka.persistence.typed.SnapshotFailed
-import akka.persistence.typed.SnapshotSelectionCriteria
-import akka.serialization.jackson.CborSerializable
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.PersistenceTestKitSnapshotPlugin
+import pekko.persistence.typed.DeleteEventsCompleted
+import pekko.persistence.typed.DeleteSnapshotsCompleted
+import pekko.persistence.typed.DeleteSnapshotsFailed
+import pekko.persistence.typed.DeletionTarget
+import pekko.persistence.typed.EventSourcedSignal
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.SnapshotCompleted
+import pekko.persistence.typed.SnapshotFailed
+import pekko.persistence.typed.SnapshotSelectionCriteria
+import pekko.serialization.jackson.CborSerializable
+import pekko.util.unused
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala
similarity index 94%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala
index 9a9a6d605d..d073364eac 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala
@@ -2,38 +2,39 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.Done
-import akka.actor.ActorInitializationException
-import akka.actor.testkit.typed.TestException
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.Terminated
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.SelectedSnapshot
-import akka.persistence.journal.inmem.InmemJournal
-import akka.persistence.query.EventEnvelope
-import akka.persistence.query.Offset
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.query.Sequence
-import akka.persistence.snapshot.SnapshotStore
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.SnapshotCompleted
-import akka.persistence.typed.SnapshotFailed
-import akka.persistence.typed.SnapshotMetadata
-import akka.persistence.typed.SnapshotSelectionCriteria
-import akka.persistence.{ SnapshotMetadata => ClassicSnapshotMetadata }
-import akka.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria }
-import akka.serialization.jackson.CborSerializable
-import akka.stream.scaladsl.Sink
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ActorInitializationException
+import pekko.actor.testkit.typed.TestException
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.Terminated
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.SelectedSnapshot
+import pekko.persistence.journal.inmem.InmemJournal
+import pekko.persistence.query.EventEnvelope
+import pekko.persistence.query.Offset
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.query.Sequence
+import pekko.persistence.snapshot.SnapshotStore
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.SnapshotCompleted
+import pekko.persistence.typed.SnapshotFailed
+import pekko.persistence.typed.SnapshotMetadata
+import pekko.persistence.typed.SnapshotSelectionCriteria
+import pekko.persistence.{ SnapshotMetadata => ClassicSnapshotMetadata }
+import pekko.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria }
+import pekko.serialization.jackson.CborSerializable
+import pekko.stream.scaladsl.Sink
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala
similarity index 96%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala
index 199173a4d5..e8edb1e322 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.NotUsed
-import akka.actor.Dropped
-import akka.actor.UnhandledMessage
-import akka.actor.testkit.typed.TestException
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.eventstream.EventStream
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.javadsl.StashOverflowException
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter._
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.Dropped
+import pekko.actor.UnhandledMessage
+import pekko.actor.testkit.typed.TestException
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.eventstream.EventStream
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.javadsl.StashOverflowException
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
@@ -39,7 +40,7 @@ object EventSourcedBehaviorStashSpec {
     akka.persistence.typed.stash-capacity = 500
     failure-journal = $${akka.persistence.journal.inmem}
     failure-journal {
-      class = "akka.persistence.typed.scaladsl.ChaosJournal"
+      class = "org.apache.pekko.persistence.typed.scaladsl.ChaosJournal"
     }
     """).withFallback(ConfigFactory.defaultReference()).resolve()
 
@@ -464,7 +465,7 @@ class EventSourcedBehaviorStashSpec
     }
 
     "unstash messages after stashed GetState" in {
-      import akka.persistence.typed.internal.EventSourcedBehaviorImpl.{ GetState, GetStateReply }
+      import pekko.persistence.typed.internal.EventSourcedBehaviorImpl.{ GetState, GetStateReply }
 
       val c = spawn(counter(nextPid()))
       val ackProbe = TestProbe[Ack]()
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala
similarity index 90%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala
index 41d5837144..daccb3294e 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.typed.PersistenceId
 import org.scalatest.wordspec.AnyWordSpecLike
 
 import java.util.concurrent.atomic.AtomicInteger
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala
similarity index 83%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala
index e8743ecc4e..3858e873f3 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala
@@ -2,28 +2,29 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.TestException
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.LoggingTestKit
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed._
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.typed.internal.EventSourcedBehaviorImpl.WriterIdentity
-import akka.persistence.typed.internal.BehaviorSetup
-import akka.persistence.typed.internal.EventSourcedSettings
-import akka.persistence.typed.internal.InternalProtocol
-import akka.persistence.typed.internal.NoOpSnapshotAdapter
-import akka.persistence.typed.internal.StashState
-import akka.persistence.typed.NoOpEventAdapter
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.{ Recovery => ClassicRecovery }
-import akka.serialization.jackson.CborSerializable
-import akka.util.ConstantFun
+import org.apache.pekko
+import pekko.actor.testkit.typed.TestException
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed._
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.typed.internal.EventSourcedBehaviorImpl.WriterIdentity
+import pekko.persistence.typed.internal.BehaviorSetup
+import pekko.persistence.typed.internal.EventSourcedSettings
+import pekko.persistence.typed.internal.InternalProtocol
+import pekko.persistence.typed.internal.NoOpSnapshotAdapter
+import pekko.persistence.typed.internal.StashState
+import pekko.persistence.typed.NoOpEventAdapter
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.{ Recovery => ClassicRecovery }
+import pekko.serialization.jackson.CborSerializable
+import pekko.util.ConstantFun
 import org.scalatest.wordspec.AnyWordSpecLike
 import org.slf4j.LoggerFactory
 
@@ -33,7 +34,7 @@ object EventSourcedBehaviorWatchSpec {
   sealed trait Command extends CborSerializable
   case object Fail extends Command
   case object Stop extends Command
-  final case class ChildHasFailed(t: akka.actor.typed.ChildFailed)
+  final case class ChildHasFailed(t: pekko.actor.typed.ChildFailed)
   final case class HasTerminated(ref: ActorRef[_])
 }
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala
similarity index 90%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala
index da635d8153..4c30ce68c9 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.query.EventEnvelope
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.query.Sequence
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.EventAdapter
-import akka.persistence.typed.EventSeq
-import akka.persistence.typed.PersistenceId
-import akka.serialization.jackson.CborSerializable
-import akka.stream.scaladsl.Sink
-import akka.testkit.JavaSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.query.EventEnvelope
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.query.Sequence
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.EventAdapter
+import pekko.persistence.typed.EventSeq
+import pekko.persistence.typed.PersistenceId
+import pekko.serialization.jackson.CborSerializable
+import pekko.stream.scaladsl.Sink
+import pekko.testkit.JavaSerializable
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala
similarity index 92%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala
index 6b14f00350..e98b2f7b4c 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala
similarity index 80%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala
index 831127a66c..e5e9f69ae9 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.persistence.query.PersistenceQuery
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin
-import akka.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.SnapshotAdapter
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.PersistenceTestKitSnapshotPlugin
+import pekko.persistence.testkit.query.scaladsl.PersistenceTestKitReadJournal
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.SnapshotAdapter
+import pekko.serialization.jackson.CborSerializable
 import org.scalatest.wordspec.AnyWordSpecLike
 
 import java.util.concurrent.atomic.AtomicInteger
@@ -33,7 +34,7 @@ class EventSourcedSnapshotAdapterSpec
     with AnyWordSpecLike
     with LogCapturing {
   import EventSourcedSnapshotAdapterSpec._
-  import akka.actor.typed.scaladsl.adapter._
+  import pekko.actor.typed.scaladsl.adapter._
 
   val pidCounter = new AtomicInteger(0)
   private def nextPid(): PersistenceId = PersistenceId.ofUniqueId(s"c${pidCounter.incrementAndGet()})")
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala
similarity index 84%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala
index 8f72ce1574..e5517f6278 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.adapter._
-import akka.persistence.journal.SteppingInmemJournal
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.persistence.journal.SteppingInmemJournal
+import pekko.persistence.typed.PersistenceId
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
@@ -78,7 +79,7 @@ class EventSourcedStashOverflowSpec
       // capacity + 1 should mean that we get a dropped last message when all stash is filled
       // while the actor is stuck in replay because journal isn't responding
       droppedMessageProbe.receiveMessage()
-      implicit val classicSystem: akka.actor.ActorSystem =
+      implicit val classicSystem: pekko.actor.ActorSystem =
         testKit.system.toClassic
       // we only need to do this one step and recovery completes
       SteppingInmemJournal.step(journal)
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/LoggerSourceSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/LoggerSourceSpec.scala
similarity index 86%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/LoggerSourceSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/LoggerSourceSpec.scala
index cd1aa2d77a..08f7722e13 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/LoggerSourceSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/LoggerSourceSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.LoggingTestKit
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.SnapshotCompleted
-import akka.persistence.typed.SnapshotFailed
+package org.apache.pekko.persistence.typed.scaladsl
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.SnapshotCompleted
+import pekko.persistence.typed.SnapshotFailed
 import org.scalatest.wordspec.AnyWordSpecLike
 import org.slf4j.event.Level
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/NullEmptyStateSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/NullEmptyStateSpec.scala
similarity index 86%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/NullEmptyStateSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/NullEmptyStateSpec.scala
index df7e59a35d..0fb537b482 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/NullEmptyStateSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/NullEmptyStateSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.TestKitSettings
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
+import org.apache.pekko
+import pekko.actor.testkit.typed.TestKitSettings
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala
similarity index 84%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala
index e1bfacfa13..5f442f3ae5 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.LoggingTestKit
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
+import pekko.serialization.jackson.CborSerializable
 import org.scalatest.wordspec.AnyWordSpecLike
 
 import java.util.UUID
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PerformanceSpec.scala
similarity index 87%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PerformanceSpec.scala
index 18937208df..95e5837db2 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PerformanceSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.TestException
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.testkit.PersistenceTestKitSnapshotPlugin
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
+import org.apache.pekko
+import pekko.actor.testkit.typed.TestException
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.PersistenceTestKitSnapshotPlugin
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/PrimitiveStateSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PrimitiveStateSpec.scala
similarity index 86%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/PrimitiveStateSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PrimitiveStateSpec.scala
index cc6e77a9a0..5a1b7d433b 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/PrimitiveStateSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PrimitiveStateSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala
similarity index 80%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala
index a3817fd3ea..75f4c38f7b 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.persistence.SelectedSnapshot
-import akka.persistence.snapshot.SnapshotStore
-import akka.persistence.typed.scaladsl.SnapshotMutableStateSpec.MutableState
-import akka.persistence.{ SnapshotMetadata => ClassicSnapshotMetadata }
-import akka.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria }
+import org.apache.pekko
+import pekko.persistence.SelectedSnapshot
+import pekko.persistence.snapshot.SnapshotStore
+import pekko.persistence.typed.scaladsl.SnapshotMutableStateSpec.MutableState
+import pekko.persistence.{ SnapshotMetadata => ClassicSnapshotMetadata }
+import pekko.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria }
 
 import scala.concurrent.Future
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala
similarity index 87%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala
index b8148b2dd6..459b5be384 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.SnapshotCompleted
-import akka.persistence.typed.SnapshotFailed
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.SnapshotCompleted
+import pekko.persistence.typed.SnapshotFailed
+import pekko.serialization.jackson.CborSerializable
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala
similarity index 84%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala
index bde995bcd7..3b2c1bc0a2 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.serialization.Snapshot
-import akka.persistence.testkit.PersistenceTestKitPlugin
-import akka.persistence.typed.PersistenceId
-import akka.serialization.Serialization
-import akka.serialization.SerializationExtension
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.serialization.Snapshot
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.typed.PersistenceId
+import pekko.serialization.Serialization
+import pekko.serialization.SerializationExtension
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.apache.commons.io.FileUtils
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorInterceptorSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehaviorInterceptorSpec.scala
similarity index 85%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorInterceptorSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehaviorInterceptorSpec.scala
index bbed3b8991..880ce969ab 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorInterceptorSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehaviorInterceptorSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.scaladsl
+package org.apache.pekko.persistence.typed.state.scaladsl
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.BehaviorInterceptor
-import akka.actor.typed.TypedActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.BehaviorInterceptor
+import pekko.actor.typed.TypedActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.typed.PersistenceId
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
 import java.util.concurrent.atomic.AtomicInteger
-import akka.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
+import pekko.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
 
 object DurableStateBehaviorInterceptorSpec {
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala
similarity index 89%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala
index 2abaab4bdd..007b8841de 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.scaladsl
+package org.apache.pekko.persistence.typed.state.scaladsl
 
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -10,16 +10,17 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.Done
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.typed.PersistenceId
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.typed.PersistenceId
+import pekko.serialization.jackson.CborSerializable
 
-import akka.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
+import pekko.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
 
 object DurableStateBehaviorReplySpec {
   def conf: Config = PersistenceTestKitDurableStateStorePlugin.config.withFallback(ConfigFactory.parseString(s"""
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorTimersSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehaviorTimersSpec.scala
similarity index 90%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorTimersSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehaviorTimersSpec.scala
index ae3195e9d4..1eacd48965 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorTimersSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehaviorTimersSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.scaladsl
+package org.apache.pekko.persistence.typed.state.scaladsl
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.typed.PersistenceId
 import org.scalatest.wordspec.AnyWordSpecLike
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
@@ -16,7 +17,7 @@ import com.typesafe.config.ConfigFactory
 import java.util.concurrent.atomic.AtomicInteger
 import scala.concurrent.duration._
 
-import akka.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
+import pekko.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
 
 object DurableStateBehaviorTimersSpec {
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateRevisionSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateRevisionSpec.scala
similarity index 87%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateRevisionSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateRevisionSpec.scala
index 28a0cdccdd..9fbc5316fa 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateRevisionSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateRevisionSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.scaladsl
+package org.apache.pekko.persistence.typed.state.scaladsl
 
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.state.RecoveryCompleted
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.state.RecoveryCompleted
 
 object DurableStateRevisionSpec {
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/NullEmptyStateSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/NullEmptyStateSpec.scala
similarity index 81%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/NullEmptyStateSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/NullEmptyStateSpec.scala
index 914ee7cb0a..8c3aa68058 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/NullEmptyStateSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/NullEmptyStateSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.scaladsl
+package org.apache.pekko.persistence.typed.state.scaladsl
 
-import akka.actor.testkit.typed.TestKitSettings
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.TestKitSettings
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.typed.PersistenceId
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
+import pekko.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
 
 object NullEmptyStateSpec {
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/PrimitiveStateSpec.scala b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/PrimitiveStateSpec.scala
similarity index 81%
rename from akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/PrimitiveStateSpec.scala
rename to akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/PrimitiveStateSpec.scala
index 4e0bdd3cd1..c688fb8746 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/PrimitiveStateSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/org/apache/pekko/persistence/typed/state/scaladsl/PrimitiveStateSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.scaladsl
+package org.apache.pekko.persistence.typed.state.scaladsl
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.typed.PersistenceId
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
+import pekko.persistence.testkit.PersistenceTestKitDurableStateStorePlugin
 
 object PrimitiveStateSpec {
 
diff --git a/akka-persistence-typed/src/main/java/akka/persistence/typed/serialization/ReplicatedEventSourcing.java b/akka-persistence-typed/src/main/java/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcing.java
similarity index 60%
rename from akka-persistence-typed/src/main/java/akka/persistence/typed/serialization/ReplicatedEventSourcing.java
rename to akka-persistence-typed/src/main/java/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcing.java
index 53d339e7e3..3310c2a56b 100644
--- a/akka-persistence-typed/src/main/java/akka/persistence/typed/serialization/ReplicatedEventSourcing.java
+++ b/akka-persistence-typed/src/main/java/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcing.java
@@ -5,19 +5,20 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ReplicatedEventSourcing.proto
 
-package akka.persistence.typed.serialization;
+package org.apache.pekko.persistence.typed.serialization;
 
 public final class ReplicatedEventSourcing {
   private ReplicatedEventSourcing() {}
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {}
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {}
 
-  public static void registerAllExtensions(akka.protobufv3.internal.ExtensionRegistry registry) {
-    registerAllExtensions((akka.protobufv3.internal.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
+    registerAllExtensions((org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   /** Protobuf enum {@code ORSetDeltaOp} */
-  public enum ORSetDeltaOp implements akka.protobufv3.internal.ProtocolMessageEnum {
+  public enum ORSetDeltaOp implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
     /** Add = 0; */
     Add(0),
     /** Remove = 1; */
@@ -64,29 +65,33 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static akka.protobufv3.internal.Internal.EnumLiteMap
+    public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalGetValueMap() {
       return internalValueMap;
     }
 
-    private static final akka.protobufv3.internal.Internal.EnumLiteMap
+    private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalValueMap =
-            new akka.protobufv3.internal.Internal.EnumLiteMap() {
+            new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
               public ORSetDeltaOp findValueByNumber(int number) {
                 return ORSetDeltaOp.forNumber(number);
               }
             };
 
-    public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
 
-    public final akka.protobufv3.internal.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
 
-    public static final akka.protobufv3.internal.Descriptors.EnumDescriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing.getDescriptor()
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+          .getDescriptor()
           .getEnumTypes()
           .get(0);
     }
@@ -94,7 +99,7 @@ public final class ReplicatedEventSourcing {
     private static final ORSetDeltaOp[] VALUES = values();
 
     public static ORSetDeltaOp valueOf(
-        akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+        org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
         throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
       }
@@ -113,7 +118,7 @@ public final class ReplicatedEventSourcing {
   public interface CounterOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:Counter)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required bytes value = 1;
@@ -126,46 +131,46 @@ public final class ReplicatedEventSourcing {
      *
      * @return The value.
      */
-    akka.protobufv3.internal.ByteString getValue();
+    org.apache.pekko.protobufv3.internal.ByteString getValue();
   }
   /** Protobuf type {@code Counter} */
-  public static final class Counter extends akka.protobufv3.internal.GeneratedMessageV3
+  public static final class Counter extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
       // @@protoc_insertion_point(message_implements:Counter)
       CounterOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use Counter.newBuilder() to construct.
-    private Counter(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Counter(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
     private Counter() {
-      value_ = akka.protobufv3.internal.ByteString.EMPTY;
+      value_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Counter();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private Counter(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -189,10 +194,10 @@ public final class ReplicatedEventSourcing {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
@@ -200,24 +205,27 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_Counter_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_Counter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter.class,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter.Builder.class);
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+                  .class,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+                  .Builder.class);
     }
 
     private int bitField0_;
     public static final int VALUE_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.ByteString value_;
+    private org.apache.pekko.protobufv3.internal.ByteString value_;
     /**
      * required bytes value = 1;
      *
@@ -231,7 +239,7 @@ public final class ReplicatedEventSourcing {
      *
      * @return The value.
      */
-    public akka.protobufv3.internal.ByteString getValue() {
+    public org.apache.pekko.protobufv3.internal.ByteString getValue() {
       return value_;
     }
 
@@ -252,7 +260,7 @@ public final class ReplicatedEventSourcing {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, value_);
@@ -267,7 +275,7 @@ public final class ReplicatedEventSourcing {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeBytesSize(1, value_);
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream.computeBytesSize(1, value_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,11 +287,13 @@ public final class ReplicatedEventSourcing {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter)) {
+      if (!(obj
+          instanceof
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter)) {
         return super.equals(obj);
       }
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter other =
-          (akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter) obj;
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter other =
+          (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter) obj;
 
       if (hasValue() != other.hasValue()) return false;
       if (hasValue()) {
@@ -309,78 +319,91 @@ public final class ReplicatedEventSourcing {
       return hash;
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        java.nio.ByteBuffer data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(java.nio.ByteBuffer data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        java.nio.ByteBuffer data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(
+            java.nio.ByteBuffer data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        java.io.InputStream input, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter
-        parseDelimitedFrom(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -394,7 +417,8 @@ public final class ReplicatedEventSourcing {
     }
 
     public static Builder newBuilder(
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter prototype) {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+            prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
@@ -405,70 +429,75 @@ public final class ReplicatedEventSourcing {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /** Protobuf type {@code Counter} */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:Counter)
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_Counter_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_Counter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter.class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter.Builder.class);
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+                    .class,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+                    .Builder.class);
       }
 
       // Construct using
-      // akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter.newBuilder()
+      // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        value_ = akka.protobufv3.internal.ByteString.EMPTY;
+        value_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_Counter_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
           getDefaultInstanceForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
             .getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter build() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter result =
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+          build() {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter result =
             buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
@@ -477,9 +506,11 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter buildPartial() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter result =
-            new akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter(this);
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+          buildPartial() {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter result =
+            new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter(
+                this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -498,23 +529,26 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -522,15 +556,19 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other
+            instanceof
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter) {
           return mergeFrom(
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter) other);
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter)
+                  other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -538,9 +576,9 @@ public final class ReplicatedEventSourcing {
       }
 
       public Builder mergeFrom(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter other) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter other) {
         if (other
-            == akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+            == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
                 .getDefaultInstance()) return this;
         if (other.hasValue()) {
           setValue(other.getValue());
@@ -560,15 +598,16 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter parsedMessage = null;
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+            parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter)
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -581,8 +620,8 @@ public final class ReplicatedEventSourcing {
 
       private int bitField0_;
 
-      private akka.protobufv3.internal.ByteString value_ =
-          akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString value_ =
+          org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes value = 1;
        *
@@ -596,7 +635,7 @@ public final class ReplicatedEventSourcing {
        *
        * @return The value.
        */
-      public akka.protobufv3.internal.ByteString getValue() {
+      public org.apache.pekko.protobufv3.internal.ByteString getValue() {
         return value_;
       }
       /**
@@ -605,7 +644,7 @@ public final class ReplicatedEventSourcing {
        * @param value The value to set.
        * @return This builder for chaining.
        */
-      public Builder setValue(akka.protobufv3.internal.ByteString value) {
+      public Builder setValue(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -628,13 +667,13 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -642,41 +681,43 @@ public final class ReplicatedEventSourcing {
     }
 
     // @@protoc_insertion_point(class_scope:Counter)
-    private static final akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+    private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .Counter
         DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter();
+      DEFAULT_INSTANCE =
+          new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter();
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
           @java.lang.Override
           public Counter parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
             return new Counter(input, extensionRegistry);
           }
         };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.Counter
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.Counter
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -685,7 +726,7 @@ public final class ReplicatedEventSourcing {
   public interface CounterUpdateOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:CounterUpdate)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required bytes delta = 1;
@@ -698,46 +739,48 @@ public final class ReplicatedEventSourcing {
      *
      * @return The delta.
      */
-    akka.protobufv3.internal.ByteString getDelta();
+    org.apache.pekko.protobufv3.internal.ByteString getDelta();
   }
   /** Protobuf type {@code CounterUpdate} */
-  public static final class CounterUpdate extends akka.protobufv3.internal.GeneratedMessageV3
+  public static final class CounterUpdate
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
       // @@protoc_insertion_point(message_implements:CounterUpdate)
       CounterUpdateOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use CounterUpdate.newBuilder() to construct.
-    private CounterUpdate(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private CounterUpdate(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
     private CounterUpdate() {
-      delta_ = akka.protobufv3.internal.ByteString.EMPTY;
+      delta_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new CounterUpdate();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private CounterUpdate(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -761,10 +804,10 @@ public final class ReplicatedEventSourcing {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
@@ -772,25 +815,27 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_CounterUpdate_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_CounterUpdate_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate.class,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate.Builder
-                  .class);
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+                  .class,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+                  .Builder.class);
     }
 
     private int bitField0_;
     public static final int DELTA_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.ByteString delta_;
+    private org.apache.pekko.protobufv3.internal.ByteString delta_;
     /**
      * required bytes delta = 1;
      *
@@ -804,7 +849,7 @@ public final class ReplicatedEventSourcing {
      *
      * @return The delta.
      */
-    public akka.protobufv3.internal.ByteString getDelta() {
+    public org.apache.pekko.protobufv3.internal.ByteString getDelta() {
       return delta_;
     }
 
@@ -825,7 +870,7 @@ public final class ReplicatedEventSourcing {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, delta_);
@@ -840,7 +885,7 @@ public final class ReplicatedEventSourcing {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeBytesSize(1, delta_);
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream.computeBytesSize(1, delta_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -853,11 +898,13 @@ public final class ReplicatedEventSourcing {
         return true;
       }
       if (!(obj
-          instanceof akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate)) {
+          instanceof
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate)) {
         return super.equals(obj);
       }
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate other =
-          (akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate) obj;
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate other =
+          (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate)
+              obj;
 
       if (hasDelta() != other.hasDelta()) return false;
       if (hasDelta()) {
@@ -883,85 +930,103 @@ public final class ReplicatedEventSourcing {
       return hash;
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
         parseFrom(java.nio.ByteBuffer data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
         parseFrom(
             java.nio.ByteBuffer data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-        parseFrom(akka.protobufv3.internal.ByteString data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
         parseFrom(
-            akka.protobufv3.internal.ByteString data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-        parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-        parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
         parseFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-        parseFrom(
-            java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-        parseDelimitedFrom(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-        parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-        parseFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -975,7 +1040,8 @@ public final class ReplicatedEventSourcing {
     }
 
     public static Builder newBuilder(
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate prototype) {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+            prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
@@ -986,72 +1052,77 @@ public final class ReplicatedEventSourcing {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /** Protobuf type {@code CounterUpdate} */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:CounterUpdate)
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdateOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdateOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_CounterUpdate_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_CounterUpdate_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate.class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate.Builder
-                    .class);
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .CounterUpdate.class,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .CounterUpdate.Builder.class);
       }
 
       // Construct using
-      // akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate.newBuilder()
+      // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
       }
 
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        delta_ = akka.protobufv3.internal.ByteString.EMPTY;
+        delta_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_CounterUpdate_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
           getDefaultInstanceForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-            .getDefaultInstance();
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate build() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate result =
-            buildPartial();
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+          build() {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+            result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1059,10 +1130,12 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
           buildPartial() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate result =
-            new akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate(this);
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+            result =
+                new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .CounterUpdate(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1081,23 +1154,26 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -1105,16 +1181,21 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other
-            instanceof akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate) {
+            instanceof
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .CounterUpdate) {
           return mergeFrom(
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate) other);
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .CounterUpdate)
+                  other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -1122,10 +1203,11 @@ public final class ReplicatedEventSourcing {
       }
 
       public Builder mergeFrom(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate other) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+              other) {
         if (other
-            == akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
-                .getDefaultInstance()) return this;
+            == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .CounterUpdate.getDefaultInstance()) return this;
         if (other.hasDelta()) {
           setDelta(other.getDelta());
         }
@@ -1144,16 +1226,17 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate parsedMessage =
-            null;
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+            parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate)
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .CounterUpdate)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -1166,8 +1249,8 @@ public final class ReplicatedEventSourcing {
 
       private int bitField0_;
 
-      private akka.protobufv3.internal.ByteString delta_ =
-          akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString delta_ =
+          org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes delta = 1;
        *
@@ -1181,7 +1264,7 @@ public final class ReplicatedEventSourcing {
        *
        * @return The delta.
        */
-      public akka.protobufv3.internal.ByteString getDelta() {
+      public org.apache.pekko.protobufv3.internal.ByteString getDelta() {
         return delta_;
       }
       /**
@@ -1190,7 +1273,7 @@ public final class ReplicatedEventSourcing {
        * @param value The delta to set.
        * @return This builder for chaining.
        */
-      public Builder setDelta(akka.protobufv3.internal.ByteString value) {
+      public Builder setDelta(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1213,13 +1296,13 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -1227,42 +1310,45 @@ public final class ReplicatedEventSourcing {
     }
 
     // @@protoc_insertion_point(class_scope:CounterUpdate)
-    private static final akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+    private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
         DEFAULT_INSTANCE;
 
     static {
       DEFAULT_INSTANCE =
-          new akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate();
+          new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .CounterUpdate();
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .CounterUpdate
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
           @java.lang.Override
           public CounterUpdate parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
             return new CounterUpdate(input, extensionRegistry);
           }
         };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.CounterUpdate
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1271,7 +1357,7 @@ public final class ReplicatedEventSourcing {
   public interface ORSetOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:ORSet)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string originDc = 1;
@@ -1290,7 +1376,7 @@ public final class ReplicatedEventSourcing {
      *
      * @return The bytes for originDc.
      */
-    akka.protobufv3.internal.ByteString getOriginDcBytes();
+    org.apache.pekko.protobufv3.internal.ByteString getOriginDcBytes();
 
     /**
      * required .VersionVector vvector = 2;
@@ -1303,25 +1389,29 @@ public final class ReplicatedEventSourcing {
      *
      * @return The vvector.
      */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getVvector();
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+        getVvector();
     /** required .VersionVector vvector = 2; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
         getVvectorOrBuilder();
 
     /** repeated .VersionVector dots = 3; */
-    java.util.List
+    java.util.List<
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
         getDotsList();
     /** repeated .VersionVector dots = 3; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getDots(int index);
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getDots(
+        int index);
     /** repeated .VersionVector dots = 3; */
     int getDotsCount();
     /** repeated .VersionVector dots = 3; */
     java.util.List<
             ? extends
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVectorOrBuilder>
         getDotsOrBuilderList();
     /** repeated .VersionVector dots = 3; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
         getDotsOrBuilder(int index);
 
     /**
@@ -1349,7 +1439,7 @@ public final class ReplicatedEventSourcing {
      * @param index The index of the value to return.
      * @return The bytes of the stringElements at the given index.
      */
-    akka.protobufv3.internal.ByteString getStringElementsBytes(int index);
+    org.apache.pekko.protobufv3.internal.ByteString getStringElementsBytes(int index);
 
     /**
      * repeated sint32 intElements = 5 [packed = true];
@@ -1392,32 +1482,32 @@ public final class ReplicatedEventSourcing {
     long getLongElements(int index);
 
     /** repeated .Payload otherElements = 7; */
-    java.util.List getOtherElementsList();
+    java.util.List getOtherElementsList();
     /** repeated .Payload otherElements = 7; */
-    akka.remote.ContainerFormats.Payload getOtherElements(int index);
+    org.apache.pekko.remote.ContainerFormats.Payload getOtherElements(int index);
     /** repeated .Payload otherElements = 7; */
     int getOtherElementsCount();
     /** repeated .Payload otherElements = 7; */
-    java.util.List
+    java.util.List
         getOtherElementsOrBuilderList();
     /** repeated .Payload otherElements = 7; */
-    akka.remote.ContainerFormats.PayloadOrBuilder getOtherElementsOrBuilder(int index);
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getOtherElementsOrBuilder(int index);
   }
   /** Protobuf type {@code ORSet} */
-  public static final class ORSet extends akka.protobufv3.internal.GeneratedMessageV3
+  public static final class ORSet extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
       // @@protoc_insertion_point(message_implements:ORSet)
       ORSetOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use ORSet.newBuilder() to construct.
-    private ORSet(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ORSet(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
     private ORSet() {
       originDc_ = "";
       dots_ = java.util.Collections.emptyList();
-      stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       intElements_ = emptyIntList();
       longElements_ = emptyLongList();
       otherElements_ = java.util.Collections.emptyList();
@@ -1426,26 +1516,26 @@ public final class ReplicatedEventSourcing {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ORSet();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private ORSet(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1456,22 +1546,23 @@ public final class ReplicatedEventSourcing {
               break;
             case 10:
               {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 originDc_ = bs;
                 break;
               }
             case 18:
               {
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .VersionVector.Builder
                     subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = vvector_.toBuilder();
                 }
                 vvector_ =
                     input.readMessage(
-                        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                            .PARSER,
+                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                            .VersionVector.PARSER,
                         extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(vvector_);
@@ -1485,22 +1576,22 @@ public final class ReplicatedEventSourcing {
                 if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                   dots_ =
                       new java.util.ArrayList<
-                          akka.persistence.typed.serialization.ReplicatedEventSourcing
+                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                               .VersionVector>();
                   mutable_bitField0_ |= 0x00000004;
                 }
                 dots_.add(
                     input.readMessage(
-                        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                            .PARSER,
+                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                            .VersionVector.PARSER,
                         extensionRegistry));
                 break;
               }
             case 34:
               {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                  stringElements_ = new akka.protobufv3.internal.LazyStringArrayList();
+                  stringElements_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                   mutable_bitField0_ |= 0x00000008;
                 }
                 stringElements_.add(bs);
@@ -1555,12 +1646,14 @@ public final class ReplicatedEventSourcing {
             case 58:
               {
                 if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                  otherElements_ = new java.util.ArrayList();
+                  otherElements_ =
+                      new java.util.ArrayList();
                   mutable_bitField0_ |= 0x00000040;
                 }
                 otherElements_.add(
                     input.readMessage(
-                        akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry));
+                        org.apache.pekko.remote.ContainerFormats.Payload.PARSER,
+                        extensionRegistry));
                 break;
               }
             default:
@@ -1572,10 +1665,10 @@ public final class ReplicatedEventSourcing {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
@@ -1598,19 +1691,21 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ORSet_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ORSet_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.class,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder.class);
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.class,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder
+                  .class);
     }
 
     private int bitField0_;
@@ -1634,7 +1729,8 @@ public final class ReplicatedEventSourcing {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           originDc_ = s;
@@ -1647,20 +1743,21 @@ public final class ReplicatedEventSourcing {
      *
      * @return The bytes for originDc.
      */
-    public akka.protobufv3.internal.ByteString getOriginDcBytes() {
+    public org.apache.pekko.protobufv3.internal.ByteString getOriginDcBytes() {
       java.lang.Object ref = originDc_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b =
-            akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
         originDc_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int VVECTOR_FIELD_NUMBER = 2;
-    private akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector vvector_;
+    private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+        vvector_;
     /**
      * required .VersionVector vvector = 2;
      *
@@ -1674,35 +1771,38 @@ public final class ReplicatedEventSourcing {
      *
      * @return The vvector.
      */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getVvector() {
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+        getVvector() {
       return vvector_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .getDefaultInstance()
           : vvector_;
     }
     /** required .VersionVector vvector = 2; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVectorOrBuilder
         getVvectorOrBuilder() {
       return vvector_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .getDefaultInstance()
           : vvector_;
     }
 
     public static final int DOTS_FIELD_NUMBER = 3;
     private java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
         dots_;
     /** repeated .VersionVector dots = 3; */
     public java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
         getDotsList() {
       return dots_;
     }
     /** repeated .VersionVector dots = 3; */
     public java.util.List<
             ? extends
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVectorOrBuilder>
         getDotsOrBuilderList() {
       return dots_;
     }
@@ -1711,24 +1811,25 @@ public final class ReplicatedEventSourcing {
       return dots_.size();
     }
     /** repeated .VersionVector dots = 3; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getDots(
-        int index) {
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+        getDots(int index) {
       return dots_.get(index);
     }
     /** repeated .VersionVector dots = 3; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVectorOrBuilder
         getDotsOrBuilder(int index) {
       return dots_.get(index);
     }
 
     public static final int STRINGELEMENTS_FIELD_NUMBER = 4;
-    private akka.protobufv3.internal.LazyStringList stringElements_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_;
     /**
      * repeated string stringElements = 4;
      *
      * @return A list containing the stringElements.
      */
-    public akka.protobufv3.internal.ProtocolStringList getStringElementsList() {
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList getStringElementsList() {
       return stringElements_;
     }
     /**
@@ -1754,12 +1855,12 @@ public final class ReplicatedEventSourcing {
      * @param index The index of the value to return.
      * @return The bytes of the stringElements at the given index.
      */
-    public akka.protobufv3.internal.ByteString getStringElementsBytes(int index) {
+    public org.apache.pekko.protobufv3.internal.ByteString getStringElementsBytes(int index) {
       return stringElements_.getByteString(index);
     }
 
     public static final int INTELEMENTS_FIELD_NUMBER = 5;
-    private akka.protobufv3.internal.Internal.IntList intElements_;
+    private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_;
     /**
      * repeated sint32 intElements = 5 [packed = true];
      *
@@ -1789,7 +1890,7 @@ public final class ReplicatedEventSourcing {
     private int intElementsMemoizedSerializedSize = -1;
 
     public static final int LONGELEMENTS_FIELD_NUMBER = 6;
-    private akka.protobufv3.internal.Internal.LongList longElements_;
+    private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_;
     /**
      * repeated sint64 longElements = 6 [packed = true];
      *
@@ -1819,13 +1920,13 @@ public final class ReplicatedEventSourcing {
     private int longElementsMemoizedSerializedSize = -1;
 
     public static final int OTHERELEMENTS_FIELD_NUMBER = 7;
-    private java.util.List otherElements_;
+    private java.util.List otherElements_;
     /** repeated .Payload otherElements = 7; */
-    public java.util.List getOtherElementsList() {
+    public java.util.List getOtherElementsList() {
       return otherElements_;
     }
     /** repeated .Payload otherElements = 7; */
-    public java.util.List
+    public java.util.List
         getOtherElementsOrBuilderList() {
       return otherElements_;
     }
@@ -1834,11 +1935,12 @@ public final class ReplicatedEventSourcing {
       return otherElements_.size();
     }
     /** repeated .Payload otherElements = 7; */
-    public akka.remote.ContainerFormats.Payload getOtherElements(int index) {
+    public org.apache.pekko.remote.ContainerFormats.Payload getOtherElements(int index) {
       return otherElements_.get(index);
     }
     /** repeated .Payload otherElements = 7; */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getOtherElementsOrBuilder(int index) {
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getOtherElementsOrBuilder(
+        int index) {
       return otherElements_.get(index);
     }
 
@@ -1879,11 +1981,11 @@ public final class ReplicatedEventSourcing {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, originDc_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, originDc_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getVvector());
@@ -1892,7 +1994,7 @@ public final class ReplicatedEventSourcing {
         output.writeMessage(3, dots_.get(i));
       }
       for (int i = 0; i < stringElements_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
             output, 4, stringElements_.getRaw(i));
       }
       if (getIntElementsList().size() > 0) {
@@ -1922,13 +2024,18 @@ public final class ReplicatedEventSourcing {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, originDc_);
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, originDc_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(2, getVvector());
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                2, getVvector());
       }
       for (int i = 0; i < dots_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(3, dots_.get(i));
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                3, dots_.get(i));
       }
       {
         int dataSize = 0;
@@ -1942,13 +2049,15 @@ public final class ReplicatedEventSourcing {
         int dataSize = 0;
         for (int i = 0; i < intElements_.size(); i++) {
           dataSize +=
-              akka.protobufv3.internal.CodedOutputStream.computeSInt32SizeNoTag(
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeSInt32SizeNoTag(
                   intElements_.getInt(i));
         }
         size += dataSize;
         if (!getIntElementsList().isEmpty()) {
           size += 1;
-          size += akka.protobufv3.internal.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size +=
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt32SizeNoTag(
+                  dataSize);
         }
         intElementsMemoizedSerializedSize = dataSize;
       }
@@ -1956,19 +2065,22 @@ public final class ReplicatedEventSourcing {
         int dataSize = 0;
         for (int i = 0; i < longElements_.size(); i++) {
           dataSize +=
-              akka.protobufv3.internal.CodedOutputStream.computeSInt64SizeNoTag(
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeSInt64SizeNoTag(
                   longElements_.getLong(i));
         }
         size += dataSize;
         if (!getLongElementsList().isEmpty()) {
           size += 1;
-          size += akka.protobufv3.internal.CodedOutputStream.computeInt32SizeNoTag(dataSize);
+          size +=
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt32SizeNoTag(
+                  dataSize);
         }
         longElementsMemoizedSerializedSize = dataSize;
       }
       for (int i = 0; i < otherElements_.size(); i++) {
         size +=
-            akka.protobufv3.internal.CodedOutputStream.computeMessageSize(7, otherElements_.get(i));
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                7, otherElements_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1980,11 +2092,13 @@ public final class ReplicatedEventSourcing {
       if (obj == this) {
         return true;
       }
-      if (!(obj instanceof akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet)) {
+      if (!(obj
+          instanceof
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet)) {
         return super.equals(obj);
       }
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet other =
-          (akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet) obj;
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet other =
+          (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet) obj;
 
       if (hasOriginDc() != other.hasOriginDc()) return false;
       if (hasOriginDc()) {
@@ -2043,78 +2157,91 @@ public final class ReplicatedEventSourcing {
       return hash;
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        java.nio.ByteBuffer data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(java.nio.ByteBuffer data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        java.nio.ByteBuffer data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(
+            java.nio.ByteBuffer data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        java.io.InputStream input, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
-        parseDelimitedFrom(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -2128,7 +2255,7 @@ public final class ReplicatedEventSourcing {
     }
 
     public static Builder newBuilder(
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet prototype) {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
@@ -2139,44 +2266,48 @@ public final class ReplicatedEventSourcing {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /** Protobuf type {@code ORSet} */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:ORSet)
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ORSet_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ORSet_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder.class);
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                    .class,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                    .Builder.class);
       }
 
       // Construct using
-      // akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.newBuilder()
+      // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
           getVvectorFieldBuilder();
           getDotsFieldBuilder();
           getOtherElementsFieldBuilder();
@@ -2200,7 +2331,7 @@ public final class ReplicatedEventSourcing {
         } else {
           dotsBuilder_.clear();
         }
-        stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000008);
         intElements_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -2216,21 +2347,23 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ORSet_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
           getDefaultInstanceForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
             .getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet build() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet result = buildPartial();
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+          build() {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet result =
+            buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2238,9 +2371,11 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet buildPartial() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet result =
-            new akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet(this);
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+          buildPartial() {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet result =
+            new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet(
+                this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2300,23 +2435,26 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -2324,15 +2462,19 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other
+            instanceof
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet) {
           return mergeFrom(
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet) other);
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet)
+                  other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -2340,9 +2482,9 @@ public final class ReplicatedEventSourcing {
       }
 
       public Builder mergeFrom(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet other) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet other) {
         if (other
-            == akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+            == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
                 .getDefaultInstance()) return this;
         if (other.hasOriginDc()) {
           bitField0_ |= 0x00000001;
@@ -2371,7 +2513,7 @@ public final class ReplicatedEventSourcing {
               dots_ = other.dots_;
               bitField0_ = (bitField0_ & ~0x00000004);
               dotsBuilder_ =
-                  akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getDotsFieldBuilder()
                       : null;
             } else {
@@ -2428,7 +2570,7 @@ public final class ReplicatedEventSourcing {
               otherElements_ = other.otherElements_;
               bitField0_ = (bitField0_ & ~0x00000040);
               otherElementsBuilder_ =
-                  akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getOtherElementsFieldBuilder()
                       : null;
             } else {
@@ -2467,15 +2609,16 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet parsedMessage = null;
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+            parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet)
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -2505,7 +2648,8 @@ public final class ReplicatedEventSourcing {
       public java.lang.String getOriginDc() {
         java.lang.Object ref = originDc_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             originDc_ = s;
@@ -2520,15 +2664,15 @@ public final class ReplicatedEventSourcing {
        *
        * @return The bytes for originDc.
        */
-      public akka.protobufv3.internal.ByteString getOriginDcBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getOriginDcBytes() {
         java.lang.Object ref = originDc_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           originDc_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -2563,7 +2707,7 @@ public final class ReplicatedEventSourcing {
        * @param value The bytes for originDc to set.
        * @return This builder for chaining.
        */
-      public Builder setOriginDcBytes(akka.protobufv3.internal.ByteString value) {
+      public Builder setOriginDcBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2573,11 +2717,15 @@ public final class ReplicatedEventSourcing {
         return this;
       }
 
-      private akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector vvector_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          vvector_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           vvectorBuilder_;
       /**
        * required .VersionVector vvector = 2;
@@ -2592,12 +2740,12 @@ public final class ReplicatedEventSourcing {
        *
        * @return The vvector.
        */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
           getVvector() {
         if (vvectorBuilder_ == null) {
           return vvector_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                  .getDefaultInstance()
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector.getDefaultInstance()
               : vvector_;
         } else {
           return vvectorBuilder_.getMessage();
@@ -2605,7 +2753,8 @@ public final class ReplicatedEventSourcing {
       }
       /** required .VersionVector vvector = 2; */
       public Builder setVvector(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (vvectorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2620,7 +2769,8 @@ public final class ReplicatedEventSourcing {
       }
       /** required .VersionVector vvector = 2; */
       public Builder setVvector(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder
               builderForValue) {
         if (vvectorBuilder_ == null) {
           vvector_ = builderForValue.build();
@@ -2633,16 +2783,17 @@ public final class ReplicatedEventSourcing {
       }
       /** required .VersionVector vvector = 2; */
       public Builder mergeVvector(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (vvectorBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)
               && vvector_ != null
               && vvector_
-                  != akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .getDefaultInstance()) {
+                  != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.getDefaultInstance()) {
             vvector_ =
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                    .newBuilder(vvector_)
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.newBuilder(vvector_)
                     .mergeFrom(value)
                     .buildPartial();
           } else {
@@ -2667,37 +2818,43 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** required .VersionVector vvector = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Builder
           getVvectorBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getVvectorFieldBuilder().getBuilder();
       }
       /** required .VersionVector vvector = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVectorOrBuilder
           getVvectorOrBuilder() {
         if (vvectorBuilder_ != null) {
           return vvectorBuilder_.getMessageOrBuilder();
         } else {
           return vvector_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                  .getDefaultInstance()
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector.getDefaultInstance()
               : vvector_;
         }
       }
       /** required .VersionVector vvector = 2; */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           getVvectorFieldBuilder() {
         if (vvectorBuilder_ == null) {
           vvectorBuilder_ =
-              new akka.protobufv3.internal.SingleFieldBuilderV3<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .Builder,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Builder,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVectorOrBuilder>(getVvector(), getParentForChildren(), isClean());
           vvector_ = null;
         }
@@ -2705,28 +2862,33 @@ public final class ReplicatedEventSourcing {
       }
 
       private java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector>
           dots_ = java.util.Collections.emptyList();
 
       private void ensureDotsIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
           dots_ =
               new java.util.ArrayList<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>(
-                  dots_);
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector>(dots_);
           bitField0_ |= 0x00000004;
         }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           dotsBuilder_;
 
       /** repeated .VersionVector dots = 3; */
       public java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector>
           getDotsList() {
         if (dotsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(dots_);
@@ -2743,8 +2905,8 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .VersionVector dots = 3; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getDots(
-          int index) {
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          getDots(int index) {
         if (dotsBuilder_ == null) {
           return dots_.get(index);
         } else {
@@ -2754,7 +2916,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector dots = 3; */
       public Builder setDots(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (dotsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2770,7 +2933,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector dots = 3; */
       public Builder setDots(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder
               builderForValue) {
         if (dotsBuilder_ == null) {
           ensureDotsIsMutable();
@@ -2783,7 +2947,8 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .VersionVector dots = 3; */
       public Builder addDots(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (dotsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2799,7 +2964,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector dots = 3; */
       public Builder addDots(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (dotsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2814,7 +2980,8 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .VersionVector dots = 3; */
       public Builder addDots(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder
               builderForValue) {
         if (dotsBuilder_ == null) {
           ensureDotsIsMutable();
@@ -2828,7 +2995,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector dots = 3; */
       public Builder addDots(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder
               builderForValue) {
         if (dotsBuilder_ == null) {
           ensureDotsIsMutable();
@@ -2843,11 +3011,12 @@ public final class ReplicatedEventSourcing {
       public Builder addAllDots(
           java.lang.Iterable<
                   ? extends
-                      akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector>
+                      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                          .VersionVector>
               values) {
         if (dotsBuilder_ == null) {
           ensureDotsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, dots_);
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, dots_);
           onChanged();
         } else {
           dotsBuilder_.addAllMessages(values);
@@ -2877,12 +3046,14 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** repeated .VersionVector dots = 3; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Builder
           getDotsBuilder(int index) {
         return getDotsFieldBuilder().getBuilder(index);
       }
       /** repeated .VersionVector dots = 3; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVectorOrBuilder
           getDotsOrBuilder(int index) {
         if (dotsBuilder_ == null) {
           return dots_.get(index);
@@ -2893,7 +3064,7 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector dots = 3; */
       public java.util.List<
               ? extends
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVectorOrBuilder>
           getDotsOrBuilderList() {
         if (dotsBuilder_ != null) {
@@ -2903,41 +3074,48 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .VersionVector dots = 3; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Builder
           addDotsBuilder() {
         return getDotsFieldBuilder()
             .addBuilder(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                    .getDefaultInstance());
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.getDefaultInstance());
       }
       /** repeated .VersionVector dots = 3; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Builder
           addDotsBuilder(int index) {
         return getDotsFieldBuilder()
             .addBuilder(
                 index,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                    .getDefaultInstance());
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.getDefaultInstance());
       }
       /** repeated .VersionVector dots = 3; */
       public java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder>
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder>
           getDotsBuilderList() {
         return getDotsFieldBuilder().getBuilderList();
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           getDotsFieldBuilder() {
         if (dotsBuilder_ == null) {
           dotsBuilder_ =
-              new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .Builder,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+              new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Builder,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVectorOrBuilder>(
                   dots_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
           dots_ = null;
@@ -2945,12 +3123,13 @@ public final class ReplicatedEventSourcing {
         return dotsBuilder_;
       }
 
-      private akka.protobufv3.internal.LazyStringList stringElements_ =
-          akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList stringElements_ =
+          org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
 
       private void ensureStringElementsIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          stringElements_ = new akka.protobufv3.internal.LazyStringArrayList(stringElements_);
+          stringElements_ =
+              new org.apache.pekko.protobufv3.internal.LazyStringArrayList(stringElements_);
           bitField0_ |= 0x00000008;
         }
       }
@@ -2959,7 +3138,7 @@ public final class ReplicatedEventSourcing {
        *
        * @return A list containing the stringElements.
        */
-      public akka.protobufv3.internal.ProtocolStringList getStringElementsList() {
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList getStringElementsList() {
         return stringElements_.getUnmodifiableView();
       }
       /**
@@ -2985,7 +3164,7 @@ public final class ReplicatedEventSourcing {
        * @param index The index of the value to return.
        * @return The bytes of the stringElements at the given index.
        */
-      public akka.protobufv3.internal.ByteString getStringElementsBytes(int index) {
+      public org.apache.pekko.protobufv3.internal.ByteString getStringElementsBytes(int index) {
         return stringElements_.getByteString(index);
       }
       /**
@@ -3027,7 +3206,8 @@ public final class ReplicatedEventSourcing {
        */
       public Builder addAllStringElements(java.lang.Iterable values) {
         ensureStringElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, stringElements_);
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+            values, stringElements_);
         onChanged();
         return this;
       }
@@ -3037,7 +3217,7 @@ public final class ReplicatedEventSourcing {
        * @return This builder for chaining.
        */
       public Builder clearStringElements() {
-        stringElements_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        stringElements_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
@@ -3048,7 +3228,7 @@ public final class ReplicatedEventSourcing {
        * @param value The bytes of the stringElements to add.
        * @return This builder for chaining.
        */
-      public Builder addStringElementsBytes(akka.protobufv3.internal.ByteString value) {
+      public Builder addStringElementsBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3058,7 +3238,7 @@ public final class ReplicatedEventSourcing {
         return this;
       }
 
-      private akka.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
+      private org.apache.pekko.protobufv3.internal.Internal.IntList intElements_ = emptyIntList();
 
       private void ensureIntElementsIsMutable() {
         if (!((bitField0_ & 0x00000010) != 0)) {
@@ -3126,7 +3306,8 @@ public final class ReplicatedEventSourcing {
        */
       public Builder addAllIntElements(java.lang.Iterable values) {
         ensureIntElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, intElements_);
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+            values, intElements_);
         onChanged();
         return this;
       }
@@ -3142,7 +3323,8 @@ public final class ReplicatedEventSourcing {
         return this;
       }
 
-      private akka.protobufv3.internal.Internal.LongList longElements_ = emptyLongList();
+      private org.apache.pekko.protobufv3.internal.Internal.LongList longElements_ =
+          emptyLongList();
 
       private void ensureLongElementsIsMutable() {
         if (!((bitField0_ & 0x00000020) != 0)) {
@@ -3210,7 +3392,8 @@ public final class ReplicatedEventSourcing {
        */
       public Builder addAllLongElements(java.lang.Iterable values) {
         ensureLongElementsIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, longElements_);
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+            values, longElements_);
         onChanged();
         return this;
       }
@@ -3226,25 +3409,27 @@ public final class ReplicatedEventSourcing {
         return this;
       }
 
-      private java.util.List otherElements_ =
+      private java.util.List otherElements_ =
           java.util.Collections.emptyList();
 
       private void ensureOtherElementsIsMutable() {
         if (!((bitField0_ & 0x00000040) != 0)) {
           otherElements_ =
-              new java.util.ArrayList(otherElements_);
+              new java.util.ArrayList(
+                  otherElements_);
           bitField0_ |= 0x00000040;
         }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload,
-              akka.remote.ContainerFormats.Payload.Builder,
-              akka.remote.ContainerFormats.PayloadOrBuilder>
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload,
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+              org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           otherElementsBuilder_;
 
       /** repeated .Payload otherElements = 7; */
-      public java.util.List getOtherElementsList() {
+      public java.util.List
+          getOtherElementsList() {
         if (otherElementsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(otherElements_);
         } else {
@@ -3260,7 +3445,7 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .Payload otherElements = 7; */
-      public akka.remote.ContainerFormats.Payload getOtherElements(int index) {
+      public org.apache.pekko.remote.ContainerFormats.Payload getOtherElements(int index) {
         if (otherElementsBuilder_ == null) {
           return otherElements_.get(index);
         } else {
@@ -3268,7 +3453,8 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .Payload otherElements = 7; */
-      public Builder setOtherElements(int index, akka.remote.ContainerFormats.Payload value) {
+      public Builder setOtherElements(
+          int index, org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (otherElementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3283,7 +3469,7 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .Payload otherElements = 7; */
       public Builder setOtherElements(
-          int index, akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          int index, org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
           otherElements_.set(index, builderForValue.build());
@@ -3294,7 +3480,7 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** repeated .Payload otherElements = 7; */
-      public Builder addOtherElements(akka.remote.ContainerFormats.Payload value) {
+      public Builder addOtherElements(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (otherElementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3308,7 +3494,8 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** repeated .Payload otherElements = 7; */
-      public Builder addOtherElements(int index, akka.remote.ContainerFormats.Payload value) {
+      public Builder addOtherElements(
+          int index, org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (otherElementsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3323,7 +3510,7 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .Payload otherElements = 7; */
       public Builder addOtherElements(
-          akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
           otherElements_.add(builderForValue.build());
@@ -3335,7 +3522,7 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .Payload otherElements = 7; */
       public Builder addOtherElements(
-          int index, akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          int index, org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
           otherElements_.add(index, builderForValue.build());
@@ -3347,10 +3534,11 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .Payload otherElements = 7; */
       public Builder addAllOtherElements(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (otherElementsBuilder_ == null) {
           ensureOtherElementsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, otherElements_);
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+              values, otherElements_);
           onChanged();
         } else {
           otherElementsBuilder_.addAllMessages(values);
@@ -3380,11 +3568,13 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** repeated .Payload otherElements = 7; */
-      public akka.remote.ContainerFormats.Payload.Builder getOtherElementsBuilder(int index) {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getOtherElementsBuilder(
+          int index) {
         return getOtherElementsFieldBuilder().getBuilder(index);
       }
       /** repeated .Payload otherElements = 7; */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getOtherElementsOrBuilder(int index) {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getOtherElementsOrBuilder(
+          int index) {
         if (otherElementsBuilder_ == null) {
           return otherElements_.get(index);
         } else {
@@ -3392,7 +3582,7 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .Payload otherElements = 7; */
-      public java.util.List
+      public java.util.List
           getOtherElementsOrBuilderList() {
         if (otherElementsBuilder_ != null) {
           return otherElementsBuilder_.getMessageOrBuilderList();
@@ -3401,32 +3591,34 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .Payload otherElements = 7; */
-      public akka.remote.ContainerFormats.Payload.Builder addOtherElementsBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder addOtherElementsBuilder() {
         return getOtherElementsFieldBuilder()
-            .addBuilder(akka.remote.ContainerFormats.Payload.getDefaultInstance());
+            .addBuilder(org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance());
       }
       /** repeated .Payload otherElements = 7; */
-      public akka.remote.ContainerFormats.Payload.Builder addOtherElementsBuilder(int index) {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder addOtherElementsBuilder(
+          int index) {
         return getOtherElementsFieldBuilder()
-            .addBuilder(index, akka.remote.ContainerFormats.Payload.getDefaultInstance());
+            .addBuilder(
+                index, org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance());
       }
       /** repeated .Payload otherElements = 7; */
-      public java.util.List
+      public java.util.List
           getOtherElementsBuilderList() {
         return getOtherElementsFieldBuilder().getBuilderList();
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload,
-              akka.remote.ContainerFormats.Payload.Builder,
-              akka.remote.ContainerFormats.PayloadOrBuilder>
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload,
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+              org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           getOtherElementsFieldBuilder() {
         if (otherElementsBuilder_ == null) {
           otherElementsBuilder_ =
-              new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-                  akka.remote.ContainerFormats.Payload,
-                  akka.remote.ContainerFormats.Payload.Builder,
-                  akka.remote.ContainerFormats.PayloadOrBuilder>(
+              new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                  org.apache.pekko.remote.ContainerFormats.Payload,
+                  org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+                  org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   otherElements_,
                   ((bitField0_ & 0x00000040) != 0),
                   getParentForChildren(),
@@ -3438,13 +3630,13 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -3452,41 +3644,43 @@ public final class ReplicatedEventSourcing {
     }
 
     // @@protoc_insertion_point(class_scope:ORSet)
-    private static final akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+    private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSet
         DEFAULT_INSTANCE;
 
     static {
-      DEFAULT_INSTANCE = new akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet();
+      DEFAULT_INSTANCE =
+          new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet();
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
           @java.lang.Override
           public ORSet parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
             return new ORSet(input, extensionRegistry);
           }
         };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3495,35 +3689,39 @@ public final class ReplicatedEventSourcing {
   public interface ORSetDeltaGroupOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:ORSetDeltaGroup)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
     java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                .Entry>
         getEntriesList();
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry getEntries(
-        int index);
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+        getEntries(int index);
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
     int getEntriesCount();
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
     java.util.List<
             ? extends
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                    .EntryOrBuilder>
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaGroup.EntryOrBuilder>
         getEntriesOrBuilderList();
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.EntryOrBuilder
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+            .EntryOrBuilder
         getEntriesOrBuilder(int index);
   }
   /** Protobuf type {@code ORSetDeltaGroup} */
-  public static final class ORSetDeltaGroup extends akka.protobufv3.internal.GeneratedMessageV3
+  public static final class ORSetDeltaGroup
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
       // @@protoc_insertion_point(message_implements:ORSetDeltaGroup)
       ORSetDeltaGroupOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use ORSetDeltaGroup.newBuilder() to construct.
-    private ORSetDeltaGroup(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ORSetDeltaGroup(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
@@ -3534,26 +3732,26 @@ public final class ReplicatedEventSourcing {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ORSetDeltaGroup();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private ORSetDeltaGroup(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3567,14 +3765,14 @@ public final class ReplicatedEventSourcing {
                 if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                   entries_ =
                       new java.util.ArrayList<
-                          akka.persistence.typed.serialization.ReplicatedEventSourcing
+                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                               .ORSetDeltaGroup.Entry>();
                   mutable_bitField0_ |= 0x00000001;
                 }
                 entries_.add(
                     input.readMessage(
-                        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                            .Entry.PARSER,
+                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                            .ORSetDeltaGroup.Entry.PARSER,
                         extensionRegistry));
                 break;
               }
@@ -3587,10 +3785,10 @@ public final class ReplicatedEventSourcing {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -3601,26 +3799,28 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ORSetDeltaGroup_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ORSetDeltaGroup_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.class,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Builder
-                  .class);
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.class,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Builder.class);
     }
 
     public interface EntryOrBuilder
         extends
         // @@protoc_insertion_point(interface_extends:ORSetDeltaGroup.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required .ORSetDeltaOp operation = 1;
@@ -3633,7 +3833,8 @@ public final class ReplicatedEventSourcing {
        *
        * @return The operation.
        */
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp getOperation();
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
+          getOperation();
 
       /**
        * required .ORSet underlying = 2;
@@ -3646,19 +3847,20 @@ public final class ReplicatedEventSourcing {
        *
        * @return The underlying.
        */
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet getUnderlying();
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+          getUnderlying();
       /** required .ORSet underlying = 2; */
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder
           getUnderlyingOrBuilder();
     }
     /** Protobuf type {@code ORSetDeltaGroup.Entry} */
-    public static final class Entry extends akka.protobufv3.internal.GeneratedMessageV3
+    public static final class Entry extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
         implements
         // @@protoc_insertion_point(message_implements:ORSetDeltaGroup.Entry)
         EntryOrBuilder {
       private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
 
@@ -3669,26 +3871,26 @@ public final class ReplicatedEventSourcing {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
         return this.unknownFields;
       }
 
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -3701,9 +3903,11 @@ public final class ReplicatedEventSourcing {
                 {
                   int rawValue = input.readEnum();
                   @SuppressWarnings("deprecation")
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp value =
-                      akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
-                          .valueOf(rawValue);
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                          .ORSetDeltaOp
+                      value =
+                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                              .ORSetDeltaOp.valueOf(rawValue);
                   if (value == null) {
                     unknownFields.mergeVarintField(1, rawValue);
                   } else {
@@ -3714,14 +3918,16 @@ public final class ReplicatedEventSourcing {
                 }
               case 18:
                 {
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                          .Builder
                       subBuilder = null;
                   if (((bitField0_ & 0x00000002) != 0)) {
                     subBuilder = underlying_.toBuilder();
                   }
                   underlying_ =
                       input.readMessage(
-                          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.PARSER,
+                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                              .ORSet.PARSER,
                           extensionRegistry);
                   if (subBuilder != null) {
                     subBuilder.mergeFrom(underlying_);
@@ -3739,10 +3945,10 @@ public final class ReplicatedEventSourcing {
                 }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
               .setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
@@ -3750,21 +3956,22 @@ public final class ReplicatedEventSourcing {
         }
       }
 
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ORSetDeltaGroup_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ORSetDeltaGroup_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                    .class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                    .Builder.class);
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaGroup.Entry.class,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaGroup.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -3783,19 +3990,22 @@ public final class ReplicatedEventSourcing {
        *
        * @return The operation.
        */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
           getOperation() {
         @SuppressWarnings("deprecation")
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp result =
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp.valueOf(
-                operation_);
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
+            result =
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaOp.valueOf(operation_);
         return result == null
-            ? akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp.Add
+            ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
+                .Add
             : result;
       }
 
       public static final int UNDERLYING_FIELD_NUMBER = 2;
-      private akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet underlying_;
+      private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+          underlying_;
       /**
        * required .ORSet underlying = 2;
        *
@@ -3809,17 +4019,18 @@ public final class ReplicatedEventSourcing {
        *
        * @return The underlying.
        */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet getUnderlying() {
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+          getUnderlying() {
         return underlying_ == null
-            ? akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+            ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
                 .getDefaultInstance()
             : underlying_;
       }
       /** required .ORSet underlying = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder
           getUnderlyingOrBuilder() {
         return underlying_ == null
-            ? akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+            ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
                 .getDefaultInstance()
             : underlying_;
       }
@@ -3849,7 +4060,7 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
           output.writeEnum(1, operation_);
@@ -3867,10 +4078,13 @@ public final class ReplicatedEventSourcing {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream.computeEnumSize(1, operation_);
+          size +=
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeEnumSize(1, operation_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(2, getUnderlying());
+          size +=
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                  2, getUnderlying());
         }
         size += unknownFields.getSerializedSize();
         memoizedSize = size;
@@ -3884,12 +4098,16 @@ public final class ReplicatedEventSourcing {
         }
         if (!(obj
             instanceof
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry)) {
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                .Entry)) {
           return super.equals(obj);
         }
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry other =
-            (akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry)
-                obj;
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                .Entry
+            other =
+                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .ORSetDeltaGroup.Entry)
+                    obj;
 
         if (hasOperation() != other.hasOperation()) return false;
         if (hasOperation()) {
@@ -3923,97 +4141,103 @@ public final class ReplicatedEventSourcing {
         return hash;
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
           parseFrom(java.nio.ByteBuffer data)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
           parseFrom(
               java.nio.ByteBuffer data,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
-          parseFrom(akka.protobufv3.internal.ByteString data)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
+          parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
           parseFrom(
-              akka.protobufv3.internal.ByteString data,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.ByteString data,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
-          parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
+          parseFrom(byte[] data)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
-          parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
+          parseFrom(
+              byte[] data,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
           parseFrom(java.io.InputStream input) throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-      }
-
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
-          parseFrom(
-              java.io.InputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-            PARSER, input, extensionRegistry);
-      }
-
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
-          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
             PARSER, input);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
-          parseDelimitedFrom(
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
+          parseFrom(
               java.io.InputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
             PARSER, input, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
-          parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
+          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
-          parseFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
+          parseDelimitedFrom(
+              java.io.InputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
+          parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+            PARSER, input);
+      }
+
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
+          parseFrom(
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
             PARSER, input, extensionRegistry);
       }
 
@@ -4027,7 +4251,8 @@ public final class ReplicatedEventSourcing {
       }
 
       public static Builder newBuilder(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry
               prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
@@ -4039,47 +4264,49 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /** Protobuf type {@code ORSetDeltaGroup.Entry} */
       public static final class Builder
-          extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+          extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
           implements
           // @@protoc_insertion_point(builder_implements:ORSetDeltaGroup.Entry)
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
               .EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+            getDescriptor() {
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .internal_static_ORSetDeltaGroup_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .internal_static_ORSetDeltaGroup_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                      .class,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                      .Builder.class);
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup.Entry.class,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup.Entry.Builder.class);
         }
 
         // Construct using
-        // akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry.newBuilder()
+        // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
-        private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        private Builder(
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
 
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
             getUnderlyingFieldBuilder();
           }
         }
@@ -4099,22 +4326,25 @@ public final class ReplicatedEventSourcing {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .internal_static_ORSetDeltaGroup_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ORSetDeltaGroup.Entry
             getDefaultInstanceForType() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-              .getDefaultInstance();
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ORSetDeltaGroup.Entry
             build() {
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry
               result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
@@ -4123,12 +4353,14 @@ public final class ReplicatedEventSourcing {
         }
 
         @java.lang.Override
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ORSetDeltaGroup.Entry
             buildPartial() {
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry
               result =
-                  new akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                      .Entry(this);
+                  new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4155,23 +4387,26 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
           return super.setField(field, value);
         }
 
         @java.lang.Override
-        public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+        public Builder clearField(
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
 
         @java.lang.Override
-        public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+        public Builder clearOneof(
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
 
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index,
             java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
@@ -4179,17 +4414,20 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
 
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
           if (other
               instanceof
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry) {
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry) {
             return mergeFrom(
-                (akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry)
+                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .ORSetDeltaGroup.Entry)
                     other);
           } else {
             super.mergeFrom(other);
@@ -4198,11 +4436,12 @@ public final class ReplicatedEventSourcing {
         }
 
         public Builder mergeFrom(
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                    .Entry
                 other) {
           if (other
-              == akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                  .getDefaultInstance()) return this;
+              == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry.getDefaultInstance()) return this;
           if (other.hasOperation()) {
             setOperation(other.getOperation());
           }
@@ -4230,16 +4469,18 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry
               parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
             parsedMessage =
-                (akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry)
+                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .ORSetDeltaGroup.Entry)
                     e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
@@ -4266,14 +4507,16 @@ public final class ReplicatedEventSourcing {
          *
          * @return The operation.
          */
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
             getOperation() {
           @SuppressWarnings("deprecation")
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp result =
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp.valueOf(
-                  operation_);
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
+              result =
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaOp.valueOf(operation_);
           return result == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp.Add
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaOp.Add
               : result;
         }
         /**
@@ -4283,7 +4526,8 @@ public final class ReplicatedEventSourcing {
          * @return This builder for chaining.
          */
         public Builder setOperation(
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp value) {
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaOp
+                value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -4304,11 +4548,14 @@ public final class ReplicatedEventSourcing {
           return this;
         }
 
-        private akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet underlying_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder>
+        private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+            underlying_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                    .Builder,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetOrBuilder>
             underlyingBuilder_;
         /**
          * required .ORSet underlying = 2;
@@ -4323,10 +4570,11 @@ public final class ReplicatedEventSourcing {
          *
          * @return The underlying.
          */
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet getUnderlying() {
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+            getUnderlying() {
           if (underlyingBuilder_ == null) {
             return underlying_ == null
-                ? akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
                     .getDefaultInstance()
                 : underlying_;
           } else {
@@ -4335,7 +4583,7 @@ public final class ReplicatedEventSourcing {
         }
         /** required .ORSet underlying = 2; */
         public Builder setUnderlying(
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet value) {
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet value) {
           if (underlyingBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4350,7 +4598,7 @@ public final class ReplicatedEventSourcing {
         }
         /** required .ORSet underlying = 2; */
         public Builder setUnderlying(
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder
                 builderForValue) {
           if (underlyingBuilder_ == null) {
             underlying_ = builderForValue.build();
@@ -4363,16 +4611,16 @@ public final class ReplicatedEventSourcing {
         }
         /** required .ORSet underlying = 2; */
         public Builder mergeUnderlying(
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet value) {
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet value) {
           if (underlyingBuilder_ == null) {
             if (((bitField0_ & 0x00000002) != 0)
                 && underlying_ != null
                 && underlying_
-                    != akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
-                        .getDefaultInstance()) {
+                    != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .ORSet.getDefaultInstance()) {
               underlying_ =
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.newBuilder(
-                          underlying_)
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                      .newBuilder(underlying_)
                       .mergeFrom(value)
                       .buildPartial();
             } else {
@@ -4397,37 +4645,42 @@ public final class ReplicatedEventSourcing {
           return this;
         }
         /** required .ORSet underlying = 2; */
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                .Builder
             getUnderlyingBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getUnderlyingFieldBuilder().getBuilder();
         }
         /** required .ORSet underlying = 2; */
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ORSetOrBuilder
             getUnderlyingOrBuilder() {
           if (underlyingBuilder_ != null) {
             return underlyingBuilder_.getMessageOrBuilder();
           } else {
             return underlying_ == null
-                ? akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
                     .getDefaultInstance()
                 : underlying_;
           }
         }
         /** required .ORSet underlying = 2; */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder>
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                    .Builder,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetOrBuilder>
             getUnderlyingFieldBuilder() {
           if (underlyingBuilder_ == null) {
             underlyingBuilder_ =
-                new akka.protobufv3.internal.SingleFieldBuilderV3<
-                    akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet,
-                    akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSet.Builder,
-                    akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetOrBuilder>(
-                    getUnderlying(), getParentForChildren(), isClean());
+                new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet,
+                    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSet
+                        .Builder,
+                    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .ORSetOrBuilder>(getUnderlying(), getParentForChildren(), isClean());
             underlying_ = null;
           }
           return underlyingBuilder_;
@@ -4435,13 +4688,13 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -4449,45 +4702,46 @@ public final class ReplicatedEventSourcing {
       }
 
       // @@protoc_insertion_point(class_scope:ORSetDeltaGroup.Entry)
-      private static final akka.persistence.typed.serialization.ReplicatedEventSourcing
+      private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ORSetDeltaGroup.Entry
           DEFAULT_INSTANCE;
 
       static {
         DEFAULT_INSTANCE =
-            new akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                .Entry();
+            new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ORSetDeltaGroup.Entry();
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
           getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
       @java.lang.Deprecated
-      public static final akka.protobufv3.internal.Parser PARSER =
-          new akka.protobufv3.internal.AbstractParser() {
+      public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+          new org.apache.pekko.protobufv3.internal.AbstractParser() {
             @java.lang.Override
             public Entry parsePartialFrom(
-                akka.protobufv3.internal.CodedInputStream input,
-                akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-                throws akka.protobufv3.internal.InvalidProtocolBufferException {
+                org.apache.pekko.protobufv3.internal.CodedInputStream input,
+                org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+                throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
               return new Entry(input, extensionRegistry);
             }
           };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
           getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -4495,19 +4749,21 @@ public final class ReplicatedEventSourcing {
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
     private java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                .Entry>
         entries_;
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
     public java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                .Entry>
         getEntriesList() {
       return entries_;
     }
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
     public java.util.List<
             ? extends
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                    .EntryOrBuilder>
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaGroup.EntryOrBuilder>
         getEntriesOrBuilderList() {
       return entries_;
     }
@@ -4516,12 +4772,13 @@ public final class ReplicatedEventSourcing {
       return entries_.size();
     }
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+            .Entry
         getEntries(int index) {
       return entries_.get(index);
     }
     /** repeated .ORSetDeltaGroup.Entry entries = 1; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
             .EntryOrBuilder
         getEntriesOrBuilder(int index) {
       return entries_.get(index);
@@ -4546,7 +4803,7 @@ public final class ReplicatedEventSourcing {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
@@ -4561,7 +4818,9 @@ public final class ReplicatedEventSourcing {
 
       size = 0;
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(1, entries_.get(i));
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                1, entries_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -4575,11 +4834,15 @@ public final class ReplicatedEventSourcing {
       }
       if (!(obj
           instanceof
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup)) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup)) {
         return super.equals(obj);
       }
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup other =
-          (akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup) obj;
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+          other =
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup)
+                  obj;
 
       if (!getEntriesList().equals(other.getEntriesList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -4602,85 +4865,103 @@ public final class ReplicatedEventSourcing {
       return hash;
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
         parseFrom(java.nio.ByteBuffer data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
         parseFrom(
             java.nio.ByteBuffer data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-        parseFrom(akka.protobufv3.internal.ByteString data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
         parseFrom(
-            akka.protobufv3.internal.ByteString data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-        parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-        parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
         parseFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-        parseFrom(
-            java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-        parseDelimitedFrom(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-        parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-        parseFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -4694,7 +4975,8 @@ public final class ReplicatedEventSourcing {
     }
 
     public static Builder newBuilder(
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup prototype) {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+            prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
@@ -4705,45 +4987,49 @@ public final class ReplicatedEventSourcing {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /** Protobuf type {@code ORSetDeltaGroup} */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:ORSetDeltaGroup)
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroupOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroupOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ORSetDeltaGroup_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ORSetDeltaGroup_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Builder
-                    .class);
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaGroup.class,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaGroup.Builder.class);
       }
 
       // Construct using
-      // akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.newBuilder()
+      // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
           getEntriesFieldBuilder();
         }
       }
@@ -4761,22 +5047,25 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ORSetDeltaGroup_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup
           getDefaultInstanceForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-            .getDefaultInstance();
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup build() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup result =
-            buildPartial();
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup
+          build() {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+            result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4784,10 +5073,13 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup
           buildPartial() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup result =
-            new akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup(this);
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+            result =
+                new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaGroup(this);
         int from_bitField0_ = bitField0_;
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -4809,23 +5101,26 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -4833,17 +5128,21 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other
             instanceof
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup) {
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ORSetDeltaGroup) {
           return mergeFrom(
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup) other);
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup)
+                  other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -4851,10 +5150,11 @@ public final class ReplicatedEventSourcing {
       }
 
       public Builder mergeFrom(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup other) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+              other) {
         if (other
-            == akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                .getDefaultInstance()) return this;
+            == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ORSetDeltaGroup.getDefaultInstance()) return this;
         if (entriesBuilder_ == null) {
           if (!other.entries_.isEmpty()) {
             if (entries_.isEmpty()) {
@@ -4874,7 +5174,7 @@ public final class ReplicatedEventSourcing {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000001);
               entriesBuilder_ =
-                  akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getEntriesFieldBuilder()
                       : null;
             } else {
@@ -4899,16 +5199,17 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup parsedMessage =
-            null;
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+            parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup)
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -4922,30 +5223,33 @@ public final class ReplicatedEventSourcing {
       private int bitField0_;
 
       private java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry>
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry>
           entries_ = java.util.Collections.emptyList();
 
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           entries_ =
               new java.util.ArrayList<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                      .Entry>(entries_);
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup.Entry>(entries_);
           bitField0_ |= 0x00000001;
         }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                  .Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                  .EntryOrBuilder>
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry.Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.EntryOrBuilder>
           entriesBuilder_;
 
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
       public java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry>
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry>
           getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
@@ -4962,7 +5266,8 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry
           getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
@@ -4973,7 +5278,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
       public Builder setEntries(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry
               value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
@@ -4990,7 +5296,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
       public Builder setEntries(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry.Builder
               builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
@@ -5003,7 +5310,8 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
       public Builder addEntries(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry
               value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
@@ -5020,7 +5328,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
       public Builder addEntries(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry
               value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
@@ -5036,7 +5345,8 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
       public Builder addEntries(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry.Builder
               builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
@@ -5050,7 +5360,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
       public Builder addEntries(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+                  .Entry.Builder
               builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
@@ -5065,12 +5376,12 @@ public final class ReplicatedEventSourcing {
       public Builder addAllEntries(
           java.lang.Iterable<
                   ? extends
-                      akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                          .Entry>
+                      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                          .ORSetDeltaGroup.Entry>
               values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, entries_);
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, entries_);
           onChanged();
         } else {
           entriesBuilder_.addAllMessages(values);
@@ -5100,14 +5411,14 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-              .Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry.Builder
           getEntriesBuilder(int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-              .EntryOrBuilder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.EntryOrBuilder
           getEntriesOrBuilder(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
@@ -5118,8 +5429,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
       public java.util.List<
               ? extends
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                      .EntryOrBuilder>
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup.EntryOrBuilder>
           getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -5128,48 +5439,49 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-              .Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry.Builder
           addEntriesBuilder() {
         return getEntriesFieldBuilder()
             .addBuilder(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                    .getDefaultInstance());
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaGroup.Entry.getDefaultInstance());
       }
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-              .Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup.Entry.Builder
           addEntriesBuilder(int index) {
         return getEntriesFieldBuilder()
             .addBuilder(
                 index,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                    .getDefaultInstance());
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ORSetDeltaGroup.Entry.getDefaultInstance());
       }
       /** repeated .ORSetDeltaGroup.Entry entries = 1; */
       public java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                  .Builder>
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry.Builder>
           getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                  .Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                  .EntryOrBuilder>
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.Entry.Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ORSetDeltaGroup.EntryOrBuilder>
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
           entriesBuilder_ =
-              new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                      .Entry,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup.Entry
-                      .Builder,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
-                      .EntryOrBuilder>(
+              new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup.Entry,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup.Entry.Builder,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ORSetDeltaGroup.EntryOrBuilder>(
                   entries_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
           entries_ = null;
         }
@@ -5178,13 +5490,13 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -5192,43 +5504,45 @@ public final class ReplicatedEventSourcing {
     }
 
     // @@protoc_insertion_point(class_scope:ORSetDeltaGroup)
-    private static final akka.persistence.typed.serialization.ReplicatedEventSourcing
+    private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ORSetDeltaGroup
         DEFAULT_INSTANCE;
 
     static {
       DEFAULT_INSTANCE =
-          new akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup();
+          new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ORSetDeltaGroup();
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ORSetDeltaGroup
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
           @java.lang.Override
           public ORSetDeltaGroup parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
             return new ORSetDeltaGroup(input, extensionRegistry);
           }
         };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ORSetDeltaGroup
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -5237,34 +5551,39 @@ public final class ReplicatedEventSourcing {
   public interface VersionVectorOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:VersionVector)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /** repeated .VersionVector.Entry entries = 1; */
-    java.util.List
+    java.util.List<
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                .Entry>
         getEntriesList();
     /** repeated .VersionVector.Entry entries = 1; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry getEntries(
-        int index);
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+        getEntries(int index);
     /** repeated .VersionVector.Entry entries = 1; */
     int getEntriesCount();
     /** repeated .VersionVector.Entry entries = 1; */
     java.util.List<
             ? extends
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                    .EntryOrBuilder>
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.EntryOrBuilder>
         getEntriesOrBuilderList();
     /** repeated .VersionVector.Entry entries = 1; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.EntryOrBuilder
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+            .EntryOrBuilder
         getEntriesOrBuilder(int index);
   }
   /** Protobuf type {@code VersionVector} */
-  public static final class VersionVector extends akka.protobufv3.internal.GeneratedMessageV3
+  public static final class VersionVector
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
       // @@protoc_insertion_point(message_implements:VersionVector)
       VersionVectorOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use VersionVector.newBuilder() to construct.
-    private VersionVector(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private VersionVector(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
@@ -5275,26 +5594,26 @@ public final class ReplicatedEventSourcing {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new VersionVector();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private VersionVector(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5308,14 +5627,14 @@ public final class ReplicatedEventSourcing {
                 if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                   entries_ =
                       new java.util.ArrayList<
-                          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                              .Entry>();
+                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                              .VersionVector.Entry>();
                   mutable_bitField0_ |= 0x00000001;
                 }
                 entries_.add(
                     input.readMessage(
-                        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                            .Entry.PARSER,
+                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                            .VersionVector.Entry.PARSER,
                         extensionRegistry));
                 break;
               }
@@ -5328,10 +5647,10 @@ public final class ReplicatedEventSourcing {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -5342,26 +5661,28 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_VersionVector_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_VersionVector_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.class,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
-                  .class);
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .class,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder.class);
     }
 
     public interface EntryOrBuilder
         extends
         // @@protoc_insertion_point(interface_extends:VersionVector.Entry)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required string key = 1;
@@ -5380,7 +5701,7 @@ public final class ReplicatedEventSourcing {
        *
        * @return The bytes for key.
        */
-      akka.protobufv3.internal.ByteString getKeyBytes();
+      org.apache.pekko.protobufv3.internal.ByteString getKeyBytes();
 
       /**
        * required int64 version = 2;
@@ -5396,13 +5717,13 @@ public final class ReplicatedEventSourcing {
       long getVersion();
     }
     /** Protobuf type {@code VersionVector.Entry} */
-    public static final class Entry extends akka.protobufv3.internal.GeneratedMessageV3
+    public static final class Entry extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
         implements
         // @@protoc_insertion_point(message_implements:VersionVector.Entry)
         EntryOrBuilder {
       private static final long serialVersionUID = 0L;
       // Use Entry.newBuilder() to construct.
-      private Entry(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Entry(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
 
@@ -5413,26 +5734,26 @@ public final class ReplicatedEventSourcing {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Entry();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
         return this.unknownFields;
       }
 
       private Entry(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -5443,7 +5764,7 @@ public final class ReplicatedEventSourcing {
                 break;
               case 10:
                 {
-                  akka.protobufv3.internal.ByteString bs = input.readBytes();
+                  org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                   bitField0_ |= 0x00000001;
                   key_ = bs;
                   break;
@@ -5463,10 +5784,10 @@ public final class ReplicatedEventSourcing {
                 }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
               .setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
@@ -5474,21 +5795,22 @@ public final class ReplicatedEventSourcing {
         }
       }
 
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_VersionVector_Entry_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_VersionVector_Entry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                    .class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                    .Builder.class);
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.Entry.class,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.Entry.Builder.class);
       }
 
       private int bitField0_;
@@ -5512,7 +5834,8 @@ public final class ReplicatedEventSourcing {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             key_ = s;
@@ -5525,15 +5848,15 @@ public final class ReplicatedEventSourcing {
        *
        * @return The bytes for key.
        */
-      public akka.protobufv3.internal.ByteString getKeyBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getKeyBytes() {
         java.lang.Object ref = key_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           key_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
@@ -5577,10 +5900,10 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeInt64(2, version_);
@@ -5595,10 +5918,12 @@ public final class ReplicatedEventSourcing {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
+          size +=
+              org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, key_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream.computeInt64Size(2, version_);
+          size +=
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(2, version_);
         }
         size += unknownFields.getSerializedSize();
         memoizedSize = size;
@@ -5612,11 +5937,15 @@ public final class ReplicatedEventSourcing {
         }
         if (!(obj
             instanceof
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry)) {
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                .Entry)) {
           return super.equals(obj);
         }
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry other =
-            (akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry) obj;
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+            other =
+                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .VersionVector.Entry)
+                    obj;
 
         if (hasKey() != other.hasKey()) return false;
         if (hasKey()) {
@@ -5643,92 +5972,110 @@ public final class ReplicatedEventSourcing {
         }
         if (hasVersion()) {
           hash = (37 * hash) + VERSION_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(getVersion());
+          hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getVersion());
         }
         hash = (29 * hash) + unknownFields.hashCode();
         memoizedHashCode = hash;
         return hash;
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
           parseFrom(java.nio.ByteBuffer data)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
           parseFrom(
               java.nio.ByteBuffer data,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-          parseFrom(akka.protobufv3.internal.ByteString data)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
+          parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
           parseFrom(
-              akka.protobufv3.internal.ByteString data,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.ByteString data,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-          parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
+          parseFrom(byte[] data)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-          parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
+          parseFrom(
+              byte[] data,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
           parseFrom(java.io.InputStream input) throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-      }
-
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-          parseFrom(
-              java.io.InputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-            PARSER, input, extensionRegistry);
-      }
-
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
             PARSER, input);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-          parseDelimitedFrom(
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
+          parseFrom(
               java.io.InputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
             PARSER, input, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-          parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
+          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-          parseFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
+          parseDelimitedFrom(
+              java.io.InputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
+          parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+            PARSER, input);
+      }
+
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
+          parseFrom(
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
             PARSER, input, extensionRegistry);
       }
 
@@ -5742,7 +6089,8 @@ public final class ReplicatedEventSourcing {
       }
 
       public static Builder newBuilder(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry
               prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
@@ -5754,47 +6102,49 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /** Protobuf type {@code VersionVector.Entry} */
       public static final class Builder
-          extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+          extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
           implements
           // @@protoc_insertion_point(builder_implements:VersionVector.Entry)
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .EntryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+            getDescriptor() {
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .internal_static_VersionVector_Entry_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .internal_static_VersionVector_Entry_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                      .class,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                      .Builder.class);
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Entry.class,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Entry.Builder.class);
         }
 
         // Construct using
-        // akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry.newBuilder()
+        // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
-        private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        private Builder(
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
 
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
         }
 
         @java.lang.Override
@@ -5808,23 +6158,26 @@ public final class ReplicatedEventSourcing {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .internal_static_VersionVector_Entry_descriptor;
         }
 
         @java.lang.Override
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .VersionVector.Entry
             getDefaultInstanceForType() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-              .getDefaultInstance();
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .VersionVector.Entry
             build() {
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry result =
-              buildPartial();
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry
+              result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -5832,11 +6185,14 @@ public final class ReplicatedEventSourcing {
         }
 
         @java.lang.Override
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .VersionVector.Entry
             buildPartial() {
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry result =
-              new akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry(
-                  this);
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry
+              result =
+                  new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Entry(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5859,23 +6215,26 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
           return super.setField(field, value);
         }
 
         @java.lang.Override
-        public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+        public Builder clearField(
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
 
         @java.lang.Override
-        public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+        public Builder clearOneof(
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
 
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index,
             java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
@@ -5883,17 +6242,20 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
 
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
           if (other
               instanceof
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry) {
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry) {
             return mergeFrom(
-                (akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry)
+                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .VersionVector.Entry)
                     other);
           } else {
             super.mergeFrom(other);
@@ -5902,11 +6264,12 @@ public final class ReplicatedEventSourcing {
         }
 
         public Builder mergeFrom(
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                    .Entry
                 other) {
           if (other
-              == akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                  .getDefaultInstance()) return this;
+              == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector.Entry.getDefaultInstance()) return this;
           if (other.hasKey()) {
             bitField0_ |= 0x00000001;
             key_ = other.key_;
@@ -5933,16 +6296,18 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry
               parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
             parsedMessage =
-                (akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry)
+                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .VersionVector.Entry)
                     e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
@@ -5972,7 +6337,8 @@ public final class ReplicatedEventSourcing {
         public java.lang.String getKey() {
           java.lang.Object ref = key_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               key_ = s;
@@ -5987,15 +6353,16 @@ public final class ReplicatedEventSourcing {
          *
          * @return The bytes for key.
          */
-        public akka.protobufv3.internal.ByteString getKeyBytes() {
+        public org.apache.pekko.protobufv3.internal.ByteString getKeyBytes() {
           java.lang.Object ref = key_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b =
-                akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+            org.apache.pekko.protobufv3.internal.ByteString b =
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
             key_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -6030,7 +6397,7 @@ public final class ReplicatedEventSourcing {
          * @param value The bytes for key to set.
          * @return This builder for chaining.
          */
-        public Builder setKeyBytes(akka.protobufv3.internal.ByteString value) {
+        public Builder setKeyBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -6083,13 +6450,13 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -6097,43 +6464,46 @@ public final class ReplicatedEventSourcing {
       }
 
       // @@protoc_insertion_point(class_scope:VersionVector.Entry)
-      private static final akka.persistence.typed.serialization.ReplicatedEventSourcing
+      private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .VersionVector.Entry
           DEFAULT_INSTANCE;
 
       static {
         DEFAULT_INSTANCE =
-            new akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry();
+            new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .VersionVector.Entry();
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector.Entry
           getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
       @java.lang.Deprecated
-      public static final akka.protobufv3.internal.Parser PARSER =
-          new akka.protobufv3.internal.AbstractParser() {
+      public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+          new org.apache.pekko.protobufv3.internal.AbstractParser() {
             @java.lang.Override
             public Entry parsePartialFrom(
-                akka.protobufv3.internal.CodedInputStream input,
-                akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-                throws akka.protobufv3.internal.InvalidProtocolBufferException {
+                org.apache.pekko.protobufv3.internal.CodedInputStream input,
+                org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+                throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
               return new Entry(input, extensionRegistry);
             }
           };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Entry
           getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -6141,19 +6511,21 @@ public final class ReplicatedEventSourcing {
 
     public static final int ENTRIES_FIELD_NUMBER = 1;
     private java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                .Entry>
         entries_;
     /** repeated .VersionVector.Entry entries = 1; */
     public java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                .Entry>
         getEntriesList() {
       return entries_;
     }
     /** repeated .VersionVector.Entry entries = 1; */
     public java.util.List<
             ? extends
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                    .EntryOrBuilder>
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.EntryOrBuilder>
         getEntriesOrBuilderList() {
       return entries_;
     }
@@ -6162,12 +6534,14 @@ public final class ReplicatedEventSourcing {
       return entries_.size();
     }
     /** repeated .VersionVector.Entry entries = 1; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+            .Entry
         getEntries(int index) {
       return entries_.get(index);
     }
     /** repeated .VersionVector.Entry entries = 1; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.EntryOrBuilder
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+            .EntryOrBuilder
         getEntriesOrBuilder(int index) {
       return entries_.get(index);
     }
@@ -6191,7 +6565,7 @@ public final class ReplicatedEventSourcing {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       for (int i = 0; i < entries_.size(); i++) {
         output.writeMessage(1, entries_.get(i));
@@ -6206,7 +6580,9 @@ public final class ReplicatedEventSourcing {
 
       size = 0;
       for (int i = 0; i < entries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(1, entries_.get(i));
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                1, entries_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -6219,11 +6595,13 @@ public final class ReplicatedEventSourcing {
         return true;
       }
       if (!(obj
-          instanceof akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector)) {
+          instanceof
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector)) {
         return super.equals(obj);
       }
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector other =
-          (akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector) obj;
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector other =
+          (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector)
+              obj;
 
       if (!getEntriesList().equals(other.getEntriesList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -6246,85 +6624,103 @@ public final class ReplicatedEventSourcing {
       return hash;
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
         parseFrom(java.nio.ByteBuffer data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
         parseFrom(
             java.nio.ByteBuffer data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-        parseFrom(akka.protobufv3.internal.ByteString data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
         parseFrom(
-            akka.protobufv3.internal.ByteString data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-        parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-        parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
         parseFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-        parseFrom(
-            java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-        parseDelimitedFrom(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-        parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-        parseFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -6338,7 +6734,8 @@ public final class ReplicatedEventSourcing {
     }
 
     public static Builder newBuilder(
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector prototype) {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+            prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
@@ -6349,45 +6746,49 @@ public final class ReplicatedEventSourcing {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /** Protobuf type {@code VersionVector} */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:VersionVector)
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVectorOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_VersionVector_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_VersionVector_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
-                    .class);
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.class,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.Builder.class);
       }
 
       // Construct using
-      // akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.newBuilder()
+      // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
           getEntriesFieldBuilder();
         }
       }
@@ -6405,22 +6806,23 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_VersionVector_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
           getDefaultInstanceForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-            .getDefaultInstance();
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector build() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector result =
-            buildPartial();
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          build() {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+            result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6428,10 +6830,12 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
           buildPartial() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector result =
-            new akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector(this);
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+            result =
+                new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector(this);
         int from_bitField0_ = bitField0_;
         if (entriesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -6453,23 +6857,26 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -6477,16 +6884,21 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other
-            instanceof akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector) {
+            instanceof
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .VersionVector) {
           return mergeFrom(
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector) other);
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector)
+                  other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -6494,10 +6906,11 @@ public final class ReplicatedEventSourcing {
       }
 
       public Builder mergeFrom(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector other) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              other) {
         if (other
-            == akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                .getDefaultInstance()) return this;
+            == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .VersionVector.getDefaultInstance()) return this;
         if (entriesBuilder_ == null) {
           if (!other.entries_.isEmpty()) {
             if (entries_.isEmpty()) {
@@ -6517,7 +6930,7 @@ public final class ReplicatedEventSourcing {
               entries_ = other.entries_;
               bitField0_ = (bitField0_ & ~0x00000001);
               entriesBuilder_ =
-                  akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getEntriesFieldBuilder()
                       : null;
             } else {
@@ -6542,16 +6955,17 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector parsedMessage =
-            null;
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+            parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector)
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -6565,30 +6979,33 @@ public final class ReplicatedEventSourcing {
       private int bitField0_;
 
       private java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry>
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry>
           entries_ = java.util.Collections.emptyList();
 
       private void ensureEntriesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           entries_ =
               new java.util.ArrayList<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry>(
-                  entries_);
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Entry>(entries_);
           bitField0_ |= 0x00000001;
         }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                  .Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry.Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
                   .EntryOrBuilder>
           entriesBuilder_;
 
       /** repeated .VersionVector.Entry entries = 1; */
       public java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry>
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry>
           getEntriesList() {
         if (entriesBuilder_ == null) {
           return java.util.Collections.unmodifiableList(entries_);
@@ -6605,7 +7022,8 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .VersionVector.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Entry
           getEntries(int index) {
         if (entriesBuilder_ == null) {
           return entries_.get(index);
@@ -6616,7 +7034,9 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector.Entry entries = 1; */
       public Builder setEntries(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry
+              value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6632,7 +7052,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector.Entry entries = 1; */
       public Builder setEntries(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry.Builder
               builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
@@ -6645,7 +7066,9 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .VersionVector.Entry entries = 1; */
       public Builder addEntries(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry
+              value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6661,7 +7084,9 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector.Entry entries = 1; */
       public Builder addEntries(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry
+              value) {
         if (entriesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6676,7 +7101,8 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .VersionVector.Entry entries = 1; */
       public Builder addEntries(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry.Builder
               builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
@@ -6690,7 +7116,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector.Entry entries = 1; */
       public Builder addEntries(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry.Builder
               builderForValue) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
@@ -6705,12 +7132,12 @@ public final class ReplicatedEventSourcing {
       public Builder addAllEntries(
           java.lang.Iterable<
                   ? extends
-                      akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                          .Entry>
+                      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                          .VersionVector.Entry>
               values) {
         if (entriesBuilder_ == null) {
           ensureEntriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, entries_);
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, entries_);
           onChanged();
         } else {
           entriesBuilder_.addAllMessages(values);
@@ -6740,13 +7167,13 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** repeated .VersionVector.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-              .Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Entry.Builder
           getEntriesBuilder(int index) {
         return getEntriesFieldBuilder().getBuilder(index);
       }
       /** repeated .VersionVector.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .EntryOrBuilder
           getEntriesOrBuilder(int index) {
         if (entriesBuilder_ == null) {
@@ -6758,8 +7185,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .VersionVector.Entry entries = 1; */
       public java.util.List<
               ? extends
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .EntryOrBuilder>
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.EntryOrBuilder>
           getEntriesOrBuilderList() {
         if (entriesBuilder_ != null) {
           return entriesBuilder_.getMessageOrBuilderList();
@@ -6768,47 +7195,49 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .VersionVector.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-              .Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Entry.Builder
           addEntriesBuilder() {
         return getEntriesFieldBuilder()
             .addBuilder(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                    .getDefaultInstance());
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.Entry.getDefaultInstance());
       }
       /** repeated .VersionVector.Entry entries = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-              .Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Entry.Builder
           addEntriesBuilder(int index) {
         return getEntriesFieldBuilder()
             .addBuilder(
                 index,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                    .getDefaultInstance());
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.Entry.getDefaultInstance());
       }
       /** repeated .VersionVector.Entry entries = 1; */
       public java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                  .Builder>
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry.Builder>
           getEntriesBuilderList() {
         return getEntriesFieldBuilder().getBuilderList();
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                  .Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Entry.Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
                   .EntryOrBuilder>
           getEntriesFieldBuilder() {
         if (entriesBuilder_ == null) {
           entriesBuilder_ =
-              new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Entry
-                      .Builder,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .EntryOrBuilder>(
+              new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Entry,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Entry.Builder,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.EntryOrBuilder>(
                   entries_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
           entries_ = null;
         }
@@ -6817,13 +7246,13 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -6831,42 +7260,45 @@ public final class ReplicatedEventSourcing {
     }
 
     // @@protoc_insertion_point(class_scope:VersionVector)
-    private static final akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
         DEFAULT_INSTANCE;
 
     static {
       DEFAULT_INSTANCE =
-          new akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector();
+          new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVector();
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVector
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
           @java.lang.Override
           public VersionVector parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
             return new VersionVector(input, extensionRegistry);
           }
         };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -6875,7 +7307,7 @@ public final class ReplicatedEventSourcing {
   public interface ReplicatedEventMetadataOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:ReplicatedEventMetadata)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string originReplica = 1;
@@ -6894,7 +7326,7 @@ public final class ReplicatedEventSourcing {
      *
      * @return The bytes for originReplica.
      */
-    akka.protobufv3.internal.ByteString getOriginReplicaBytes();
+    org.apache.pekko.protobufv3.internal.ByteString getOriginReplicaBytes();
 
     /**
      * required int64 originSequenceNr = 2;
@@ -6920,9 +7352,10 @@ public final class ReplicatedEventSourcing {
      *
      * @return The versionVector.
      */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getVersionVector();
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+        getVersionVector();
     /** required .VersionVector versionVector = 3; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
         getVersionVectorOrBuilder();
 
     /**
@@ -6940,14 +7373,14 @@ public final class ReplicatedEventSourcing {
   }
   /** Protobuf type {@code ReplicatedEventMetadata} */
   public static final class ReplicatedEventMetadata
-      extends akka.protobufv3.internal.GeneratedMessageV3
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
       // @@protoc_insertion_point(message_implements:ReplicatedEventMetadata)
       ReplicatedEventMetadataOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use ReplicatedEventMetadata.newBuilder() to construct.
     private ReplicatedEventMetadata(
-        akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
@@ -6958,26 +7391,26 @@ public final class ReplicatedEventSourcing {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ReplicatedEventMetadata();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private ReplicatedEventMetadata(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6988,7 +7421,7 @@ public final class ReplicatedEventSourcing {
               break;
             case 10:
               {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 originReplica_ = bs;
                 break;
@@ -7001,15 +7434,16 @@ public final class ReplicatedEventSourcing {
               }
             case 26:
               {
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .VersionVector.Builder
                     subBuilder = null;
                 if (((bitField0_ & 0x00000004) != 0)) {
                   subBuilder = versionVector_.toBuilder();
                 }
                 versionVector_ =
                     input.readMessage(
-                        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                            .PARSER,
+                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                            .VersionVector.PARSER,
                         extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(versionVector_);
@@ -7033,10 +7467,10 @@ public final class ReplicatedEventSourcing {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
@@ -7044,21 +7478,22 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ReplicatedEventMetadata_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ReplicatedEventMetadata_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
-                  .class,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
-                  .Builder.class);
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedEventMetadata.class,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedEventMetadata.Builder.class);
     }
 
     private int bitField0_;
@@ -7082,7 +7517,8 @@ public final class ReplicatedEventSourcing {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           originReplica_ = s;
@@ -7095,15 +7531,15 @@ public final class ReplicatedEventSourcing {
      *
      * @return The bytes for originReplica.
      */
-    public akka.protobufv3.internal.ByteString getOriginReplicaBytes() {
+    public org.apache.pekko.protobufv3.internal.ByteString getOriginReplicaBytes() {
       java.lang.Object ref = originReplica_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b =
-            akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
         originReplica_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -7127,7 +7563,7 @@ public final class ReplicatedEventSourcing {
     }
 
     public static final int VERSIONVECTOR_FIELD_NUMBER = 3;
-    private akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         versionVector_;
     /**
      * required .VersionVector versionVector = 3;
@@ -7142,18 +7578,19 @@ public final class ReplicatedEventSourcing {
      *
      * @return The versionVector.
      */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         getVersionVector() {
       return versionVector_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .getDefaultInstance()
           : versionVector_;
     }
     /** required .VersionVector versionVector = 3; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVectorOrBuilder
         getVersionVectorOrBuilder() {
       return versionVector_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .getDefaultInstance()
           : versionVector_;
     }
@@ -7210,10 +7647,11 @@ public final class ReplicatedEventSourcing {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, originReplica_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+            output, 1, originReplica_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt64(2, originSequenceNr_);
@@ -7234,17 +7672,23 @@ public final class ReplicatedEventSourcing {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, originReplica_);
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                1, originReplica_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeInt64Size(2, originSequenceNr_);
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(
+                2, originSequenceNr_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         size +=
-            akka.protobufv3.internal.CodedOutputStream.computeMessageSize(3, getVersionVector());
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                3, getVersionVector());
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeBoolSize(4, concurrent_);
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeBoolSize(4, concurrent_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -7258,12 +7702,16 @@ public final class ReplicatedEventSourcing {
       }
       if (!(obj
           instanceof
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata)) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedEventMetadata)) {
         return super.equals(obj);
       }
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata other =
-          (akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata)
-              obj;
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedEventMetadata
+          other =
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ReplicatedEventMetadata)
+                  obj;
 
       if (hasOriginReplica() != other.hasOriginReplica()) return false;
       if (hasOriginReplica()) {
@@ -7298,7 +7746,9 @@ public final class ReplicatedEventSourcing {
       }
       if (hasOriginSequenceNr()) {
         hash = (37 * hash) + ORIGINSEQUENCENR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(getOriginSequenceNr());
+        hash =
+            (53 * hash)
+                + org.apache.pekko.protobufv3.internal.Internal.hashLong(getOriginSequenceNr());
       }
       if (hasVersionVector()) {
         hash = (37 * hash) + VERSIONVECTOR_FIELD_NUMBER;
@@ -7306,104 +7756,112 @@ public final class ReplicatedEventSourcing {
       }
       if (hasConcurrent()) {
         hash = (37 * hash) + CONCURRENT_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(getConcurrent());
+        hash =
+            (53 * hash)
+                + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(getConcurrent());
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
         parseFrom(java.nio.ByteBuffer data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
         parseFrom(
             java.nio.ByteBuffer data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
-        parseFrom(akka.protobufv3.internal.ByteString data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
         parseFrom(
-            akka.protobufv3.internal.ByteString data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
-        parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
-        parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
         parseFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
-            .ReplicatedEventMetadata
-        parseFrom(
-            java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
-            .ReplicatedEventMetadata
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
-        parseDelimitedFrom(
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
-        parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedEventMetadata
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedEventMetadata
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
         parseFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -7417,7 +7875,8 @@ public final class ReplicatedEventSourcing {
     }
 
     public static Builder newBuilder(
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedEventMetadata
             prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
@@ -7429,47 +7888,49 @@ public final class ReplicatedEventSourcing {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /** Protobuf type {@code ReplicatedEventMetadata} */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:ReplicatedEventMetadata)
-        akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadataOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedEventMetadata_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedEventMetadata_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
-                    .class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
-                    .Builder.class);
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ReplicatedEventMetadata.class,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ReplicatedEventMetadata.Builder.class);
       }
 
       // Construct using
-      // akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata.newBuilder()
+      // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
           getVersionVectorFieldBuilder();
         }
       }
@@ -7493,22 +7954,25 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedEventMetadata_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedEventMetadata
           getDefaultInstanceForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
-            .getDefaultInstance();
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedEventMetadata.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedEventMetadata
           build() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedEventMetadata
             result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
@@ -7517,11 +7981,13 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedEventMetadata
           buildPartial() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedEventMetadata
             result =
-                new akka.persistence.typed.serialization.ReplicatedEventSourcing
+                new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedEventMetadata(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
@@ -7557,23 +8023,26 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -7581,17 +8050,20 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other
             instanceof
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata) {
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedEventMetadata) {
           return mergeFrom(
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata)
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ReplicatedEventMetadata)
                   other);
         } else {
           super.mergeFrom(other);
@@ -7600,11 +8072,12 @@ public final class ReplicatedEventSourcing {
       }
 
       public Builder mergeFrom(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedEventMetadata
               other) {
         if (other
-            == akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
-                .getDefaultInstance()) return this;
+            == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedEventMetadata.getDefaultInstance()) return this;
         if (other.hasOriginReplica()) {
           bitField0_ |= 0x00000001;
           originReplica_ = other.originReplica_;
@@ -7646,16 +8119,18 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedEventMetadata
             parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata)
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .ReplicatedEventMetadata)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -7685,7 +8160,8 @@ public final class ReplicatedEventSourcing {
       public java.lang.String getOriginReplica() {
         java.lang.Object ref = originReplica_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             originReplica_ = s;
@@ -7700,15 +8176,15 @@ public final class ReplicatedEventSourcing {
        *
        * @return The bytes for originReplica.
        */
-      public akka.protobufv3.internal.ByteString getOriginReplicaBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getOriginReplicaBytes() {
         java.lang.Object ref = originReplica_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           originReplica_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -7743,7 +8219,7 @@ public final class ReplicatedEventSourcing {
        * @param value The bytes for originReplica to set.
        * @return This builder for chaining.
        */
-      public Builder setOriginReplicaBytes(akka.protobufv3.internal.ByteString value) {
+      public Builder setOriginReplicaBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7794,12 +8270,15 @@ public final class ReplicatedEventSourcing {
         return this;
       }
 
-      private akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
           versionVector_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           versionVectorBuilder_;
       /**
        * required .VersionVector versionVector = 3;
@@ -7814,12 +8293,12 @@ public final class ReplicatedEventSourcing {
        *
        * @return The versionVector.
        */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
           getVersionVector() {
         if (versionVectorBuilder_ == null) {
           return versionVector_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                  .getDefaultInstance()
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector.getDefaultInstance()
               : versionVector_;
         } else {
           return versionVectorBuilder_.getMessage();
@@ -7827,7 +8306,8 @@ public final class ReplicatedEventSourcing {
       }
       /** required .VersionVector versionVector = 3; */
       public Builder setVersionVector(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (versionVectorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7842,7 +8322,8 @@ public final class ReplicatedEventSourcing {
       }
       /** required .VersionVector versionVector = 3; */
       public Builder setVersionVector(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder
               builderForValue) {
         if (versionVectorBuilder_ == null) {
           versionVector_ = builderForValue.build();
@@ -7855,16 +8336,17 @@ public final class ReplicatedEventSourcing {
       }
       /** required .VersionVector versionVector = 3; */
       public Builder mergeVersionVector(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (versionVectorBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)
               && versionVector_ != null
               && versionVector_
-                  != akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .getDefaultInstance()) {
+                  != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.getDefaultInstance()) {
             versionVector_ =
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                    .newBuilder(versionVector_)
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.newBuilder(versionVector_)
                     .mergeFrom(value)
                     .buildPartial();
           } else {
@@ -7889,37 +8371,43 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** required .VersionVector versionVector = 3; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Builder
           getVersionVectorBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getVersionVectorFieldBuilder().getBuilder();
       }
       /** required .VersionVector versionVector = 3; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVectorOrBuilder
           getVersionVectorOrBuilder() {
         if (versionVectorBuilder_ != null) {
           return versionVectorBuilder_.getMessageOrBuilder();
         } else {
           return versionVector_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                  .getDefaultInstance()
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector.getDefaultInstance()
               : versionVector_;
         }
       }
       /** required .VersionVector versionVector = 3; */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           getVersionVectorFieldBuilder() {
         if (versionVectorBuilder_ == null) {
           versionVectorBuilder_ =
-              new akka.protobufv3.internal.SingleFieldBuilderV3<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .Builder,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Builder,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVectorOrBuilder>(
                   getVersionVector(), getParentForChildren(), isClean());
           versionVector_ = null;
@@ -7970,13 +8458,13 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -7984,45 +8472,47 @@ public final class ReplicatedEventSourcing {
     }
 
     // @@protoc_insertion_point(class_scope:ReplicatedEventMetadata)
-    private static final akka.persistence.typed.serialization.ReplicatedEventSourcing
+    private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
         DEFAULT_INSTANCE;
 
     static {
       DEFAULT_INSTANCE =
-          new akka.persistence.typed.serialization.ReplicatedEventSourcing
+          new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedEventMetadata();
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedEventMetadata
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
-          @java.lang.Override
-          public ReplicatedEventMetadata parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
-            return new ReplicatedEventMetadata(input, extensionRegistry);
-          }
-        };
+    public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER =
+            new org.apache.pekko.protobufv3.internal.AbstractParser() {
+              @java.lang.Override
+              public ReplicatedEventMetadata parsePartialFrom(
+                  org.apache.pekko.protobufv3.internal.CodedInputStream input,
+                  org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+                  throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+                return new ReplicatedEventMetadata(input, extensionRegistry);
+              }
+            };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedEventMetadata
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedEventMetadata
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -8031,7 +8521,7 @@ public final class ReplicatedEventSourcing {
   public interface ReplicatedSnapshotMetadataOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:ReplicatedSnapshotMetadata)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .VersionVector version = 1;
@@ -8044,42 +8534,44 @@ public final class ReplicatedEventSourcing {
      *
      * @return The version.
      */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getVersion();
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+        getVersion();
     /** required .VersionVector version = 1; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
         getVersionOrBuilder();
 
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
     java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                .Seen>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedSnapshotMetadata.Seen>
         getSeenPerReplicaList();
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata.Seen
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedSnapshotMetadata.Seen
         getSeenPerReplica(int index);
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
     int getSeenPerReplicaCount();
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
     java.util.List<
             ? extends
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata.SeenOrBuilder>
         getSeenPerReplicaOrBuilderList();
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-            .SeenOrBuilder
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedSnapshotMetadata.SeenOrBuilder
         getSeenPerReplicaOrBuilder(int index);
   }
   /** Protobuf type {@code ReplicatedSnapshotMetadata} */
   public static final class ReplicatedSnapshotMetadata
-      extends akka.protobufv3.internal.GeneratedMessageV3
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
       // @@protoc_insertion_point(message_implements:ReplicatedSnapshotMetadata)
       ReplicatedSnapshotMetadataOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use ReplicatedSnapshotMetadata.newBuilder() to construct.
     private ReplicatedSnapshotMetadata(
-        akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
@@ -8090,26 +8582,26 @@ public final class ReplicatedEventSourcing {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ReplicatedSnapshotMetadata();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private ReplicatedSnapshotMetadata(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8120,15 +8612,16 @@ public final class ReplicatedEventSourcing {
               break;
             case 10:
               {
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .VersionVector.Builder
                     subBuilder = null;
                 if (((bitField0_ & 0x00000001) != 0)) {
                   subBuilder = version_.toBuilder();
                 }
                 version_ =
                     input.readMessage(
-                        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                            .PARSER,
+                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                            .VersionVector.PARSER,
                         extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(version_);
@@ -8142,13 +8635,13 @@ public final class ReplicatedEventSourcing {
                 if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                   seenPerReplica_ =
                       new java.util.ArrayList<
-                          akka.persistence.typed.serialization.ReplicatedEventSourcing
+                          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                               .ReplicatedSnapshotMetadata.Seen>();
                   mutable_bitField0_ |= 0x00000002;
                 }
                 seenPerReplica_.add(
                     input.readMessage(
-                        akka.persistence.typed.serialization.ReplicatedEventSourcing
+                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                             .ReplicatedSnapshotMetadata.Seen.PARSER,
                         extensionRegistry));
                 break;
@@ -8162,10 +8655,10 @@ public final class ReplicatedEventSourcing {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
@@ -8176,27 +8669,28 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ReplicatedSnapshotMetadata_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ReplicatedSnapshotMetadata_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.class,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Builder.class);
     }
 
     public interface SeenOrBuilder
         extends
         // @@protoc_insertion_point(interface_extends:ReplicatedSnapshotMetadata.Seen)
-        akka.protobufv3.internal.MessageOrBuilder {
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
       /**
        * required string replicaId = 1;
@@ -8215,7 +8709,7 @@ public final class ReplicatedEventSourcing {
        *
        * @return The bytes for replicaId.
        */
-      akka.protobufv3.internal.ByteString getReplicaIdBytes();
+      org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes();
 
       /**
        * required int64 sequenceNr = 2;
@@ -8231,13 +8725,13 @@ public final class ReplicatedEventSourcing {
       long getSequenceNr();
     }
     /** Protobuf type {@code ReplicatedSnapshotMetadata.Seen} */
-    public static final class Seen extends akka.protobufv3.internal.GeneratedMessageV3
+    public static final class Seen extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
         implements
         // @@protoc_insertion_point(message_implements:ReplicatedSnapshotMetadata.Seen)
         SeenOrBuilder {
       private static final long serialVersionUID = 0L;
       // Use Seen.newBuilder() to construct.
-      private Seen(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      private Seen(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
         super(builder);
       }
 
@@ -8248,26 +8742,26 @@ public final class ReplicatedEventSourcing {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
         return new Seen();
       }
 
       @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
         return this.unknownFields;
       }
 
       private Seen(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         this();
         if (extensionRegistry == null) {
           throw new java.lang.NullPointerException();
         }
         int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -8278,7 +8772,7 @@ public final class ReplicatedEventSourcing {
                 break;
               case 10:
                 {
-                  akka.protobufv3.internal.ByteString bs = input.readBytes();
+                  org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                   bitField0_ |= 0x00000001;
                   replicaId_ = bs;
                   break;
@@ -8298,10 +8792,10 @@ public final class ReplicatedEventSourcing {
                 }
             }
           }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
               .setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
@@ -8309,20 +8803,21 @@ public final class ReplicatedEventSourcing {
         }
       }
 
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedSnapshotMetadata_Seen_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedSnapshotMetadata_Seen_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata.Seen.class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata.Seen.Builder.class);
       }
 
@@ -8347,7 +8842,8 @@ public final class ReplicatedEventSourcing {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             replicaId_ = s;
@@ -8360,15 +8856,15 @@ public final class ReplicatedEventSourcing {
        *
        * @return The bytes for replicaId.
        */
-      public akka.protobufv3.internal.ByteString getReplicaIdBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes() {
         java.lang.Object ref = replicaId_;
         if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           replicaId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
 
@@ -8412,10 +8908,11 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
           throws java.io.IOException {
         if (((bitField0_ & 0x00000001) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, replicaId_);
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+              output, 1, replicaId_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
           output.writeInt64(2, sequenceNr_);
@@ -8430,10 +8927,14 @@ public final class ReplicatedEventSourcing {
 
         size = 0;
         if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, replicaId_);
+          size +=
+              org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                  1, replicaId_);
         }
         if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream.computeInt64Size(2, sequenceNr_);
+          size +=
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(
+                  2, sequenceNr_);
         }
         size += unknownFields.getSerializedSize();
         memoizedSize = size;
@@ -8447,13 +8948,14 @@ public final class ReplicatedEventSourcing {
         }
         if (!(obj
             instanceof
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                .Seen)) {
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedSnapshotMetadata.Seen)) {
           return super.equals(obj);
         }
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata.Seen
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedSnapshotMetadata.Seen
             other =
-                (akka.persistence.typed.serialization.ReplicatedEventSourcing
+                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                         .ReplicatedSnapshotMetadata.Seen)
                     obj;
 
@@ -8482,104 +8984,111 @@ public final class ReplicatedEventSourcing {
         }
         if (hasSequenceNr()) {
           hash = (37 * hash) + SEQUENCENR_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(getSequenceNr());
+          hash =
+              (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getSequenceNr());
         }
         hash = (29 * hash) + unknownFields.hashCode();
         memoizedHashCode = hash;
         return hash;
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
           parseFrom(java.nio.ByteBuffer data)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
           parseFrom(
               java.nio.ByteBuffer data,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
-          parseFrom(akka.protobufv3.internal.ByteString data)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
           parseFrom(
-              akka.protobufv3.internal.ByteString data,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.ByteString data,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
-          parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          parseFrom(byte[] data)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
-          parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          parseFrom(
+              byte[] data,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
           parseFrom(java.io.InputStream input) throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-      }
-
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
-              .ReplicatedSnapshotMetadata.Seen
-          parseFrom(
-              java.io.InputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-            PARSER, input, extensionRegistry);
-      }
-
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
-              .ReplicatedSnapshotMetadata.Seen
-          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
             PARSER, input);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
-          parseDelimitedFrom(
+          parseFrom(
               java.io.InputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
             PARSER, input, extensionRegistry);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
-          parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input);
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata.Seen
+          parseDelimitedFrom(
+              java.io.InputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata.Seen
+          parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+            PARSER, input);
+      }
+
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
           parseFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
             PARSER, input, extensionRegistry);
       }
 
@@ -8593,8 +9102,8 @@ public final class ReplicatedEventSourcing {
       }
 
       public static Builder newBuilder(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen
               prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
@@ -8606,47 +9115,49 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
       /** Protobuf type {@code ReplicatedSnapshotMetadata.Seen} */
       public static final class Builder
-          extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+          extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
           implements
           // @@protoc_insertion_point(builder_implements:ReplicatedSnapshotMetadata.Seen)
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-              .SeenOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata.SeenOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+            getDescriptor() {
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .internal_static_ReplicatedSnapshotMetadata_Seen_descriptor;
         }
 
         @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .internal_static_ReplicatedSnapshotMetadata_Seen_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata.Seen.class,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata.Seen.Builder.class);
         }
 
         // Construct using
-        // akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata.Seen.newBuilder()
+        // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata.Seen.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
-        private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        private Builder(
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
 
         private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
         }
 
         @java.lang.Override
@@ -8660,25 +9171,25 @@ public final class ReplicatedEventSourcing {
         }
 
         @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .internal_static_ReplicatedSnapshotMetadata_Seen_descriptor;
         }
 
         @java.lang.Override
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedSnapshotMetadata.Seen
             getDefaultInstanceForType() {
-          return akka.persistence.typed.serialization.ReplicatedEventSourcing
+          return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen.getDefaultInstance();
         }
 
         @java.lang.Override
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedSnapshotMetadata.Seen
             build() {
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen
               result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
@@ -8687,13 +9198,13 @@ public final class ReplicatedEventSourcing {
         }
 
         @java.lang.Override
-        public akka.persistence.typed.serialization.ReplicatedEventSourcing
+        public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedSnapshotMetadata.Seen
             buildPartial() {
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen
               result =
-                  new akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata.Seen(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
@@ -8717,23 +9228,26 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
           return super.setField(field, value);
         }
 
         @java.lang.Override
-        public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+        public Builder clearField(
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
 
         @java.lang.Override
-        public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+        public Builder clearOneof(
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
           return super.clearOneof(oneof);
         }
 
         @java.lang.Override
         public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
             int index,
             java.lang.Object value) {
           return super.setRepeatedField(field, index, value);
@@ -8741,18 +9255,19 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
 
         @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
           if (other
               instanceof
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen) {
             return mergeFrom(
-                (akka.persistence.typed.serialization.ReplicatedEventSourcing
+                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                         .ReplicatedSnapshotMetadata.Seen)
                     other);
           } else {
@@ -8762,11 +9277,11 @@ public final class ReplicatedEventSourcing {
         }
 
         public Builder mergeFrom(
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                    .Seen
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .ReplicatedSnapshotMetadata.Seen
                 other) {
           if (other
-              == akka.persistence.typed.serialization.ReplicatedEventSourcing
+              == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen.getDefaultInstance()) return this;
           if (other.hasReplicaId()) {
             bitField0_ |= 0x00000001;
@@ -8794,17 +9309,17 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen
               parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
             parsedMessage =
-                (akka.persistence.typed.serialization.ReplicatedEventSourcing
+                (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                         .ReplicatedSnapshotMetadata.Seen)
                     e.getUnfinishedMessage();
             throw e.unwrapIOException();
@@ -8835,7 +9350,8 @@ public final class ReplicatedEventSourcing {
         public java.lang.String getReplicaId() {
           java.lang.Object ref = replicaId_;
           if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               replicaId_ = s;
@@ -8850,15 +9366,16 @@ public final class ReplicatedEventSourcing {
          *
          * @return The bytes for replicaId.
          */
-        public akka.protobufv3.internal.ByteString getReplicaIdBytes() {
+        public org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes() {
           java.lang.Object ref = replicaId_;
           if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b =
-                akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+            org.apache.pekko.protobufv3.internal.ByteString b =
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
             replicaId_ = b;
             return b;
           } else {
-            return (akka.protobufv3.internal.ByteString) ref;
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
           }
         }
         /**
@@ -8893,7 +9410,7 @@ public final class ReplicatedEventSourcing {
          * @param value The bytes for replicaId to set.
          * @return This builder for chaining.
          */
-        public Builder setReplicaIdBytes(akka.protobufv3.internal.ByteString value) {
+        public Builder setReplicaIdBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -8946,13 +9463,13 @@ public final class ReplicatedEventSourcing {
 
         @java.lang.Override
         public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
@@ -8960,46 +9477,46 @@ public final class ReplicatedEventSourcing {
       }
 
       // @@protoc_insertion_point(class_scope:ReplicatedSnapshotMetadata.Seen)
-      private static final akka.persistence.typed.serialization.ReplicatedEventSourcing
+      private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
           DEFAULT_INSTANCE;
 
       static {
         DEFAULT_INSTANCE =
-            new akka.persistence.typed.serialization.ReplicatedEventSourcing
+            new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedSnapshotMetadata.Seen();
       }
 
-      public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata.Seen
           getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
       @java.lang.Deprecated
-      public static final akka.protobufv3.internal.Parser PARSER =
-          new akka.protobufv3.internal.AbstractParser() {
+      public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+          new org.apache.pekko.protobufv3.internal.AbstractParser() {
             @java.lang.Override
             public Seen parsePartialFrom(
-                akka.protobufv3.internal.CodedInputStream input,
-                akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-                throws akka.protobufv3.internal.InvalidProtocolBufferException {
+                org.apache.pekko.protobufv3.internal.CodedInputStream input,
+                org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+                throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
               return new Seen(input, extensionRegistry);
             }
           };
 
-      public static akka.protobufv3.internal.Parser parser() {
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
         return PARSER;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-              .Seen
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata.Seen
           getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -9007,7 +9524,8 @@ public final class ReplicatedEventSourcing {
 
     private int bitField0_;
     public static final int VERSION_FIELD_NUMBER = 1;
-    private akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector version_;
+    private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+        version_;
     /**
      * required .VersionVector version = 1;
      *
@@ -9021,37 +9539,39 @@ public final class ReplicatedEventSourcing {
      *
      * @return The version.
      */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getVersion() {
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+        getVersion() {
       return version_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .getDefaultInstance()
           : version_;
     }
     /** required .VersionVector version = 1; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVectorOrBuilder
         getVersionOrBuilder() {
       return version_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .getDefaultInstance()
           : version_;
     }
 
     public static final int SEENPERREPLICA_FIELD_NUMBER = 2;
     private java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                .Seen>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedSnapshotMetadata.Seen>
         seenPerReplica_;
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
     public java.util.List<
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                .Seen>
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedSnapshotMetadata.Seen>
         getSeenPerReplicaList() {
       return seenPerReplica_;
     }
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
     public java.util.List<
             ? extends
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata.SeenOrBuilder>
         getSeenPerReplicaOrBuilderList() {
       return seenPerReplica_;
@@ -9061,14 +9581,14 @@ public final class ReplicatedEventSourcing {
       return seenPerReplica_.size();
     }
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-            .Seen
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedSnapshotMetadata.Seen
         getSeenPerReplica(int index) {
       return seenPerReplica_.get(index);
     }
     /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-            .SeenOrBuilder
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedSnapshotMetadata.SeenOrBuilder
         getSeenPerReplicaOrBuilder(int index) {
       return seenPerReplica_.get(index);
     }
@@ -9100,7 +9620,7 @@ public final class ReplicatedEventSourcing {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getVersion());
@@ -9118,11 +9638,13 @@ public final class ReplicatedEventSourcing {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(1, getVersion());
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                1, getVersion());
       }
       for (int i = 0; i < seenPerReplica_.size(); i++) {
         size +=
-            akka.protobufv3.internal.CodedOutputStream.computeMessageSize(
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
                 2, seenPerReplica_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -9137,13 +9659,14 @@ public final class ReplicatedEventSourcing {
       }
       if (!(obj
           instanceof
-          akka.persistence.typed.serialization.ReplicatedEventSourcing
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata)) {
         return super.equals(obj);
       }
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata
           other =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata)
                   obj;
 
@@ -9176,97 +9699,103 @@ public final class ReplicatedEventSourcing {
       return hash;
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
         parseFrom(java.nio.ByteBuffer data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
         parseFrom(
             java.nio.ByteBuffer data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
-        parseFrom(akka.protobufv3.internal.ByteString data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
         parseFrom(
-            akka.protobufv3.internal.ByteString data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
-        parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
-        parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
         parseFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
-            .ReplicatedSnapshotMetadata
-        parseFrom(
-            java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
-            .ReplicatedSnapshotMetadata
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
-        parseDelimitedFrom(
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
-        parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedSnapshotMetadata
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedSnapshotMetadata
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
         parseFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -9280,7 +9809,8 @@ public final class ReplicatedEventSourcing {
     }
 
     public static Builder newBuilder(
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedSnapshotMetadata
             prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
@@ -9292,47 +9822,49 @@ public final class ReplicatedEventSourcing {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /** Protobuf type {@code ReplicatedSnapshotMetadata} */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:ReplicatedSnapshotMetadata)
-        akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadataOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedSnapshotMetadata_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedSnapshotMetadata_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata.class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata.Builder.class);
       }
 
       // Construct using
-      // akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata.newBuilder()
+      // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
           getVersionFieldBuilder();
           getSeenPerReplicaFieldBuilder();
         }
@@ -9357,22 +9889,25 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedSnapshotMetadata_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata
           getDefaultInstanceForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata
           build() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedSnapshotMetadata
             result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
@@ -9381,11 +9916,13 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata
           buildPartial() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedSnapshotMetadata
             result =
-                new akka.persistence.typed.serialization.ReplicatedEventSourcing
+                new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
@@ -9418,23 +9955,26 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -9442,18 +9982,19 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other
             instanceof
-            akka.persistence.typed.serialization.ReplicatedEventSourcing
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedSnapshotMetadata) {
           return mergeFrom(
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata)
                   other);
         } else {
@@ -9463,10 +10004,11 @@ public final class ReplicatedEventSourcing {
       }
 
       public Builder mergeFrom(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata
               other) {
         if (other
-            == akka.persistence.typed.serialization.ReplicatedEventSourcing
+            == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedSnapshotMetadata.getDefaultInstance()) return this;
         if (other.hasVersion()) {
           mergeVersion(other.getVersion());
@@ -9490,7 +10032,7 @@ public final class ReplicatedEventSourcing {
               seenPerReplica_ = other.seenPerReplica_;
               bitField0_ = (bitField0_ & ~0x00000002);
               seenPerReplicaBuilder_ =
-                  akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
                       ? getSeenPerReplicaFieldBuilder()
                       : null;
             } else {
@@ -9521,16 +10063,17 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .ReplicatedSnapshotMetadata
             parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
@@ -9544,11 +10087,15 @@ public final class ReplicatedEventSourcing {
 
       private int bitField0_;
 
-      private akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector version_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          version_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           versionBuilder_;
       /**
        * required .VersionVector version = 1;
@@ -9563,12 +10110,12 @@ public final class ReplicatedEventSourcing {
        *
        * @return The version.
        */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
           getVersion() {
         if (versionBuilder_ == null) {
           return version_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                  .getDefaultInstance()
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector.getDefaultInstance()
               : version_;
         } else {
           return versionBuilder_.getMessage();
@@ -9576,7 +10123,8 @@ public final class ReplicatedEventSourcing {
       }
       /** required .VersionVector version = 1; */
       public Builder setVersion(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (versionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9591,7 +10139,8 @@ public final class ReplicatedEventSourcing {
       }
       /** required .VersionVector version = 1; */
       public Builder setVersion(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder
               builderForValue) {
         if (versionBuilder_ == null) {
           version_ = builderForValue.build();
@@ -9604,16 +10153,17 @@ public final class ReplicatedEventSourcing {
       }
       /** required .VersionVector version = 1; */
       public Builder mergeVersion(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (versionBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)
               && version_ != null
               && version_
-                  != akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .getDefaultInstance()) {
+                  != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.getDefaultInstance()) {
             version_ =
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                    .newBuilder(version_)
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.newBuilder(version_)
                     .mergeFrom(value)
                     .buildPartial();
           } else {
@@ -9638,37 +10188,43 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** required .VersionVector version = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Builder
           getVersionBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getVersionFieldBuilder().getBuilder();
       }
       /** required .VersionVector version = 1; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVectorOrBuilder
           getVersionOrBuilder() {
         if (versionBuilder_ != null) {
           return versionBuilder_.getMessageOrBuilder();
         } else {
           return version_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                  .getDefaultInstance()
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector.getDefaultInstance()
               : version_;
         }
       }
       /** required .VersionVector version = 1; */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           getVersionFieldBuilder() {
         if (versionBuilder_ == null) {
           versionBuilder_ =
-              new akka.protobufv3.internal.SingleFieldBuilderV3<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .Builder,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Builder,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVectorOrBuilder>(getVersion(), getParentForChildren(), isClean());
           version_ = null;
         }
@@ -9676,7 +10232,7 @@ public final class ReplicatedEventSourcing {
       }
 
       private java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen>
           seenPerReplica_ = java.util.Collections.emptyList();
 
@@ -9684,24 +10240,24 @@ public final class ReplicatedEventSourcing {
         if (!((bitField0_ & 0x00000002) != 0)) {
           seenPerReplica_ =
               new java.util.ArrayList<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata.Seen>(seenPerReplica_);
           bitField0_ |= 0x00000002;
         }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.SeenOrBuilder>
           seenPerReplicaBuilder_;
 
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
       public java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen>
           getSeenPerReplicaList() {
         if (seenPerReplicaBuilder_ == null) {
@@ -9719,8 +10275,8 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-              .Seen
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata.Seen
           getSeenPerReplica(int index) {
         if (seenPerReplicaBuilder_ == null) {
           return seenPerReplica_.get(index);
@@ -9731,8 +10287,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
       public Builder setSeenPerReplica(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen
               value) {
         if (seenPerReplicaBuilder_ == null) {
           if (value == null) {
@@ -9749,8 +10305,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
       public Builder setSeenPerReplica(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen.Builder
               builderForValue) {
         if (seenPerReplicaBuilder_ == null) {
           ensureSeenPerReplicaIsMutable();
@@ -9763,8 +10319,8 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
       public Builder addSeenPerReplica(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen
               value) {
         if (seenPerReplicaBuilder_ == null) {
           if (value == null) {
@@ -9781,8 +10337,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
       public Builder addSeenPerReplica(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen
               value) {
         if (seenPerReplicaBuilder_ == null) {
           if (value == null) {
@@ -9798,8 +10354,8 @@ public final class ReplicatedEventSourcing {
       }
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
       public Builder addSeenPerReplica(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen.Builder
               builderForValue) {
         if (seenPerReplicaBuilder_ == null) {
           ensureSeenPerReplicaIsMutable();
@@ -9813,8 +10369,8 @@ public final class ReplicatedEventSourcing {
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
       public Builder addSeenPerReplica(
           int index,
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-                  .Seen.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .ReplicatedSnapshotMetadata.Seen.Builder
               builderForValue) {
         if (seenPerReplicaBuilder_ == null) {
           ensureSeenPerReplicaIsMutable();
@@ -9829,12 +10385,13 @@ public final class ReplicatedEventSourcing {
       public Builder addAllSeenPerReplica(
           java.lang.Iterable<
                   ? extends
-                      akka.persistence.typed.serialization.ReplicatedEventSourcing
+                      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                           .ReplicatedSnapshotMetadata.Seen>
               values) {
         if (seenPerReplicaBuilder_ == null) {
           ensureSeenPerReplicaIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, seenPerReplica_);
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+              values, seenPerReplica_);
           onChanged();
         } else {
           seenPerReplicaBuilder_.addAllMessages(values);
@@ -9864,14 +10421,14 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-              .Seen.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata.Seen.Builder
           getSeenPerReplicaBuilder(int index) {
         return getSeenPerReplicaFieldBuilder().getBuilder(index);
       }
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-              .SeenOrBuilder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata.SeenOrBuilder
           getSeenPerReplicaOrBuilder(int index) {
         if (seenPerReplicaBuilder_ == null) {
           return seenPerReplica_.get(index);
@@ -9882,7 +10439,7 @@ public final class ReplicatedEventSourcing {
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
       public java.util.List<
               ? extends
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata.SeenOrBuilder>
           getSeenPerReplicaOrBuilderList() {
         if (seenPerReplicaBuilder_ != null) {
@@ -9892,48 +10449,48 @@ public final class ReplicatedEventSourcing {
         }
       }
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-              .Seen.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata.Seen.Builder
           addSeenPerReplicaBuilder() {
         return getSeenPerReplicaFieldBuilder()
             .addBuilder(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata.Seen.getDefaultInstance());
       }
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
-              .Seen.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedSnapshotMetadata.Seen.Builder
           addSeenPerReplicaBuilder(int index) {
         return getSeenPerReplicaFieldBuilder()
             .addBuilder(
                 index,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedSnapshotMetadata.Seen.getDefaultInstance());
       }
       /** repeated .ReplicatedSnapshotMetadata.Seen seenPerReplica = 2; */
       public java.util.List<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen.Builder>
           getSeenPerReplicaBuilderList() {
         return getSeenPerReplicaFieldBuilder().getBuilderList();
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.Seen.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedSnapshotMetadata.SeenOrBuilder>
           getSeenPerReplicaFieldBuilder() {
         if (seenPerReplicaBuilder_ == null) {
           seenPerReplicaBuilder_ =
-              new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+              new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata.Seen,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata.Seen.Builder,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedSnapshotMetadata.SeenOrBuilder>(
                   seenPerReplica_,
                   ((bitField0_ & 0x00000002) != 0),
@@ -9946,13 +10503,13 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -9960,45 +10517,48 @@ public final class ReplicatedEventSourcing {
     }
 
     // @@protoc_insertion_point(class_scope:ReplicatedSnapshotMetadata)
-    private static final akka.persistence.typed.serialization.ReplicatedEventSourcing
+    private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
         DEFAULT_INSTANCE;
 
     static {
       DEFAULT_INSTANCE =
-          new akka.persistence.typed.serialization.ReplicatedEventSourcing
+          new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedSnapshotMetadata();
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedSnapshotMetadata
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
-          @java.lang.Override
-          public ReplicatedSnapshotMetadata parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
-            return new ReplicatedSnapshotMetadata(input, extensionRegistry);
-          }
-        };
+    public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER =
+            new org.apache.pekko.protobufv3.internal.AbstractParser() {
+              @java.lang.Override
+              public ReplicatedSnapshotMetadata parsePartialFrom(
+                  org.apache.pekko.protobufv3.internal.CodedInputStream input,
+                  org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+                  throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+                return new ReplicatedSnapshotMetadata(input, extensionRegistry);
+              }
+            };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser
+        getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedSnapshotMetadata
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedSnapshotMetadata
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -10007,7 +10567,7 @@ public final class ReplicatedEventSourcing {
   public interface ReplicatedPublishedEventMetaDataOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:ReplicatedPublishedEventMetaData)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * optional string replicaId = 1;
@@ -10026,7 +10586,7 @@ public final class ReplicatedEventSourcing {
      *
      * @return The bytes for replicaId.
      */
-    akka.protobufv3.internal.ByteString getReplicaIdBytes();
+    org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes();
 
     /**
      * optional .VersionVector versionVector = 2;
@@ -10039,21 +10599,22 @@ public final class ReplicatedEventSourcing {
      *
      * @return The versionVector.
      */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector getVersionVector();
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+        getVersionVector();
     /** optional .VersionVector versionVector = 2; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
         getVersionVectorOrBuilder();
   }
   /** Protobuf type {@code ReplicatedPublishedEventMetaData} */
   public static final class ReplicatedPublishedEventMetaData
-      extends akka.protobufv3.internal.GeneratedMessageV3
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
       // @@protoc_insertion_point(message_implements:ReplicatedPublishedEventMetaData)
       ReplicatedPublishedEventMetaDataOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use ReplicatedPublishedEventMetaData.newBuilder() to construct.
     private ReplicatedPublishedEventMetaData(
-        akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
@@ -10064,26 +10625,26 @@ public final class ReplicatedEventSourcing {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ReplicatedPublishedEventMetaData();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private ReplicatedPublishedEventMetaData(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -10094,22 +10655,23 @@ public final class ReplicatedEventSourcing {
               break;
             case 10:
               {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 replicaId_ = bs;
                 break;
               }
             case 18:
               {
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                        .VersionVector.Builder
                     subBuilder = null;
                 if (((bitField0_ & 0x00000002) != 0)) {
                   subBuilder = versionVector_.toBuilder();
                 }
                 versionVector_ =
                     input.readMessage(
-                        akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                            .PARSER,
+                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                            .VersionVector.PARSER,
                         extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(versionVector_);
@@ -10127,10 +10689,10 @@ public final class ReplicatedEventSourcing {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
@@ -10138,20 +10700,21 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ReplicatedPublishedEventMetaData_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_ReplicatedPublishedEventMetaData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData.class,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData.Builder.class);
     }
 
@@ -10176,7 +10739,8 @@ public final class ReplicatedEventSourcing {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           replicaId_ = s;
@@ -10189,20 +10753,20 @@ public final class ReplicatedEventSourcing {
      *
      * @return The bytes for replicaId.
      */
-    public akka.protobufv3.internal.ByteString getReplicaIdBytes() {
+    public org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes() {
       java.lang.Object ref = replicaId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b =
-            akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
         replicaId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int VERSIONVECTOR_FIELD_NUMBER = 2;
-    private akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         versionVector_;
     /**
      * optional .VersionVector versionVector = 2;
@@ -10217,18 +10781,19 @@ public final class ReplicatedEventSourcing {
      *
      * @return The versionVector.
      */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
         getVersionVector() {
       return versionVector_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .getDefaultInstance()
           : versionVector_;
     }
     /** optional .VersionVector versionVector = 2; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .VersionVectorOrBuilder
         getVersionVectorOrBuilder() {
       return versionVector_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
               .getDefaultInstance()
           : versionVector_;
     }
@@ -10252,10 +10817,10 @@ public final class ReplicatedEventSourcing {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, replicaId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, replicaId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeMessage(2, getVersionVector());
@@ -10270,11 +10835,14 @@ public final class ReplicatedEventSourcing {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, replicaId_);
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                1, replicaId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         size +=
-            akka.protobufv3.internal.CodedOutputStream.computeMessageSize(2, getVersionVector());
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                2, getVersionVector());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -10288,13 +10856,14 @@ public final class ReplicatedEventSourcing {
       }
       if (!(obj
           instanceof
-          akka.persistence.typed.serialization.ReplicatedEventSourcing
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData)) {
         return super.equals(obj);
       }
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedPublishedEventMetaData
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .ReplicatedPublishedEventMetaData
           other =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedPublishedEventMetaData)
                   obj;
 
@@ -10330,97 +10899,103 @@ public final class ReplicatedEventSourcing {
       return hash;
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         parseFrom(java.nio.ByteBuffer data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         parseFrom(
             java.nio.ByteBuffer data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
-        parseFrom(akka.protobufv3.internal.ByteString data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         parseFrom(
-            akka.protobufv3.internal.ByteString data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
-        parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
-        parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         parseFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
-            .ReplicatedPublishedEventMetaData
-        parseFrom(
-            java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
-            .ReplicatedPublishedEventMetaData
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
-        parseDelimitedFrom(
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
-        parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedPublishedEventMetaData
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedPublishedEventMetaData
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         parseFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -10434,7 +11009,7 @@ public final class ReplicatedEventSourcing {
     }
 
     public static Builder newBuilder(
-        akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedPublishedEventMetaData
             prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
@@ -10447,47 +11022,49 @@ public final class ReplicatedEventSourcing {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /** Protobuf type {@code ReplicatedPublishedEventMetaData} */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:ReplicatedPublishedEventMetaData)
-        akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaDataOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedPublishedEventMetaData_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedPublishedEventMetaData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedPublishedEventMetaData.class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedPublishedEventMetaData.Builder.class);
       }
 
       // Construct using
-      // akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedPublishedEventMetaData.newBuilder()
+      // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedPublishedEventMetaData.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
           getVersionVectorFieldBuilder();
         }
       }
@@ -10507,24 +11084,24 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_ReplicatedPublishedEventMetaData_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData
           getDefaultInstanceForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData
           build() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedPublishedEventMetaData
             result = buildPartial();
         if (!result.isInitialized()) {
@@ -10534,13 +11111,13 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData
           buildPartial() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedPublishedEventMetaData
             result =
-                new akka.persistence.typed.serialization.ReplicatedEventSourcing
+                new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedPublishedEventMetaData(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
@@ -10568,23 +11145,26 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -10592,18 +11172,19 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other
             instanceof
-            akka.persistence.typed.serialization.ReplicatedEventSourcing
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedPublishedEventMetaData) {
           return mergeFrom(
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedPublishedEventMetaData)
                   other);
         } else {
@@ -10613,11 +11194,11 @@ public final class ReplicatedEventSourcing {
       }
 
       public Builder mergeFrom(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData
               other) {
         if (other
-            == akka.persistence.typed.serialization.ReplicatedEventSourcing
+            == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedPublishedEventMetaData.getDefaultInstance()) return this;
         if (other.hasReplicaId()) {
           bitField0_ |= 0x00000001;
@@ -10644,17 +11225,17 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                 .ReplicatedPublishedEventMetaData
             parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedPublishedEventMetaData)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
@@ -10685,7 +11266,8 @@ public final class ReplicatedEventSourcing {
       public java.lang.String getReplicaId() {
         java.lang.Object ref = replicaId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             replicaId_ = s;
@@ -10700,15 +11282,15 @@ public final class ReplicatedEventSourcing {
        *
        * @return The bytes for replicaId.
        */
-      public akka.protobufv3.internal.ByteString getReplicaIdBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getReplicaIdBytes() {
         java.lang.Object ref = replicaId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           replicaId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -10743,7 +11325,7 @@ public final class ReplicatedEventSourcing {
        * @param value The bytes for replicaId to set.
        * @return This builder for chaining.
        */
-      public Builder setReplicaIdBytes(akka.protobufv3.internal.ByteString value) {
+      public Builder setReplicaIdBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10753,12 +11335,15 @@ public final class ReplicatedEventSourcing {
         return this;
       }
 
-      private akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
           versionVector_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           versionVectorBuilder_;
       /**
        * optional .VersionVector versionVector = 2;
@@ -10773,12 +11358,12 @@ public final class ReplicatedEventSourcing {
        *
        * @return The versionVector.
        */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
           getVersionVector() {
         if (versionVectorBuilder_ == null) {
           return versionVector_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                  .getDefaultInstance()
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector.getDefaultInstance()
               : versionVector_;
         } else {
           return versionVectorBuilder_.getMessage();
@@ -10786,7 +11371,8 @@ public final class ReplicatedEventSourcing {
       }
       /** optional .VersionVector versionVector = 2; */
       public Builder setVersionVector(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (versionVectorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10801,7 +11387,8 @@ public final class ReplicatedEventSourcing {
       }
       /** optional .VersionVector versionVector = 2; */
       public Builder setVersionVector(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder
               builderForValue) {
         if (versionVectorBuilder_ == null) {
           versionVector_ = builderForValue.build();
@@ -10814,16 +11401,17 @@ public final class ReplicatedEventSourcing {
       }
       /** optional .VersionVector versionVector = 2; */
       public Builder mergeVersionVector(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector value) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              value) {
         if (versionVectorBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)
               && versionVector_ != null
               && versionVector_
-                  != akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .getDefaultInstance()) {
+                  != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.getDefaultInstance()) {
             versionVector_ =
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                    .newBuilder(versionVector_)
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .VersionVector.newBuilder(versionVector_)
                     .mergeFrom(value)
                     .buildPartial();
           } else {
@@ -10848,37 +11436,43 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** optional .VersionVector versionVector = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+              .Builder
           getVersionVectorBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getVersionVectorFieldBuilder().getBuilder();
       }
       /** optional .VersionVector versionVector = 2; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .VersionVectorOrBuilder
           getVersionVectorOrBuilder() {
         if (versionVectorBuilder_ != null) {
           return versionVectorBuilder_.getMessageOrBuilder();
         } else {
           return versionVector_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                  .getDefaultInstance()
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector.getDefaultInstance()
               : versionVector_;
         }
       }
       /** optional .VersionVector versionVector = 2; */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVectorOrBuilder>
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVector,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
+                  .Builder,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .VersionVectorOrBuilder>
           getVersionVectorFieldBuilder() {
         if (versionVectorBuilder_ == null) {
           versionVectorBuilder_ =
-              new akka.protobufv3.internal.SingleFieldBuilderV3<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing.VersionVector
-                      .Builder,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .VersionVector.Builder,
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .VersionVectorOrBuilder>(
                   getVersionVector(), getParentForChildren(), isClean());
           versionVector_ = null;
@@ -10888,13 +11482,13 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -10902,45 +11496,50 @@ public final class ReplicatedEventSourcing {
     }
 
     // @@protoc_insertion_point(class_scope:ReplicatedPublishedEventMetaData)
-    private static final akka.persistence.typed.serialization.ReplicatedEventSourcing
+    private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         DEFAULT_INSTANCE;
 
     static {
       DEFAULT_INSTANCE =
-          new akka.persistence.typed.serialization.ReplicatedEventSourcing
+          new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData();
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
-          @java.lang.Override
-          public ReplicatedPublishedEventMetaData parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
-            return new ReplicatedPublishedEventMetaData(input, extensionRegistry);
-          }
-        };
+    public static final org.apache.pekko.protobufv3.internal.Parser<
+            ReplicatedPublishedEventMetaData>
+        PARSER =
+            new org.apache.pekko.protobufv3.internal.AbstractParser<
+                ReplicatedPublishedEventMetaData>() {
+              @java.lang.Override
+              public ReplicatedPublishedEventMetaData parsePartialFrom(
+                  org.apache.pekko.protobufv3.internal.CodedInputStream input,
+                  org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+                  throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+                return new ReplicatedPublishedEventMetaData(input, extensionRegistry);
+              }
+            };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser
+        parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser
+        getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
@@ -10950,7 +11549,7 @@ public final class ReplicatedEventSourcing {
   public interface PublishedEventOrBuilder
       extends
       // @@protoc_insertion_point(interface_extends:PublishedEvent)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * optional string persistenceId = 1;
@@ -10969,7 +11568,7 @@ public final class ReplicatedEventSourcing {
      *
      * @return The bytes for persistenceId.
      */
-    akka.protobufv3.internal.ByteString getPersistenceIdBytes();
+    org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes();
 
     /**
      * optional int64 sequenceNr = 2;
@@ -10995,9 +11594,9 @@ public final class ReplicatedEventSourcing {
      *
      * @return The payload.
      */
-    akka.remote.ContainerFormats.Payload getPayload();
+    org.apache.pekko.remote.ContainerFormats.Payload getPayload();
     /** optional .Payload payload = 3; */
-    akka.remote.ContainerFormats.PayloadOrBuilder getPayloadOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getPayloadOrBuilder();
 
     /**
      * optional int64 timestamp = 4;
@@ -11023,21 +11622,24 @@ public final class ReplicatedEventSourcing {
      *
      * @return The metadata.
      */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing.ReplicatedPublishedEventMetaData
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .ReplicatedPublishedEventMetaData
         getMetadata();
     /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
-    akka.persistence.typed.serialization.ReplicatedEventSourcing
+    org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaDataOrBuilder
         getMetadataOrBuilder();
   }
   /** Protobuf type {@code PublishedEvent} */
-  public static final class PublishedEvent extends akka.protobufv3.internal.GeneratedMessageV3
+  public static final class PublishedEvent
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
       implements
       // @@protoc_insertion_point(message_implements:PublishedEvent)
       PublishedEventOrBuilder {
     private static final long serialVersionUID = 0L;
     // Use PublishedEvent.newBuilder() to construct.
-    private PublishedEvent(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private PublishedEvent(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
 
@@ -11048,26 +11650,26 @@ public final class ReplicatedEventSourcing {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new PublishedEvent();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
       return this.unknownFields;
     }
 
     private PublishedEvent(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -11078,7 +11680,7 @@ public final class ReplicatedEventSourcing {
               break;
             case 10:
               {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
                 persistenceId_ = bs;
                 break;
@@ -11091,13 +11693,13 @@ public final class ReplicatedEventSourcing {
               }
             case 26:
               {
-                akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+                org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000004) != 0)) {
                   subBuilder = payload_.toBuilder();
                 }
                 payload_ =
                     input.readMessage(
-                        akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+                        org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(payload_);
                   payload_ = subBuilder.buildPartial();
@@ -11113,7 +11715,7 @@ public final class ReplicatedEventSourcing {
               }
             case 42:
               {
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                         .ReplicatedPublishedEventMetaData.Builder
                     subBuilder = null;
                 if (((bitField0_ & 0x00000010) != 0)) {
@@ -11121,7 +11723,7 @@ public final class ReplicatedEventSourcing {
                 }
                 metadata_ =
                     input.readMessage(
-                        akka.persistence.typed.serialization.ReplicatedEventSourcing
+                        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                             .ReplicatedPublishedEventMetaData.PARSER,
                         extensionRegistry);
                 if (subBuilder != null) {
@@ -11140,10 +11742,10 @@ public final class ReplicatedEventSourcing {
               }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(e)
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
             .setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
@@ -11151,20 +11753,22 @@ public final class ReplicatedEventSourcing {
       }
     }
 
-    public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_PublishedEvent_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
           .internal_static_PublishedEvent_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent.class,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent.Builder
-                  .class);
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .PublishedEvent.class,
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                  .PublishedEvent.Builder.class);
     }
 
     private int bitField0_;
@@ -11188,7 +11792,8 @@ public final class ReplicatedEventSourcing {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           persistenceId_ = s;
@@ -11201,15 +11806,15 @@ public final class ReplicatedEventSourcing {
      *
      * @return The bytes for persistenceId.
      */
-    public akka.protobufv3.internal.ByteString getPersistenceIdBytes() {
+    public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
       java.lang.Object ref = persistenceId_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b =
-            akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
         persistenceId_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -11233,7 +11838,7 @@ public final class ReplicatedEventSourcing {
     }
 
     public static final int PAYLOAD_FIELD_NUMBER = 3;
-    private akka.remote.ContainerFormats.Payload payload_;
+    private org.apache.pekko.remote.ContainerFormats.Payload payload_;
     /**
      * optional .Payload payload = 3;
      *
@@ -11247,15 +11852,15 @@ public final class ReplicatedEventSourcing {
      *
      * @return The payload.
      */
-    public akka.remote.ContainerFormats.Payload getPayload() {
+    public org.apache.pekko.remote.ContainerFormats.Payload getPayload() {
       return payload_ == null
-          ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+          ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
           : payload_;
     }
     /** optional .Payload payload = 3; */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getPayloadOrBuilder() {
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getPayloadOrBuilder() {
       return payload_ == null
-          ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+          ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
           : payload_;
     }
 
@@ -11279,7 +11884,7 @@ public final class ReplicatedEventSourcing {
     }
 
     public static final int METADATA_FIELD_NUMBER = 5;
-    private akka.persistence.typed.serialization.ReplicatedEventSourcing
+    private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         metadata_;
     /**
@@ -11295,20 +11900,20 @@ public final class ReplicatedEventSourcing {
      *
      * @return The metadata.
      */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaData
         getMetadata() {
       return metadata_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData.getDefaultInstance()
           : metadata_;
     }
     /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .ReplicatedPublishedEventMetaDataOrBuilder
         getMetadataOrBuilder() {
       return metadata_ == null
-          ? akka.persistence.typed.serialization.ReplicatedEventSourcing
+          ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData.getDefaultInstance()
           : metadata_;
     }
@@ -11338,10 +11943,11 @@ public final class ReplicatedEventSourcing {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, persistenceId_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+            output, 1, persistenceId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt64(2, sequenceNr_);
@@ -11365,19 +11971,27 @@ public final class ReplicatedEventSourcing {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, persistenceId_);
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                1, persistenceId_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeInt64Size(2, sequenceNr_);
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(2, sequenceNr_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(3, getPayload());
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                3, getPayload());
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeInt64Size(4, timestamp_);
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(4, timestamp_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream.computeMessageSize(5, getMetadata());
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                5, getMetadata());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -11390,11 +12004,16 @@ public final class ReplicatedEventSourcing {
         return true;
       }
       if (!(obj
-          instanceof akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent)) {
+          instanceof
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .PublishedEvent)) {
         return super.equals(obj);
       }
-      akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent other =
-          (akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent) obj;
+      org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+          other =
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .PublishedEvent)
+                  obj;
 
       if (hasPersistenceId() != other.hasPersistenceId()) return false;
       if (hasPersistenceId()) {
@@ -11433,7 +12052,8 @@ public final class ReplicatedEventSourcing {
       }
       if (hasSequenceNr()) {
         hash = (37 * hash) + SEQUENCENR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(getSequenceNr());
+        hash =
+            (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getSequenceNr());
       }
       if (hasPayload()) {
         hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
@@ -11441,7 +12061,7 @@ public final class ReplicatedEventSourcing {
       }
       if (hasTimestamp()) {
         hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(getTimestamp());
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getTimestamp());
       }
       if (hasMetadata()) {
         hash = (37 * hash) + METADATA_FIELD_NUMBER;
@@ -11452,85 +12072,103 @@ public final class ReplicatedEventSourcing {
       return hash;
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
         parseFrom(java.nio.ByteBuffer data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
         parseFrom(
             java.nio.ByteBuffer data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-        parseFrom(akka.protobufv3.internal.ByteString data)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
         parseFrom(
-            akka.protobufv3.internal.ByteString data,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-        parseFrom(byte[] data) throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-        parseFrom(byte[] data, akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
         parseFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-        parseFrom(
-            java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
-    }
-
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-        parseDelimitedFrom(
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
+        parseFrom(
             java.io.InputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-        parseFrom(akka.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-        parseFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
           PARSER, input, extensionRegistry);
     }
 
@@ -11544,7 +12182,8 @@ public final class ReplicatedEventSourcing {
     }
 
     public static Builder newBuilder(
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent prototype) {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+            prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
 
@@ -11555,45 +12194,49 @@ public final class ReplicatedEventSourcing {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /** Protobuf type {@code PublishedEvent} */
     public static final class Builder
-        extends akka.protobufv3.internal.GeneratedMessageV3.Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
         implements
         // @@protoc_insertion_point(builder_implements:PublishedEvent)
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEventOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor getDescriptor() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEventOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_PublishedEvent_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_PublishedEvent_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent.class,
-                akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent.Builder
-                    .class);
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .PublishedEvent.class,
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .PublishedEvent.Builder.class);
       }
 
       // Construct using
-      // akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent.newBuilder()
+      // org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
 
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
           getPayloadFieldBuilder();
           getMetadataFieldBuilder();
         }
@@ -11624,22 +12267,23 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
             .internal_static_PublishedEvent_descriptor;
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
           getDefaultInstanceForType() {
-        return akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-            .getDefaultInstance();
+        return org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent build() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent result =
-            buildPartial();
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+          build() {
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+            result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11647,10 +12291,12 @@ public final class ReplicatedEventSourcing {
       }
 
       @java.lang.Override
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
           buildPartial() {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent result =
-            new akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent(this);
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+            result =
+                new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                    .PublishedEvent(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -11693,23 +12339,26 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
 
       @java.lang.Override
-      public Builder clearField(akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
 
       @java.lang.Override
-      public Builder clearOneof(akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
 
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index,
           java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
@@ -11717,17 +12366,21 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
 
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
         if (other
             instanceof
-            akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent) {
+            org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .PublishedEvent) {
           return mergeFrom(
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent) other);
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .PublishedEvent)
+                  other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -11735,10 +12388,11 @@ public final class ReplicatedEventSourcing {
       }
 
       public Builder mergeFrom(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent other) {
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+              other) {
         if (other
-            == akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
-                .getDefaultInstance()) return this;
+            == org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                .PublishedEvent.getDefaultInstance()) return this;
         if (other.hasPersistenceId()) {
           bitField0_ |= 0x00000001;
           persistenceId_ = other.persistenceId_;
@@ -11778,16 +12432,17 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent parsedMessage =
-            null;
+        org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+            parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
           parsedMessage =
-              (akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent)
+              (org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+                      .PublishedEvent)
                   e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
@@ -11817,7 +12472,8 @@ public final class ReplicatedEventSourcing {
       public java.lang.String getPersistenceId() {
         java.lang.Object ref = persistenceId_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs = (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             persistenceId_ = s;
@@ -11832,15 +12488,15 @@ public final class ReplicatedEventSourcing {
        *
        * @return The bytes for persistenceId.
        */
-      public akka.protobufv3.internal.ByteString getPersistenceIdBytes() {
+      public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
         java.lang.Object ref = persistenceId_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b =
-              akka.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
           persistenceId_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -11875,7 +12531,7 @@ public final class ReplicatedEventSourcing {
        * @param value The bytes for persistenceId to set.
        * @return This builder for chaining.
        */
-      public Builder setPersistenceIdBytes(akka.protobufv3.internal.ByteString value) {
+      public Builder setPersistenceIdBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -11926,11 +12582,11 @@ public final class ReplicatedEventSourcing {
         return this;
       }
 
-      private akka.remote.ContainerFormats.Payload payload_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload,
-              akka.remote.ContainerFormats.Payload.Builder,
-              akka.remote.ContainerFormats.PayloadOrBuilder>
+      private org.apache.pekko.remote.ContainerFormats.Payload payload_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload,
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+              org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           payloadBuilder_;
       /**
        * optional .Payload payload = 3;
@@ -11945,17 +12601,17 @@ public final class ReplicatedEventSourcing {
        *
        * @return The payload.
        */
-      public akka.remote.ContainerFormats.Payload getPayload() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getPayload() {
         if (payloadBuilder_ == null) {
           return payload_ == null
-              ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+              ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
               : payload_;
         } else {
           return payloadBuilder_.getMessage();
         }
       }
       /** optional .Payload payload = 3; */
-      public Builder setPayload(akka.remote.ContainerFormats.Payload value) {
+      public Builder setPayload(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (payloadBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -11969,7 +12625,8 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** optional .Payload payload = 3; */
-      public Builder setPayload(akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+      public Builder setPayload(
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (payloadBuilder_ == null) {
           payload_ = builderForValue.build();
           onChanged();
@@ -11980,13 +12637,14 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** optional .Payload payload = 3; */
-      public Builder mergePayload(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergePayload(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (payloadBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)
               && payload_ != null
-              && payload_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              && payload_
+                  != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             payload_ =
-                akka.remote.ContainerFormats.Payload.newBuilder(payload_)
+                org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(payload_)
                     .mergeFrom(value)
                     .buildPartial();
           } else {
@@ -12011,33 +12669,33 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** optional .Payload payload = 3; */
-      public akka.remote.ContainerFormats.Payload.Builder getPayloadBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getPayloadBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getPayloadFieldBuilder().getBuilder();
       }
       /** optional .Payload payload = 3; */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getPayloadOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getPayloadOrBuilder() {
         if (payloadBuilder_ != null) {
           return payloadBuilder_.getMessageOrBuilder();
         } else {
           return payload_ == null
-              ? akka.remote.ContainerFormats.Payload.getDefaultInstance()
+              ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
               : payload_;
         }
       }
       /** optional .Payload payload = 3; */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload,
-              akka.remote.ContainerFormats.Payload.Builder,
-              akka.remote.ContainerFormats.PayloadOrBuilder>
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload,
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+              org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           getPayloadFieldBuilder() {
         if (payloadBuilder_ == null) {
           payloadBuilder_ =
-              new akka.protobufv3.internal.SingleFieldBuilderV3<
-                  akka.remote.ContainerFormats.Payload,
-                  akka.remote.ContainerFormats.Payload.Builder,
-                  akka.remote.ContainerFormats.PayloadOrBuilder>(
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.remote.ContainerFormats.Payload,
+                  org.apache.pekko.remote.ContainerFormats.Payload.Builder,
+                  org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getPayload(), getParentForChildren(), isClean());
           payload_ = null;
         }
@@ -12085,15 +12743,15 @@ public final class ReplicatedEventSourcing {
         return this;
       }
 
-      private akka.persistence.typed.serialization.ReplicatedEventSourcing
+      private org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData
           metadata_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaDataOrBuilder>
           metadataBuilder_;
       /**
@@ -12109,12 +12767,12 @@ public final class ReplicatedEventSourcing {
        *
        * @return The metadata.
        */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData
           getMetadata() {
         if (metadataBuilder_ == null) {
           return metadata_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData.getDefaultInstance()
               : metadata_;
         } else {
@@ -12123,7 +12781,7 @@ public final class ReplicatedEventSourcing {
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
       public Builder setMetadata(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData
               value) {
         if (metadataBuilder_ == null) {
@@ -12140,7 +12798,7 @@ public final class ReplicatedEventSourcing {
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
       public Builder setMetadata(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData.Builder
               builderForValue) {
         if (metadataBuilder_ == null) {
@@ -12154,17 +12812,17 @@ public final class ReplicatedEventSourcing {
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
       public Builder mergeMetadata(
-          akka.persistence.typed.serialization.ReplicatedEventSourcing
+          org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData
               value) {
         if (metadataBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0)
               && metadata_ != null
               && metadata_
-                  != akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  != org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedPublishedEventMetaData.getDefaultInstance()) {
             metadata_ =
-                akka.persistence.typed.serialization.ReplicatedEventSourcing
+                org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                     .ReplicatedPublishedEventMetaData.newBuilder(metadata_)
                     .mergeFrom(value)
                     .buildPartial();
@@ -12190,7 +12848,7 @@ public final class ReplicatedEventSourcing {
         return this;
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaData.Builder
           getMetadataBuilder() {
         bitField0_ |= 0x00000010;
@@ -12198,35 +12856,35 @@ public final class ReplicatedEventSourcing {
         return getMetadataFieldBuilder().getBuilder();
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
-      public akka.persistence.typed.serialization.ReplicatedEventSourcing
+      public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
               .ReplicatedPublishedEventMetaDataOrBuilder
           getMetadataOrBuilder() {
         if (metadataBuilder_ != null) {
           return metadataBuilder_.getMessageOrBuilder();
         } else {
           return metadata_ == null
-              ? akka.persistence.typed.serialization.ReplicatedEventSourcing
+              ? org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData.getDefaultInstance()
               : metadata_;
         }
       }
       /** optional .ReplicatedPublishedEventMetaData metadata = 5; */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaData.Builder,
-              akka.persistence.typed.serialization.ReplicatedEventSourcing
+              org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                   .ReplicatedPublishedEventMetaDataOrBuilder>
           getMetadataFieldBuilder() {
         if (metadataBuilder_ == null) {
           metadataBuilder_ =
-              new akka.protobufv3.internal.SingleFieldBuilderV3<
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedPublishedEventMetaData,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedPublishedEventMetaData.Builder,
-                  akka.persistence.typed.serialization.ReplicatedEventSourcing
+                  org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
                       .ReplicatedPublishedEventMetaDataOrBuilder>(
                   getMetadata(), getParentForChildren(), isClean());
           metadata_ = null;
@@ -12236,13 +12894,13 @@ public final class ReplicatedEventSourcing {
 
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -12250,101 +12908,104 @@ public final class ReplicatedEventSourcing {
     }
 
     // @@protoc_insertion_point(class_scope:PublishedEvent)
-    private static final akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+    private static final org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
         DEFAULT_INSTANCE;
 
     static {
       DEFAULT_INSTANCE =
-          new akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent();
+          new org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+              .PublishedEvent();
     }
 
-    public static akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+    public static org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing
+            .PublishedEvent
         getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
     @java.lang.Deprecated
-    public static final akka.protobufv3.internal.Parser PARSER =
-        new akka.protobufv3.internal.AbstractParser() {
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
           @java.lang.Override
           public PublishedEvent parsePartialFrom(
-              akka.protobufv3.internal.CodedInputStream input,
-              akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-              throws akka.protobufv3.internal.InvalidProtocolBufferException {
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
             return new PublishedEvent(input, extensionRegistry);
           }
         };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
+    public org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcing.PublishedEvent
         getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_Counter_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Counter_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_CounterUpdate_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_CounterUpdate_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_ORSet_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ORSet_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_ORSetDeltaGroup_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ORSetDeltaGroup_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_ORSetDeltaGroup_Entry_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ORSetDeltaGroup_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_VersionVector_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_VersionVector_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_VersionVector_Entry_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_VersionVector_Entry_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_ReplicatedEventMetadata_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ReplicatedEventMetadata_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_ReplicatedSnapshotMetadata_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ReplicatedSnapshotMetadata_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_ReplicatedSnapshotMetadata_Seen_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ReplicatedSnapshotMetadata_Seen_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_ReplicatedPublishedEventMetaData_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ReplicatedPublishedEventMetaData_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
       internal_static_PublishedEvent_descriptor;
-  private static final akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_PublishedEvent_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor getDescriptor() {
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
   }
 
-  private static akka.protobufv3.internal.Descriptors.FileDescriptor descriptor;
+  private static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor descriptor;
 
   static {
     java.lang.String[] descriptorData = {
@@ -12376,32 +13037,33 @@ public final class ReplicatedEventSourcing {
           + "\022\031\n\007payload\030\003 \001(\0132\010.Payload\022\021\n\ttimestamp"
           + "\030\004 \001(\003\0223\n\010metadata\030\005 \001(\0132!.ReplicatedPub"
           + "lishedEventMetaData*-\n\014ORSetDeltaOp\022\007\n\003A"
-          + "dd\020\000\022\n\n\006Remove\020\001\022\010\n\004Full\020\002B(\n$akka.persi"
+          + "dd\020\000\022\n\n\006Remove\020\001\022\010\n\004Full\020\002B(\n$org.apache.pekko.persi"
           + "stence.typed.serializationH\001"
     };
     descriptor =
-        akka.protobufv3.internal.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-            descriptorData,
-            new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
-              akka.remote.ContainerFormats.getDescriptor(),
-            });
+        org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
+            .internalBuildGeneratedFileFrom(
+                descriptorData,
+                new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
+                  org.apache.pekko.remote.ContainerFormats.getDescriptor(),
+                });
     internal_static_Counter_descriptor = getDescriptor().getMessageTypes().get(0);
     internal_static_Counter_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_Counter_descriptor,
             new java.lang.String[] {
               "Value",
             });
     internal_static_CounterUpdate_descriptor = getDescriptor().getMessageTypes().get(1);
     internal_static_CounterUpdate_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_CounterUpdate_descriptor,
             new java.lang.String[] {
               "Delta",
             });
     internal_static_ORSet_descriptor = getDescriptor().getMessageTypes().get(2);
     internal_static_ORSet_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_ORSet_descriptor,
             new java.lang.String[] {
               "OriginDc",
@@ -12414,7 +13076,7 @@ public final class ReplicatedEventSourcing {
             });
     internal_static_ORSetDeltaGroup_descriptor = getDescriptor().getMessageTypes().get(3);
     internal_static_ORSetDeltaGroup_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_ORSetDeltaGroup_descriptor,
             new java.lang.String[] {
               "Entries",
@@ -12422,14 +13084,14 @@ public final class ReplicatedEventSourcing {
     internal_static_ORSetDeltaGroup_Entry_descriptor =
         internal_static_ORSetDeltaGroup_descriptor.getNestedTypes().get(0);
     internal_static_ORSetDeltaGroup_Entry_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_ORSetDeltaGroup_Entry_descriptor,
             new java.lang.String[] {
               "Operation", "Underlying",
             });
     internal_static_VersionVector_descriptor = getDescriptor().getMessageTypes().get(4);
     internal_static_VersionVector_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_VersionVector_descriptor,
             new java.lang.String[] {
               "Entries",
@@ -12437,14 +13099,14 @@ public final class ReplicatedEventSourcing {
     internal_static_VersionVector_Entry_descriptor =
         internal_static_VersionVector_descriptor.getNestedTypes().get(0);
     internal_static_VersionVector_Entry_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_VersionVector_Entry_descriptor,
             new java.lang.String[] {
               "Key", "Version",
             });
     internal_static_ReplicatedEventMetadata_descriptor = getDescriptor().getMessageTypes().get(5);
     internal_static_ReplicatedEventMetadata_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_ReplicatedEventMetadata_descriptor,
             new java.lang.String[] {
               "OriginReplica", "OriginSequenceNr", "VersionVector", "Concurrent",
@@ -12452,7 +13114,7 @@ public final class ReplicatedEventSourcing {
     internal_static_ReplicatedSnapshotMetadata_descriptor =
         getDescriptor().getMessageTypes().get(6);
     internal_static_ReplicatedSnapshotMetadata_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_ReplicatedSnapshotMetadata_descriptor,
             new java.lang.String[] {
               "Version", "SeenPerReplica",
@@ -12460,7 +13122,7 @@ public final class ReplicatedEventSourcing {
     internal_static_ReplicatedSnapshotMetadata_Seen_descriptor =
         internal_static_ReplicatedSnapshotMetadata_descriptor.getNestedTypes().get(0);
     internal_static_ReplicatedSnapshotMetadata_Seen_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_ReplicatedSnapshotMetadata_Seen_descriptor,
             new java.lang.String[] {
               "ReplicaId", "SequenceNr",
@@ -12468,19 +13130,19 @@ public final class ReplicatedEventSourcing {
     internal_static_ReplicatedPublishedEventMetaData_descriptor =
         getDescriptor().getMessageTypes().get(7);
     internal_static_ReplicatedPublishedEventMetaData_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_ReplicatedPublishedEventMetaData_descriptor,
             new java.lang.String[] {
               "ReplicaId", "VersionVector",
             });
     internal_static_PublishedEvent_descriptor = getDescriptor().getMessageTypes().get(8);
     internal_static_PublishedEvent_fieldAccessorTable =
-        new akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
             internal_static_PublishedEvent_descriptor,
             new java.lang.String[] {
               "PersistenceId", "SequenceNr", "Payload", "Timestamp", "Metadata",
             });
-    akka.remote.ContainerFormats.getDescriptor();
+    org.apache.pekko.remote.ContainerFormats.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/akka-persistence-typed/src/main/protobuf/ReplicatedEventSourcing.proto b/akka-persistence-typed/src/main/protobuf/ReplicatedEventSourcing.proto
index 7c88bb18f7..1626a6d82c 100644
--- a/akka-persistence-typed/src/main/protobuf/ReplicatedEventSourcing.proto
+++ b/akka-persistence-typed/src/main/protobuf/ReplicatedEventSourcing.proto
@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-option java_package = "akka.persistence.typed.serialization";
+option java_package = "org.apache.pekko.persistence.typed.serialization";
 option optimize_for = SPEED;
 import "ContainerFormats.proto";
 
diff --git a/akka-persistence-typed/src/main/resources/reference.conf b/akka-persistence-typed/src/main/resources/reference.conf
index 43500138fd..1f02e84d32 100644
--- a/akka-persistence-typed/src/main/resources/reference.conf
+++ b/akka-persistence-typed/src/main/resources/reference.conf
@@ -1,18 +1,18 @@
 akka.actor {
 
-  serialization-identifiers."akka.persistence.typed.serialization.ReplicatedEventSourcingSerializer" = 40
+  serialization-identifiers."org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcingSerializer" = 40
 
-  serializers.replicated-event-sourcing = "akka.persistence.typed.serialization.ReplicatedEventSourcingSerializer"
+  serializers.replicated-event-sourcing = "org.apache.pekko.persistence.typed.serialization.ReplicatedEventSourcingSerializer"
 
   serialization-bindings {
-    "akka.persistence.typed.internal.VersionVector" = replicated-event-sourcing
-    "akka.persistence.typed.crdt.Counter" = replicated-event-sourcing
-    "akka.persistence.typed.crdt.Counter$Updated" = replicated-event-sourcing
-    "akka.persistence.typed.crdt.ORSet" = replicated-event-sourcing
-    "akka.persistence.typed.crdt.ORSet$DeltaOp" = replicated-event-sourcing
-    "akka.persistence.typed.internal.ReplicatedEventMetadata" = replicated-event-sourcing
-    "akka.persistence.typed.internal.ReplicatedSnapshotMetadata" = replicated-event-sourcing
-    "akka.persistence.typed.internal.PublishedEventImpl" = replicated-event-sourcing
+    "org.apache.pekko.persistence.typed.internal.VersionVector" = replicated-event-sourcing
+    "org.apache.pekko.persistence.typed.crdt.Counter" = replicated-event-sourcing
+    "org.apache.pekko.persistence.typed.crdt.Counter$Updated" = replicated-event-sourcing
+    "org.apache.pekko.persistence.typed.crdt.ORSet" = replicated-event-sourcing
+    "org.apache.pekko.persistence.typed.crdt.ORSet$DeltaOp" = replicated-event-sourcing
+    "org.apache.pekko.persistence.typed.internal.ReplicatedEventMetadata" = replicated-event-sourcing
+    "org.apache.pekko.persistence.typed.internal.ReplicatedSnapshotMetadata" = replicated-event-sourcing
+    "org.apache.pekko.persistence.typed.internal.PublishedEventImpl" = replicated-event-sourcing
   }
 }
 
@@ -32,7 +32,7 @@ akka.persistence.typed {
   # 'stash' effect.
   #
   # Possible options
-  # - drop - the message is published as a akka.actor.typed.Dropped message on the event bus
+  # - drop - the message is published as a org.apache.pekko.actor.typed.Dropped message on the event bus
   # - fail - an exception is thrown so that the actor is failed
   stash-overflow-strategy = "drop"
 
@@ -41,7 +41,7 @@ akka.persistence.typed {
   log-stashing = off
 
   # By default, internal event sourced behavior logging are sent to
-  # akka.persistence.typed.internal.EventSourcedBehaviorImpl
+  # org.apache.pekko.persistence.typed.internal.EventSourcedBehaviorImpl
   # this can be changed by setting this to 'true' in which case the internal logging is sent to
   # the actor context logger.
   use-context-logger-for-internal-logging = false
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/EventAdapter.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventAdapter.scala
similarity index 87%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/EventAdapter.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventAdapter.scala
index 892224937c..f5a9855da9 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/EventAdapter.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventAdapter.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import scala.annotation.varargs
 import scala.collection.immutable
 
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.annotation.InternalApi
 
 /**
  * Facility to convert from and to specialised data models, as may be required by specialized persistence Journals.
@@ -81,7 +82,7 @@ object EventSeq {
 
   /** Java API */
   final def create[A](events: java.util.List[A]): EventSeq[A] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     EventsSeq(events.asScala.toList)
   }
 
@@ -91,26 +92,26 @@ object EventSeq {
 }
 
 /** INTERNAL API */
-@InternalApi private[akka] final case class SingleEventSeq[A](event: A) extends EventSeq[A] {
+@InternalApi private[pekko] final case class SingleEventSeq[A](event: A) extends EventSeq[A] {
   override def events: immutable.Seq[A] = List(event)
   override def size: Int = 1
 }
 
 /** INTERNAL API */
-@InternalApi private[akka] case object EmptyEventSeq extends EventSeq[Nothing] {
+@InternalApi private[pekko] case object EmptyEventSeq extends EventSeq[Nothing] {
   override def events: immutable.Seq[Nothing] = Nil
   override def size: Int = 0
 }
 
 /** INTERNAL API */
-@InternalApi private[akka] final case class EventsSeq[A](override val events: immutable.Seq[A]) extends EventSeq[A] {
+@InternalApi private[pekko] final case class EventsSeq[A](override val events: immutable.Seq[A]) extends EventSeq[A] {
   override def size: Int = events.size
 }
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object NoOpEventAdapter {
+@InternalApi private[pekko] object NoOpEventAdapter {
   private val i = new NoOpEventAdapter[Nothing]
   def instance[E]: NoOpEventAdapter[E] = i.asInstanceOf[NoOpEventAdapter[E]]
 }
@@ -118,7 +119,7 @@ object EventSeq {
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] class NoOpEventAdapter[E] extends EventAdapter[E, Any] {
+@InternalApi private[pekko] class NoOpEventAdapter[E] extends EventAdapter[E, Any] {
   override def toJournal(e: E): Any = e
   override def fromJournal(p: Any, manifest: String): EventSeq[E] = EventSeq.single(p.asInstanceOf[E])
   override def manifest(event: E): String = ""
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/EventRejectedException.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventRejectedException.scala
similarity index 89%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/EventRejectedException.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventRejectedException.scala
index 9283639fec..362ad69c1a 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/EventRejectedException.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventRejectedException.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 /**
  * Thrown if a journal rejects an event e.g. due to a serialization error.
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/EventSourcedSignal.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventSourcedSignal.scala
similarity index 92%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/EventSourcedSignal.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventSourcedSignal.scala
index c911066e50..5bbbd6fa1f 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/EventSourcedSignal.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventSourcedSignal.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
-import akka.actor.typed.Signal
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.typed.Signal
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
 
 /**
  * Supertype for all Akka Persistence Typed specific signals
@@ -64,7 +65,7 @@ object SnapshotMetadata {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def fromClassic(metadata: akka.persistence.SnapshotMetadata): SnapshotMetadata =
+  @InternalApi private[pekko] def fromClassic(metadata: pekko.persistence.SnapshotMetadata): SnapshotMetadata =
     new SnapshotMetadata(metadata.persistenceId, metadata.sequenceNr, metadata.timestamp)
 }
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/PersistenceId.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/PersistenceId.scala
similarity index 99%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/PersistenceId.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/PersistenceId.scala
index 61500573e3..29ce53f60d 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/PersistenceId.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/PersistenceId.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 object PersistenceId {
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/PublishedEvent.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/PublishedEvent.scala
similarity index 85%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/PublishedEvent.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/PublishedEvent.scala
index 27bf5dd408..d89ff9d582 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/PublishedEvent.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/PublishedEvent.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import java.util.Optional
 
-import akka.annotation.DoNotInherit
-import akka.persistence.typed.internal.ReplicatedPublishedEventMetaData
+import org.apache.pekko
+import pekko.annotation.DoNotInherit
+import pekko.persistence.typed.internal.ReplicatedPublishedEventMetaData
 
 /**
  * When using event publishing the events published to the system event stream will be in this form.
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/ReplicaId.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/ReplicaId.scala
similarity index 84%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/ReplicaId.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/ReplicaId.scala
index c161706cea..f204b0f9e7 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/ReplicaId.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/ReplicaId.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 /**
  * Identifies a replica in Replicated Event Sourcing, could be a datacenter name or a logical identifier.
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/ReplicationId.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/ReplicationId.scala
similarity index 96%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/ReplicationId.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/ReplicationId.scala
index 47c994fbc3..26c8f073b1 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/ReplicationId.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/ReplicationId.scala
@@ -2,10 +2,10 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 object ReplicationId {
-  private[akka] val Separator = '|'
+  private[pekko] val Separator = '|'
   def fromString(id: String): ReplicationId = {
     val split = id.split("\\|")
     require(split.size == 3, s"invalid replication id $id")
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/SnapshotAdapter.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/SnapshotAdapter.scala
similarity index 94%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/SnapshotAdapter.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/SnapshotAdapter.scala
index 3354a465f8..f859f76f79 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/SnapshotAdapter.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/SnapshotAdapter.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 /**
  * Facility to convert snapshots from and to a specialized data model.
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/SnapshotSelectionCriteria.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/SnapshotSelectionCriteria.scala
similarity index 82%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/SnapshotSelectionCriteria.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/SnapshotSelectionCriteria.scala
index c603348be0..c035b3b2a8 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/SnapshotSelectionCriteria.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/SnapshotSelectionCriteria.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
-import akka.annotation.InternalApi
-import akka.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria }
-import akka.util.HashCode
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria }
+import pekko.util.HashCode
 
 object SnapshotSelectionCriteria {
 
@@ -29,7 +30,7 @@ object SnapshotSelectionCriteria {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def fromClassic(c: ClassicSnapshotSelectionCriteria): SnapshotSelectionCriteria =
+  @InternalApi private[pekko] def fromClassic(c: ClassicSnapshotSelectionCriteria): SnapshotSelectionCriteria =
     new SnapshotSelectionCriteria(c.maxSequenceNr, c.maxTimestamp, c.minSequenceNr, c.minTimestamp)
 
 }
@@ -37,7 +38,7 @@ object SnapshotSelectionCriteria {
 /**
  * Selection criteria for loading and deleting snapshots.
  */
-final class SnapshotSelectionCriteria @InternalApi private[akka] (
+final class SnapshotSelectionCriteria @InternalApi private[pekko] (
     val maxSequenceNr: Long,
     val maxTimestamp: Long,
     val minSequenceNr: Long,
@@ -82,8 +83,8 @@ final class SnapshotSelectionCriteria @InternalApi private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def toClassic: akka.persistence.SnapshotSelectionCriteria =
-    akka.persistence.SnapshotSelectionCriteria(maxSequenceNr, maxTimestamp, minSequenceNr, minTimestamp)
+  @InternalApi private[pekko] def toClassic: pekko.persistence.SnapshotSelectionCriteria =
+    pekko.persistence.SnapshotSelectionCriteria(maxSequenceNr, maxTimestamp, minSequenceNr, minTimestamp)
 
   override def equals(other: Any): Boolean = other match {
     case that: SnapshotSelectionCriteria =>
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/Counter.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/Counter.scala
similarity index 92%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/Counter.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/Counter.scala
index 7725193f9a..19a176ea15 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/Counter.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/Counter.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.crdt
+package org.apache.pekko.persistence.typed.crdt
 
 object Counter {
   val empty: Counter = Counter(0)
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/LwwTime.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/LwwTime.scala
similarity index 90%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/LwwTime.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/LwwTime.scala
index 433949ced2..135b0029fe 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/LwwTime.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/LwwTime.scala
@@ -2,8 +2,8 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.crdt
-import akka.persistence.typed.ReplicaId
+package org.apache.pekko.persistence.typed.crdt
+import org.apache.pekko.persistence.typed.ReplicaId
 
 /**
  * Utility class for comparing timestamp replica
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/ORSet.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala
similarity index 92%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/ORSet.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala
index ba1578ae98..a0097068e0 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/ORSet.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.crdt
+package org.apache.pekko.persistence.typed.crdt
 
 import scala.annotation.tailrec
 import scala.collection.immutable
-import akka.util.HashCode
-import akka.annotation.InternalApi
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.crdt.ORSet.DeltaOp
-import akka.persistence.typed.internal.{ ManyVersionVector, OneVersionVector, VersionVector }
+import org.apache.pekko
+import pekko.util.HashCode
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.crdt.ORSet.DeltaOp
+import pekko.persistence.typed.internal.{ ManyVersionVector, OneVersionVector, VersionVector }
 
 object ORSet {
   def empty[A](originReplica: ReplicaId): ORSet[A] = new ORSet(originReplica.id, Map.empty, VersionVector.empty)
@@ -29,7 +30,7 @@ object ORSet {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] type Dot = VersionVector
+  @InternalApi private[pekko] type Dot = VersionVector
 
   sealed trait DeltaOp {
     def merge(that: DeltaOp): DeltaOp
@@ -38,12 +39,12 @@ object ORSet {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] sealed abstract class AtomicDeltaOp[A] extends DeltaOp {
+  @InternalApi private[pekko] sealed abstract class AtomicDeltaOp[A] extends DeltaOp {
     def underlying: ORSet[A]
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] final case class AddDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
+  @InternalApi private[pekko] final case class AddDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
 
     override def merge(that: DeltaOp): DeltaOp = that match {
       case AddDeltaOp(u) =>
@@ -67,7 +68,7 @@ object ORSet {
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] final case class RemoveDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
+  @InternalApi private[pekko] final case class RemoveDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
     if (underlying.size != 1)
       throw new IllegalArgumentException(s"RemoveDeltaOp should contain one removed element, but was $underlying")
 
@@ -78,7 +79,7 @@ object ORSet {
   }
 
   /** INTERNAL API: Used for `clear` but could be used for other cases also */
-  @InternalApi private[akka] final case class FullStateDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
+  @InternalApi private[pekko] final case class FullStateDeltaOp[A](underlying: ORSet[A]) extends AtomicDeltaOp[A] {
     override def merge(that: DeltaOp): DeltaOp = that match {
       case _: AtomicDeltaOp[A @unchecked] => DeltaGroup(Vector(this, that))
       case DeltaGroup(ops)                => DeltaGroup(this +: ops)
@@ -88,7 +89,7 @@ object ORSet {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] final case class DeltaGroup[A](ops: immutable.IndexedSeq[DeltaOp]) extends DeltaOp {
+  @InternalApi private[pekko] final case class DeltaGroup[A](ops: immutable.IndexedSeq[DeltaOp]) extends DeltaOp {
     override def merge(that: DeltaOp): DeltaOp = that match {
       case thatAdd: AddDeltaOp[A @unchecked] =>
         // merge AddDeltaOp into last AddDeltaOp in the group, if possible
@@ -111,7 +112,7 @@ object ORSet {
    *         [{a, 4}, {b, 1}, {c, 1}, {d, 14}, {e, 5}, {f, 2}] =
    *         [{b, 2}, {g, 22}]
    */
-  @InternalApi private[akka] def subtractDots(dot: Dot, vvector: VersionVector): Dot = {
+  @InternalApi private[pekko] def subtractDots(dot: Dot, vvector: VersionVector): Dot = {
 
     @tailrec def dropDots(remaining: List[(String, Long)], acc: List[(String, Long)]): List[(String, Long)] =
       remaining match {
@@ -146,7 +147,7 @@ object ORSet {
    * INTERNAL API
    * @see [[ORSet#merge]]
    */
-  @InternalApi private[akka] def mergeCommonKeys[A](
+  @InternalApi private[pekko] def mergeCommonKeys[A](
       commonKeys: Set[A],
       lhs: ORSet[A],
       rhs: ORSet[A]): Map[A, ORSet.Dot] =
@@ -218,7 +219,7 @@ object ORSet {
    * INTERNAL API
    * @see [[ORSet#merge]]
    */
-  @InternalApi private[akka] def mergeDisjointKeys[A](
+  @InternalApi private[pekko] def mergeDisjointKeys[A](
       keys: Set[A],
       elementsMap: Map[A, ORSet.Dot],
       vvector: VersionVector,
@@ -273,10 +274,10 @@ object ORSet {
  *
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
-final class ORSet[A] private[akka] (
+final class ORSet[A] private[pekko] (
     val originReplica: String,
-    private[akka] val elementsMap: Map[A, ORSet.Dot],
-    private[akka] val vvector: VersionVector)
+    private[pekko] val elementsMap: Map[A, ORSet.Dot],
+    private[pekko] val vvector: VersionVector)
     extends OpCrdt[DeltaOp] {
 
   type T = ORSet[A]
@@ -291,7 +292,7 @@ final class ORSet[A] private[akka] (
    * Java API
    */
   def getElements(): java.util.Set[A] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     elements.asJava
   }
 
@@ -320,7 +321,7 @@ final class ORSet[A] private[akka] (
    * `elems` must not be empty.
    */
   def addAll(elems: java.util.Set[A]): ORSet.DeltaOp = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     addAll(elems.asScala.toSet)
   }
 
@@ -362,7 +363,7 @@ final class ORSet[A] private[akka] (
    * `elems` must not be empty.
    */
   def removeAll(elems: java.util.Set[A]): ORSet.DeltaOp = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     removeAll(elems.asScala.toSet)
   }
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/OpCrdt.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/OpCrdt.scala
similarity index 69%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/OpCrdt.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/OpCrdt.scala
index 16309c39e2..84fd9ab666 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/crdt/OpCrdt.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/OpCrdt.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.crdt
+package org.apache.pekko.persistence.typed.crdt
 
-import akka.annotation.DoNotInherit
+import org.apache.pekko.annotation.DoNotInherit
 
 @DoNotInherit
 trait OpCrdt[Operation] { self =>
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/delivery/EventSourcedProducerQueue.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/delivery/EventSourcedProducerQueue.scala
similarity index 93%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/delivery/EventSourcedProducerQueue.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/delivery/EventSourcedProducerQueue.scala
index 04e355f64f..427cdadde0 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/delivery/EventSourcedProducerQueue.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/delivery/EventSourcedProducerQueue.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.delivery
+package org.apache.pekko.persistence.typed.delivery
 
 import java.time.{ Duration => JavaDuration }
 
@@ -10,22 +10,23 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.delivery.DurableProducerQueue
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.annotation.ApiMayChange
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.delivery.EventSourcedProducerQueue.CleanupTick
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.RetentionCriteria
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.delivery.DurableProducerQueue
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.annotation.ApiMayChange
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.delivery.EventSourcedProducerQueue.CleanupTick
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.RetentionCriteria
+import pekko.util.JavaDurationConverters._
 
 /**
- * [[DurableProducerQueue]] that can be used with [[akka.actor.typed.delivery.ProducerController]]
+ * [[DurableProducerQueue]] that can be used with [[pekko.actor.typed.delivery.ProducerController]]
  * for reliable delivery of messages. It is implemented with Event Sourcing and stores one
  * event before sending the message to the destination and one event for the confirmation
  * that the message has been delivered and processed.
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/BehaviorSetup.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/BehaviorSetup.scala
similarity index 87%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/BehaviorSetup.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/BehaviorSetup.scala
index 896c2a88c1..de25c4175b 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/BehaviorSetup.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/BehaviorSetup.scala
@@ -2,31 +2,32 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import scala.concurrent.ExecutionContext
 import scala.util.control.NonFatal
 
-import akka.actor.Cancellable
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.{ ActorRef => ClassicActorRef }
-import akka.annotation.InternalApi
-import akka.persistence._
-import akka.persistence.typed.EventAdapter
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.SnapshotAdapter
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.RetentionCriteria
-import akka.util.OptionVal
+import org.apache.pekko
+import pekko.actor.Cancellable
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.{ ActorRef => ClassicActorRef }
+import pekko.annotation.InternalApi
+import pekko.persistence._
+import pekko.persistence.typed.EventAdapter
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.SnapshotAdapter
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.RetentionCriteria
+import pekko.util.OptionVal
 import org.slf4j.Logger
 import org.slf4j.MDC
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object BehaviorSetup {
+@InternalApi private[pekko] object BehaviorSetup {
   sealed trait SnapshotAfterPersist
   case object NoSnapshot extends SnapshotAfterPersist
   case object SnapshotWithRetention extends SnapshotAfterPersist
@@ -37,7 +38,7 @@ import org.slf4j.MDC
  * INTERNAL API: Carry state for the Persistent behavior implementation behaviors.
  */
 @InternalApi
-private[akka] final class BehaviorSetup[C, E, S](
+private[pekko] final class BehaviorSetup[C, E, S](
     val context: ActorContext[InternalProtocol],
     val persistenceId: PersistenceId,
     val emptyState: S,
@@ -60,7 +61,7 @@ private[akka] final class BehaviorSetup[C, E, S](
 
   import BehaviorSetup._
   import InternalProtocol.RecoveryTickEvent
-  import akka.actor.typed.scaladsl.adapter._
+  import pekko.actor.typed.scaladsl.adapter._
 
   val persistence: Persistence = Persistence(context.system.toClassic)
 
@@ -163,7 +164,7 @@ private[akka] final class BehaviorSetup[C, E, S](
  * INTERNAL API
  */
 @InternalApi
-private[akka] object PersistenceMdc {
+private[pekko] object PersistenceMdc {
   // format: OFF
   val Initializing      = "initializing"
   val AwaitingPermit    = "get-permit"
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EffectImpl.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EffectImpl.scala
similarity index 73%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EffectImpl.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EffectImpl.scala
index 6427d249da..8fbff49ad6 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EffectImpl.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EffectImpl.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import scala.collection.immutable
 
-import akka.actor.typed.ActorRef
-import akka.annotation.InternalApi
-import akka.persistence.typed.javadsl
-import akka.persistence.typed.scaladsl
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.javadsl
+import pekko.persistence.typed.scaladsl
 
 /** INTERNAL API */
 @InternalApi
-private[akka] abstract class EffectImpl[+Event, State]
+private[pekko] abstract class EffectImpl[+Event, State]
     extends javadsl.EffectBuilder[Event, State]
     with javadsl.ReplyEffect[Event, State]
     with scaladsl.ReplyEffect[Event, State]
@@ -41,7 +42,7 @@ private[akka] abstract class EffectImpl[+Event, State]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] object CompositeEffect {
+private[pekko] object CompositeEffect {
   def apply[Event, State](
       effect: scaladsl.EffectBuilder[Event, State],
       sideEffects: SideEffect[State]): CompositeEffect[Event, State] =
@@ -50,7 +51,7 @@ private[akka] object CompositeEffect {
 
 /** INTERNAL API */
 @InternalApi
-private[akka] final case class CompositeEffect[Event, State](
+private[pekko] final case class CompositeEffect[Event, State](
     persistingEffect: scaladsl.EffectBuilder[Event, State],
     _sideEffects: immutable.Seq[SideEffect[State]])
     extends EffectImpl[Event, State] {
@@ -63,11 +64,11 @@ private[akka] final case class CompositeEffect[Event, State](
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object PersistNothing extends EffectImpl[Nothing, Nothing]
+private[pekko] case object PersistNothing extends EffectImpl[Nothing, Nothing]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] final case class Persist[Event, State](event: Event) extends EffectImpl[Event, State] {
+private[pekko] final case class Persist[Event, State](event: Event) extends EffectImpl[Event, State] {
   override def events = event :: Nil
 
   override def toString: String = s"Persist(${event.getClass.getName})"
@@ -75,7 +76,7 @@ private[akka] final case class Persist[Event, State](event: Event) extends Effec
 
 /** INTERNAL API */
 @InternalApi
-private[akka] final case class PersistAll[Event, State](override val events: immutable.Seq[Event])
+private[pekko] final case class PersistAll[Event, State](override val events: immutable.Seq[Event])
     extends EffectImpl[Event, State] {
 
   override def toString: String = s"PersistAll(${events.map(_.getClass.getName).mkString(",")})"
@@ -83,8 +84,8 @@ private[akka] final case class PersistAll[Event, State](override val events: imm
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object Unhandled extends EffectImpl[Nothing, Nothing]
+private[pekko] case object Unhandled extends EffectImpl[Nothing, Nothing]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object Stash extends EffectImpl[Nothing, Nothing]
+private[pekko] case object Stash extends EffectImpl[Nothing, Nothing]
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedBehaviorImpl.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedBehaviorImpl.scala
similarity index 83%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedBehaviorImpl.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedBehaviorImpl.scala
index 2631010fa6..afc16a903f 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedBehaviorImpl.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedBehaviorImpl.scala
@@ -2,58 +2,59 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import java.util.Optional
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicInteger
 
-import akka.actor.typed
-import akka.actor.typed.ActorRef
-import akka.actor.typed.BackoffSupervisorStrategy
-import akka.actor.typed.Behavior
-import akka.actor.typed.BehaviorInterceptor
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.internal.ActorContextImpl
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.annotation._
-import akka.persistence.JournalProtocol
-import akka.persistence.Recovery
-import akka.persistence.RecoveryPermitter
-import akka.persistence.SnapshotProtocol
-import akka.persistence.journal.Tagged
-import akka.persistence.typed.DeleteEventsCompleted
-import akka.persistence.typed.DeleteEventsFailed
-import akka.persistence.typed.DeleteSnapshotsCompleted
-import akka.persistence.typed.DeleteSnapshotsFailed
-import akka.persistence.typed.DeletionTarget
-import akka.persistence.typed.EventAdapter
-import akka.persistence.typed.NoOpEventAdapter
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.PublishedEvent
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.SnapshotAdapter
-import akka.persistence.typed.SnapshotCompleted
-import akka.persistence.typed.SnapshotFailed
-import akka.persistence.typed.SnapshotSelectionCriteria
-import akka.persistence.typed.scaladsl.RetentionCriteria
-import akka.persistence.typed.scaladsl._
-import akka.persistence.typed.scaladsl.{ Recovery => TypedRecovery }
-import akka.util.ConstantFun
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.typed
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.BackoffSupervisorStrategy
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.BehaviorInterceptor
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.Signal
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.internal.ActorContextImpl
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.annotation._
+import pekko.persistence.JournalProtocol
+import pekko.persistence.Recovery
+import pekko.persistence.RecoveryPermitter
+import pekko.persistence.SnapshotProtocol
+import pekko.persistence.journal.Tagged
+import pekko.persistence.typed.DeleteEventsCompleted
+import pekko.persistence.typed.DeleteEventsFailed
+import pekko.persistence.typed.DeleteSnapshotsCompleted
+import pekko.persistence.typed.DeleteSnapshotsFailed
+import pekko.persistence.typed.DeletionTarget
+import pekko.persistence.typed.EventAdapter
+import pekko.persistence.typed.NoOpEventAdapter
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.PublishedEvent
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.SnapshotAdapter
+import pekko.persistence.typed.SnapshotCompleted
+import pekko.persistence.typed.SnapshotFailed
+import pekko.persistence.typed.SnapshotSelectionCriteria
+import pekko.persistence.typed.scaladsl.RetentionCriteria
+import pekko.persistence.typed.scaladsl._
+import pekko.persistence.typed.scaladsl.{ Recovery => TypedRecovery }
+import pekko.util.ConstantFun
+import pekko.util.unused
 import org.slf4j.LoggerFactory
 
 @InternalApi
-private[akka] object EventSourcedBehaviorImpl {
+private[pekko] object EventSourcedBehaviorImpl {
 
   object WriterIdentity {
 
     // ok to wrap around (2*Int.MaxValue restarts will not happen within a journal roundtrip)
-    private[akka] val instanceIdCounter = new AtomicInteger(1)
+    private[pekko] val instanceIdCounter = new AtomicInteger(1)
 
     def newIdentity(): WriterIdentity = {
       val instanceId: Int = WriterIdentity.instanceIdCounter.getAndIncrement()
@@ -87,7 +88,7 @@ private[akka] object EventSourcedBehaviorImpl {
 }
 
 @InternalApi
-private[akka] final case class EventSourcedBehaviorImpl[Command, Event, State](
+private[pekko] final case class EventSourcedBehaviorImpl[Command, Event, State](
     persistenceId: PersistenceId,
     emptyState: State,
     commandHandler: EventSourcedBehavior.CommandHandler[Command, Event, State],
@@ -235,7 +236,7 @@ private[akka] final case class EventSourcedBehaviorImpl[Command, Event, State](
   }
 
   @InternalStableApi
-  private[akka] def initialize(@unused context: ActorContext[_]): Unit = ()
+  private[pekko] def initialize(@unused context: ActorContext[_]): Unit = ()
 
   override def receiveSignal(
       handler: PartialFunction[(State, Signal), Unit]): EventSourcedBehavior[Command, Event, State] =
@@ -283,7 +284,7 @@ private[akka] final case class EventSourcedBehaviorImpl[Command, Event, State](
     copy(publishEvents = enabled)
   }
 
-  override private[akka] def withReplication(
+  override private[pekko] def withReplication(
       context: ReplicationContextImpl): EventSourcedBehavior[Command, Event, State] = {
     copy(
       replication = Some(ReplicationSetup(context.replicationId.replicaId, context.replicasAndQueryPlugins, context)))
@@ -291,11 +292,11 @@ private[akka] final case class EventSourcedBehaviorImpl[Command, Event, State](
 }
 
 /** Protocol used internally by the eventsourced behaviors. */
-@InternalApi private[akka] sealed trait InternalProtocol
-@InternalApi private[akka] object InternalProtocol {
+@InternalApi private[pekko] sealed trait InternalProtocol
+@InternalApi private[pekko] object InternalProtocol {
   case object RecoveryPermitGranted extends InternalProtocol
-  final case class JournalResponse(msg: akka.persistence.JournalProtocol.Response) extends InternalProtocol
-  final case class SnapshotterResponse(msg: akka.persistence.SnapshotProtocol.Response) extends InternalProtocol
+  final case class JournalResponse(msg: pekko.persistence.JournalProtocol.Response) extends InternalProtocol
+  final case class SnapshotterResponse(msg: pekko.persistence.SnapshotProtocol.Response) extends InternalProtocol
   final case class RecoveryTickEvent(snapshot: Boolean) extends InternalProtocol
   final case class IncomingCommand[C](c: C) extends InternalProtocol
 
@@ -320,7 +321,7 @@ object ReplicatedEventMetadata {
  *                at each location as they are received at different times
  */
 @InternalApi
-private[akka] final case class ReplicatedEventMetadata(
+private[pekko] final case class ReplicatedEventMetadata(
     originReplica: ReplicaId,
     originSequenceNr: Long,
     version: VersionVector,
@@ -340,7 +341,7 @@ object ReplicatedSnapshotMetadata {
 }
 
 @InternalApi
-private[akka] final case class ReplicatedSnapshotMetadata(version: VersionVector, seenPerReplica: Map[ReplicaId, Long])
+private[pekko] final case class ReplicatedSnapshotMetadata(version: VersionVector, seenPerReplica: Map[ReplicaId, Long])
 
 /**
  * An event replicated from a different replica.
@@ -349,21 +350,21 @@ private[akka] final case class ReplicatedSnapshotMetadata(version: VersionVector
  * merged with the current local version.
  */
 @InternalApi
-private[akka] final case class ReplicatedEvent[E](
+private[pekko] final case class ReplicatedEvent[E](
     event: E,
     originReplica: ReplicaId,
     originSequenceNr: Long,
     originVersion: VersionVector)
 @InternalApi
-private[akka] case object ReplicatedEventAck
+private[pekko] case object ReplicatedEventAck
 
-final class ReplicatedPublishedEventMetaData(val replicaId: ReplicaId, private[akka] val version: VersionVector)
+final class ReplicatedPublishedEventMetaData(val replicaId: ReplicaId, private[pekko] val version: VersionVector)
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] final case class PublishedEventImpl(
+private[pekko] final case class PublishedEventImpl(
     persistenceId: PersistenceId,
     sequenceNumber: Long,
     payload: Any,
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedSettings.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedSettings.scala
similarity index 88%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedSettings.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedSettings.scala
index f2ce630d62..36e48a1258 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedSettings.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/EventSourcedSettings.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import java.util.concurrent.TimeUnit
 
@@ -10,14 +10,15 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.actor.typed.ActorSystem
-import akka.annotation.InternalApi
-import akka.persistence.Persistence
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.annotation.InternalApi
+import pekko.persistence.Persistence
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object EventSourcedSettings {
+@InternalApi private[pekko] object EventSourcedSettings {
 
   def apply(system: ActorSystem[_], journalPluginId: String, snapshotPluginId: String): EventSourcedSettings =
     apply(system.settings.config, journalPluginId, snapshotPluginId)
@@ -73,7 +74,7 @@ import akka.persistence.Persistence
  * INTERNAL API
  */
 @InternalApi
-private[akka] final case class EventSourcedSettings(
+private[pekko] final case class EventSourcedSettings(
     stashCapacity: Int,
     stashOverflowStrategy: StashOverflowStrategy,
     logOnStashing: Boolean,
@@ -93,13 +94,13 @@ private[akka] final case class EventSourcedSettings(
  * INTERNAL API
  */
 @InternalApi
-private[akka] sealed trait StashOverflowStrategy
+private[pekko] sealed trait StashOverflowStrategy
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object StashOverflowStrategy {
+private[pekko] object StashOverflowStrategy {
   case object Drop extends StashOverflowStrategy
   case object Fail extends StashOverflowStrategy
 }
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ExternalInteractions.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ExternalInteractions.scala
similarity index 87%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ExternalInteractions.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ExternalInteractions.scala
index fbd173837e..6aa10ddce0 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ExternalInteractions.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ExternalInteractions.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import scala.collection.immutable
-import akka.actor.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.PreRestart
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.annotation.InternalApi
-import akka.annotation.InternalStableApi
-import akka.persistence._
-import akka.persistence.JournalProtocol.ReplayMessages
-import akka.persistence.SnapshotProtocol.LoadSnapshot
-import akka.util.{ unused, OptionVal }
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.PreRestart
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.annotation.InternalApi
+import pekko.annotation.InternalStableApi
+import pekko.persistence._
+import pekko.persistence.JournalProtocol.ReplayMessages
+import pekko.persistence.SnapshotProtocol.LoadSnapshot
+import pekko.util.{ unused, OptionVal }
 
 /** INTERNAL API */
 @InternalApi
-private[akka] object JournalInteractions {
+private[pekko] object JournalInteractions {
 
   type EventOrTaggedOrReplicated = Any // `Any` since can be `E` or `Tagged` or a `ReplicatedEvent`
 
@@ -35,7 +36,7 @@ private[akka] object JournalInteractions {
 
 /** INTERNAL API */
 @InternalApi
-private[akka] trait JournalInteractions[C, E, S] {
+private[pekko] trait JournalInteractions[C, E, S] {
 
   import JournalInteractions._
 
@@ -75,7 +76,7 @@ private[akka] trait JournalInteractions[C, E, S] {
   }
 
   @InternalStableApi
-  private[akka] def onWriteInitiated(
+  private[pekko] def onWriteInitiated(
       @unused ctx: ActorContext[_],
       @unused cmd: Any,
       @unused repr: PersistentRepr): Unit = ()
@@ -116,7 +117,7 @@ private[akka] trait JournalInteractions[C, E, S] {
   }
 
   @InternalStableApi
-  private[akka] def onWritesInitiated(
+  private[pekko] def onWritesInitiated(
       @unused ctx: ActorContext[_],
       @unused cmd: Any,
       @unused repr: immutable.Seq[PersistentRepr]): Unit = ()
@@ -153,7 +154,7 @@ private[akka] trait JournalInteractions[C, E, S] {
   }
 
   /**
-   * On [[akka.persistence.SaveSnapshotSuccess]], if `SnapshotCountRetentionCriteria.deleteEventsOnSnapshot`
+   * On [[pekko.persistence.SaveSnapshotSuccess]], if `SnapshotCountRetentionCriteria.deleteEventsOnSnapshot`
    * is enabled, old messages are deleted based on `SnapshotCountRetentionCriteria.snapshotEveryNEvents`
    * before old snapshots are deleted.
    */
@@ -180,7 +181,7 @@ private[akka] trait JournalInteractions[C, E, S] {
 
 /** INTERNAL API */
 @InternalApi
-private[akka] trait SnapshotInteractions[C, E, S] {
+private[pekko] trait SnapshotInteractions[C, E, S] {
 
   def setup: BehaviorSetup[C, E, S]
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/FastForwardingFilter.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/FastForwardingFilter.scala
similarity index 75%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/FastForwardingFilter.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/FastForwardingFilter.scala
index 0a3a6221f5..37d50a6bb8 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/FastForwardingFilter.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/FastForwardingFilter.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.annotation.InternalApi
-import akka.persistence.query.EventEnvelope
-import akka.stream.Attributes
-import akka.stream.FlowShape
-import akka.stream.Inlet
-import akka.stream.Outlet
-import akka.stream.stage.GraphStageLogic
-import akka.stream.stage.GraphStageWithMaterializedValue
-import akka.stream.stage.InHandler
-import akka.stream.stage.OutHandler
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.query.EventEnvelope
+import pekko.stream.Attributes
+import pekko.stream.FlowShape
+import pekko.stream.Inlet
+import pekko.stream.Outlet
+import pekko.stream.stage.GraphStageLogic
+import pekko.stream.stage.GraphStageWithMaterializedValue
+import pekko.stream.stage.InHandler
+import pekko.stream.stage.OutHandler
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] trait ReplicationStreamControl {
+private[pekko] trait ReplicationStreamControl {
   def fastForward(sequenceNumber: Long): Unit
 }
 
@@ -27,7 +28,7 @@ private[akka] trait ReplicationStreamControl {
  * INTERNAL API
  */
 @InternalApi
-private[akka] class FastForwardingFilter
+private[pekko] class FastForwardingFilter
     extends GraphStageWithMaterializedValue[FlowShape[EventEnvelope, EventEnvelope], ReplicationStreamControl] {
 
   val in = Inlet[EventEnvelope]("FastForwardingFilter.in")
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/JournalFailureException.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/JournalFailureException.scala
similarity index 62%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/JournalFailureException.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/JournalFailureException.scala
index 279005c6a8..928d2c47f5 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/JournalFailureException.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/JournalFailureException.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.PersistenceId
 
 /**
  * INTERNAL API
@@ -13,7 +14,7 @@ import akka.persistence.typed.PersistenceId
  * Used for journal failures. Private to akka as only internal supervision strategies should use it.
  */
 @InternalApi
-final private[akka] class JournalFailureException(msg: String, cause: Throwable) extends RuntimeException(msg, cause) {
+final private[pekko] class JournalFailureException(msg: String, cause: Throwable) extends RuntimeException(msg, cause) {
   def this(persistenceId: PersistenceId, sequenceNr: Long, eventType: String, cause: Throwable) =
     this(
       s"Failed to persist event type [$eventType] with sequence number [$sequenceNr] for persistenceId [${persistenceId.id}]",
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/NoOpSnapshotAdapter.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/NoOpSnapshotAdapter.scala
similarity index 57%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/NoOpSnapshotAdapter.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/NoOpSnapshotAdapter.scala
index 8c4318d8b4..ef3cc26621 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/NoOpSnapshotAdapter.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/NoOpSnapshotAdapter.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.SnapshotAdapter
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.SnapshotAdapter
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] class NoOpSnapshotAdapter extends SnapshotAdapter[Any] {
+private[pekko] class NoOpSnapshotAdapter extends SnapshotAdapter[Any] {
   override def toJournal(state: Any): Any = state
   override def fromJournal(from: Any): Any = from
 }
@@ -20,7 +21,7 @@ private[akka] class NoOpSnapshotAdapter extends SnapshotAdapter[Any] {
  * INTERNAL API
  */
 @InternalApi
-private[akka] object NoOpSnapshotAdapter {
+private[pekko] object NoOpSnapshotAdapter {
   val i = new NoOpSnapshotAdapter
   def instance[S]: SnapshotAdapter[S] = i.asInstanceOf[SnapshotAdapter[S]]
 }
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RecoveryImpl.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/RecoveryImpl.scala
similarity index 50%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RecoveryImpl.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/RecoveryImpl.scala
index b74c28c689..33a41351f4 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RecoveryImpl.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/RecoveryImpl.scala
@@ -2,41 +2,42 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.{ javadsl, scaladsl, SnapshotSelectionCriteria }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.{ javadsl, scaladsl, SnapshotSelectionCriteria }
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] case object DefaultRecovery extends javadsl.Recovery with scaladsl.Recovery {
+@InternalApi private[pekko] case object DefaultRecovery extends javadsl.Recovery with scaladsl.Recovery {
   override def asScala: scaladsl.Recovery = this
   override def asJava: javadsl.Recovery = this
 
   /**
    * INTERNAL API
    */
-  override private[akka] def toClassic = akka.persistence.Recovery()
+  override private[pekko] def toClassic = pekko.persistence.Recovery()
 }
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] case object DisabledRecovery extends javadsl.Recovery with scaladsl.Recovery {
+@InternalApi private[pekko] case object DisabledRecovery extends javadsl.Recovery with scaladsl.Recovery {
   override def asScala: scaladsl.Recovery = this
   override def asJava: javadsl.Recovery = this
 
   /**
    * INTERNAL API
    */
-  override private[akka] def toClassic = akka.persistence.Recovery.none
+  override private[pekko] def toClassic = pekko.persistence.Recovery.none
 }
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] case class RecoveryWithSnapshotSelectionCriteria(
+@InternalApi private[pekko] case class RecoveryWithSnapshotSelectionCriteria(
     snapshotSelectionCriteria: SnapshotSelectionCriteria)
     extends javadsl.Recovery
     with scaladsl.Recovery {
@@ -46,5 +47,5 @@ import akka.persistence.typed.{ javadsl, scaladsl, SnapshotSelectionCriteria }
   /**
    * INTERNAL API
    */
-  override private[akka] def toClassic = akka.persistence.Recovery(snapshotSelectionCriteria.toClassic)
+  override private[pekko] def toClassic = pekko.persistence.Recovery(snapshotSelectionCriteria.toClassic)
 }
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingEvents.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingEvents.scala
similarity index 89%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingEvents.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingEvents.scala
index 225de2fdb7..f4d5395994 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingEvents.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingEvents.scala
@@ -2,32 +2,33 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import scala.concurrent.duration._
 import scala.util.control.NonFatal
-import akka.actor.typed.{ Behavior, Signal }
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.internal.UnstashException
-import akka.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors, LoggerOps }
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.event.Logging
-import akka.persistence._
-import akka.persistence.JournalProtocol._
-import akka.persistence.typed.EmptyEventSeq
-import akka.persistence.typed.EventsSeq
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.RecoveryFailed
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.SingleEventSeq
-import akka.persistence.typed.internal.BehaviorSetup.SnapshotWithoutRetention
-import akka.persistence.typed.internal.EventSourcedBehaviorImpl.{ GetSeenSequenceNr, GetState }
-import akka.persistence.typed.internal.ReplayingEvents.ReplayingState
-import akka.persistence.typed.internal.Running.WithSeqNrAccessible
-import akka.persistence.typed.internal.Running.startReplicationStream
-import akka.util.OptionVal
-import akka.util.PrettyDuration._
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.typed.{ Behavior, Signal }
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.internal.UnstashException
+import pekko.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors, LoggerOps }
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.event.Logging
+import pekko.persistence._
+import pekko.persistence.JournalProtocol._
+import pekko.persistence.typed.EmptyEventSeq
+import pekko.persistence.typed.EventsSeq
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.RecoveryFailed
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.SingleEventSeq
+import pekko.persistence.typed.internal.BehaviorSetup.SnapshotWithoutRetention
+import pekko.persistence.typed.internal.EventSourcedBehaviorImpl.{ GetSeenSequenceNr, GetState }
+import pekko.persistence.typed.internal.ReplayingEvents.ReplayingState
+import pekko.persistence.typed.internal.Running.WithSeqNrAccessible
+import pekko.persistence.typed.internal.Running.startReplicationStream
+import pekko.util.OptionVal
+import pekko.util.PrettyDuration._
+import pekko.util.unused
 
 import scala.collection.immutable
 
@@ -47,10 +48,10 @@ import scala.collection.immutable
  * See previous behavior [[ReplayingSnapshot]].
  */
 @InternalApi
-private[akka] object ReplayingEvents {
+private[pekko] object ReplayingEvents {
 
   @InternalApi
-  private[akka] final case class ReplayingState[State](
+  private[pekko] final case class ReplayingState[State](
       seqNr: Long,
       state: State,
       eventSeenInInterval: Boolean,
@@ -71,7 +72,7 @@ private[akka] object ReplayingEvents {
 }
 
 @InternalApi
-private[akka] final class ReplayingEvents[C, E, S](
+private[pekko] final class ReplayingEvents[C, E, S](
     override val setup: BehaviorSetup[C, E, S],
     var state: ReplayingState[S])
     extends AbstractBehavior[InternalProtocol](setup.context)
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingSnapshot.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingSnapshot.scala
similarity index 89%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingSnapshot.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingSnapshot.scala
index 984cb15bbb..59900fd9f7 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingSnapshot.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplayingSnapshot.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.actor.typed.Behavior
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.scaladsl.{ ActorContext, Behaviors }
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.persistence._
-import akka.persistence.SnapshotProtocol.LoadSnapshotFailed
-import akka.persistence.SnapshotProtocol.LoadSnapshotResult
-import akka.persistence.typed.{ RecoveryFailed, ReplicaId }
-import akka.persistence.typed.internal.EventSourcedBehaviorImpl.{ GetSeenSequenceNr, GetState }
-import akka.util.unused
-import akka.actor.typed.scaladsl.LoggerOps
+import org.apache.pekko
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.scaladsl.{ ActorContext, Behaviors }
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.persistence._
+import pekko.persistence.SnapshotProtocol.LoadSnapshotFailed
+import pekko.persistence.SnapshotProtocol.LoadSnapshotResult
+import pekko.persistence.typed.{ RecoveryFailed, ReplicaId }
+import pekko.persistence.typed.internal.EventSourcedBehaviorImpl.{ GetSeenSequenceNr, GetState }
+import pekko.util.unused
+import pekko.actor.typed.scaladsl.LoggerOps
 
 /**
  * INTERNAL API
@@ -32,7 +33,7 @@ import akka.actor.typed.scaladsl.LoggerOps
  * See previous behavior [[RequestingRecoveryPermit]].
  */
 @InternalApi
-private[akka] object ReplayingSnapshot {
+private[pekko] object ReplayingSnapshot {
 
   def apply[C, E, S](setup: BehaviorSetup[C, E, S], receivedPoisonPill: Boolean): Behavior[InternalProtocol] =
     new ReplayingSnapshot(setup.setMdcPhase(PersistenceMdc.ReplayingSnapshot)).createBehavior(receivedPoisonPill)
@@ -40,7 +41,7 @@ private[akka] object ReplayingSnapshot {
 }
 
 @InternalApi
-private[akka] class ReplayingSnapshot[C, E, S](override val setup: BehaviorSetup[C, E, S])
+private[pekko] class ReplayingSnapshot[C, E, S](override val setup: BehaviorSetup[C, E, S])
     extends JournalInteractions[C, E, S]
     with SnapshotInteractions[C, E, S]
     with StashManagement[C, E, S] {
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplicationSetup.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplicationSetup.scala
similarity index 83%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplicationSetup.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplicationSetup.scala
index fdb281f836..8c48d5df5d 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplicationSetup.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplicationSetup.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.util.OptionVal
-import akka.util.WallClock
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.util.OptionVal
+import pekko.util.WallClock
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] final class ReplicationContextImpl(
+private[pekko] final class ReplicationContextImpl(
     val replicationId: ReplicationId,
     val replicasAndQueryPlugins: Map[ReplicaId, String])
-    extends akka.persistence.typed.scaladsl.ReplicationContext
-    with akka.persistence.typed.javadsl.ReplicationContext {
+    extends pekko.persistence.typed.scaladsl.ReplicationContext
+    with pekko.persistence.typed.javadsl.ReplicationContext {
   val allReplicas: Set[ReplicaId] = replicasAndQueryPlugins.keySet
   // these are not volatile as they are set on the same thread as they should be accessed
   var _currentThread: OptionVal[Thread] = OptionVal.None
@@ -80,7 +81,7 @@ private[akka] final class ReplicationContextImpl(
  * INTERNAL API
  */
 @InternalApi
-private[akka] final case class ReplicationSetup(
+private[pekko] final case class ReplicationSetup(
     replicaId: ReplicaId,
     allReplicasAndQueryPlugins: Map[ReplicaId, String],
     replicationContext: ReplicationContextImpl) {
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RequestingRecoveryPermit.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/RequestingRecoveryPermit.scala
similarity index 82%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RequestingRecoveryPermit.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/RequestingRecoveryPermit.scala
index 614d27540d..eca01ff5f8 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RequestingRecoveryPermit.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/RequestingRecoveryPermit.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.actor.typed.Behavior
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.scaladsl.{ ActorContext, Behaviors }
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.scaladsl.{ ActorContext, Behaviors }
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.util.unused
 
 /**
  * INTERNAL API
@@ -21,7 +22,7 @@ import akka.util.unused
  * See next behavior [[ReplayingSnapshot]].
  */
 @InternalApi
-private[akka] object RequestingRecoveryPermit {
+private[pekko] object RequestingRecoveryPermit {
 
   def apply[C, E, S](setup: BehaviorSetup[C, E, S]): Behavior[InternalProtocol] =
     new RequestingRecoveryPermit(setup.setMdcPhase(PersistenceMdc.AwaitingPermit)).createBehavior()
@@ -29,7 +30,7 @@ private[akka] object RequestingRecoveryPermit {
 }
 
 @InternalApi
-private[akka] class RequestingRecoveryPermit[C, E, S](override val setup: BehaviorSetup[C, E, S])
+private[pekko] class RequestingRecoveryPermit[C, E, S](override val setup: BehaviorSetup[C, E, S])
     extends StashManagement[C, E, S]
     with JournalInteractions[C, E, S]
     with SnapshotInteractions[C, E, S] {
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RetentionCriteriaImpl.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/RetentionCriteriaImpl.scala
similarity index 83%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RetentionCriteriaImpl.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/RetentionCriteriaImpl.scala
index 02472f221f..d870f4a51e 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RetentionCriteriaImpl.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/RetentionCriteriaImpl.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.javadsl
-import akka.persistence.typed.scaladsl
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.javadsl
+import pekko.persistence.typed.scaladsl
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] final case class SnapshotCountRetentionCriteriaImpl(
+@InternalApi private[pekko] final case class SnapshotCountRetentionCriteriaImpl(
     snapshotEveryNEvents: Int,
     keepNSnapshots: Int,
     deleteEventsOnSnapshot: Boolean)
@@ -47,7 +48,7 @@ import akka.persistence.typed.scaladsl
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] case object DisabledRetentionCriteria
+@InternalApi private[pekko] case object DisabledRetentionCriteria
     extends javadsl.RetentionCriteria
     with scaladsl.RetentionCriteria {
   override def asScala: scaladsl.RetentionCriteria = this
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/Running.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala
similarity index 93%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/Running.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala
index 7d39bf0a30..b442bdd0d2 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/Running.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/Running.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import java.time.Instant
 import java.time.LocalDateTime
@@ -11,31 +11,32 @@ import java.time.format.DateTimeFormatter
 import java.util.concurrent.atomic.AtomicReference
 import scala.annotation.tailrec
 import scala.collection.immutable
-import akka.actor.UnhandledMessage
-import akka.actor.typed.eventstream.EventStream
-import akka.actor.typed.{ Behavior, Signal }
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors, LoggerOps }
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.event.Logging
-import akka.persistence.DeleteMessagesFailure
-import akka.persistence.DeleteMessagesSuccess
-import akka.persistence.DeleteSnapshotFailure
-import akka.persistence.DeleteSnapshotSuccess
-import akka.persistence.DeleteSnapshotsFailure
-import akka.persistence.DeleteSnapshotsSuccess
-import akka.persistence.JournalProtocol
-import akka.persistence.JournalProtocol._
-import akka.persistence.PersistentRepr
-import akka.persistence.SaveSnapshotFailure
-import akka.persistence.SaveSnapshotSuccess
-import akka.persistence.SnapshotProtocol
-import akka.persistence.journal.Tagged
-import akka.persistence.query.{ EventEnvelope, PersistenceQuery }
-import akka.persistence.query.scaladsl.EventsByPersistenceIdQuery
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.{
+import org.apache.pekko
+import pekko.actor.UnhandledMessage
+import pekko.actor.typed.eventstream.EventStream
+import pekko.actor.typed.{ Behavior, Signal }
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors, LoggerOps }
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.event.Logging
+import pekko.persistence.DeleteMessagesFailure
+import pekko.persistence.DeleteMessagesSuccess
+import pekko.persistence.DeleteSnapshotFailure
+import pekko.persistence.DeleteSnapshotSuccess
+import pekko.persistence.DeleteSnapshotsFailure
+import pekko.persistence.DeleteSnapshotsSuccess
+import pekko.persistence.JournalProtocol
+import pekko.persistence.JournalProtocol._
+import pekko.persistence.PersistentRepr
+import pekko.persistence.SaveSnapshotFailure
+import pekko.persistence.SaveSnapshotSuccess
+import pekko.persistence.SnapshotProtocol
+import pekko.persistence.journal.Tagged
+import pekko.persistence.query.{ EventEnvelope, PersistenceQuery }
+import pekko.persistence.query.scaladsl.EventsByPersistenceIdQuery
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.{
   DeleteEventsCompleted,
   DeleteEventsFailed,
   DeleteSnapshotsCompleted,
@@ -48,19 +49,19 @@ import akka.persistence.typed.{
   SnapshotMetadata,
   SnapshotSelectionCriteria
 }
-import akka.persistence.typed.internal.EventSourcedBehaviorImpl.{ GetSeenSequenceNr, GetState, GetStateReply }
-import akka.persistence.typed.internal.InternalProtocol.ReplicatedEventEnvelope
-import akka.persistence.typed.internal.JournalInteractions.EventToPersist
-import akka.persistence.typed.internal.Running.WithSeqNrAccessible
-import akka.persistence.typed.scaladsl.Effect
-import akka.stream.scaladsl.Keep
-import akka.stream.{ RestartSettings, SystemMaterializer, WatchedActorTerminatedException }
-import akka.stream.scaladsl.Source
-import akka.stream.scaladsl.{ RestartSource, Sink }
-import akka.stream.typed.scaladsl.ActorFlow
-import akka.util.OptionVal
-import akka.util.unused
-import akka.util.Timeout
+import pekko.persistence.typed.internal.EventSourcedBehaviorImpl.{ GetSeenSequenceNr, GetState, GetStateReply }
+import pekko.persistence.typed.internal.InternalProtocol.ReplicatedEventEnvelope
+import pekko.persistence.typed.internal.JournalInteractions.EventToPersist
+import pekko.persistence.typed.internal.Running.WithSeqNrAccessible
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.stream.scaladsl.Keep
+import pekko.stream.{ RestartSettings, SystemMaterializer, WatchedActorTerminatedException }
+import pekko.stream.scaladsl.Source
+import pekko.stream.scaladsl.{ RestartSource, Sink }
+import pekko.stream.typed.scaladsl.ActorFlow
+import pekko.util.OptionVal
+import pekko.util.unused
+import pekko.util.Timeout
 
 /**
  * INTERNAL API
@@ -81,7 +82,7 @@ import akka.util.Timeout
  * See previous [[ReplayingEvents]].
  */
 @InternalApi
-private[akka] object Running {
+private[pekko] object Running {
 
   trait WithSeqNrAccessible {
     def currentSequenceNumber: Long
@@ -131,7 +132,7 @@ private[akka] object Running {
 
         val controlRef = new AtomicReference[ReplicationStreamControl]()
 
-        import akka.actor.typed.scaladsl.AskPattern._
+        import pekko.actor.typed.scaladsl.AskPattern._
         val source = RestartSource
           .withBackoff(RestartSettings(2.seconds, 10.seconds, randomFactor = 0.2)) { () =>
             Source.futureSource {
@@ -216,7 +217,7 @@ private[akka] object Running {
 // ===============================================
 
 /** INTERNAL API */
-@InternalApi private[akka] final class Running[C, E, S](override val setup: BehaviorSetup[C, E, S])
+@InternalApi private[pekko] final class Running[C, E, S](override val setup: BehaviorSetup[C, E, S])
     extends JournalInteractions[C, E, S]
     with SnapshotInteractions[C, E, S]
     with StashManagement[C, E, S] {
@@ -589,7 +590,7 @@ private[akka] object Running {
           (applySideEffects(sideEffects, state), true)
 
         case _: Unhandled.type =>
-          import akka.actor.typed.scaladsl.adapter._
+          import pekko.actor.typed.scaladsl.adapter._
           setup.context.system.toClassic.eventStream
             .publish(UnhandledMessage(msg, setup.context.system.toClassic.deadLetters, setup.context.self.toClassic))
           (applySideEffects(sideEffects, state), true)
@@ -631,7 +632,7 @@ private[akka] object Running {
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] class PersistingEvents(
+  @InternalApi private[pekko] class PersistingEvents(
       var state: RunningState[S],
       var visibleState: RunningState[S], // previous state until write success
       numberOfEvents: Int,
@@ -778,7 +779,7 @@ private[akka] object Running {
   // ===============================================
 
   /** INTERNAL API */
-  @InternalApi private[akka] class StoringSnapshot(
+  @InternalApi private[pekko] class StoringSnapshot(
       state: RunningState[S],
       sideEffects: immutable.Seq[SideEffect[S]],
       snapshotReason: SnapshotAfterPersist)
@@ -971,17 +972,17 @@ private[akka] object Running {
   }
 
   @InternalStableApi
-  private[akka] def onWriteFailed(
+  private[pekko] def onWriteFailed(
       @unused ctx: ActorContext[_],
       @unused reason: Throwable,
       @unused event: PersistentRepr): Unit = ()
   @InternalStableApi
-  private[akka] def onWriteRejected(
+  private[pekko] def onWriteRejected(
       @unused ctx: ActorContext[_],
       @unused reason: Throwable,
       @unused event: PersistentRepr): Unit = ()
   @InternalStableApi
-  private[akka] def onWriteSuccess(@unused ctx: ActorContext[_], @unused event: PersistentRepr): Unit = ()
+  private[pekko] def onWriteSuccess(@unused ctx: ActorContext[_], @unused event: PersistentRepr): Unit = ()
   @InternalStableApi
-  private[akka] def onWriteDone(@unused ctx: ActorContext[_], @unused event: PersistentRepr): Unit = ()
+  private[pekko] def onWriteDone(@unused ctx: ActorContext[_], @unused event: PersistentRepr): Unit = ()
 }
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/SideEffect.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/SideEffect.scala
similarity index 62%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/SideEffect.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/SideEffect.scala
index 7ebf0f4997..35a0a14122 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/SideEffect.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/SideEffect.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.actor.typed.ActorRef
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.annotation.InternalApi
 
 /**
  * A [[SideEffect]] is an side effect that can be chained after a main effect.
@@ -16,17 +17,17 @@ import akka.annotation.InternalApi
  * INTERNAL API
  */
 @InternalApi
-private[akka] sealed abstract class SideEffect[State]
+private[pekko] sealed abstract class SideEffect[State]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] class Callback[State](val sideEffect: State => Unit) extends SideEffect[State] {
+private[pekko] class Callback[State](val sideEffect: State => Unit) extends SideEffect[State] {
   override def toString: String = "Callback"
 }
 
 /** INTERNAL API */
 @InternalApi
-final private[akka] class ReplyEffectImpl[ReplyMessage, State](
+final private[pekko] class ReplyEffectImpl[ReplyMessage, State](
     replyTo: ActorRef[ReplyMessage],
     replyWithMessage: State => ReplyMessage)
     extends Callback[State](state => replyTo ! replyWithMessage(state)) {
@@ -35,21 +36,21 @@ final private[akka] class ReplyEffectImpl[ReplyMessage, State](
 
 /** INTERNAL API */
 @InternalApi
-final private[akka] class NoReplyEffectImpl[State] extends Callback[State](_ => ()) {
+final private[pekko] class NoReplyEffectImpl[State] extends Callback[State](_ => ()) {
   override def toString: String = "NoReply"
 }
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object Stop extends SideEffect[Nothing]
+private[pekko] case object Stop extends SideEffect[Nothing]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object UnstashAll extends SideEffect[Nothing]
+private[pekko] case object UnstashAll extends SideEffect[Nothing]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] object SideEffect {
+private[pekko] object SideEffect {
 
   def apply[State](callback: State => Unit): SideEffect[State] =
     new Callback(callback)
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/StashManagement.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/StashManagement.scala
similarity index 88%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/StashManagement.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/StashManagement.scala
index 781b275bab..f4c8d006d7 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/StashManagement.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/StashManagement.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
-import akka.actor.Dropped
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.actor.typed.scaladsl.StashBuffer
-import akka.actor.typed.scaladsl.StashOverflowException
-import akka.actor.typed.scaladsl.adapter._
-import akka.annotation.InternalApi
-import akka.util.ConstantFun
+import org.apache.pekko
+import pekko.actor.Dropped
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.actor.typed.scaladsl.StashBuffer
+import pekko.actor.typed.scaladsl.StashOverflowException
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.annotation.InternalApi
+import pekko.util.ConstantFun
 
 /** INTERNAL API: Stash management for persistent behaviors */
 @InternalApi
-private[akka] trait StashManagement[C, E, S] {
+private[pekko] trait StashManagement[C, E, S] {
 
   def setup: BehaviorSetup[C, E, S]
 
@@ -125,7 +126,7 @@ private[akka] trait StashManagement[C, E, S] {
 
 /** INTERNAL API: stash buffer state in order to survive restart of internal behavior */
 @InternalApi
-private[akka] class StashState(ctx: ActorContext[InternalProtocol], settings: EventSourcedSettings) {
+private[pekko] class StashState(ctx: ActorContext[InternalProtocol], settings: EventSourcedSettings) {
 
   private var _internalStashBuffer: StashBuffer[InternalProtocol] = StashBuffer(ctx, settings.stashCapacity)
   private var _userStashBuffer: StashBuffer[InternalProtocol] = StashBuffer(ctx, settings.stashCapacity)
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/VersionVector.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/VersionVector.scala
similarity index 88%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/VersionVector.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/VersionVector.scala
index 8b5251fae6..92ab4b3c45 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/VersionVector.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/VersionVector.scala
@@ -2,10 +2,10 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 import scala.annotation.tailrec
 import scala.collection.immutable.TreeMap
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
@@ -13,7 +13,7 @@ import akka.annotation.InternalApi
  * VersionVector module with helper classes and methods.
  */
 @InternalApi
-private[akka] object VersionVector {
+private[pekko] object VersionVector {
 
   private val emptyVersions: TreeMap[String, Long] = TreeMap.empty
   val empty: VersionVector = ManyVersionVector(emptyVersions)
@@ -28,7 +28,7 @@ private[akka] object VersionVector {
   def apply(key: String, version: Long): VersionVector = OneVersionVector(key, version)
 
   /** INTERNAL API */
-  @InternalApi private[akka] def apply(versions: List[(String, Long)]): VersionVector =
+  @InternalApi private[pekko] def apply(versions: List[(String, Long)]): VersionVector =
     if (versions.isEmpty) empty
     else if (versions.tail.isEmpty) apply(versions.head._1, versions.head._2)
     else apply(emptyVersions ++ versions)
@@ -45,7 +45,7 @@ private[akka] object VersionVector {
   private case object FullOrder extends Ordering
 
   /** INTERNAL API */
-  @InternalApi private[akka] object Timestamp {
+  @InternalApi private[pekko] object Timestamp {
     final val Zero = 0L
     final val EndMarker = Long.MinValue
   }
@@ -67,12 +67,12 @@ private[akka] object VersionVector {
  *    2) Friedemann Mattern (1988). "Virtual Time and Global States of Distributed Systems". Workshop on Parallel and Distributed Algorithms: pp. 215-226
  * }}}
  *
- * Based on `akka.cluster.ddata.VersionVector`.
+ * Based on `org.apache.pekko.cluster.ddata.VersionVector`.
  *
  * This class is immutable, i.e. "modifying" methods return a new instance.
  */
 @InternalApi
-private[akka] sealed abstract class VersionVector {
+private[pekko] sealed abstract class VersionVector {
 
   type T = VersionVector
 
@@ -95,14 +95,14 @@ private[akka] sealed abstract class VersionVector {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def size: Int
+  @InternalApi private[pekko] def size: Int
 
   def versionAt(key: String): Long
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def contains(key: String): Boolean
+  @InternalApi private[pekko] def contains(key: String): Boolean
 
   /**
    * Returns true if this and that are concurrent else false.
@@ -187,7 +187,7 @@ private[akka] sealed abstract class VersionVector {
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def versionsIterator: Iterator[(String, Long)]
+  @InternalApi private[pekko] def versionsIterator: Iterator[(String, Long)]
 
   /**
    * Compare two version vectors. The outcome will be one of the following:
@@ -210,14 +210,14 @@ private[akka] sealed abstract class VersionVector {
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] final case class OneVersionVector private[akka] (key: String, version: Long)
+@InternalApi private[pekko] final case class OneVersionVector private[pekko] (key: String, version: Long)
     extends VersionVector {
   import VersionVector.Timestamp
 
   override def isEmpty: Boolean = false
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def size: Int = 1
+  @InternalApi private[pekko] override def size: Int = 1
 
   override def increment(k: String): VersionVector = {
     val v = version + 1
@@ -235,11 +235,11 @@ private[akka] sealed abstract class VersionVector {
     else Timestamp.Zero
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def contains(k: String): Boolean =
+  @InternalApi private[pekko] override def contains(k: String): Boolean =
     k == key
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def versionsIterator: Iterator[(String, Long)] =
+  @InternalApi private[pekko] override def versionsIterator: Iterator[(String, Long)] =
     Iterator.single((key, version))
 
   override def merge(that: VersionVector): VersionVector = {
@@ -266,13 +266,13 @@ private[akka] sealed abstract class VersionVector {
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] final case class ManyVersionVector(versions: TreeMap[String, Long]) extends VersionVector {
+@InternalApi private[pekko] final case class ManyVersionVector(versions: TreeMap[String, Long]) extends VersionVector {
   import VersionVector.Timestamp
 
   override def isEmpty: Boolean = versions.isEmpty
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def size: Int = versions.size
+  @InternalApi private[pekko] override def size: Int = versions.size
 
   override def increment(key: String): VersionVector = {
     val v = versionAt(key) + 1
@@ -288,11 +288,11 @@ private[akka] sealed abstract class VersionVector {
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def contains(key: String): Boolean =
+  @InternalApi private[pekko] override def contains(key: String): Boolean =
     versions.contains(key)
 
   /** INTERNAL API */
-  @InternalApi private[akka] override def versionsIterator: Iterator[(String, Long)] =
+  @InternalApi private[pekko] override def versionsIterator: Iterator[(String, Long)] =
     versions.iterator
 
   override def merge(that: VersionVector): VersionVector = {
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandler.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandler.scala
similarity index 98%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandler.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandler.scala
index 4b42d8c087..5f116adf8e 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandler.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandler.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
 import java.util.Objects
 import java.util.function.{ BiFunction, Function => JFunction, Predicate, Supplier }
 
 import scala.compat.java8.FunctionConverters._
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.internal._
-import akka.util.OptionVal
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.internal._
+import pekko.util.OptionVal
 
 /**
  * FunctionalInterface for reacting on commands
@@ -188,7 +189,7 @@ object CommandHandlerBuilderByState {
       handler: BiFunction[State, Command, Effect[Event, State]])
 }
 
-final class CommandHandlerBuilderByState[Command, Event, S <: State, State] @InternalApi private[akka] (
+final class CommandHandlerBuilderByState[Command, Event, S <: State, State] @InternalApi private[pekko] (
     private val stateClass: Class[S],
     private val statePredicate: Predicate[S]) {
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandlerWithReply.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
similarity index 99%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandlerWithReply.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
index a1e9270c8e..a3144e8c23 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandlerWithReply.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/CommandHandlerWithReply.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
 import java.util.Objects
 import java.util.function.{ BiFunction, Function => JFunction, Predicate, Supplier }
 
 import scala.compat.java8.FunctionConverters._
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.internal._
-import akka.util.OptionVal
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.internal._
+import pekko.util.OptionVal
 
 /* Note that this is a copy of CommandHandler.scala to support ReplyEffect
  * s/Effect/ReplyEffect/
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Effect.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala
similarity index 94%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Effect.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala
index f5f97c54d6..5574ba0174 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Effect.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
-import akka.actor.typed.ActorRef
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.japi.function
-import akka.persistence.typed.internal._
-import akka.persistence.typed.internal.SideEffect
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.japi.function
+import pekko.persistence.typed.internal._
+import pekko.persistence.typed.internal.SideEffect
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * INTERNAL API: see `class EffectFactories`
  */
-@InternalApi private[akka] object EffectFactories extends EffectFactories[Nothing, Nothing]
+@InternalApi private[pekko] object EffectFactories extends EffectFactories[Nothing, Nothing]
 
 /**
  * Factory methods for creating [[Effect]] directives - how an event sourced actor reacts on a command.
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventHandler.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventHandler.scala
similarity index 99%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventHandler.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventHandler.scala
index fa658fea2b..c11e47cc8e 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventHandler.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventHandler.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
 import java.util.Objects
 import java.util.function.{ BiFunction, Function => JFunction, Predicate, Supplier }
 
 import scala.compat.java8.FunctionConverters._
 
-import akka.annotation.InternalApi
-import akka.util.OptionVal
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.util.OptionVal
 
 /**
  * FunctionalInterface for reacting on events having been persisted
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventSourcedBehavior.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehavior.scala
similarity index 94%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventSourcedBehavior.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehavior.scala
index 3c8ec88e27..a510e6e10a 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventSourcedBehavior.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehavior.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
 import java.util.Collections
 import java.util.Optional
 
-import akka.actor.typed
-import akka.actor.typed.BackoffSupervisorStrategy
-import akka.actor.typed.Behavior
-import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior
-import akka.actor.typed.javadsl.ActorContext
-import akka.annotation.InternalApi
-import akka.persistence.typed._
-import akka.persistence.typed.EventAdapter
-import akka.persistence.typed.internal._
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.typed
+import pekko.actor.typed.BackoffSupervisorStrategy
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.internal.BehaviorImpl.DeferredBehavior
+import pekko.actor.typed.javadsl.ActorContext
+import pekko.annotation.InternalApi
+import pekko.persistence.typed._
+import pekko.persistence.typed.EventAdapter
+import pekko.persistence.typed.internal._
+import pekko.util.unused
 
-abstract class EventSourcedBehavior[Command, Event, State] private[akka] (
+abstract class EventSourcedBehavior[Command, Event, State] private[pekko] (
     val persistenceId: PersistenceId,
     onPersistFailure: Optional[BackoffSupervisorStrategy])
     extends DeferredBehavior[Command] {
@@ -85,7 +86,7 @@ abstract class EventSourcedBehavior[Command, Event, State] private[akka] (
 
   /**
    * Override to react on general lifecycle signals and persistence specific signals (subtypes of
-   * [[akka.persistence.typed.EventSourcedSignal]]).
+   * [[pekko.persistence.typed.EventSourcedSignal]]).
    *
    * Use [[EventSourcedBehavior#newSignalHandlerBuilder]] to define the signal handler.
    */
@@ -188,12 +189,12 @@ abstract class EventSourcedBehavior[Command, Event, State] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] final def createEventSourcedBehavior()
+  @InternalApi private[pekko] final def createEventSourcedBehavior()
       : scaladsl.EventSourcedBehavior[Command, Event, State] = {
     val snapshotWhen: (State, Event, Long) => Boolean = (state, event, seqNr) => shouldSnapshot(state, event, seqNr)
 
     val tagger: Event => Set[String] = { event =>
-      import akka.util.ccompat.JavaConverters._
+      import org.apache.pekko.util.ccompat.JavaConverters._
       val tags = tagsFor(event)
       if (tags.isEmpty) Set.empty
       else tags.asScala.toSet
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/PersistentFSMMigration.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/PersistentFSMMigration.scala
similarity index 76%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/PersistentFSMMigration.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/PersistentFSMMigration.scala
index ff10b09475..d0ee06ba2d 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/PersistentFSMMigration.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/PersistentFSMMigration.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
 import java.time.Duration
 import java.util.Optional
 
 import scala.compat.java8.OptionConverters._
 
-import akka.japi.function.Function3
-import akka.persistence.typed.SnapshotAdapter
-import akka.util.JavaDurationConverters._
+import org.apache.pekko
+import pekko.japi.function.Function3
+import pekko.persistence.typed.SnapshotAdapter
+import pekko.util.JavaDurationConverters._
 
 /**
  * Helper functions for migration from PersistentFSM to Persistence Typed
@@ -27,6 +28,6 @@ object PersistentFSMMigration {
    * @return A [[SnapshotAdapter]] to be used with a [[EventSourcedBehavior]]
    */
   def snapshotAdapter[State](adapt: Function3[String, Any, Optional[Duration], State]): SnapshotAdapter[State] =
-    akka.persistence.typed.scaladsl.PersistentFSMMigration.snapshotAdapter((stateId, snapshot, timer) =>
+    pekko.persistence.typed.scaladsl.PersistentFSMMigration.snapshotAdapter((stateId, snapshot, timer) =>
       adapt.apply(stateId, snapshot, timer.map(_.asJava).asJava))
 }
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Recovery.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Recovery.scala
similarity index 72%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Recovery.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Recovery.scala
index 5a688eebac..9f9dde6a3e 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Recovery.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Recovery.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.SnapshotSelectionCriteria
-import akka.persistence.typed.internal.{ DefaultRecovery, DisabledRecovery, RecoveryWithSnapshotSelectionCriteria }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.SnapshotSelectionCriteria
+import pekko.persistence.typed.internal.{ DefaultRecovery, DisabledRecovery, RecoveryWithSnapshotSelectionCriteria }
 
 /**
  * Strategy for recovery of snapshots and events.
  */
 abstract class Recovery {
-  def asScala: akka.persistence.typed.scaladsl.Recovery
+  def asScala: pekko.persistence.typed.scaladsl.Recovery
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def toClassic: akka.persistence.Recovery
+  @InternalApi private[pekko] def toClassic: pekko.persistence.Recovery
 }
 
 /**
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/ReplicatedEventSourcedBehavior.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcedBehavior.scala
similarity index 75%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/ReplicatedEventSourcedBehavior.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcedBehavior.scala
index b822668b49..ce75bf051d 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/ReplicatedEventSourcedBehavior.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcedBehavior.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
 import java.util.Optional
 
-import akka.actor.typed.BackoffSupervisorStrategy
-import akka.actor.typed.Behavior
-import akka.actor.typed.TypedActorContext
-import akka.annotation.InternalApi
-import akka.persistence.typed.internal.ReplicationContextImpl
+import org.apache.pekko
+import pekko.actor.typed.BackoffSupervisorStrategy
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.TypedActorContext
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.internal.ReplicationContextImpl
 
 /**
  * Base class for replicated event sourced behaviors.
@@ -24,7 +25,7 @@ abstract class ReplicatedEventSourcedBehavior[Command, Event, State](
 
   /**
    * Override and return false to disable events being published to the system event stream as
-   * [[akka.persistence.typed.PublishedEvent]] after they have been persisted.
+   * [[pekko.persistence.typed.PublishedEvent]] after they have been persisted.
    */
   def withEventPublishing: Boolean = true
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/ReplicatedEventSourcing.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcing.scala
similarity index 92%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/ReplicatedEventSourcing.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcing.scala
index ae9ea03b90..6eec1d11df 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/ReplicatedEventSourcing.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcing.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
 import java.util.function.{ Function => JFunction }
 import java.util.{ Set => JSet }
 import java.util.{ Map => JMap }
 
-import akka.annotation.DoNotInherit
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.internal.ReplicationContextImpl
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.annotation.DoNotInherit
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.internal.ReplicationContextImpl
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Provides access to replication specific state
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/RetentionCriteria.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/RetentionCriteria.scala
similarity index 83%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/RetentionCriteria.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/RetentionCriteria.scala
index 02bfddc5db..9974410987 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/RetentionCriteria.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/RetentionCriteria.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
-import akka.annotation.DoNotInherit
-import akka.persistence.typed.internal.DisabledRetentionCriteria
-import akka.persistence.typed.internal.SnapshotCountRetentionCriteriaImpl
+import org.apache.pekko
+import pekko.annotation.DoNotInherit
+import pekko.persistence.typed.internal.DisabledRetentionCriteria
+import pekko.persistence.typed.internal.SnapshotCountRetentionCriteriaImpl
 
 /**
  * Criteria for retention/deletion of snapshots and events.
  */
 abstract class RetentionCriteria {
-  def asScala: akka.persistence.typed.scaladsl.RetentionCriteria
+  def asScala: pekko.persistence.typed.scaladsl.RetentionCriteria
 }
 
 /**
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/SignalHandler.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/SignalHandler.scala
similarity index 86%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/SignalHandler.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/SignalHandler.scala
index 1ffe1ec235..09052c26c9 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/SignalHandler.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/SignalHandler.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl
+package org.apache.pekko.persistence.typed.javadsl
 
 import java.util.function.BiConsumer
 import java.util.function.Consumer
 
-import akka.actor.typed.Signal
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.typed.Signal
+import pekko.annotation.InternalApi
 
 object SignalHandler {
   private val Empty: SignalHandler[Any] = new SignalHandler[Any](PartialFunction.empty)
@@ -22,13 +23,13 @@ final class SignalHandler[State](_handler: PartialFunction[(State, Signal), Unit
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def isEmpty: Boolean = _handler eq PartialFunction.empty
+  private[pekko] def isEmpty: Boolean = _handler eq PartialFunction.empty
 
   /**
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def handler: PartialFunction[(State, Signal), Unit] = _handler
+  private[pekko] def handler: PartialFunction[(State, Signal), Unit] = _handler
 }
 
 object SignalHandlerBuilder {
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/Effect.scala
similarity index 96%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/Effect.scala
index 1705b56402..1038e0d178 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/Effect.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
 import scala.collection.{ immutable => im }
 
-import akka.actor.typed.ActorRef
-import akka.annotation.DoNotInherit
-import akka.persistence.typed.internal._
-import akka.persistence.typed.internal.SideEffect
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.annotation.DoNotInherit
+import pekko.persistence.typed.internal._
+import pekko.persistence.typed.internal.SideEffect
 
 /**
  * Factory methods for creating [[Effect]] directives - how an event sourced actor reacts on a command.
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/EventSourcedBehavior.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehavior.scala
similarity index 89%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/EventSourcedBehavior.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehavior.scala
index fed62b6be0..d244802471 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/EventSourcedBehavior.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/EventSourcedBehavior.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.typed.BackoffSupervisorStrategy
-import akka.actor.typed.Behavior
-import akka.actor.typed.Signal
-import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior
-import akka.actor.typed.internal.InterceptorImpl
-import akka.actor.typed.internal.LoggerClass
-import akka.actor.typed.scaladsl.ActorContext
-import akka.annotation.ApiMayChange
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.persistence.typed.EventAdapter
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.SnapshotAdapter
-import akka.persistence.typed.SnapshotSelectionCriteria
-import akka.persistence.typed.internal._
+import org.apache.pekko
+import pekko.actor.typed.BackoffSupervisorStrategy
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Signal
+import pekko.actor.typed.internal.BehaviorImpl.DeferredBehavior
+import pekko.actor.typed.internal.InterceptorImpl
+import pekko.actor.typed.internal.LoggerClass
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.annotation.ApiMayChange
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.EventAdapter
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.SnapshotAdapter
+import pekko.persistence.typed.SnapshotSelectionCriteria
+import pekko.persistence.typed.internal._
 
 import scala.annotation.tailrec
 
@@ -133,7 +134,7 @@ object EventSourcedBehavior {
    *
    * The regular lifecycle signals can be handled as well as
    * Akka Persistence specific signals (snapshot and recovery related). Those are all subtypes of
-   * [[akka.persistence.typed.EventSourcedSignal]]
+   * [[pekko.persistence.typed.EventSourcedSignal]]
    */
   def receiveSignal(signalHandler: PartialFunction[(State, Signal), Unit]): EventSourcedBehavior[Command, Event, State]
 
@@ -222,7 +223,7 @@ object EventSourcedBehavior {
   def withRecovery(recovery: Recovery): EventSourcedBehavior[Command, Event, State]
 
   /**
-   * Publish events to the system event stream as [[akka.persistence.typed.PublishedEvent]] after they have been persisted
+   * Publish events to the system event stream as [[pekko.persistence.typed.PublishedEvent]] after they have been persisted
    */
   @ApiMayChange
   def withEventPublishing(enabled: Boolean): EventSourcedBehavior[Command, Event, State]
@@ -231,5 +232,5 @@ object EventSourcedBehavior {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def withReplication(context: ReplicationContextImpl): EventSourcedBehavior[Command, Event, State]
+  private[pekko] def withReplication(context: ReplicationContextImpl): EventSourcedBehavior[Command, Event, State]
 }
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentFSMMigration.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentFSMMigration.scala
similarity index 87%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentFSMMigration.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentFSMMigration.scala
index e972619e40..5f219b46c4 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentFSMMigration.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentFSMMigration.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
 import scala.concurrent.duration.FiniteDuration
 
-import akka.persistence.fsm.PersistentFSM.PersistentFSMSnapshot
-import akka.persistence.typed.SnapshotAdapter
+import org.apache.pekko
+import pekko.persistence.fsm.PersistentFSM.PersistentFSMSnapshot
+import pekko.persistence.typed.SnapshotAdapter
 
 /**
  * Helper functions for migration from PersistentFSM to Persistence Typed
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Recovery.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/Recovery.scala
similarity index 72%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Recovery.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/Recovery.scala
index 9657ba1a1f..8bfeda6426 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Recovery.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/Recovery.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.SnapshotSelectionCriteria
-import akka.persistence.typed.internal.{ DefaultRecovery, DisabledRecovery, RecoveryWithSnapshotSelectionCriteria }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.SnapshotSelectionCriteria
+import pekko.persistence.typed.internal.{ DefaultRecovery, DisabledRecovery, RecoveryWithSnapshotSelectionCriteria }
 
 /**
  * Strategy for recovery of snapshots and events.
  */
 trait Recovery {
-  def asJava: akka.persistence.typed.javadsl.Recovery
+  def asJava: pekko.persistence.typed.javadsl.Recovery
 
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] def toClassic: akka.persistence.Recovery
+  @InternalApi private[pekko] def toClassic: pekko.persistence.Recovery
 
 }
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/ReplicatedEventSourcing.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/ReplicatedEventSourcing.scala
similarity index 93%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/ReplicatedEventSourcing.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/ReplicatedEventSourcing.scala
index 6e7acb7a39..dc45472a2d 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/ReplicatedEventSourcing.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/ReplicatedEventSourcing.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.annotation.DoNotInherit
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.ReplicationId
-import akka.persistence.typed.internal.ReplicationContextImpl
+import org.apache.pekko
+import pekko.annotation.DoNotInherit
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.ReplicationId
+import pekko.persistence.typed.internal.ReplicationContextImpl
 
 /**
  * Provides access to replication specific state
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/RetentionCriteria.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/RetentionCriteria.scala
similarity index 83%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/RetentionCriteria.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/RetentionCriteria.scala
index 2751b245b7..7bd8b98e3c 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/RetentionCriteria.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/scaladsl/RetentionCriteria.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.annotation.DoNotInherit
-import akka.persistence.typed.internal.DisabledRetentionCriteria
-import akka.persistence.typed.internal.SnapshotCountRetentionCriteriaImpl
+import org.apache.pekko
+import pekko.annotation.DoNotInherit
+import pekko.persistence.typed.internal.DisabledRetentionCriteria
+import pekko.persistence.typed.internal.SnapshotCountRetentionCriteriaImpl
 
 /**
  * Criteria for retention/deletion of snapshots and events.
  */
 trait RetentionCriteria {
-  def asJava: akka.persistence.typed.javadsl.RetentionCriteria
+  def asJava: pekko.persistence.typed.javadsl.RetentionCriteria
 }
 
 /**
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala
similarity index 93%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala
index 5c23f40d4a..9e8bddded9 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala
@@ -2,35 +2,36 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.serialization
+package org.apache.pekko.persistence.typed.serialization
 
 import java.io.NotSerializableException
 import java.util.{ ArrayList, Collections, Comparator }
 import java.{ lang => jl }
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.crdt.{ Counter, ORSet }
-import akka.persistence.typed.internal.PublishedEventImpl
-import akka.persistence.typed.internal.ReplicatedEventMetadata
-import akka.persistence.typed.internal.ReplicatedSnapshotMetadata
-import akka.persistence.typed.internal.ReplicatedPublishedEventMetaData
-import akka.persistence.typed.internal.VersionVector
-import akka.remote.ByteStringUtils
-import akka.remote.ContainerFormats.Payload
-import akka.remote.serialization.WrappedPayloadSupport
-import akka.serialization.{ BaseSerializer, SerializerWithStringManifest }
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.crdt.{ Counter, ORSet }
+import pekko.persistence.typed.internal.PublishedEventImpl
+import pekko.persistence.typed.internal.ReplicatedEventMetadata
+import pekko.persistence.typed.internal.ReplicatedSnapshotMetadata
+import pekko.persistence.typed.internal.ReplicatedPublishedEventMetaData
+import pekko.persistence.typed.internal.VersionVector
+import pekko.remote.ByteStringUtils
+import pekko.remote.ContainerFormats.Payload
+import pekko.remote.serialization.WrappedPayloadSupport
+import pekko.serialization.{ BaseSerializer, SerializerWithStringManifest }
 
 import scala.annotation.tailrec
-import akka.util.ccompat.JavaConverters._
+import pekko.util.ccompat.JavaConverters._
 
 import scala.collection.immutable.TreeMap
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object ReplicatedEventSourcingSerializer {
+@InternalApi private[pekko] object ReplicatedEventSourcingSerializer {
   object Comparator extends Comparator[Payload] {
     override def compare(a: Payload, b: Payload): Int = {
       val aByteString = a.getEnclosedMessage
@@ -59,7 +60,7 @@ import scala.collection.immutable.TreeMap
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] final class ReplicatedEventSourcingSerializer(val system: ExtendedActorSystem)
+@InternalApi private[pekko] final class ReplicatedEventSourcingSerializer(val system: ExtendedActorSystem)
     extends SerializerWithStringManifest
     with BaseSerializer {
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/DurableStateSignal.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/DurableStateSignal.scala
similarity index 80%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/DurableStateSignal.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/DurableStateSignal.scala
index 1ce71d81b0..d96dc91374 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/DurableStateSignal.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/DurableStateSignal.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state
+package org.apache.pekko.persistence.typed.state
 
-import akka.actor.typed.Signal
-import akka.annotation.DoNotInherit
+import org.apache.pekko
+import pekko.actor.typed.Signal
+import pekko.annotation.DoNotInherit
 
 /**
  * Supertype for all `DurableStateBehavior` specific signals
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/BehaviorSetup.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/BehaviorSetup.scala
similarity index 80%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/BehaviorSetup.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/BehaviorSetup.scala
index 6d6169bd43..7bacec40c7 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/BehaviorSetup.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/BehaviorSetup.scala
@@ -2,32 +2,33 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
 import scala.util.control.NonFatal
 
 import org.slf4j.Logger
 import org.slf4j.MDC
 
-import akka.actor.Cancellable
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.{ ActorRef => ClassicActorRef }
-import akka.annotation.InternalApi
-import akka.persistence._
-import akka.persistence.typed.state.internal.InternalProtocol.RecoveryTimeout
-import akka.persistence.typed.state.scaladsl.DurableStateBehavior
-import akka.persistence.state.DurableStateStoreRegistry
-import akka.persistence.state.scaladsl.DurableStateUpdateStore
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.SnapshotAdapter
-import akka.util.OptionVal
+import org.apache.pekko
+import pekko.actor.Cancellable
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.{ ActorRef => ClassicActorRef }
+import pekko.annotation.InternalApi
+import pekko.persistence._
+import pekko.persistence.typed.state.internal.InternalProtocol.RecoveryTimeout
+import pekko.persistence.typed.state.scaladsl.DurableStateBehavior
+import pekko.persistence.state.DurableStateStoreRegistry
+import pekko.persistence.state.scaladsl.DurableStateUpdateStore
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.SnapshotAdapter
+import pekko.util.OptionVal
 
 /**
  * INTERNAL API: Carry state for the `DurableStateBehavior` implementation behaviors.
  */
 @InternalApi
-private[akka] final class BehaviorSetup[C, S](
+private[pekko] final class BehaviorSetup[C, S](
     val context: ActorContext[InternalProtocol],
     val persistenceId: PersistenceId,
     val emptyState: S,
@@ -40,7 +41,7 @@ private[akka] final class BehaviorSetup[C, S](
     val stashState: StashState,
     private val internalLoggerFactory: () => Logger) {
 
-  import akka.actor.typed.scaladsl.adapter._
+  import pekko.actor.typed.scaladsl.adapter._
 
   val persistence: Persistence = Persistence(context.system.toClassic)
 
@@ -110,7 +111,7 @@ private[akka] final class BehaviorSetup[C, S](
  * INTERNAL API
  */
 @InternalApi
-private[akka] object PersistenceMdc {
+private[pekko] object PersistenceMdc {
   // format: OFF
   val Initializing      = "initializing"
   val AwaitingPermit    = "get-permit"
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateBehaviorImpl.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateBehaviorImpl.scala
similarity index 85%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateBehaviorImpl.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateBehaviorImpl.scala
index 65bd02d983..6f59cf16bd 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateBehaviorImpl.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateBehaviorImpl.scala
@@ -2,31 +2,32 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
 import org.slf4j.LoggerFactory
 
-import akka.actor.typed
-import akka.actor.typed.ActorRef
-import akka.actor.typed.BackoffSupervisorStrategy
-import akka.actor.typed.Behavior
-import akka.actor.typed.BehaviorInterceptor
-import akka.actor.typed.PostStop
-import akka.actor.typed.Signal
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.internal.ActorContextImpl
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.annotation._
-import akka.persistence.RecoveryPermitter
-import akka.persistence.typed.state.scaladsl._
-import akka.persistence.state.scaladsl.GetObjectResult
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.SnapshotAdapter
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.typed
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.BackoffSupervisorStrategy
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.BehaviorInterceptor
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.Signal
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.internal.ActorContextImpl
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.annotation._
+import pekko.persistence.RecoveryPermitter
+import pekko.persistence.typed.state.scaladsl._
+import pekko.persistence.state.scaladsl.GetObjectResult
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.SnapshotAdapter
+import pekko.util.unused
 
 @InternalApi
-private[akka] object DurableStateBehaviorImpl {
+private[pekko] object DurableStateBehaviorImpl {
 
   /**
    * Used by DurableStateBehaviorTestKit to retrieve the `persistenceId`.
@@ -42,7 +43,7 @@ private[akka] object DurableStateBehaviorImpl {
 }
 
 @InternalApi
-private[akka] final case class DurableStateBehaviorImpl[Command, State](
+private[pekko] final case class DurableStateBehaviorImpl[Command, State](
     persistenceId: PersistenceId,
     emptyState: State,
     commandHandler: DurableStateBehavior.CommandHandler[Command, State],
@@ -147,7 +148,7 @@ private[akka] final case class DurableStateBehaviorImpl[Command, State](
   }
 
   @InternalStableApi
-  private[akka] def initialize(@unused context: ActorContext[_]): Unit = ()
+  private[pekko] def initialize(@unused context: ActorContext[_]): Unit = ()
 
   override def receiveSignal(handler: PartialFunction[(State, Signal), Unit]): DurableStateBehavior[Command, State] =
     copy(signalHandler = handler)
@@ -169,8 +170,8 @@ private[akka] final case class DurableStateBehaviorImpl[Command, State](
 }
 
 /** Protocol used internally by the DurableStateBehavior. */
-@InternalApi private[akka] sealed trait InternalProtocol
-@InternalApi private[akka] object InternalProtocol {
+@InternalApi private[pekko] sealed trait InternalProtocol
+@InternalApi private[pekko] object InternalProtocol {
   case object RecoveryPermitGranted extends InternalProtocol
   final case class GetSuccess[S](result: GetObjectResult[S]) extends InternalProtocol
   final case class GetFailure(cause: Throwable) extends InternalProtocol
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateSettings.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateSettings.scala
similarity index 87%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateSettings.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateSettings.scala
index ea5062a662..149fc167f3 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateSettings.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateSettings.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
 import java.util.concurrent.TimeUnit
 
@@ -11,14 +11,15 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.actor.typed.ActorSystem
-import akka.annotation.InternalApi
-import akka.persistence.Persistence
+import org.apache.pekko
+import pekko.actor.typed.ActorSystem
+import pekko.annotation.InternalApi
+import pekko.persistence.Persistence
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object DurableStateSettings {
+@InternalApi private[pekko] object DurableStateSettings {
 
   def apply(system: ActorSystem[_], durableStateStorePluginId: String): DurableStateSettings =
     apply(system.settings.config, durableStateStorePluginId)
@@ -71,7 +72,7 @@ import akka.persistence.Persistence
  * INTERNAL API
  */
 @InternalApi
-private[akka] final case class DurableStateSettings(
+private[pekko] final case class DurableStateSettings(
     stashCapacity: Int,
     stashOverflowStrategy: StashOverflowStrategy,
     logOnStashing: Boolean,
@@ -88,13 +89,13 @@ private[akka] final case class DurableStateSettings(
  * INTERNAL API
  */
 @InternalApi
-private[akka] sealed trait StashOverflowStrategy
+private[pekko] sealed trait StashOverflowStrategy
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object StashOverflowStrategy {
+private[pekko] object StashOverflowStrategy {
   case object Drop extends StashOverflowStrategy
   case object Fail extends StashOverflowStrategy
 }
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateStoreException.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateStoreException.scala
similarity index 65%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateStoreException.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateStoreException.scala
index 51a994882b..61dc99f53f 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateStoreException.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateStoreException.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.PersistenceId
 
 /**
  * INTERNAL API
@@ -13,7 +14,7 @@ import akka.persistence.typed.PersistenceId
  * Used for store failures. Private to akka as only internal supervision strategies should use it.
  */
 @InternalApi
-final private[akka] class DurableStateStoreException(msg: String, cause: Throwable)
+final private[pekko] class DurableStateStoreException(msg: String, cause: Throwable)
     extends RuntimeException(msg, cause) {
   def this(persistenceId: PersistenceId, sequenceNr: Long, cause: Throwable) =
     this(s"Failed to persist state with sequence number [$sequenceNr] for persistenceId [${persistenceId.id}]", cause)
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateStoreInteractions.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateStoreInteractions.scala
similarity index 80%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateStoreInteractions.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateStoreInteractions.scala
index 1dcf8227bb..5f5a92bd5d 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/DurableStateStoreInteractions.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/DurableStateStoreInteractions.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
 import scala.util.Failure
 import scala.util.Success
 
-import akka.Done
-import akka.actor.typed.Behavior
-import akka.actor.typed.PostStop
-import akka.actor.typed.PreRestart
-import akka.actor.typed.Signal
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.annotation.InternalApi
-import akka.annotation.InternalStableApi
-import akka.persistence._
-import akka.persistence.state.scaladsl.GetObjectResult
-import akka.util.unused
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.PostStop
+import pekko.actor.typed.PreRestart
+import pekko.actor.typed.Signal
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.annotation.InternalApi
+import pekko.annotation.InternalStableApi
+import pekko.persistence._
+import pekko.persistence.state.scaladsl.GetObjectResult
+import pekko.util.unused
 
 /** INTERNAL API */
 @InternalApi
-private[akka] trait DurableStateStoreInteractions[C, S] {
+private[pekko] trait DurableStateStoreInteractions[C, S] {
 
   def setup: BehaviorSetup[C, S]
 
@@ -76,9 +77,9 @@ private[akka] trait DurableStateStoreInteractions[C, S] {
 
   // FIXME These hook methods are for Telemetry. What more parameters are needed? persistenceId?
   @InternalStableApi
-  private[akka] def onWriteInitiated(@unused ctx: ActorContext[_], @unused cmd: Any): Unit = ()
+  private[pekko] def onWriteInitiated(@unused ctx: ActorContext[_], @unused cmd: Any): Unit = ()
 
-  private[akka] def onDeleteInitiated(@unused ctx: ActorContext[_], @unused cmd: Any): Unit = ()
+  private[pekko] def onDeleteInitiated(@unused ctx: ActorContext[_], @unused cmd: Any): Unit = ()
 
   protected def requestRecoveryPermit(): Unit = {
     setup.persistence.recoveryPermitter.tell(RecoveryPermitter.RequestRecoveryPermit, setup.selfClassic)
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/EffectImpl.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/EffectImpl.scala
similarity index 72%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/EffectImpl.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/EffectImpl.scala
index af7c5d1fc9..e9b82d9c83 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/EffectImpl.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/EffectImpl.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
 import scala.collection.immutable
 
-import akka.actor.typed.ActorRef
-import akka.annotation.InternalApi
-import akka.persistence.typed.state.javadsl
-import akka.persistence.typed.state.scaladsl
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.state.javadsl
+import pekko.persistence.typed.state.scaladsl
 
 /** INTERNAL API */
 @InternalApi
-private[akka] abstract class EffectImpl[State]
+private[pekko] abstract class EffectImpl[State]
     extends javadsl.EffectBuilder[State]
     with javadsl.ReplyEffect[State]
     with scaladsl.ReplyEffect[State]
@@ -41,14 +42,14 @@ private[akka] abstract class EffectImpl[State]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] object CompositeEffect {
+private[pekko] object CompositeEffect {
   def apply[State](effect: scaladsl.EffectBuilder[State], sideEffects: SideEffect[State]): CompositeEffect[State] =
     CompositeEffect[State](effect, sideEffects :: Nil)
 }
 
 /** INTERNAL API */
 @InternalApi
-private[akka] final case class CompositeEffect[State](
+private[pekko] final case class CompositeEffect[State](
     persistingEffect: scaladsl.EffectBuilder[State],
     _sideEffects: immutable.Seq[SideEffect[State]])
     extends EffectImpl[State] {
@@ -61,11 +62,11 @@ private[akka] final case class CompositeEffect[State](
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object PersistNothing extends EffectImpl[Nothing]
+private[pekko] case object PersistNothing extends EffectImpl[Nothing]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] final case class Persist[State](newState: State) extends EffectImpl[State] {
+private[pekko] final case class Persist[State](newState: State) extends EffectImpl[State] {
   override val state: Option[State] = Option(newState)
 
   override def toString: String = s"Persist(${newState.getClass.getName})"
@@ -73,12 +74,12 @@ private[akka] final case class Persist[State](newState: State) extends EffectImp
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case class Delete[State]() extends EffectImpl[State]
+private[pekko] case class Delete[State]() extends EffectImpl[State]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object Unhandled extends EffectImpl[Nothing]
+private[pekko] case object Unhandled extends EffectImpl[Nothing]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object Stash extends EffectImpl[Nothing]
+private[pekko] case object Stash extends EffectImpl[Nothing]
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/NoOpSnapshotAdapter.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/NoOpSnapshotAdapter.scala
similarity index 56%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/NoOpSnapshotAdapter.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/NoOpSnapshotAdapter.scala
index 774870284f..a4457e8d29 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/NoOpSnapshotAdapter.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/NoOpSnapshotAdapter.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.SnapshotAdapter
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.SnapshotAdapter
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] class NoOpSnapshotAdapter extends SnapshotAdapter[Any] {
+private[pekko] class NoOpSnapshotAdapter extends SnapshotAdapter[Any] {
   override def toJournal(state: Any): Any = state
   override def fromJournal(from: Any): Any = from
 }
@@ -20,7 +21,7 @@ private[akka] class NoOpSnapshotAdapter extends SnapshotAdapter[Any] {
  * INTERNAL API
  */
 @InternalApi
-private[akka] object NoOpSnapshotAdapter {
+private[pekko] object NoOpSnapshotAdapter {
   val i = new NoOpSnapshotAdapter
   def instance[S]: SnapshotAdapter[S] = i.asInstanceOf[SnapshotAdapter[S]]
 }
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/Recovering.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Recovering.scala
similarity index 86%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/Recovering.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Recovering.scala
index c895acf171..1b75998dd8 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/Recovering.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Recovering.scala
@@ -2,27 +2,28 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
 import scala.concurrent.duration._
 
-import akka.actor.typed.Behavior
-import akka.actor.typed.Signal
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.annotation.InternalApi
-import akka.annotation.InternalStableApi
-import akka.persistence._
-import akka.persistence.state.scaladsl.GetObjectResult
-import akka.persistence.typed.state.RecoveryCompleted
-import akka.persistence.typed.state.RecoveryFailed
-import akka.persistence.typed.state.internal.DurableStateBehaviorImpl.GetState
-import akka.persistence.typed.state.internal.Running.WithRevisionAccessible
-import akka.util.PrettyDuration._
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Signal
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.annotation.InternalApi
+import pekko.annotation.InternalStableApi
+import pekko.persistence._
+import pekko.persistence.state.scaladsl.GetObjectResult
+import pekko.persistence.typed.state.RecoveryCompleted
+import pekko.persistence.typed.state.RecoveryFailed
+import pekko.persistence.typed.state.internal.DurableStateBehaviorImpl.GetState
+import pekko.persistence.typed.state.internal.Running.WithRevisionAccessible
+import pekko.util.PrettyDuration._
+import pekko.util.unused
 
 /**
  * INTERNAL API
@@ -37,7 +38,7 @@ import akka.util.unused
  * See previous behavior [[RequestingRecoveryPermit]].
  */
 @InternalApi
-private[akka] object Recovering {
+private[pekko] object Recovering {
 
   def apply[C, S](setup: BehaviorSetup[C, S], receivedPoisonPill: Boolean): Behavior[InternalProtocol] = {
     Behaviors.setup { _ =>
@@ -49,7 +50,7 @@ private[akka] object Recovering {
   }
 
   @InternalApi
-  private[akka] final case class RecoveryState[State](
+  private[pekko] final case class RecoveryState[State](
       revision: Long,
       state: State,
       receivedPoisonPill: Boolean,
@@ -58,7 +59,7 @@ private[akka] object Recovering {
 }
 
 @InternalApi
-private[akka] class Recovering[C, S](
+private[pekko] class Recovering[C, S](
     override val setup: BehaviorSetup[C, S],
     var recoveryState: Recovering.RecoveryState[S])
     extends AbstractBehavior[InternalProtocol](setup.context) // must be class for WithSeqNrAccessible
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/RequestingRecoveryPermit.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/RequestingRecoveryPermit.scala
similarity index 82%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/RequestingRecoveryPermit.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/RequestingRecoveryPermit.scala
index adeb042ea6..335e4222f2 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/RequestingRecoveryPermit.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/RequestingRecoveryPermit.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
-import akka.actor.typed.Behavior
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.scaladsl.{ ActorContext, Behaviors }
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.scaladsl.{ ActorContext, Behaviors }
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.util.unused
 
 /**
  * INTERNAL API
@@ -21,7 +22,7 @@ import akka.util.unused
  * See next behavior [[Recovering]].
  */
 @InternalApi
-private[akka] object RequestingRecoveryPermit {
+private[pekko] object RequestingRecoveryPermit {
 
   def apply[C, S](setup: BehaviorSetup[C, S]): Behavior[InternalProtocol] =
     new RequestingRecoveryPermit(setup.setMdcPhase(PersistenceMdc.AwaitingPermit)).createBehavior()
@@ -29,7 +30,7 @@ private[akka] object RequestingRecoveryPermit {
 }
 
 @InternalApi
-private[akka] class RequestingRecoveryPermit[C, S](override val setup: BehaviorSetup[C, S])
+private[pekko] class RequestingRecoveryPermit[C, S](override val setup: BehaviorSetup[C, S])
     extends StashManagement[C, S]
     with DurableStateStoreInteractions[C, S] {
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/Running.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Running.scala
similarity index 89%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/Running.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Running.scala
index 467c2ff61b..74374302a9 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/Running.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/Running.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
 import scala.annotation.tailrec
 import scala.collection.immutable
 
-import akka.actor.UnhandledMessage
-import akka.actor.typed.Behavior
-import akka.actor.typed.Signal
-import akka.actor.typed.internal.PoisonPill
-import akka.actor.typed.scaladsl.AbstractBehavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.annotation.InternalApi
-import akka.annotation.InternalStableApi
-import akka.persistence.typed.state.internal.DurableStateBehaviorImpl.GetState
-import akka.persistence.typed.state.scaladsl.Effect
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.UnhandledMessage
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Signal
+import pekko.actor.typed.internal.PoisonPill
+import pekko.actor.typed.scaladsl.AbstractBehavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.annotation.InternalApi
+import pekko.annotation.InternalStableApi
+import pekko.persistence.typed.state.internal.DurableStateBehaviorImpl.GetState
+import pekko.persistence.typed.state.scaladsl.Effect
+import pekko.util.unused
 
 /**
  * INTERNAL API
@@ -39,7 +40,7 @@ import akka.util.unused
  * See previous [[Recovering]].
  */
 @InternalApi
-private[akka] object Running {
+private[pekko] object Running {
 
   trait WithRevisionAccessible {
     def currentRevision: Long
@@ -59,7 +60,7 @@ private[akka] object Running {
 // ===============================================
 
 /** INTERNAL API */
-@InternalApi private[akka] final class Running[C, S](override val setup: BehaviorSetup[C, S])
+@InternalApi private[pekko] final class Running[C, S](override val setup: BehaviorSetup[C, S])
     extends DurableStateStoreInteractions[C, S]
     with StashManagement[C, S] {
   import InternalProtocol._
@@ -146,7 +147,7 @@ private[akka] object Running {
           (applySideEffects(sideEffects, nextState), true)
 
         case _: Unhandled.type =>
-          import akka.actor.typed.scaladsl.adapter._
+          import pekko.actor.typed.scaladsl.adapter._
           setup.context.system.toClassic.eventStream
             .publish(UnhandledMessage(msg, setup.context.system.toClassic.deadLetters, setup.context.self.toClassic))
           (applySideEffects(sideEffects, state), true)
@@ -180,7 +181,7 @@ private[akka] object Running {
   }
 
   /** INTERNAL API */
-  @InternalApi private[akka] class PersistingState(
+  @InternalApi private[pekko] class PersistingState(
       var state: RunningState[S],
       var visibleState: RunningState[S], // previous state until write success
       var sideEffects: immutable.Seq[SideEffect[S]],
@@ -284,8 +285,8 @@ private[akka] object Running {
   }
 
   @InternalStableApi
-  private[akka] def onWriteFailed(@unused ctx: ActorContext[_], @unused reason: Throwable): Unit = ()
+  private[pekko] def onWriteFailed(@unused ctx: ActorContext[_], @unused reason: Throwable): Unit = ()
   @InternalStableApi
-  private[akka] def onWriteSuccess(@unused ctx: ActorContext[_]): Unit = ()
+  private[pekko] def onWriteSuccess(@unused ctx: ActorContext[_]): Unit = ()
 
 }
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/SideEffect.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/SideEffect.scala
similarity index 61%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/SideEffect.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/SideEffect.scala
index a8854f03c5..0c9e61473a 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/SideEffect.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/SideEffect.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
-import akka.actor.typed.ActorRef
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.annotation.InternalApi
 
 /**
  * A [[SideEffect]] is an side effect that can be chained after a main effect.
@@ -16,17 +17,17 @@ import akka.annotation.InternalApi
  * INTERNAL API
  */
 @InternalApi
-private[akka] sealed abstract class SideEffect[State]
+private[pekko] sealed abstract class SideEffect[State]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] class Callback[State](val sideEffect: State => Unit) extends SideEffect[State] {
+private[pekko] class Callback[State](val sideEffect: State => Unit) extends SideEffect[State] {
   override def toString: String = "Callback"
 }
 
 /** INTERNAL API */
 @InternalApi
-final private[akka] class ReplyEffectImpl[ReplyMessage, State](
+final private[pekko] class ReplyEffectImpl[ReplyMessage, State](
     replyTo: ActorRef[ReplyMessage],
     replyWithMessage: State => ReplyMessage)
     extends Callback[State](state => replyTo ! replyWithMessage(state)) {
@@ -35,21 +36,21 @@ final private[akka] class ReplyEffectImpl[ReplyMessage, State](
 
 /** INTERNAL API */
 @InternalApi
-final private[akka] class NoReplyEffectImpl[State] extends Callback[State](_ => ()) {
+final private[pekko] class NoReplyEffectImpl[State] extends Callback[State](_ => ()) {
   override def toString: String = "NoReply"
 }
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object Stop extends SideEffect[Nothing]
+private[pekko] case object Stop extends SideEffect[Nothing]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] case object UnstashAll extends SideEffect[Nothing]
+private[pekko] case object UnstashAll extends SideEffect[Nothing]
 
 /** INTERNAL API */
 @InternalApi
-private[akka] object SideEffect {
+private[pekko] object SideEffect {
 
   def apply[State](callback: State => Unit): SideEffect[State] =
     new Callback(callback)
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/StashManagement.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/StashManagement.scala
similarity index 88%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/StashManagement.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/StashManagement.scala
index 72747fa7dd..1b0c946f48 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/internal/StashManagement.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/internal/StashManagement.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.internal
+package org.apache.pekko.persistence.typed.state.internal
 
-import akka.actor.Dropped
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.actor.typed.scaladsl.StashBuffer
-import akka.actor.typed.scaladsl.StashOverflowException
-import akka.actor.typed.scaladsl.adapter._
-import akka.annotation.InternalApi
-import akka.util.ConstantFun
+import org.apache.pekko
+import pekko.actor.Dropped
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.actor.typed.scaladsl.StashBuffer
+import pekko.actor.typed.scaladsl.StashOverflowException
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.annotation.InternalApi
+import pekko.util.ConstantFun
 
 /** INTERNAL API: Stash management for persistent behaviors */
 @InternalApi
-private[akka] trait StashManagement[C, S] {
+private[pekko] trait StashManagement[C, S] {
 
   def setup: BehaviorSetup[C, S]
 
@@ -125,7 +126,7 @@ private[akka] trait StashManagement[C, S] {
 
 /** INTERNAL API: stash buffer state in order to survive restart of internal behavior */
 @InternalApi
-private[akka] class StashState(ctx: ActorContext[InternalProtocol], settings: DurableStateSettings) {
+private[pekko] class StashState(ctx: ActorContext[InternalProtocol], settings: DurableStateSettings) {
 
   private var _internalStashBuffer: StashBuffer[InternalProtocol] = StashBuffer(ctx, settings.stashCapacity)
   private var _userStashBuffer: StashBuffer[InternalProtocol] = StashBuffer(ctx, settings.stashCapacity)
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/CommandHandler.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandler.scala
similarity index 98%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/CommandHandler.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandler.scala
index 000a97cb10..0efa6b6f63 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/CommandHandler.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandler.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.javadsl
+package org.apache.pekko.persistence.typed.state.javadsl
 
 import java.util.Objects
 import java.util.function.BiFunction
@@ -12,9 +12,10 @@ import java.util.function.{ Function => JFunction }
 
 import scala.compat.java8.FunctionConverters._
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.state.internal._
-import akka.util.OptionVal
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.state.internal._
+import pekko.util.OptionVal
 
 /**
  * FunctionalInterface for reacting on commands
@@ -189,7 +190,7 @@ object CommandHandlerBuilderByState {
       handler: BiFunction[State, Command, Effect[State]])
 }
 
-final class CommandHandlerBuilderByState[Command, S <: State, State] @InternalApi private[akka] (
+final class CommandHandlerBuilderByState[Command, S <: State, State] @InternalApi private[pekko] (
     private val stateClass: Class[S],
     private val statePredicate: Predicate[S]) {
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/CommandHandlerWithReply.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
similarity index 99%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
index 48c7d7952e..68bb7f9fcd 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/CommandHandlerWithReply.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.javadsl
+package org.apache.pekko.persistence.typed.state.javadsl
 
 import java.util.Objects
 import java.util.function.BiFunction
@@ -12,9 +12,10 @@ import java.util.function.{ Function => JFunction }
 
 import scala.compat.java8.FunctionConverters._
 
-import akka.annotation.InternalApi
-import akka.persistence.typed.state.internal._
-import akka.util.OptionVal
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.state.internal._
+import pekko.util.OptionVal
 
 /* Note that this is a copy of CommandHandler.scala to support ReplyEffect
  * s/Effect/ReplyEffect/
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/DurableStateBehavior.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/DurableStateBehavior.scala
similarity index 88%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/DurableStateBehavior.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/DurableStateBehavior.scala
index aa97201df4..2c6e78fecb 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/DurableStateBehavior.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/DurableStateBehavior.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.javadsl
+package org.apache.pekko.persistence.typed.state.javadsl
 
 import java.util.Optional
 
-import akka.actor.typed
-import akka.actor.typed.BackoffSupervisorStrategy
-import akka.actor.typed.Behavior
-import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior
-import akka.actor.typed.javadsl.ActorContext
-import akka.annotation.ApiMayChange
-import akka.annotation.InternalApi
-import akka.persistence.typed.state.internal
-import akka.persistence.typed.state.internal._
-import akka.persistence.typed.state.scaladsl
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.SnapshotAdapter
+import org.apache.pekko
+import pekko.actor.typed
+import pekko.actor.typed.BackoffSupervisorStrategy
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.internal.BehaviorImpl.DeferredBehavior
+import pekko.actor.typed.javadsl.ActorContext
+import pekko.annotation.ApiMayChange
+import pekko.annotation.InternalApi
+import pekko.persistence.typed.state.internal
+import pekko.persistence.typed.state.internal._
+import pekko.persistence.typed.state.scaladsl
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.SnapshotAdapter
 
 /**
  * A `Behavior` for a persistent actor with durable storage of its state.
@@ -25,7 +26,7 @@ import akka.persistence.typed.SnapshotAdapter
  * API May Change
  */
 @ApiMayChange
-abstract class DurableStateBehavior[Command, State] private[akka] (
+abstract class DurableStateBehavior[Command, State] private[pekko] (
     val persistenceId: PersistenceId,
     onPersistFailure: Optional[BackoffSupervisorStrategy])
     extends DeferredBehavior[Command] {
@@ -79,7 +80,7 @@ abstract class DurableStateBehavior[Command, State] private[akka] (
 
   /**
    * Override to react on general lifecycle signals and `DurableStateBehavior` specific signals
-   * (recovery related). Those are all subtypes of [[akka.persistence.typed.state.DurableStateSignal]].
+   * (recovery related). Those are all subtypes of [[pekko.persistence.typed.state.DurableStateSignal]].
    *
    * Use [[DurableStateBehavior#newSignalHandlerBuilder]] to define the signal handler.
    */
@@ -123,7 +124,7 @@ abstract class DurableStateBehavior[Command, State] private[akka] (
   /**
    * INTERNAL API
    */
-  @InternalApi private[akka] final def createDurableStateBehavior(): scaladsl.DurableStateBehavior[Command, State] = {
+  @InternalApi private[pekko] final def createDurableStateBehavior(): scaladsl.DurableStateBehavior[Command, State] = {
 
     val behavior = new internal.DurableStateBehaviorImpl[Command, State](
       persistenceId,
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/Effect.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/Effect.scala
similarity index 94%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/Effect.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/Effect.scala
index 92cf7b37e0..a1c50f6019 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/Effect.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/Effect.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.javadsl
+package org.apache.pekko.persistence.typed.state.javadsl
 
-import akka.actor.typed.ActorRef
-import akka.annotation.ApiMayChange
-import akka.annotation.DoNotInherit
-import akka.annotation.InternalApi
-import akka.japi.function
-import akka.persistence.typed.state.internal.SideEffect
-import akka.persistence.typed.state.internal._
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.annotation.ApiMayChange
+import pekko.annotation.DoNotInherit
+import pekko.annotation.InternalApi
+import pekko.japi.function
+import pekko.persistence.typed.state.internal.SideEffect
+import pekko.persistence.typed.state.internal._
 
 /**
  * INTERNAL API: see `class EffectFactories`
  */
-@InternalApi private[akka] object EffectFactories extends EffectFactories[Nothing]
+@InternalApi private[pekko] object EffectFactories extends EffectFactories[Nothing]
 
 /**
  * Factory methods for creating [[Effect]] directives - how a `DurableStateBehavior` reacts on a command.
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/SignalHandler.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/SignalHandler.scala
similarity index 85%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/SignalHandler.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/SignalHandler.scala
index 6bb8d39fd9..ce41518cff 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/javadsl/SignalHandler.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/javadsl/SignalHandler.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.javadsl
+package org.apache.pekko.persistence.typed.state.javadsl
 
 import java.util.function.BiConsumer
 import java.util.function.Consumer
 
-import akka.actor.typed.Signal
-import akka.annotation.InternalApi
+import org.apache.pekko
+import pekko.actor.typed.Signal
+import pekko.annotation.InternalApi
 
 object SignalHandler {
   private val Empty: SignalHandler[Any] = new SignalHandler[Any](PartialFunction.empty)
@@ -22,13 +23,13 @@ final class SignalHandler[State](_handler: PartialFunction[(State, Signal), Unit
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def isEmpty: Boolean = _handler eq PartialFunction.empty
+  private[pekko] def isEmpty: Boolean = _handler eq PartialFunction.empty
 
   /**
    * INTERNAL API
    */
   @InternalApi
-  private[akka] def handler: PartialFunction[(State, Signal), Unit] = _handler
+  private[pekko] def handler: PartialFunction[(State, Signal), Unit] = _handler
 }
 
 object SignalHandlerBuilder {
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/scaladsl/DurableStateBehavior.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehavior.scala
similarity index 88%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/scaladsl/DurableStateBehavior.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehavior.scala
index 7d21e35c8b..fe3badcc82 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/scaladsl/DurableStateBehavior.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/DurableStateBehavior.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.scaladsl
+package org.apache.pekko.persistence.typed.state.scaladsl
 
 import scala.annotation.tailrec
 
-import akka.actor.typed.BackoffSupervisorStrategy
-import akka.actor.typed.Behavior
-import akka.actor.typed.Signal
-import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior
-import akka.actor.typed.internal.InterceptorImpl
-import akka.actor.typed.internal.LoggerClass
-import akka.actor.typed.scaladsl.ActorContext
-import akka.annotation.ApiMayChange
-import akka.annotation.DoNotInherit
-import akka.persistence.typed.state.internal._
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.SnapshotAdapter
+import org.apache.pekko
+import pekko.actor.typed.BackoffSupervisorStrategy
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.Signal
+import pekko.actor.typed.internal.BehaviorImpl.DeferredBehavior
+import pekko.actor.typed.internal.InterceptorImpl
+import pekko.actor.typed.internal.LoggerClass
+import pekko.actor.typed.scaladsl.ActorContext
+import pekko.annotation.ApiMayChange
+import pekko.annotation.DoNotInherit
+import pekko.persistence.typed.state.internal._
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.SnapshotAdapter
 
 /**
  * API May Change
@@ -122,7 +123,7 @@ object DurableStateBehavior {
    * Allows the `DurableStateBehavior` to react on signals.
    *
    * The regular lifecycle signals can be handled as well as `DurableStateBehavior` specific signals
-   * (recovery related). Those are all subtypes of [[akka.persistence.typed.state.DurableStateSignal]]
+   * (recovery related). Those are all subtypes of [[pekko.persistence.typed.state.DurableStateSignal]]
    */
   def receiveSignal(signalHandler: PartialFunction[(State, Signal), Unit]): DurableStateBehavior[Command, State]
 
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/scaladsl/Effect.scala b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/Effect.scala
similarity index 95%
rename from akka-persistence-typed/src/main/scala/akka/persistence/typed/state/scaladsl/Effect.scala
rename to akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/Effect.scala
index f7725e1e58..99bae1e2bb 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/state/scaladsl/Effect.scala
+++ b/akka-persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/state/scaladsl/Effect.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.state.scaladsl
+package org.apache.pekko.persistence.typed.state.scaladsl
 
-import akka.actor.typed.ActorRef
-import akka.annotation.ApiMayChange
-import akka.annotation.DoNotInherit
-import akka.persistence.typed.state.internal.SideEffect
-import akka.persistence.typed.state.internal._
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.annotation.ApiMayChange
+import pekko.annotation.DoNotInherit
+import pekko.persistence.typed.state.internal.SideEffect
+import pekko.persistence.typed.state.internal._
 
 /**
  * Factory methods for creating [[Effect]] directives - how a `DurableStateBehavior` reacts on a command.
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java
similarity index 93%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java
index 3eddfc9dbb..bd6af8bf83 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BasicPersistentBehaviorTest.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorTest.java
@@ -2,29 +2,29 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.SupervisorStrategy;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.persistence.typed.DeleteEventsFailed;
-import akka.persistence.typed.DeleteSnapshotsFailed;
-import akka.persistence.typed.RecoveryCompleted;
-import akka.persistence.typed.SnapshotFailed;
-import akka.persistence.typed.SnapshotSelectionCriteria;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.Effect;
-import akka.persistence.typed.javadsl.Recovery;
-import akka.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.SupervisorStrategy;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.persistence.typed.DeleteEventsFailed;
+import org.apache.pekko.persistence.typed.DeleteSnapshotsFailed;
+import org.apache.pekko.persistence.typed.RecoveryCompleted;
+import org.apache.pekko.persistence.typed.SnapshotFailed;
+import org.apache.pekko.persistence.typed.SnapshotSelectionCriteria;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.Effect;
+import org.apache.pekko.persistence.typed.javadsl.Recovery;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
 // #behavior
-import akka.persistence.typed.javadsl.EventSourcedBehavior;
-import akka.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
+import org.apache.pekko.persistence.typed.PersistenceId;
 
 // #behavior
-import akka.persistence.typed.javadsl.RetentionCriteria;
-import akka.persistence.typed.javadsl.SignalHandler;
+import org.apache.pekko.persistence.typed.javadsl.RetentionCriteria;
+import org.apache.pekko.persistence.typed.javadsl.SignalHandler;
 
 import java.time.Duration;
 import java.util.ArrayList;
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java
similarity index 95%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java
index 9e213db840..b801a6e52b 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntity.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntity.java
@@ -2,14 +2,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.*;
 
 // #behavior
 public class BlogPostEntity
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntityDurableState.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.java
similarity index 93%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntityDurableState.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.java
index 6b8ef791a7..ad742f9d66 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/BlogPostEntityDurableState.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.java
@@ -2,14 +2,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.state.javadsl.*;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.state.javadsl.*;
 
 // #behavior
 public class BlogPostEntityDurableState
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java
similarity index 94%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java
index 5361155306..195035edbe 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/DurableStatePersistentBehaviorTest.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorTest.java
@@ -2,22 +2,22 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.SupervisorStrategy;
-import akka.persistence.typed.state.javadsl.CommandHandler;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.SupervisorStrategy;
+import org.apache.pekko.persistence.typed.state.javadsl.CommandHandler;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
 // #behavior
-import akka.persistence.typed.state.javadsl.DurableStateBehavior;
-import akka.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.state.javadsl.DurableStateBehavior;
+import org.apache.pekko.persistence.typed.PersistenceId;
 
 // #behavior
 
 // #effects
-import akka.Done;
+import org.apache.pekko.Done;
 // #effects
 
 import java.time.Duration;
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/MovieWatchList.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/MovieWatchList.java
similarity index 88%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/MovieWatchList.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/MovieWatchList.java
index 9cecb16a9e..c8eedcf863 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/MovieWatchList.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/MovieWatchList.java
@@ -2,14 +2,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.EventSourcedBehavior;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/NullBlogState.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/NullBlogState.java
similarity index 95%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/NullBlogState.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/NullBlogState.java
index 7207bc9eda..d6d5e9dfc6 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/NullBlogState.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/NullBlogState.java
@@ -2,12 +2,12 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.*;
 
 public class NullBlogState {
 
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/OptionalBlogState.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/OptionalBlogState.java
similarity index 96%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/OptionalBlogState.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/OptionalBlogState.java
index f715ccf198..27e98980f1 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/OptionalBlogState.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/OptionalBlogState.java
@@ -2,12 +2,12 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.*;
 
 import java.util.Optional;
 
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java
similarity index 94%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java
index c9dc17284c..18c1875f27 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java
@@ -2,16 +2,16 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.javadsl.TimerScheduler;
-import akka.persistence.typed.*;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.javadsl.TimerScheduler;
+import org.apache.pekko.persistence.typed.*;
+import org.apache.pekko.persistence.typed.javadsl.*;
 
 import java.time.Duration;
 
-import static jdocs.akka.persistence.typed.WebStoreCustomerFSM.*;
+import static jdocs.org.apache.pekko.persistence.typed.WebStoreCustomerFSM.*;
 
 @Deprecated
 public class PersistentFsmToTypedMigrationCompileOnlyTest {
@@ -98,7 +98,7 @@ public class PersistentFsmToTypedMigrationCompileOnlyTest {
 
     @Override
     public EventSeq fromJournal(Object event, String manifest) {
-      if (event instanceof akka.persistence.fsm.PersistentFSM.StateChangeEvent) {
+      if (event instanceof org.apache.pekko.persistence.fsm.PersistentFSM.StateChangeEvent) {
         // In this example the state transitions can be inferred from the events
         // Alternatively the StateChangeEvent can be converted to a private event if either the
         // StateChangeEvent.stateIdentifier
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/StashingExample.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/StashingExample.java
similarity index 90%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/StashingExample.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/StashingExample.java
index ff30057996..c56a036b36 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/StashingExample.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/StashingExample.java
@@ -2,15 +2,15 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
-import akka.actor.typed.Behavior;
-import akka.actor.typed.SupervisorStrategy;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.CommandHandler;
-import akka.persistence.typed.javadsl.Effect;
-import akka.persistence.typed.javadsl.EventHandler;
-import akka.persistence.typed.javadsl.EventSourcedBehavior;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.SupervisorStrategy;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
+import org.apache.pekko.persistence.typed.javadsl.Effect;
+import org.apache.pekko.persistence.typed.javadsl.EventHandler;
+import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
 
 import java.time.Duration;
 import java.util.Optional;
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/WebStoreCustomerFSM.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/WebStoreCustomerFSM.java
similarity index 93%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/WebStoreCustomerFSM.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/WebStoreCustomerFSM.java
index e5496f45fa..b19cb1bd91 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/WebStoreCustomerFSM.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/WebStoreCustomerFSM.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed;
+package jdocs.org.apache.pekko.persistence.typed;
 
 import java.io.Serializable;
 
@@ -11,8 +11,8 @@ import java.util.List;
 import java.util.ArrayList;
 
 /**
- * The model from akka.persistence.fsm.AbstractPersistentFSMTest.WebStoreCustomerFSM brought here
- * for the PersistentFsmToTypedMigrationCompileOnlyTest
+ * The model from org.apache.pekko.persistence.fsm.AbstractPersistentFSMTest.WebStoreCustomerFSM
+ * brought here for the PersistentFsmToTypedMigrationCompileOnlyTest
  */
 public class WebStoreCustomerFSM {
   public static class ShoppingCart {
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/Auction.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/Auction.java
similarity index 95%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/Auction.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/Auction.java
index 10b785c9e5..b2fbf040f4 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/Auction.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/Auction.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed.auction;
+package jdocs.org.apache.pekko.persistence.typed.auction;
 
 import java.time.Instant;
 import java.util.UUID;
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionCommand.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionCommand.java
similarity index 96%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionCommand.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionCommand.java
index 7ede2211e5..4c0cdab6d9 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionCommand.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionCommand.java
@@ -2,10 +2,10 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed.auction;
+package jdocs.org.apache.pekko.persistence.typed.auction;
 
-import akka.Done;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.Done;
+import org.apache.pekko.actor.typed.ActorRef;
 
 import java.util.UUID;
 
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionEntity.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEntity.java
similarity index 96%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionEntity.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEntity.java
index d855fc8acc..ec5eab1560 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionEntity.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEntity.java
@@ -2,20 +2,20 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed.auction;
+package jdocs.org.apache.pekko.persistence.typed.auction;
 
-import akka.Done;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.javadsl.*;
+import org.apache.pekko.Done;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.*;
 
-import static jdocs.akka.persistence.typed.auction.AuctionCommand.*;
-import static jdocs.akka.persistence.typed.auction.AuctionEvent.*;
+import static jdocs.org.apache.pekko.persistence.typed.auction.AuctionCommand.*;
+import static jdocs.org.apache.pekko.persistence.typed.auction.AuctionEvent.*;
 
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.UUID;
-import akka.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorRef;
 
 /**
  * Based on
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionEvent.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEvent.java
similarity index 96%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionEvent.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEvent.java
index c336f3fb40..1374ee00e1 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionEvent.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEvent.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed.auction;
+package jdocs.org.apache.pekko.persistence.typed.auction;
 
 import java.util.UUID;
 
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionState.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionState.java
similarity index 97%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionState.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionState.java
index 0a756c8143..9df3e4446f 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionState.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionState.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed.auction;
+package jdocs.org.apache.pekko.persistence.typed.auction;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionStatus.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionStatus.java
similarity index 85%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionStatus.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionStatus.java
index f7d15cef7d..dce096bd05 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/AuctionStatus.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionStatus.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed.auction;
+package jdocs.org.apache.pekko.persistence.typed.auction;
 
 /** Auction status. */
 public enum AuctionStatus {
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/Bid.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/Bid.java
similarity index 93%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/Bid.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/Bid.java
index b0d8d1e8d2..a25c1b82e8 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/Bid.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/Bid.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed.auction;
+package jdocs.org.apache.pekko.persistence.typed.auction;
 
 import java.time.Instant;
 import java.util.UUID;
diff --git a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/BidResultStatus.java b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/BidResultStatus.java
similarity index 92%
rename from akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/BidResultStatus.java
rename to akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/BidResultStatus.java
index c9cf0fda32..703999c8e7 100644
--- a/akka-persistence-typed/src/test/java/jdocs/akka/persistence/typed/auction/BidResultStatus.java
+++ b/akka-persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/BidResultStatus.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package jdocs.akka.persistence.typed.auction;
+package jdocs.org.apache.pekko.persistence.typed.auction;
 
 /** The status of the result of placing a bid. */
 public enum BidResultStatus {
diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/LoggerSourceTest.java b/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/LoggerSourceTest.java
similarity index 87%
rename from akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/LoggerSourceTest.java
rename to akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/LoggerSourceTest.java
index 3fc7f1f078..944c7c7828 100644
--- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/LoggerSourceTest.java
+++ b/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/LoggerSourceTest.java
@@ -2,18 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl;
+package org.apache.pekko.persistence.typed.javadsl;
 
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.LoggingTestKit;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.RecoveryCompleted;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.LoggingTestKit;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.RecoveryCompleted;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java b/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/NullEmptyStateTest.java
similarity index 86%
rename from akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java
rename to akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/NullEmptyStateTest.java
index 57bed0e906..eb7fd19149 100644
--- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java
+++ b/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/NullEmptyStateTest.java
@@ -2,16 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl;
+package org.apache.pekko.persistence.typed.javadsl;
 
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.RecoveryCompleted;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.RecoveryCompleted;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java b/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java
similarity index 95%
rename from akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java
rename to akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java
index b6ab918d2c..f508152f0c 100644
--- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java
+++ b/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java
@@ -2,22 +2,22 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl;
+package org.apache.pekko.persistence.typed.javadsl;
 
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Scheduler;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.japi.function.Procedure;
-import akka.persistence.typed.*;
-import akka.actor.testkit.typed.javadsl.TestInbox;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Scheduler;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.japi.function.Procedure;
+import org.apache.pekko.persistence.typed.*;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestInbox;
 
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletionStage;
 
-import static akka.actor.typed.javadsl.AskPattern.ask;
+import static org.apache.pekko.actor.typed.javadsl.AskPattern.ask;
 
 public class PersistentActorCompileOnlyTest {
 
diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PrimitiveStateTest.java b/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PrimitiveStateTest.java
similarity index 83%
rename from akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PrimitiveStateTest.java
rename to akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PrimitiveStateTest.java
index bbf671963d..94a4225e14 100644
--- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PrimitiveStateTest.java
+++ b/akka-persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PrimitiveStateTest.java
@@ -2,16 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.javadsl;
+package org.apache.pekko.persistence.typed.javadsl;
 
-import akka.actor.testkit.typed.javadsl.LogCapturing;
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.persistence.typed.PersistenceId;
-import akka.persistence.typed.RecoveryCompleted;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.RecoveryCompleted;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
diff --git a/akka-persistence-typed/src/test/resources/logback-test.xml b/akka-persistence-typed/src/test/resources/logback-test.xml
index 901bdbb4aa..543780d0e8 100644
--- a/akka-persistence-typed/src/test/resources/logback-test.xml
+++ b/akka-persistence-typed/src/test/resources/logback-test.xml
@@ -12,16 +12,16 @@
     
-    
+    
 
     
-    
+    
         
     
 
diff --git a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala
similarity index 90%
rename from akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala
rename to akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala
index d3accaab64..be3f334d66 100644
--- a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BasicPersistentBehaviorCompileOnly.scala
+++ b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BasicPersistentBehaviorCompileOnly.scala
@@ -2,36 +2,39 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
 import scala.concurrent.duration._
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.SupervisorStrategy
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.LoggerOps
-import akka.persistence.typed.DeleteEventsFailed
-import akka.persistence.typed.DeleteSnapshotsFailed
-import akka.persistence.typed.EventAdapter
-import akka.persistence.typed.EventSeq
-import akka.persistence.typed.scaladsl.Recovery
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.SupervisorStrategy
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.LoggerOps
+import pekko.persistence.typed.DeleteEventsFailed
+import pekko.persistence.typed.DeleteSnapshotsFailed
+import pekko.persistence.typed.EventAdapter
+import pekko.persistence.typed.EventSeq
+import pekko.persistence.typed.scaladsl.Recovery
 //#structure
 //#behavior
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.PersistenceId
 
 //#behavior
 //#structure
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.SnapshotFailed
+import org.apache.pekko
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.SnapshotFailed
 import scala.annotation.nowarn
 
 // unused variables in pattern match are useful in the docs
 @nowarn
 object BasicPersistentBehaviorCompileOnly {
 
-  import akka.persistence.typed.scaladsl.RetentionCriteria
+  import pekko.persistence.typed.scaladsl.RetentionCriteria
 
   object FirstExample {
     // #command
@@ -49,7 +52,7 @@ object BasicPersistentBehaviorCompileOnly {
     // #state
 
     // #command-handler
-    import akka.persistence.typed.scaladsl.Effect
+    import org.apache.pekko.persistence.typed.scaladsl.Effect
 
     val commandHandler: (State, Command) => Effect[Event, State] = { (state, command) =>
       command match {
@@ -204,8 +207,9 @@ object BasicPersistentBehaviorCompileOnly {
 
   object BehaviorWithContext {
     // #actor-context
-    import akka.persistence.typed.scaladsl.Effect
-    import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
+    import org.apache.pekko
+    import pekko.persistence.typed.scaladsl.Effect
+    import pekko.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
 
     def apply(): Behavior[String] =
       Behaviors.setup { context =>
@@ -248,7 +252,7 @@ object BasicPersistentBehaviorCompileOnly {
   // #snapshottingPredicate
 
   // #snapshotSelection
-  import akka.persistence.typed.SnapshotSelectionCriteria
+  import org.apache.pekko.persistence.typed.SnapshotSelectionCriteria
 
   EventSourcedBehavior[Command, Event, State](
     persistenceId = PersistenceId.ofUniqueId("abc"),
@@ -260,7 +264,7 @@ object BasicPersistentBehaviorCompileOnly {
 
   // #retentionCriteria
 
-  import akka.persistence.typed.scaladsl.Effect
+  import org.apache.pekko.persistence.typed.scaladsl.Effect
 
   EventSourcedBehavior[Command, Event, State](
     persistenceId = PersistenceId.ofUniqueId("abc"),
diff --git a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala
similarity index 92%
rename from akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala
rename to akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala
index 57ed76147d..9d16939a6b 100644
--- a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntity.scala
+++ b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntity.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.pattern.StatusReply
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.pattern.StatusReply
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
 
 //#behavior
 object BlogPostEntity {
diff --git a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntityDurableState.scala b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala
similarity index 90%
rename from akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntityDurableState.scala
rename to akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala
index 032391b85f..2bf9738271 100644
--- a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/BlogPostEntityDurableState.scala
+++ b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/BlogPostEntityDurableState.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
-import akka.Done
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.pattern.StatusReply
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.state.scaladsl.Effect
-import akka.persistence.typed.state.scaladsl.DurableStateBehavior
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.pattern.StatusReply
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.state.scaladsl.Effect
+import pekko.persistence.typed.state.scaladsl.DurableStateBehavior
 
 //#behavior
 object BlogPostEntityDurableState {
diff --git a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala
similarity index 84%
rename from akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala
rename to akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala
index 0931b707d6..46dd70d0cd 100644
--- a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala
+++ b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/DurableStatePersistentBehaviorCompileOnly.scala
@@ -2,24 +2,26 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
-import akka.actor.typed.ActorRef
-import akka.Done
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.typed.state.scaladsl.Effect
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.Done
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.typed.state.scaladsl.Effect
 
 //#structure
 //#behavior
-import akka.persistence.typed.state.scaladsl.DurableStateBehavior
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.persistence.typed.state.scaladsl.DurableStateBehavior
+import pekko.persistence.typed.PersistenceId
 
 //#behavior
 //#structure
 
 import scala.annotation.nowarn
-import akka.serialization.jackson.CborSerializable
+import pekko.serialization.jackson.CborSerializable
 
 // unused variables in pattern match are useful in the docs
 @nowarn
@@ -38,7 +40,7 @@ object DurableStatePersistentBehaviorCompileOnly {
     // #state
 
     // #command-handler
-    import akka.persistence.typed.state.scaladsl.Effect
+    import pekko.persistence.typed.state.scaladsl.Effect
 
     val commandHandler: (State, Command[_]) => Effect[State] = (state, command) =>
       command match {
@@ -105,8 +107,9 @@ object DurableStatePersistentBehaviorCompileOnly {
 
   object BehaviorWithContext {
     // #actor-context
-    import akka.persistence.typed.state.scaladsl.Effect
-    import akka.persistence.typed.state.scaladsl.DurableStateBehavior.CommandHandler
+    import org.apache.pekko
+    import pekko.persistence.typed.state.scaladsl.Effect
+    import pekko.persistence.typed.state.scaladsl.DurableStateBehavior.CommandHandler
 
     def apply(): Behavior[String] =
       Behaviors.setup { context =>
@@ -133,8 +136,8 @@ object DurableStatePersistentBehaviorCompileOnly {
   }
 
   object WrapBehavior {
-    import akka.persistence.typed.state.scaladsl.Effect
-    import akka.persistence.typed.state.scaladsl.DurableStateBehavior.CommandHandler
+    import pekko.persistence.typed.state.scaladsl.Effect
+    import pekko.persistence.typed.state.scaladsl.DurableStateBehavior.CommandHandler
 
     def apply(): Behavior[Command[_]] =
       // #wrapPersistentBehavior
diff --git a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/MovieWatchList.scala b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/MovieWatchList.scala
similarity index 79%
rename from akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/MovieWatchList.scala
rename to akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/MovieWatchList.scala
index 28ab2197a9..3b1f3f4f4c 100644
--- a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/MovieWatchList.scala
+++ b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/MovieWatchList.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
 
 object MovieWatchList {
   sealed trait Command
diff --git a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala
similarity index 83%
rename from akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala
rename to akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala
index 1b4e0028ac..9174d10443 100644
--- a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/PersistentFsmToTypedMigrationSpec.scala
+++ b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationSpec.scala
@@ -2,38 +2,39 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
 import java.util.UUID
 
-import akka.actor.PoisonPill
-import akka.actor.testkit.typed.scaladsl.ActorTestKit
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.TimerScheduler
-import akka.actor.typed.ActorRef
-import akka.actor.typed.Behavior
-import akka.persistence.fsm.PersistentFSM.StateChangeEvent
-import akka.persistence.fsm.PersistentFSMSpec.CustomerInactive
-import akka.persistence.fsm.PersistentFSMSpec.DomainEvent
-import akka.persistence.fsm.PersistentFSMSpec.EmptyShoppingCart
-import akka.persistence.fsm.PersistentFSMSpec.Item
-import akka.persistence.fsm.PersistentFSMSpec.ItemAdded
-import akka.persistence.fsm.PersistentFSMSpec.OrderDiscarded
-import akka.persistence.fsm.PersistentFSMSpec.OrderExecuted
-import akka.persistence.fsm.PersistentFSMSpec.ShoppingCart
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
-import akka.persistence.typed.scaladsl.PersistentFSMMigration
-import akka.persistence.typed.EventAdapter
-import akka.persistence.typed.EventSeq
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.SnapshotAdapter
+import org.apache.pekko
+import pekko.actor.PoisonPill
+import pekko.actor.testkit.typed.scaladsl.ActorTestKit
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.TimerScheduler
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.persistence.fsm.PersistentFSM.StateChangeEvent
+import pekko.persistence.fsm.PersistentFSMSpec.CustomerInactive
+import pekko.persistence.fsm.PersistentFSMSpec.DomainEvent
+import pekko.persistence.fsm.PersistentFSMSpec.EmptyShoppingCart
+import pekko.persistence.fsm.PersistentFSMSpec.Item
+import pekko.persistence.fsm.PersistentFSMSpec.ItemAdded
+import pekko.persistence.fsm.PersistentFSMSpec.OrderDiscarded
+import pekko.persistence.fsm.PersistentFSMSpec.OrderExecuted
+import pekko.persistence.fsm.PersistentFSMSpec.ShoppingCart
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.PersistentFSMMigration
+import pekko.persistence.typed.EventAdapter
+import pekko.persistence.typed.EventSeq
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.SnapshotAdapter
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.concurrent.ScalaFutures
 import scala.concurrent.duration._
-import akka.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
 
 object PersistentFsmToTypedMigrationSpec {
   // cannot be moved to testkit journals as it requires sharing journal content across actor system instances
@@ -205,17 +206,17 @@ object ShoppingCartBehavior {
 
 class PersistentFsmToTypedMigrationSpec extends AnyWordSpec with ScalaFutures with LogCapturing {
 
-  import akka.persistence.fsm.PersistentFSMSpec._
+  import pekko.persistence.fsm.PersistentFSMSpec._
 
   "PersistentFSM migration to Persistence Typed" must {
     "work when snapshot is not current" in {
-      val classicActorSystem = akka.actor.ActorSystem("ClassicSystem", PersistentFsmToTypedMigrationSpec.config)
+      val classicActorSystem = pekko.actor.ActorSystem("ClassicSystem", PersistentFsmToTypedMigrationSpec.config)
       val shirt = Item("1", "Shirt", 59.99f)
       val shoes = Item("2", "Shoes", 89.99f)
       val coat = Item("3", "Coat", 119.99f)
       val pid = "no-snapshot"
       try {
-        import akka.testkit.TestProbe
+        import pekko.testkit.TestProbe
         val reportActorProbe = TestProbe()(classicActorSystem)
         val classicProbe = TestProbe()(classicActorSystem)
         implicit val classicRef = classicProbe.ref
@@ -235,7 +236,7 @@ class PersistentFsmToTypedMigrationSpec extends AnyWordSpec with ScalaFutures wi
       val typedTestKit = ActorTestKit("System", PersistentFsmToTypedMigrationSpec.config)
       try {
         import typedTestKit._
-        val typedProbe = akka.actor.testkit.typed.scaladsl.TestProbe[ShoppingCart]()
+        val typedProbe = pekko.actor.testkit.typed.scaladsl.TestProbe[ShoppingCart]()
         val typedReplacement = spawn(ShoppingCartBehavior(PersistenceId.ofUniqueId(pid)))
         typedReplacement ! ShoppingCartBehavior.AddItem(coat)
         typedReplacement ! ShoppingCartBehavior.GetCurrentCart(typedProbe.ref)
@@ -250,11 +251,11 @@ class PersistentFsmToTypedMigrationSpec extends AnyWordSpec with ScalaFutures wi
     }
 
     "work if snapshot is current" in {
-      val classicActorSystem = akka.actor.ActorSystem("CLassicSystem", PersistentFsmToTypedMigrationSpec.config)
+      val classicActorSystem = pekko.actor.ActorSystem("CLassicSystem", PersistentFsmToTypedMigrationSpec.config)
       val shirt = Item("1", "Shirt", 59.99f)
       val pid = "current-shapshot"
       try {
-        import akka.testkit.TestProbe
+        import pekko.testkit.TestProbe
         val reportActorProbe = TestProbe()(classicActorSystem)
         val classicProbe = TestProbe()(classicActorSystem)
         implicit val classicRef = classicProbe.ref
@@ -273,7 +274,7 @@ class PersistentFsmToTypedMigrationSpec extends AnyWordSpec with ScalaFutures wi
       val typedTestKit = ActorTestKit("TypedSystem", PersistentFsmToTypedMigrationSpec.config)
       try {
         import typedTestKit._
-        val typedProbe = akka.actor.testkit.typed.scaladsl.TestProbe[ShoppingCart]()
+        val typedProbe = pekko.actor.testkit.typed.scaladsl.TestProbe[ShoppingCart]()
         val typedReplacement = spawn(ShoppingCartBehavior(PersistenceId.ofUniqueId(pid)))
         typedReplacement ! ShoppingCartBehavior.GetCurrentCart(typedProbe.ref)
         typedProbe.expectMessage(NonEmptyShoppingCart(Seq(shirt)))
diff --git a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/StashingExample.scala b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/StashingExample.scala
similarity index 89%
rename from akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/StashingExample.scala
rename to akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/StashingExample.scala
index 7ce446f097..8964398f1a 100644
--- a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/StashingExample.scala
+++ b/akka-persistence-typed/src/test/scala/docs/org/apache/pekko/persistence/typed/StashingExample.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package docs.akka.persistence.typed
+package docs.org.apache.pekko.persistence.typed
 
 import scala.concurrent.duration._
 
-import akka.actor.typed.Behavior
-import akka.actor.typed.SupervisorStrategy
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
+import org.apache.pekko
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.SupervisorStrategy
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
 
 object StashingExample {
 
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ClusterSingletonPersistenceSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ClusterSingletonPersistenceSpec.scala
similarity index 75%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/ClusterSingletonPersistenceSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ClusterSingletonPersistenceSpec.scala
index 50e9946da7..2fd43d6c51 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ClusterSingletonPersistenceSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ClusterSingletonPersistenceSpec.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.cluster.typed.ClusterSingleton
-import akka.cluster.typed.SingletonActor
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
+import org.apache.pekko
+import pekko.actor
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.cluster.typed.ClusterSingleton
+import pekko.cluster.typed.SingletonActor
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
 
 object ClusterSingletonPersistenceSpec {
   val config = ConfigFactory.parseString("""
@@ -59,12 +60,12 @@ class ClusterSingletonPersistenceSpec
     with LogCapturing {
   import ClusterSingletonPersistenceSpec._
 
-  import akka.actor.typed.scaladsl.adapter._
+  import pekko.actor.typed.scaladsl.adapter._
 
   implicit val s: ActorSystem[Nothing] = system
 
   implicit val classicSystem: actor.ActorSystem = system.toClassic
-  private val classicCluster = akka.cluster.Cluster(classicSystem)
+  private val classicCluster = pekko.cluster.Cluster(classicSystem)
 
   "A typed cluster singleton with persistent actor" must {
 
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ManyRecoveriesSpec.scala
similarity index 82%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ManyRecoveriesSpec.scala
index 20b40b7224..191dc72a18 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ManyRecoveriesSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
-import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior }
-import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
-import akka.testkit.TestLatch
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter.TypedActorSystemOps
+import pekko.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior }
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
+import pekko.testkit.TestLatch
 
 object ManyRecoveriesSpec {
 
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/PersistenceIdSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/PersistenceIdSpec.scala
similarity index 96%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/PersistenceIdSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/PersistenceIdSpec.scala
index 77982c7301..e3c01f2ebc 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/PersistenceIdSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/PersistenceIdSpec.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
+import org.apache.pekko.actor.testkit.typed.scaladsl.LogCapturing
 
 class PersistenceIdSpec extends AnyWordSpec with Matchers with LogCapturing {
 
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingSerializationSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingSerializationSpec.scala
similarity index 70%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingSerializationSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingSerializationSpec.scala
index 1037021925..37e4d1bd3a 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ReplicatedEventSourcingSerializationSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/ReplicatedEventSourcingSerializationSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.persistence.typed.crdt.Counter
-import akka.persistence.typed.crdt.ORSet
-import akka.persistence.typed.internal.ReplicatedEventMetadata
-import akka.persistence.typed.internal.ReplicatedSnapshotMetadata
-import akka.persistence.typed.internal.VersionVector
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.persistence.typed.crdt.Counter
+import pekko.persistence.typed.crdt.ORSet
+import pekko.persistence.typed.internal.ReplicatedEventMetadata
+import pekko.persistence.typed.internal.ReplicatedSnapshotMetadata
+import pekko.persistence.typed.internal.VersionVector
 import org.scalatest.wordspec.AnyWordSpecLike
 
 class ReplicatedEventSourcingSerializationSpec
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/StashingWhenSnapshottingSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/StashingWhenSnapshottingSpec.scala
similarity index 79%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/StashingWhenSnapshottingSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/StashingWhenSnapshottingSpec.scala
index ec3975144d..79ecb0f38e 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/StashingWhenSnapshottingSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/StashingWhenSnapshottingSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed
+package org.apache.pekko.persistence.typed
 
 import java.util.concurrent.CyclicBarrier
 
@@ -13,19 +13,20 @@ import scala.util.Success
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Extension
-import akka.actor.typed.ExtensionId
-import akka.actor.typed.scaladsl.adapter._
-import akka.persistence
-import akka.persistence.SelectedSnapshot
-import akka.persistence.snapshot.SnapshotStore
-import akka.persistence.typed.StashingWhenSnapshottingSpec.ControllableSnapshotStoreExt
-import akka.persistence.typed.scaladsl.Effect
-import akka.persistence.typed.scaladsl.EventSourcedBehavior
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Extension
+import pekko.actor.typed.ExtensionId
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.persistence
+import pekko.persistence.SelectedSnapshot
+import pekko.persistence.snapshot.SnapshotStore
+import pekko.persistence.typed.StashingWhenSnapshottingSpec.ControllableSnapshotStoreExt
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
 
 object StashingWhenSnapshottingSpec {
   object ControllableSnapshotStoreExt extends ExtensionId[ControllableSnapshotStoreExt] {
@@ -54,7 +55,7 @@ object StashingWhenSnapshottingSpec {
   }
   val config = ConfigFactory.parseString(s"""
   slow-snapshot {
-    class = "akka.persistence.typed.StashingWhenSnapshottingSpec$$ControllableSnapshotStore"
+    class = "org.apache.pekko.persistence.typed.StashingWhenSnapshottingSpec$$ControllableSnapshotStore"
   }
   akka.actor.allow-java-serialization = on
   akka {
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala
similarity index 93%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala
index de8c766318..65734e4a61 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.delivery
+package org.apache.pekko.persistence.typed.delivery
 
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicInteger
@@ -13,18 +13,19 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.delivery.DurableProducerQueue.Confirmed
-import akka.actor.typed.delivery.DurableProducerQueue.LoadState
-import akka.actor.typed.delivery.DurableProducerQueue.MessageSent
-import akka.actor.typed.delivery.DurableProducerQueue.NoQualifier
-import akka.actor.typed.delivery.DurableProducerQueue.State
-import akka.actor.typed.delivery.DurableProducerQueue.StoreMessageConfirmed
-import akka.actor.typed.delivery.DurableProducerQueue.StoreMessageSent
-import akka.actor.typed.delivery.DurableProducerQueue.StoreMessageSentAck
-import akka.actor.typed.eventstream.EventStream
-import akka.persistence.journal.inmem.InmemJournal
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.delivery.DurableProducerQueue.Confirmed
+import pekko.actor.typed.delivery.DurableProducerQueue.LoadState
+import pekko.actor.typed.delivery.DurableProducerQueue.MessageSent
+import pekko.actor.typed.delivery.DurableProducerQueue.NoQualifier
+import pekko.actor.typed.delivery.DurableProducerQueue.State
+import pekko.actor.typed.delivery.DurableProducerQueue.StoreMessageConfirmed
+import pekko.actor.typed.delivery.DurableProducerQueue.StoreMessageSent
+import pekko.actor.typed.delivery.DurableProducerQueue.StoreMessageSentAck
+import pekko.actor.typed.eventstream.EventStream
+import pekko.persistence.journal.inmem.InmemJournal
+import pekko.persistence.typed.PersistenceId
 
 object EventSourcedProducerQueueSpec {
   def conf: Config =
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala
similarity index 96%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala
index 346933059b..a1527e29d1 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.delivery
+package org.apache.pekko.persistence.typed.delivery
 
 import java.util.UUID
 
@@ -10,10 +10,11 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.ProducerController
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.ProducerController
+import pekko.persistence.typed.PersistenceId
 
 object ReliableDeliveryWithEventSourcedProducerQueueSpec {
   def conf: Config =
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala
similarity index 96%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala
index 8f6cf6e34a..fb9a0f8883 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.delivery
+package org.apache.pekko.persistence.typed.delivery
 
 import scala.concurrent.duration._
 import java.util.UUID
@@ -12,12 +12,13 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.FishingOutcome
-import akka.actor.testkit.typed.scaladsl._
-import akka.actor.typed.delivery.ConsumerController
-import akka.actor.typed.delivery.WorkPullingProducerController
-import akka.actor.typed.receptionist.ServiceKey
-import akka.persistence.typed.PersistenceId
+import org.apache.pekko
+import pekko.actor.testkit.typed.FishingOutcome
+import pekko.actor.testkit.typed.scaladsl._
+import pekko.actor.typed.delivery.ConsumerController
+import pekko.actor.typed.delivery.WorkPullingProducerController
+import pekko.actor.typed.receptionist.ServiceKey
+import pekko.persistence.typed.PersistenceId
 
 object WorkPullingWithEventSourcedProducerQueueSpec {
   def conf: Config =
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/internal/RecoveryPermitterSpec.scala
similarity index 86%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/internal/RecoveryPermitterSpec.scala
index 2f5e5482bf..52662e086e 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/internal/RecoveryPermitterSpec.scala
@@ -2,28 +2,29 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import scala.concurrent.duration._
 import scala.util.control.NoStackTrace
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.ActorSystem
-import akka.actor.PoisonPill
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.LoggingTestKit
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.{ ActorRef, Behavior }
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.adapter.{ TypedActorRefOps, TypedActorSystemOps }
-import akka.persistence.Persistence
-import akka.persistence.RecoveryPermitter.{ RecoveryPermitGranted, RequestRecoveryPermit, ReturnRecoveryPermit }
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
-import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior }
-import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.PoisonPill
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.LoggingTestKit
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.{ ActorRef, Behavior }
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.adapter.{ TypedActorRefOps, TypedActorSystemOps }
+import pekko.persistence.Persistence
+import pekko.persistence.RecoveryPermitter.{ RecoveryPermitGranted, RequestRecoveryPermit, ReturnRecoveryPermit }
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
+import pekko.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior }
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler
 
 object RecoveryPermitterSpec {
 
@@ -73,7 +74,7 @@ class RecoveryPermitterSpec extends ScalaTestWithActorTestKit(s"""
       akka.persistence.max-concurrent-recoveries = 3
       akka.persistence.journal.plugin = "akka.persistence.journal.inmem"
       akka.persistence.journal.inmem.test-serialization = on
-      akka.loggers = ["akka.testkit.TestEventListener"]
+      akka.loggers = ["org.apache.pekko.testkit.TestEventListener"]
       """) with AnyWordSpecLike with LogCapturing {
 
   import RecoveryPermitterSpec._
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RetentionCriteriaSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/internal/RetentionCriteriaSpec.scala
similarity index 92%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RetentionCriteriaSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/internal/RetentionCriteriaSpec.scala
index b67fb6780f..d0c3bffe66 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RetentionCriteriaSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/internal/RetentionCriteriaSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import org.scalatest.TestSuite
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.persistence.typed.scaladsl.RetentionCriteria
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.persistence.typed.scaladsl.RetentionCriteria
 
 class RetentionCriteriaSpec extends TestSuite with Matchers with AnyWordSpecLike with LogCapturing {
 
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/StashStateSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/internal/StashStateSpec.scala
similarity index 79%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/StashStateSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/internal/StashStateSpec.scala
index b85f7f3fd2..60bcb96bad 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/StashStateSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/internal/StashStateSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.internal
+package org.apache.pekko.persistence.typed.internal
 
 import scala.concurrent.duration._
 
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.testkit.typed.scaladsl.TestProbe
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.persistence.typed.internal.InternalProtocol.IncomingCommand
-import akka.persistence.typed.internal.InternalProtocol.RecoveryPermitGranted
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.testkit.typed.scaladsl.TestProbe
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.persistence.typed.internal.InternalProtocol.IncomingCommand
+import pekko.persistence.typed.internal.InternalProtocol.RecoveryPermitGranted
 
 class StashStateSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
 
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala
similarity index 95%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala
index 7b7c8d9d7d..343138529d 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.Behaviors
-import akka.actor.typed.scaladsl.TimerScheduler
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.RecoveryCompleted
+import org.apache.pekko
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.ActorSystem
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.Behaviors
+import pekko.actor.typed.scaladsl.TimerScheduler
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.RecoveryCompleted
 
 import scala.annotation.nowarn
 import scala.concurrent.ExecutionContext
@@ -21,7 +22,7 @@ import scala.concurrent.duration._
 @nowarn
 object PersistentActorCompileOnlyTest {
 
-  import akka.persistence.typed.scaladsl.EventSourcedBehavior._
+  import pekko.persistence.typed.scaladsl.EventSourcedBehavior._
 
   object WithAck {
     case object Ack
@@ -64,8 +65,8 @@ object PersistentActorCompileOnlyTest {
     val sideEffectProcessor: ActorRef[Request] = ???
 
     def performSideEffect(sender: ActorRef[AcknowledgeSideEffect], correlationId: Int, data: String): Unit = {
-      import akka.actor.typed.scaladsl.AskPattern._
-      implicit val timeout: akka.util.Timeout = 1.second
+      import pekko.actor.typed.scaladsl.AskPattern._
+      implicit val timeout: pekko.util.Timeout = 1.second
       implicit val system: ActorSystem[_] = ???
       implicit val ec: ExecutionContext = ???
 
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotIsOptionalSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SnapshotIsOptionalSpec.scala
similarity index 90%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotIsOptionalSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SnapshotIsOptionalSpec.scala
index f1e8e2187e..89e86f2652 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotIsOptionalSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/scaladsl/SnapshotIsOptionalSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.scaladsl
+package org.apache.pekko.persistence.typed.scaladsl
 
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicInteger
@@ -12,11 +12,12 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.actor.typed.ActorRef
-import akka.persistence.typed.PersistenceId
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.persistence.typed.PersistenceId
+import pekko.serialization.jackson.CborSerializable
 
 object SnapshotIsOptionalSpec {
   private val conf: Config = ConfigFactory.parseString(s"""
diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/serialization/ReplicatedEventSourcingSerializerSpec.scala b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializerSpec.scala
similarity index 74%
rename from akka-persistence-typed/src/test/scala/akka/persistence/typed/serialization/ReplicatedEventSourcingSerializerSpec.scala
rename to akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializerSpec.scala
index 6311bcd605..4c5edae341 100644
--- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/serialization/ReplicatedEventSourcingSerializerSpec.scala
+++ b/akka-persistence-typed/src/test/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializerSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.typed.serialization
+package org.apache.pekko.persistence.typed.serialization
 
-import akka.actor.testkit.typed.scaladsl.LogCapturing
-import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import akka.persistence.typed.PersistenceId
-import akka.persistence.typed.ReplicaId
-import akka.persistence.typed.crdt.Counter
-import akka.persistence.typed.crdt.ORSet
-import akka.persistence.typed.internal.PublishedEventImpl
-import akka.persistence.typed.internal.ReplicatedPublishedEventMetaData
-import akka.persistence.typed.internal.VersionVector
+import org.apache.pekko
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.ReplicaId
+import pekko.persistence.typed.crdt.Counter
+import pekko.persistence.typed.crdt.ORSet
+import pekko.persistence.typed.internal.PublishedEventImpl
+import pekko.persistence.typed.internal.ReplicatedPublishedEventMetaData
+import pekko.persistence.typed.internal.VersionVector
 import org.scalatest.wordspec.AnyWordSpecLike
 
 class ReplicatedEventSourcingSerializerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
diff --git a/akka-persistence/src/main/java/akka/persistence/serialization/MessageFormats.java b/akka-persistence/src/main/java/akka/persistence/serialization/MessageFormats.java
deleted file mode 100644
index fa039198b8..0000000000
--- a/akka-persistence/src/main/java/akka/persistence/serialization/MessageFormats.java
+++ /dev/null
@@ -1,7350 +0,0 @@
-/*
- * Copyright (C) 2020-2022 Lightbend Inc. 
- */
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: MessageFormats.proto
-
-package akka.persistence.serialization;
-
-public final class MessageFormats {
-  private MessageFormats() {}
-  public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
-  }
-  public interface PersistentMessageOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:PersistentMessage)
-      akka.protobufv3.internal.MessageOrBuilder {
-
-    /**
-     * optional .PersistentPayload payload = 1;
-     * @return Whether the payload field is set.
-     */
-    boolean hasPayload();
-    /**
-     * optional .PersistentPayload payload = 1;
-     * @return The payload.
-     */
-    akka.persistence.serialization.MessageFormats.PersistentPayload getPayload();
-    /**
-     * optional .PersistentPayload payload = 1;
-     */
-    akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getPayloadOrBuilder();
-
-    /**
-     * optional int64 sequenceNr = 2;
-     * @return Whether the sequenceNr field is set.
-     */
-    boolean hasSequenceNr();
-    /**
-     * optional int64 sequenceNr = 2;
-     * @return The sequenceNr.
-     */
-    long getSequenceNr();
-
-    /**
-     * optional string persistenceId = 3;
-     * @return Whether the persistenceId field is set.
-     */
-    boolean hasPersistenceId();
-    /**
-     * optional string persistenceId = 3;
-     * @return The persistenceId.
-     */
-    java.lang.String getPersistenceId();
-    /**
-     * optional string persistenceId = 3;
-     * @return The bytes for persistenceId.
-     */
-    akka.protobufv3.internal.ByteString
-        getPersistenceIdBytes();
-
-    /**
-     * 
    -     * not used in new records from 2.4
-     * 
    
-     *
-     * optional bool deleted = 4;
-     * @return Whether the deleted field is set.
-     */
-    boolean hasDeleted();
-    /**
-     * 
    -     * not used in new records from 2.4
-     * 
    
-     *
-     * optional bool deleted = 4;
-     * @return The deleted.
-     */
-    boolean getDeleted();
-
-    /**
-     * 
    -     * optional int32 redeliveries = 6; // Removed in 2.4
-     * repeated string confirms = 7; // Removed in 2.4
-     * optional bool confirmable = 8;  // Removed in 2.4
-     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-     * optional string confirmTarget = 10; // Removed in 2.4
-     * 
    
-     *
-     * optional string sender = 11;
-     * @return Whether the sender field is set.
-     */
-    boolean hasSender();
-    /**
-     * 
    -     * optional int32 redeliveries = 6; // Removed in 2.4
-     * repeated string confirms = 7; // Removed in 2.4
-     * optional bool confirmable = 8;  // Removed in 2.4
-     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-     * optional string confirmTarget = 10; // Removed in 2.4
-     * 
    
-     *
-     * optional string sender = 11;
-     * @return The sender.
-     */
-    java.lang.String getSender();
-    /**
-     * 
    -     * optional int32 redeliveries = 6; // Removed in 2.4
-     * repeated string confirms = 7; // Removed in 2.4
-     * optional bool confirmable = 8;  // Removed in 2.4
-     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-     * optional string confirmTarget = 10; // Removed in 2.4
-     * 
    
-     *
-     * optional string sender = 11;
-     * @return The bytes for sender.
-     */
-    akka.protobufv3.internal.ByteString
-        getSenderBytes();
-
-    /**
-     * optional string manifest = 12;
-     * @return Whether the manifest field is set.
-     */
-    boolean hasManifest();
-    /**
-     * optional string manifest = 12;
-     * @return The manifest.
-     */
-    java.lang.String getManifest();
-    /**
-     * optional string manifest = 12;
-     * @return The bytes for manifest.
-     */
-    akka.protobufv3.internal.ByteString
-        getManifestBytes();
-
-    /**
-     * optional string writerUuid = 13;
-     * @return Whether the writerUuid field is set.
-     */
-    boolean hasWriterUuid();
-    /**
-     * optional string writerUuid = 13;
-     * @return The writerUuid.
-     */
-    java.lang.String getWriterUuid();
-    /**
-     * optional string writerUuid = 13;
-     * @return The bytes for writerUuid.
-     */
-    akka.protobufv3.internal.ByteString
-        getWriterUuidBytes();
-
-    /**
-     * optional sint64 timestamp = 14;
-     * @return Whether the timestamp field is set.
-     */
-    boolean hasTimestamp();
-    /**
-     * optional sint64 timestamp = 14;
-     * @return The timestamp.
-     */
-    long getTimestamp();
-
-    /**
-     * optional .PersistentPayload metadata = 15;
-     * @return Whether the metadata field is set.
-     */
-    boolean hasMetadata();
-    /**
-     * optional .PersistentPayload metadata = 15;
-     * @return The metadata.
-     */
-    akka.persistence.serialization.MessageFormats.PersistentPayload getMetadata();
-    /**
-     * optional .PersistentPayload metadata = 15;
-     */
-    akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getMetadataOrBuilder();
-  }
-  /**
-   * Protobuf type {@code PersistentMessage}
-   */
-  public  static final class PersistentMessage extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:PersistentMessage)
-      PersistentMessageOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use PersistentMessage.newBuilder() to construct.
-    private PersistentMessage(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private PersistentMessage() {
-      persistenceId_ = "";
-      sender_ = "";
-      manifest_ = "";
-      writerUuid_ = "";
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new PersistentMessage();
-    }
-
-    @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PersistentMessage(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              akka.persistence.serialization.MessageFormats.PersistentPayload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = payload_.toBuilder();
-              }
-              payload_ = input.readMessage(akka.persistence.serialization.MessageFormats.PersistentPayload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(payload_);
-                payload_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              sequenceNr_ = input.readInt64();
-              break;
-            }
-            case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000004;
-              persistenceId_ = bs;
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              deleted_ = input.readBool();
-              break;
-            }
-            case 90: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000010;
-              sender_ = bs;
-              break;
-            }
-            case 98: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000020;
-              manifest_ = bs;
-              break;
-            }
-            case 106: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000040;
-              writerUuid_ = bs;
-              break;
-            }
-            case 112: {
-              bitField0_ |= 0x00000080;
-              timestamp_ = input.readSInt64();
-              break;
-            }
-            case 122: {
-              akka.persistence.serialization.MessageFormats.PersistentPayload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000100) != 0)) {
-                subBuilder = metadata_.toBuilder();
-              }
-              metadata_ = input.readMessage(akka.persistence.serialization.MessageFormats.PersistentPayload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(metadata_);
-                metadata_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000100;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.persistence.serialization.MessageFormats.internal_static_PersistentMessage_descriptor;
-    }
-
-    @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.persistence.serialization.MessageFormats.internal_static_PersistentMessage_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              akka.persistence.serialization.MessageFormats.PersistentMessage.class, akka.persistence.serialization.MessageFormats.PersistentMessage.Builder.class);
-    }
-
-    private int bitField0_;
-    public static final int PAYLOAD_FIELD_NUMBER = 1;
-    private akka.persistence.serialization.MessageFormats.PersistentPayload payload_;
-    /**
-     * optional .PersistentPayload payload = 1;
-     * @return Whether the payload field is set.
-     */
-    public boolean hasPayload() {
-      return ((bitField0_ & 0x00000001) != 0);
-    }
-    /**
-     * optional .PersistentPayload payload = 1;
-     * @return The payload.
-     */
-    public akka.persistence.serialization.MessageFormats.PersistentPayload getPayload() {
-      return payload_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
-    }
-    /**
-     * optional .PersistentPayload payload = 1;
-     */
-    public akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getPayloadOrBuilder() {
-      return payload_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
-    }
-
-    public static final int SEQUENCENR_FIELD_NUMBER = 2;
-    private long sequenceNr_;
-    /**
-     * optional int64 sequenceNr = 2;
-     * @return Whether the sequenceNr field is set.
-     */
-    public boolean hasSequenceNr() {
-      return ((bitField0_ & 0x00000002) != 0);
-    }
-    /**
-     * optional int64 sequenceNr = 2;
-     * @return The sequenceNr.
-     */
-    public long getSequenceNr() {
-      return sequenceNr_;
-    }
-
-    public static final int PERSISTENCEID_FIELD_NUMBER = 3;
-    private volatile java.lang.Object persistenceId_;
-    /**
-     * optional string persistenceId = 3;
-     * @return Whether the persistenceId field is set.
-     */
-    public boolean hasPersistenceId() {
-      return ((bitField0_ & 0x00000004) != 0);
-    }
-    /**
-     * optional string persistenceId = 3;
-     * @return The persistenceId.
-     */
-    public java.lang.String getPersistenceId() {
-      java.lang.Object ref = persistenceId_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          persistenceId_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * optional string persistenceId = 3;
-     * @return The bytes for persistenceId.
-     */
-    public akka.protobufv3.internal.ByteString
-        getPersistenceIdBytes() {
-      java.lang.Object ref = persistenceId_;
-      if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        persistenceId_ = b;
-        return b;
-      } else {
-        return (akka.protobufv3.internal.ByteString) ref;
-      }
-    }
-
-    public static final int DELETED_FIELD_NUMBER = 4;
-    private boolean deleted_;
-    /**
-     * 
    -     * not used in new records from 2.4
-     * 
    
-     *
-     * optional bool deleted = 4;
-     * @return Whether the deleted field is set.
-     */
-    public boolean hasDeleted() {
-      return ((bitField0_ & 0x00000008) != 0);
-    }
-    /**
-     * 
    -     * not used in new records from 2.4
-     * 
    
-     *
-     * optional bool deleted = 4;
-     * @return The deleted.
-     */
-    public boolean getDeleted() {
-      return deleted_;
-    }
-
-    public static final int SENDER_FIELD_NUMBER = 11;
-    private volatile java.lang.Object sender_;
-    /**
-     * 
    -     * optional int32 redeliveries = 6; // Removed in 2.4
-     * repeated string confirms = 7; // Removed in 2.4
-     * optional bool confirmable = 8;  // Removed in 2.4
-     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-     * optional string confirmTarget = 10; // Removed in 2.4
-     * 
    
-     *
-     * optional string sender = 11;
-     * @return Whether the sender field is set.
-     */
-    public boolean hasSender() {
-      return ((bitField0_ & 0x00000010) != 0);
-    }
-    /**
-     * 
    -     * optional int32 redeliveries = 6; // Removed in 2.4
-     * repeated string confirms = 7; // Removed in 2.4
-     * optional bool confirmable = 8;  // Removed in 2.4
-     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-     * optional string confirmTarget = 10; // Removed in 2.4
-     * 
    
-     *
-     * optional string sender = 11;
-     * @return The sender.
-     */
-    public java.lang.String getSender() {
-      java.lang.Object ref = sender_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          sender_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * 
    -     * optional int32 redeliveries = 6; // Removed in 2.4
-     * repeated string confirms = 7; // Removed in 2.4
-     * optional bool confirmable = 8;  // Removed in 2.4
-     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-     * optional string confirmTarget = 10; // Removed in 2.4
-     * 
    
-     *
-     * optional string sender = 11;
-     * @return The bytes for sender.
-     */
-    public akka.protobufv3.internal.ByteString
-        getSenderBytes() {
-      java.lang.Object ref = sender_;
-      if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        sender_ = b;
-        return b;
-      } else {
-        return (akka.protobufv3.internal.ByteString) ref;
-      }
-    }
-
-    public static final int MANIFEST_FIELD_NUMBER = 12;
-    private volatile java.lang.Object manifest_;
-    /**
-     * optional string manifest = 12;
-     * @return Whether the manifest field is set.
-     */
-    public boolean hasManifest() {
-      return ((bitField0_ & 0x00000020) != 0);
-    }
-    /**
-     * optional string manifest = 12;
-     * @return The manifest.
-     */
-    public java.lang.String getManifest() {
-      java.lang.Object ref = manifest_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          manifest_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * optional string manifest = 12;
-     * @return The bytes for manifest.
-     */
-    public akka.protobufv3.internal.ByteString
-        getManifestBytes() {
-      java.lang.Object ref = manifest_;
-      if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        manifest_ = b;
-        return b;
-      } else {
-        return (akka.protobufv3.internal.ByteString) ref;
-      }
-    }
-
-    public static final int WRITERUUID_FIELD_NUMBER = 13;
-    private volatile java.lang.Object writerUuid_;
-    /**
-     * optional string writerUuid = 13;
-     * @return Whether the writerUuid field is set.
-     */
-    public boolean hasWriterUuid() {
-      return ((bitField0_ & 0x00000040) != 0);
-    }
-    /**
-     * optional string writerUuid = 13;
-     * @return The writerUuid.
-     */
-    public java.lang.String getWriterUuid() {
-      java.lang.Object ref = writerUuid_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          writerUuid_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * optional string writerUuid = 13;
-     * @return The bytes for writerUuid.
-     */
-    public akka.protobufv3.internal.ByteString
-        getWriterUuidBytes() {
-      java.lang.Object ref = writerUuid_;
-      if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        writerUuid_ = b;
-        return b;
-      } else {
-        return (akka.protobufv3.internal.ByteString) ref;
-      }
-    }
-
-    public static final int TIMESTAMP_FIELD_NUMBER = 14;
-    private long timestamp_;
-    /**
-     * optional sint64 timestamp = 14;
-     * @return Whether the timestamp field is set.
-     */
-    public boolean hasTimestamp() {
-      return ((bitField0_ & 0x00000080) != 0);
-    }
-    /**
-     * optional sint64 timestamp = 14;
-     * @return The timestamp.
-     */
-    public long getTimestamp() {
-      return timestamp_;
-    }
-
-    public static final int METADATA_FIELD_NUMBER = 15;
-    private akka.persistence.serialization.MessageFormats.PersistentPayload metadata_;
-    /**
-     * optional .PersistentPayload metadata = 15;
-     * @return Whether the metadata field is set.
-     */
-    public boolean hasMetadata() {
-      return ((bitField0_ & 0x00000100) != 0);
-    }
-    /**
-     * optional .PersistentPayload metadata = 15;
-     * @return The metadata.
-     */
-    public akka.persistence.serialization.MessageFormats.PersistentPayload getMetadata() {
-      return metadata_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : metadata_;
-    }
-    /**
-     * optional .PersistentPayload metadata = 15;
-     */
-    public akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getMetadataOrBuilder() {
-      return metadata_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : metadata_;
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (hasPayload()) {
-        if (!getPayload().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasMetadata()) {
-        if (!getMetadata().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
-        output.writeMessage(1, getPayload());
-      }
-      if (((bitField0_ & 0x00000002) != 0)) {
-        output.writeInt64(2, sequenceNr_);
-      }
-      if (((bitField0_ & 0x00000004) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, persistenceId_);
-      }
-      if (((bitField0_ & 0x00000008) != 0)) {
-        output.writeBool(4, deleted_);
-      }
-      if (((bitField0_ & 0x00000010) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 11, sender_);
-      }
-      if (((bitField0_ & 0x00000020) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 12, manifest_);
-      }
-      if (((bitField0_ & 0x00000040) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 13, writerUuid_);
-      }
-      if (((bitField0_ & 0x00000080) != 0)) {
-        output.writeSInt64(14, timestamp_);
-      }
-      if (((bitField0_ & 0x00000100) != 0)) {
-        output.writeMessage(15, getMetadata());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeMessageSize(1, getPayload());
-      }
-      if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeInt64Size(2, sequenceNr_);
-      }
-      if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, persistenceId_);
-      }
-      if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeBoolSize(4, deleted_);
-      }
-      if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(11, sender_);
-      }
-      if (((bitField0_ & 0x00000020) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(12, manifest_);
-      }
-      if (((bitField0_ & 0x00000040) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(13, writerUuid_);
-      }
-      if (((bitField0_ & 0x00000080) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeSInt64Size(14, timestamp_);
-      }
-      if (((bitField0_ & 0x00000100) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeMessageSize(15, getMetadata());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof akka.persistence.serialization.MessageFormats.PersistentMessage)) {
-        return super.equals(obj);
-      }
-      akka.persistence.serialization.MessageFormats.PersistentMessage other = (akka.persistence.serialization.MessageFormats.PersistentMessage) obj;
-
-      if (hasPayload() != other.hasPayload()) return false;
-      if (hasPayload()) {
-        if (!getPayload()
-            .equals(other.getPayload())) return false;
-      }
-      if (hasSequenceNr() != other.hasSequenceNr()) return false;
-      if (hasSequenceNr()) {
-        if (getSequenceNr()
-            != other.getSequenceNr()) return false;
-      }
-      if (hasPersistenceId() != other.hasPersistenceId()) return false;
-      if (hasPersistenceId()) {
-        if (!getPersistenceId()
-            .equals(other.getPersistenceId())) return false;
-      }
-      if (hasDeleted() != other.hasDeleted()) return false;
-      if (hasDeleted()) {
-        if (getDeleted()
-            != other.getDeleted()) return false;
-      }
-      if (hasSender() != other.hasSender()) return false;
-      if (hasSender()) {
-        if (!getSender()
-            .equals(other.getSender())) return false;
-      }
-      if (hasManifest() != other.hasManifest()) return false;
-      if (hasManifest()) {
-        if (!getManifest()
-            .equals(other.getManifest())) return false;
-      }
-      if (hasWriterUuid() != other.hasWriterUuid()) return false;
-      if (hasWriterUuid()) {
-        if (!getWriterUuid()
-            .equals(other.getWriterUuid())) return false;
-      }
-      if (hasTimestamp() != other.hasTimestamp()) return false;
-      if (hasTimestamp()) {
-        if (getTimestamp()
-            != other.getTimestamp()) return false;
-      }
-      if (hasMetadata() != other.hasMetadata()) return false;
-      if (hasMetadata()) {
-        if (!getMetadata()
-            .equals(other.getMetadata())) return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasPayload()) {
-        hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
-        hash = (53 * hash) + getPayload().hashCode();
-      }
-      if (hasSequenceNr()) {
-        hash = (37 * hash) + SEQUENCENR_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
-            getSequenceNr());
-      }
-      if (hasPersistenceId()) {
-        hash = (37 * hash) + PERSISTENCEID_FIELD_NUMBER;
-        hash = (53 * hash) + getPersistenceId().hashCode();
-      }
-      if (hasDeleted()) {
-        hash = (37 * hash) + DELETED_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
-            getDeleted());
-      }
-      if (hasSender()) {
-        hash = (37 * hash) + SENDER_FIELD_NUMBER;
-        hash = (53 * hash) + getSender().hashCode();
-      }
-      if (hasManifest()) {
-        hash = (37 * hash) + MANIFEST_FIELD_NUMBER;
-        hash = (53 * hash) + getManifest().hashCode();
-      }
-      if (hasWriterUuid()) {
-        hash = (37 * hash) + WRITERUUID_FIELD_NUMBER;
-        hash = (53 * hash) + getWriterUuid().hashCode();
-      }
-      if (hasTimestamp()) {
-        hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
-            getTimestamp());
-      }
-      if (hasMetadata()) {
-        hash = (37 * hash) + METADATA_FIELD_NUMBER;
-        hash = (53 * hash) + getMetadata().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(
-        java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(
-        java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(
-        byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseDelimitedFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(akka.persistence.serialization.MessageFormats.PersistentMessage prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code PersistentMessage}
-     */
-    public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:PersistentMessage)
-        akka.persistence.serialization.MessageFormats.PersistentMessageOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentMessage_descriptor;
-      }
-
-      @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentMessage_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                akka.persistence.serialization.MessageFormats.PersistentMessage.class, akka.persistence.serialization.MessageFormats.PersistentMessage.Builder.class);
-      }
-
-      // Construct using akka.persistence.serialization.MessageFormats.PersistentMessage.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getPayloadFieldBuilder();
-          getMetadataFieldBuilder();
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-        } else {
-          payloadBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        sequenceNr_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        persistenceId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
-        deleted_ = false;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        sender_ = "";
-        bitField0_ = (bitField0_ & ~0x00000010);
-        manifest_ = "";
-        bitField0_ = (bitField0_ & ~0x00000020);
-        writerUuid_ = "";
-        bitField0_ = (bitField0_ & ~0x00000040);
-        timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000080);
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-        } else {
-          metadataBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000100);
-        return this;
-      }
-
-      @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentMessage_descriptor;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentMessage getDefaultInstanceForType() {
-        return akka.persistence.serialization.MessageFormats.PersistentMessage.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentMessage build() {
-        akka.persistence.serialization.MessageFormats.PersistentMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentMessage buildPartial() {
-        akka.persistence.serialization.MessageFormats.PersistentMessage result = new akka.persistence.serialization.MessageFormats.PersistentMessage(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (payloadBuilder_ == null) {
-            result.payload_ = payload_;
-          } else {
-            result.payload_ = payloadBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.sequenceNr_ = sequenceNr_;
-          to_bitField0_ |= 0x00000002;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.persistenceId_ = persistenceId_;
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          result.deleted_ = deleted_;
-          to_bitField0_ |= 0x00000008;
-        }
-        if (((from_bitField0_ & 0x00000010) != 0)) {
-          to_bitField0_ |= 0x00000010;
-        }
-        result.sender_ = sender_;
-        if (((from_bitField0_ & 0x00000020) != 0)) {
-          to_bitField0_ |= 0x00000020;
-        }
-        result.manifest_ = manifest_;
-        if (((from_bitField0_ & 0x00000040) != 0)) {
-          to_bitField0_ |= 0x00000040;
-        }
-        result.writerUuid_ = writerUuid_;
-        if (((from_bitField0_ & 0x00000080) != 0)) {
-          result.timestamp_ = timestamp_;
-          to_bitField0_ |= 0x00000080;
-        }
-        if (((from_bitField0_ & 0x00000100) != 0)) {
-          if (metadataBuilder_ == null) {
-            result.metadata_ = metadata_;
-          } else {
-            result.metadata_ = metadataBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000100;
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.persistence.serialization.MessageFormats.PersistentMessage) {
-          return mergeFrom((akka.persistence.serialization.MessageFormats.PersistentMessage)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(akka.persistence.serialization.MessageFormats.PersistentMessage other) {
-        if (other == akka.persistence.serialization.MessageFormats.PersistentMessage.getDefaultInstance()) return this;
-        if (other.hasPayload()) {
-          mergePayload(other.getPayload());
-        }
-        if (other.hasSequenceNr()) {
-          setSequenceNr(other.getSequenceNr());
-        }
-        if (other.hasPersistenceId()) {
-          bitField0_ |= 0x00000004;
-          persistenceId_ = other.persistenceId_;
-          onChanged();
-        }
-        if (other.hasDeleted()) {
-          setDeleted(other.getDeleted());
-        }
-        if (other.hasSender()) {
-          bitField0_ |= 0x00000010;
-          sender_ = other.sender_;
-          onChanged();
-        }
-        if (other.hasManifest()) {
-          bitField0_ |= 0x00000020;
-          manifest_ = other.manifest_;
-          onChanged();
-        }
-        if (other.hasWriterUuid()) {
-          bitField0_ |= 0x00000040;
-          writerUuid_ = other.writerUuid_;
-          onChanged();
-        }
-        if (other.hasTimestamp()) {
-          setTimestamp(other.getTimestamp());
-        }
-        if (other.hasMetadata()) {
-          mergeMetadata(other.getMetadata());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        if (hasPayload()) {
-          if (!getPayload().isInitialized()) {
-            return false;
-          }
-        }
-        if (hasMetadata()) {
-          if (!getMetadata().isInitialized()) {
-            return false;
-          }
-        }
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        akka.persistence.serialization.MessageFormats.PersistentMessage parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.persistence.serialization.MessageFormats.PersistentMessage) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private akka.persistence.serialization.MessageFormats.PersistentPayload payload_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder> payloadBuilder_;
-      /**
-       * optional .PersistentPayload payload = 1;
-       * @return Whether the payload field is set.
-       */
-      public boolean hasPayload() {
-        return ((bitField0_ & 0x00000001) != 0);
-      }
-      /**
-       * optional .PersistentPayload payload = 1;
-       * @return The payload.
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayload getPayload() {
-        if (payloadBuilder_ == null) {
-          return payload_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
-        } else {
-          return payloadBuilder_.getMessage();
-        }
-      }
-      /**
-       * optional .PersistentPayload payload = 1;
-       */
-      public Builder setPayload(akka.persistence.serialization.MessageFormats.PersistentPayload value) {
-        if (payloadBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          payload_ = value;
-          onChanged();
-        } else {
-          payloadBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      /**
-       * optional .PersistentPayload payload = 1;
-       */
-      public Builder setPayload(
-          akka.persistence.serialization.MessageFormats.PersistentPayload.Builder builderForValue) {
-        if (payloadBuilder_ == null) {
-          payload_ = builderForValue.build();
-          onChanged();
-        } else {
-          payloadBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      /**
-       * optional .PersistentPayload payload = 1;
-       */
-      public Builder mergePayload(akka.persistence.serialization.MessageFormats.PersistentPayload value) {
-        if (payloadBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0) &&
-              payload_ != null &&
-              payload_ != akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
-            payload_ =
-              akka.persistence.serialization.MessageFormats.PersistentPayload.newBuilder(payload_).mergeFrom(value).buildPartial();
-          } else {
-            payload_ = value;
-          }
-          onChanged();
-        } else {
-          payloadBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      /**
-       * optional .PersistentPayload payload = 1;
-       */
-      public Builder clearPayload() {
-        if (payloadBuilder_ == null) {
-          payload_ = null;
-          onChanged();
-        } else {
-          payloadBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      /**
-       * optional .PersistentPayload payload = 1;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayload.Builder getPayloadBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return getPayloadFieldBuilder().getBuilder();
-      }
-      /**
-       * optional .PersistentPayload payload = 1;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getPayloadOrBuilder() {
-        if (payloadBuilder_ != null) {
-          return payloadBuilder_.getMessageOrBuilder();
-        } else {
-          return payload_ == null ?
-              akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
-        }
-      }
-      /**
-       * optional .PersistentPayload payload = 1;
-       */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder> 
-          getPayloadFieldBuilder() {
-        if (payloadBuilder_ == null) {
-          payloadBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>(
-                  getPayload(),
-                  getParentForChildren(),
-                  isClean());
-          payload_ = null;
-        }
-        return payloadBuilder_;
-      }
-
-      private long sequenceNr_ ;
-      /**
-       * optional int64 sequenceNr = 2;
-       * @return Whether the sequenceNr field is set.
-       */
-      public boolean hasSequenceNr() {
-        return ((bitField0_ & 0x00000002) != 0);
-      }
-      /**
-       * optional int64 sequenceNr = 2;
-       * @return The sequenceNr.
-       */
-      public long getSequenceNr() {
-        return sequenceNr_;
-      }
-      /**
-       * optional int64 sequenceNr = 2;
-       * @param value The sequenceNr to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSequenceNr(long value) {
-        bitField0_ |= 0x00000002;
-        sequenceNr_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * optional int64 sequenceNr = 2;
-       * @return This builder for chaining.
-       */
-      public Builder clearSequenceNr() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        sequenceNr_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object persistenceId_ = "";
-      /**
-       * optional string persistenceId = 3;
-       * @return Whether the persistenceId field is set.
-       */
-      public boolean hasPersistenceId() {
-        return ((bitField0_ & 0x00000004) != 0);
-      }
-      /**
-       * optional string persistenceId = 3;
-       * @return The persistenceId.
-       */
-      public java.lang.String getPersistenceId() {
-        java.lang.Object ref = persistenceId_;
-        if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            persistenceId_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * optional string persistenceId = 3;
-       * @return The bytes for persistenceId.
-       */
-      public akka.protobufv3.internal.ByteString
-          getPersistenceIdBytes() {
-        java.lang.Object ref = persistenceId_;
-        if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          persistenceId_ = b;
-          return b;
-        } else {
-          return (akka.protobufv3.internal.ByteString) ref;
-        }
-      }
-      /**
-       * optional string persistenceId = 3;
-       * @param value The persistenceId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPersistenceId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        persistenceId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * optional string persistenceId = 3;
-       * @return This builder for chaining.
-       */
-      public Builder clearPersistenceId() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        persistenceId_ = getDefaultInstance().getPersistenceId();
-        onChanged();
-        return this;
-      }
-      /**
-       * optional string persistenceId = 3;
-       * @param value The bytes for persistenceId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPersistenceIdBytes(
-          akka.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        persistenceId_ = value;
-        onChanged();
-        return this;
-      }
-
-      private boolean deleted_ ;
-      /**
-       * 
    -       * not used in new records from 2.4
-       * 
    
-       *
-       * optional bool deleted = 4;
-       * @return Whether the deleted field is set.
-       */
-      public boolean hasDeleted() {
-        return ((bitField0_ & 0x00000008) != 0);
-      }
-      /**
-       * 
    -       * not used in new records from 2.4
-       * 
    
-       *
-       * optional bool deleted = 4;
-       * @return The deleted.
-       */
-      public boolean getDeleted() {
-        return deleted_;
-      }
-      /**
-       * 
    -       * not used in new records from 2.4
-       * 
    
-       *
-       * optional bool deleted = 4;
-       * @param value The deleted to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDeleted(boolean value) {
-        bitField0_ |= 0x00000008;
-        deleted_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
    -       * not used in new records from 2.4
-       * 
    
-       *
-       * optional bool deleted = 4;
-       * @return This builder for chaining.
-       */
-      public Builder clearDeleted() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        deleted_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object sender_ = "";
-      /**
-       * 
    -       * optional int32 redeliveries = 6; // Removed in 2.4
-       * repeated string confirms = 7; // Removed in 2.4
-       * optional bool confirmable = 8;  // Removed in 2.4
-       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-       * optional string confirmTarget = 10; // Removed in 2.4
-       * 
    
-       *
-       * optional string sender = 11;
-       * @return Whether the sender field is set.
-       */
-      public boolean hasSender() {
-        return ((bitField0_ & 0x00000010) != 0);
-      }
-      /**
-       * 
    -       * optional int32 redeliveries = 6; // Removed in 2.4
-       * repeated string confirms = 7; // Removed in 2.4
-       * optional bool confirmable = 8;  // Removed in 2.4
-       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-       * optional string confirmTarget = 10; // Removed in 2.4
-       * 
    
-       *
-       * optional string sender = 11;
-       * @return The sender.
-       */
-      public java.lang.String getSender() {
-        java.lang.Object ref = sender_;
-        if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            sender_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
    -       * optional int32 redeliveries = 6; // Removed in 2.4
-       * repeated string confirms = 7; // Removed in 2.4
-       * optional bool confirmable = 8;  // Removed in 2.4
-       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-       * optional string confirmTarget = 10; // Removed in 2.4
-       * 
    
-       *
-       * optional string sender = 11;
-       * @return The bytes for sender.
-       */
-      public akka.protobufv3.internal.ByteString
-          getSenderBytes() {
-        java.lang.Object ref = sender_;
-        if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          sender_ = b;
-          return b;
-        } else {
-          return (akka.protobufv3.internal.ByteString) ref;
-        }
-      }
-      /**
-       * 
    -       * optional int32 redeliveries = 6; // Removed in 2.4
-       * repeated string confirms = 7; // Removed in 2.4
-       * optional bool confirmable = 8;  // Removed in 2.4
-       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-       * optional string confirmTarget = 10; // Removed in 2.4
-       * 
    
-       *
-       * optional string sender = 11;
-       * @param value The sender to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSender(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
-        sender_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
    -       * optional int32 redeliveries = 6; // Removed in 2.4
-       * repeated string confirms = 7; // Removed in 2.4
-       * optional bool confirmable = 8;  // Removed in 2.4
-       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-       * optional string confirmTarget = 10; // Removed in 2.4
-       * 
    
-       *
-       * optional string sender = 11;
-       * @return This builder for chaining.
-       */
-      public Builder clearSender() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        sender_ = getDefaultInstance().getSender();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
    -       * optional int32 redeliveries = 6; // Removed in 2.4
-       * repeated string confirms = 7; // Removed in 2.4
-       * optional bool confirmable = 8;  // Removed in 2.4
-       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
-       * optional string confirmTarget = 10; // Removed in 2.4
-       * 
    
-       *
-       * optional string sender = 11;
-       * @param value The bytes for sender to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSenderBytes(
-          akka.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
-        sender_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object manifest_ = "";
-      /**
-       * optional string manifest = 12;
-       * @return Whether the manifest field is set.
-       */
-      public boolean hasManifest() {
-        return ((bitField0_ & 0x00000020) != 0);
-      }
-      /**
-       * optional string manifest = 12;
-       * @return The manifest.
-       */
-      public java.lang.String getManifest() {
-        java.lang.Object ref = manifest_;
-        if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            manifest_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * optional string manifest = 12;
-       * @return The bytes for manifest.
-       */
-      public akka.protobufv3.internal.ByteString
-          getManifestBytes() {
-        java.lang.Object ref = manifest_;
-        if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          manifest_ = b;
-          return b;
-        } else {
-          return (akka.protobufv3.internal.ByteString) ref;
-        }
-      }
-      /**
-       * optional string manifest = 12;
-       * @param value The manifest to set.
-       * @return This builder for chaining.
-       */
-      public Builder setManifest(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000020;
-        manifest_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * optional string manifest = 12;
-       * @return This builder for chaining.
-       */
-      public Builder clearManifest() {
-        bitField0_ = (bitField0_ & ~0x00000020);
-        manifest_ = getDefaultInstance().getManifest();
-        onChanged();
-        return this;
-      }
-      /**
-       * optional string manifest = 12;
-       * @param value The bytes for manifest to set.
-       * @return This builder for chaining.
-       */
-      public Builder setManifestBytes(
-          akka.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000020;
-        manifest_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object writerUuid_ = "";
-      /**
-       * optional string writerUuid = 13;
-       * @return Whether the writerUuid field is set.
-       */
-      public boolean hasWriterUuid() {
-        return ((bitField0_ & 0x00000040) != 0);
-      }
-      /**
-       * optional string writerUuid = 13;
-       * @return The writerUuid.
-       */
-      public java.lang.String getWriterUuid() {
-        java.lang.Object ref = writerUuid_;
-        if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            writerUuid_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * optional string writerUuid = 13;
-       * @return The bytes for writerUuid.
-       */
-      public akka.protobufv3.internal.ByteString
-          getWriterUuidBytes() {
-        java.lang.Object ref = writerUuid_;
-        if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          writerUuid_ = b;
-          return b;
-        } else {
-          return (akka.protobufv3.internal.ByteString) ref;
-        }
-      }
-      /**
-       * optional string writerUuid = 13;
-       * @param value The writerUuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWriterUuid(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000040;
-        writerUuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * optional string writerUuid = 13;
-       * @return This builder for chaining.
-       */
-      public Builder clearWriterUuid() {
-        bitField0_ = (bitField0_ & ~0x00000040);
-        writerUuid_ = getDefaultInstance().getWriterUuid();
-        onChanged();
-        return this;
-      }
-      /**
-       * optional string writerUuid = 13;
-       * @param value The bytes for writerUuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWriterUuidBytes(
-          akka.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000040;
-        writerUuid_ = value;
-        onChanged();
-        return this;
-      }
-
-      private long timestamp_ ;
-      /**
-       * optional sint64 timestamp = 14;
-       * @return Whether the timestamp field is set.
-       */
-      public boolean hasTimestamp() {
-        return ((bitField0_ & 0x00000080) != 0);
-      }
-      /**
-       * optional sint64 timestamp = 14;
-       * @return The timestamp.
-       */
-      public long getTimestamp() {
-        return timestamp_;
-      }
-      /**
-       * optional sint64 timestamp = 14;
-       * @param value The timestamp to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000080;
-        timestamp_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * optional sint64 timestamp = 14;
-       * @return This builder for chaining.
-       */
-      public Builder clearTimestamp() {
-        bitField0_ = (bitField0_ & ~0x00000080);
-        timestamp_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private akka.persistence.serialization.MessageFormats.PersistentPayload metadata_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder> metadataBuilder_;
-      /**
-       * optional .PersistentPayload metadata = 15;
-       * @return Whether the metadata field is set.
-       */
-      public boolean hasMetadata() {
-        return ((bitField0_ & 0x00000100) != 0);
-      }
-      /**
-       * optional .PersistentPayload metadata = 15;
-       * @return The metadata.
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayload getMetadata() {
-        if (metadataBuilder_ == null) {
-          return metadata_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : metadata_;
-        } else {
-          return metadataBuilder_.getMessage();
-        }
-      }
-      /**
-       * optional .PersistentPayload metadata = 15;
-       */
-      public Builder setMetadata(akka.persistence.serialization.MessageFormats.PersistentPayload value) {
-        if (metadataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          metadata_ = value;
-          onChanged();
-        } else {
-          metadataBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000100;
-        return this;
-      }
-      /**
-       * optional .PersistentPayload metadata = 15;
-       */
-      public Builder setMetadata(
-          akka.persistence.serialization.MessageFormats.PersistentPayload.Builder builderForValue) {
-        if (metadataBuilder_ == null) {
-          metadata_ = builderForValue.build();
-          onChanged();
-        } else {
-          metadataBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000100;
-        return this;
-      }
-      /**
-       * optional .PersistentPayload metadata = 15;
-       */
-      public Builder mergeMetadata(akka.persistence.serialization.MessageFormats.PersistentPayload value) {
-        if (metadataBuilder_ == null) {
-          if (((bitField0_ & 0x00000100) != 0) &&
-              metadata_ != null &&
-              metadata_ != akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
-            metadata_ =
-              akka.persistence.serialization.MessageFormats.PersistentPayload.newBuilder(metadata_).mergeFrom(value).buildPartial();
-          } else {
-            metadata_ = value;
-          }
-          onChanged();
-        } else {
-          metadataBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000100;
-        return this;
-      }
-      /**
-       * optional .PersistentPayload metadata = 15;
-       */
-      public Builder clearMetadata() {
-        if (metadataBuilder_ == null) {
-          metadata_ = null;
-          onChanged();
-        } else {
-          metadataBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000100);
-        return this;
-      }
-      /**
-       * optional .PersistentPayload metadata = 15;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayload.Builder getMetadataBuilder() {
-        bitField0_ |= 0x00000100;
-        onChanged();
-        return getMetadataFieldBuilder().getBuilder();
-      }
-      /**
-       * optional .PersistentPayload metadata = 15;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getMetadataOrBuilder() {
-        if (metadataBuilder_ != null) {
-          return metadataBuilder_.getMessageOrBuilder();
-        } else {
-          return metadata_ == null ?
-              akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : metadata_;
-        }
-      }
-      /**
-       * optional .PersistentPayload metadata = 15;
-       */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder> 
-          getMetadataFieldBuilder() {
-        if (metadataBuilder_ == null) {
-          metadataBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>(
-                  getMetadata(),
-                  getParentForChildren(),
-                  isClean());
-          metadata_ = null;
-        }
-        return metadataBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:PersistentMessage)
-    }
-
-    // @@protoc_insertion_point(class_scope:PersistentMessage)
-    private static final akka.persistence.serialization.MessageFormats.PersistentMessage DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new akka.persistence.serialization.MessageFormats.PersistentMessage();
-    }
-
-    public static akka.persistence.serialization.MessageFormats.PersistentMessage getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
-      @java.lang.Override
-      public PersistentMessage parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return new PersistentMessage(input, extensionRegistry);
-      }
-    };
-
-    public static akka.protobufv3.internal.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.persistence.serialization.MessageFormats.PersistentMessage getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface PersistentPayloadOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:PersistentPayload)
-      akka.protobufv3.internal.MessageOrBuilder {
-
-    /**
-     * required int32 serializerId = 1;
-     * @return Whether the serializerId field is set.
-     */
-    boolean hasSerializerId();
-    /**
-     * required int32 serializerId = 1;
-     * @return The serializerId.
-     */
-    int getSerializerId();
-
-    /**
-     * required bytes payload = 2;
-     * @return Whether the payload field is set.
-     */
-    boolean hasPayload();
-    /**
-     * required bytes payload = 2;
-     * @return The payload.
-     */
-    akka.protobufv3.internal.ByteString getPayload();
-
-    /**
-     * optional bytes payloadManifest = 3;
-     * @return Whether the payloadManifest field is set.
-     */
-    boolean hasPayloadManifest();
-    /**
-     * optional bytes payloadManifest = 3;
-     * @return The payloadManifest.
-     */
-    akka.protobufv3.internal.ByteString getPayloadManifest();
-  }
-  /**
-   * Protobuf type {@code PersistentPayload}
-   */
-  public  static final class PersistentPayload extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:PersistentPayload)
-      PersistentPayloadOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use PersistentPayload.newBuilder() to construct.
-    private PersistentPayload(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private PersistentPayload() {
-      payload_ = akka.protobufv3.internal.ByteString.EMPTY;
-      payloadManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new PersistentPayload();
-    }
-
-    @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PersistentPayload(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              payload_ = input.readBytes();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              payloadManifest_ = input.readBytes();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.persistence.serialization.MessageFormats.internal_static_PersistentPayload_descriptor;
-    }
-
-    @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.persistence.serialization.MessageFormats.internal_static_PersistentPayload_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              akka.persistence.serialization.MessageFormats.PersistentPayload.class, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder.class);
-    }
-
-    private int bitField0_;
-    public static final int SERIALIZERID_FIELD_NUMBER = 1;
-    private int serializerId_;
-    /**
-     * required int32 serializerId = 1;
-     * @return Whether the serializerId field is set.
-     */
-    public boolean hasSerializerId() {
-      return ((bitField0_ & 0x00000001) != 0);
-    }
-    /**
-     * required int32 serializerId = 1;
-     * @return The serializerId.
-     */
-    public int getSerializerId() {
-      return serializerId_;
-    }
-
-    public static final int PAYLOAD_FIELD_NUMBER = 2;
-    private akka.protobufv3.internal.ByteString payload_;
-    /**
-     * required bytes payload = 2;
-     * @return Whether the payload field is set.
-     */
-    public boolean hasPayload() {
-      return ((bitField0_ & 0x00000002) != 0);
-    }
-    /**
-     * required bytes payload = 2;
-     * @return The payload.
-     */
-    public akka.protobufv3.internal.ByteString getPayload() {
-      return payload_;
-    }
-
-    public static final int PAYLOADMANIFEST_FIELD_NUMBER = 3;
-    private akka.protobufv3.internal.ByteString payloadManifest_;
-    /**
-     * optional bytes payloadManifest = 3;
-     * @return Whether the payloadManifest field is set.
-     */
-    public boolean hasPayloadManifest() {
-      return ((bitField0_ & 0x00000004) != 0);
-    }
-    /**
-     * optional bytes payloadManifest = 3;
-     * @return The payloadManifest.
-     */
-    public akka.protobufv3.internal.ByteString getPayloadManifest() {
-      return payloadManifest_;
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (!hasSerializerId()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasPayload()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
-        output.writeInt32(1, serializerId_);
-      }
-      if (((bitField0_ & 0x00000002) != 0)) {
-        output.writeBytes(2, payload_);
-      }
-      if (((bitField0_ & 0x00000004) != 0)) {
-        output.writeBytes(3, payloadManifest_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeInt32Size(1, serializerId_);
-      }
-      if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeBytesSize(2, payload_);
-      }
-      if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeBytesSize(3, payloadManifest_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof akka.persistence.serialization.MessageFormats.PersistentPayload)) {
-        return super.equals(obj);
-      }
-      akka.persistence.serialization.MessageFormats.PersistentPayload other = (akka.persistence.serialization.MessageFormats.PersistentPayload) obj;
-
-      if (hasSerializerId() != other.hasSerializerId()) return false;
-      if (hasSerializerId()) {
-        if (getSerializerId()
-            != other.getSerializerId()) return false;
-      }
-      if (hasPayload() != other.hasPayload()) return false;
-      if (hasPayload()) {
-        if (!getPayload()
-            .equals(other.getPayload())) return false;
-      }
-      if (hasPayloadManifest() != other.hasPayloadManifest()) return false;
-      if (hasPayloadManifest()) {
-        if (!getPayloadManifest()
-            .equals(other.getPayloadManifest())) return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasSerializerId()) {
-        hash = (37 * hash) + SERIALIZERID_FIELD_NUMBER;
-        hash = (53 * hash) + getSerializerId();
-      }
-      if (hasPayload()) {
-        hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
-        hash = (53 * hash) + getPayload().hashCode();
-      }
-      if (hasPayloadManifest()) {
-        hash = (37 * hash) + PAYLOADMANIFEST_FIELD_NUMBER;
-        hash = (53 * hash) + getPayloadManifest().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(
-        java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(
-        java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(
-        byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseDelimitedFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(akka.persistence.serialization.MessageFormats.PersistentPayload prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code PersistentPayload}
-     */
-    public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:PersistentPayload)
-        akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentPayload_descriptor;
-      }
-
-      @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentPayload_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                akka.persistence.serialization.MessageFormats.PersistentPayload.class, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder.class);
-      }
-
-      // Construct using akka.persistence.serialization.MessageFormats.PersistentPayload.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        payload_ = akka.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        payloadManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        return this;
-      }
-
-      @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentPayload_descriptor;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentPayload getDefaultInstanceForType() {
-        return akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentPayload build() {
-        akka.persistence.serialization.MessageFormats.PersistentPayload result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentPayload buildPartial() {
-        akka.persistence.serialization.MessageFormats.PersistentPayload result = new akka.persistence.serialization.MessageFormats.PersistentPayload(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.serializerId_ = serializerId_;
-          to_bitField0_ |= 0x00000001;
-        }
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.payload_ = payload_;
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.payloadManifest_ = payloadManifest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.persistence.serialization.MessageFormats.PersistentPayload) {
-          return mergeFrom((akka.persistence.serialization.MessageFormats.PersistentPayload)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(akka.persistence.serialization.MessageFormats.PersistentPayload other) {
-        if (other == akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) return this;
-        if (other.hasSerializerId()) {
-          setSerializerId(other.getSerializerId());
-        }
-        if (other.hasPayload()) {
-          setPayload(other.getPayload());
-        }
-        if (other.hasPayloadManifest()) {
-          setPayloadManifest(other.getPayloadManifest());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        if (!hasSerializerId()) {
-          return false;
-        }
-        if (!hasPayload()) {
-          return false;
-        }
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        akka.persistence.serialization.MessageFormats.PersistentPayload parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.persistence.serialization.MessageFormats.PersistentPayload) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private int serializerId_ ;
-      /**
-       * required int32 serializerId = 1;
-       * @return Whether the serializerId field is set.
-       */
-      public boolean hasSerializerId() {
-        return ((bitField0_ & 0x00000001) != 0);
-      }
-      /**
-       * required int32 serializerId = 1;
-       * @return The serializerId.
-       */
-      public int getSerializerId() {
-        return serializerId_;
-      }
-      /**
-       * required int32 serializerId = 1;
-       * @param value The serializerId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000001;
-        serializerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * required int32 serializerId = 1;
-       * @return This builder for chaining.
-       */
-      public Builder clearSerializerId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        serializerId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private akka.protobufv3.internal.ByteString payload_ = akka.protobufv3.internal.ByteString.EMPTY;
-      /**
-       * required bytes payload = 2;
-       * @return Whether the payload field is set.
-       */
-      public boolean hasPayload() {
-        return ((bitField0_ & 0x00000002) != 0);
-      }
-      /**
-       * required bytes payload = 2;
-       * @return The payload.
-       */
-      public akka.protobufv3.internal.ByteString getPayload() {
-        return payload_;
-      }
-      /**
-       * required bytes payload = 2;
-       * @param value The payload to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPayload(akka.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        payload_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * required bytes payload = 2;
-       * @return This builder for chaining.
-       */
-      public Builder clearPayload() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        payload_ = getDefaultInstance().getPayload();
-        onChanged();
-        return this;
-      }
-
-      private akka.protobufv3.internal.ByteString payloadManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
-      /**
-       * optional bytes payloadManifest = 3;
-       * @return Whether the payloadManifest field is set.
-       */
-      public boolean hasPayloadManifest() {
-        return ((bitField0_ & 0x00000004) != 0);
-      }
-      /**
-       * optional bytes payloadManifest = 3;
-       * @return The payloadManifest.
-       */
-      public akka.protobufv3.internal.ByteString getPayloadManifest() {
-        return payloadManifest_;
-      }
-      /**
-       * optional bytes payloadManifest = 3;
-       * @param value The payloadManifest to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPayloadManifest(akka.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        payloadManifest_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * optional bytes payloadManifest = 3;
-       * @return This builder for chaining.
-       */
-      public Builder clearPayloadManifest() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        payloadManifest_ = getDefaultInstance().getPayloadManifest();
-        onChanged();
-        return this;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:PersistentPayload)
-    }
-
-    // @@protoc_insertion_point(class_scope:PersistentPayload)
-    private static final akka.persistence.serialization.MessageFormats.PersistentPayload DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new akka.persistence.serialization.MessageFormats.PersistentPayload();
-    }
-
-    public static akka.persistence.serialization.MessageFormats.PersistentPayload getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
-      @java.lang.Override
-      public PersistentPayload parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return new PersistentPayload(input, extensionRegistry);
-      }
-    };
-
-    public static akka.protobufv3.internal.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.persistence.serialization.MessageFormats.PersistentPayload getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface AtomicWriteOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:AtomicWrite)
-      akka.protobufv3.internal.MessageOrBuilder {
-
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    java.util.List 
-        getPayloadList();
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    akka.persistence.serialization.MessageFormats.PersistentMessage getPayload(int index);
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    int getPayloadCount();
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    java.util.List 
-        getPayloadOrBuilderList();
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    akka.persistence.serialization.MessageFormats.PersistentMessageOrBuilder getPayloadOrBuilder(
-        int index);
-  }
-  /**
-   * Protobuf type {@code AtomicWrite}
-   */
-  public  static final class AtomicWrite extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:AtomicWrite)
-      AtomicWriteOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use AtomicWrite.newBuilder() to construct.
-    private AtomicWrite(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private AtomicWrite() {
-      payload_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new AtomicWrite();
-    }
-
-    @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AtomicWrite(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                payload_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              payload_.add(
-                  input.readMessage(akka.persistence.serialization.MessageFormats.PersistentMessage.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          payload_ = java.util.Collections.unmodifiableList(payload_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.persistence.serialization.MessageFormats.internal_static_AtomicWrite_descriptor;
-    }
-
-    @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.persistence.serialization.MessageFormats.internal_static_AtomicWrite_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              akka.persistence.serialization.MessageFormats.AtomicWrite.class, akka.persistence.serialization.MessageFormats.AtomicWrite.Builder.class);
-    }
-
-    public static final int PAYLOAD_FIELD_NUMBER = 1;
-    private java.util.List payload_;
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    public java.util.List getPayloadList() {
-      return payload_;
-    }
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    public java.util.List 
-        getPayloadOrBuilderList() {
-      return payload_;
-    }
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    public int getPayloadCount() {
-      return payload_.size();
-    }
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    public akka.persistence.serialization.MessageFormats.PersistentMessage getPayload(int index) {
-      return payload_.get(index);
-    }
-    /**
-     * repeated .PersistentMessage payload = 1;
-     */
-    public akka.persistence.serialization.MessageFormats.PersistentMessageOrBuilder getPayloadOrBuilder(
-        int index) {
-      return payload_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      for (int i = 0; i < getPayloadCount(); i++) {
-        if (!getPayload(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < payload_.size(); i++) {
-        output.writeMessage(1, payload_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < payload_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeMessageSize(1, payload_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof akka.persistence.serialization.MessageFormats.AtomicWrite)) {
-        return super.equals(obj);
-      }
-      akka.persistence.serialization.MessageFormats.AtomicWrite other = (akka.persistence.serialization.MessageFormats.AtomicWrite) obj;
-
-      if (!getPayloadList()
-          .equals(other.getPayloadList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getPayloadCount() > 0) {
-        hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
-        hash = (53 * hash) + getPayloadList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
-        java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
-        java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
-        byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseDelimitedFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(akka.persistence.serialization.MessageFormats.AtomicWrite prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code AtomicWrite}
-     */
-    public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:AtomicWrite)
-        akka.persistence.serialization.MessageFormats.AtomicWriteOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.persistence.serialization.MessageFormats.internal_static_AtomicWrite_descriptor;
-      }
-
-      @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.persistence.serialization.MessageFormats.internal_static_AtomicWrite_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                akka.persistence.serialization.MessageFormats.AtomicWrite.class, akka.persistence.serialization.MessageFormats.AtomicWrite.Builder.class);
-      }
-
-      // Construct using akka.persistence.serialization.MessageFormats.AtomicWrite.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getPayloadFieldBuilder();
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        if (payloadBuilder_ == null) {
-          payload_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          payloadBuilder_.clear();
-        }
-        return this;
-      }
-
-      @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.persistence.serialization.MessageFormats.internal_static_AtomicWrite_descriptor;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.AtomicWrite getDefaultInstanceForType() {
-        return akka.persistence.serialization.MessageFormats.AtomicWrite.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.AtomicWrite build() {
-        akka.persistence.serialization.MessageFormats.AtomicWrite result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.AtomicWrite buildPartial() {
-        akka.persistence.serialization.MessageFormats.AtomicWrite result = new akka.persistence.serialization.MessageFormats.AtomicWrite(this);
-        int from_bitField0_ = bitField0_;
-        if (payloadBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            payload_ = java.util.Collections.unmodifiableList(payload_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.payload_ = payload_;
-        } else {
-          result.payload_ = payloadBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.persistence.serialization.MessageFormats.AtomicWrite) {
-          return mergeFrom((akka.persistence.serialization.MessageFormats.AtomicWrite)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(akka.persistence.serialization.MessageFormats.AtomicWrite other) {
-        if (other == akka.persistence.serialization.MessageFormats.AtomicWrite.getDefaultInstance()) return this;
-        if (payloadBuilder_ == null) {
-          if (!other.payload_.isEmpty()) {
-            if (payload_.isEmpty()) {
-              payload_ = other.payload_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensurePayloadIsMutable();
-              payload_.addAll(other.payload_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.payload_.isEmpty()) {
-            if (payloadBuilder_.isEmpty()) {
-              payloadBuilder_.dispose();
-              payloadBuilder_ = null;
-              payload_ = other.payload_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              payloadBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getPayloadFieldBuilder() : null;
-            } else {
-              payloadBuilder_.addAllMessages(other.payload_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        for (int i = 0; i < getPayloadCount(); i++) {
-          if (!getPayload(i).isInitialized()) {
-            return false;
-          }
-        }
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        akka.persistence.serialization.MessageFormats.AtomicWrite parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.persistence.serialization.MessageFormats.AtomicWrite) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List payload_ =
-        java.util.Collections.emptyList();
-      private void ensurePayloadIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          payload_ = new java.util.ArrayList(payload_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.PersistentMessage, akka.persistence.serialization.MessageFormats.PersistentMessage.Builder, akka.persistence.serialization.MessageFormats.PersistentMessageOrBuilder> payloadBuilder_;
-
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public java.util.List getPayloadList() {
-        if (payloadBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(payload_);
-        } else {
-          return payloadBuilder_.getMessageList();
-        }
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public int getPayloadCount() {
-        if (payloadBuilder_ == null) {
-          return payload_.size();
-        } else {
-          return payloadBuilder_.getCount();
-        }
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentMessage getPayload(int index) {
-        if (payloadBuilder_ == null) {
-          return payload_.get(index);
-        } else {
-          return payloadBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public Builder setPayload(
-          int index, akka.persistence.serialization.MessageFormats.PersistentMessage value) {
-        if (payloadBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePayloadIsMutable();
-          payload_.set(index, value);
-          onChanged();
-        } else {
-          payloadBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public Builder setPayload(
-          int index, akka.persistence.serialization.MessageFormats.PersistentMessage.Builder builderForValue) {
-        if (payloadBuilder_ == null) {
-          ensurePayloadIsMutable();
-          payload_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          payloadBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public Builder addPayload(akka.persistence.serialization.MessageFormats.PersistentMessage value) {
-        if (payloadBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePayloadIsMutable();
-          payload_.add(value);
-          onChanged();
-        } else {
-          payloadBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public Builder addPayload(
-          int index, akka.persistence.serialization.MessageFormats.PersistentMessage value) {
-        if (payloadBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePayloadIsMutable();
-          payload_.add(index, value);
-          onChanged();
-        } else {
-          payloadBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public Builder addPayload(
-          akka.persistence.serialization.MessageFormats.PersistentMessage.Builder builderForValue) {
-        if (payloadBuilder_ == null) {
-          ensurePayloadIsMutable();
-          payload_.add(builderForValue.build());
-          onChanged();
-        } else {
-          payloadBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public Builder addPayload(
-          int index, akka.persistence.serialization.MessageFormats.PersistentMessage.Builder builderForValue) {
-        if (payloadBuilder_ == null) {
-          ensurePayloadIsMutable();
-          payload_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          payloadBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public Builder addAllPayload(
-          java.lang.Iterable values) {
-        if (payloadBuilder_ == null) {
-          ensurePayloadIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
-              values, payload_);
-          onChanged();
-        } else {
-          payloadBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public Builder clearPayload() {
-        if (payloadBuilder_ == null) {
-          payload_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          payloadBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public Builder removePayload(int index) {
-        if (payloadBuilder_ == null) {
-          ensurePayloadIsMutable();
-          payload_.remove(index);
-          onChanged();
-        } else {
-          payloadBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentMessage.Builder getPayloadBuilder(
-          int index) {
-        return getPayloadFieldBuilder().getBuilder(index);
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentMessageOrBuilder getPayloadOrBuilder(
-          int index) {
-        if (payloadBuilder_ == null) {
-          return payload_.get(index);  } else {
-          return payloadBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public java.util.List 
-           getPayloadOrBuilderList() {
-        if (payloadBuilder_ != null) {
-          return payloadBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(payload_);
-        }
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentMessage.Builder addPayloadBuilder() {
-        return getPayloadFieldBuilder().addBuilder(
-            akka.persistence.serialization.MessageFormats.PersistentMessage.getDefaultInstance());
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentMessage.Builder addPayloadBuilder(
-          int index) {
-        return getPayloadFieldBuilder().addBuilder(
-            index, akka.persistence.serialization.MessageFormats.PersistentMessage.getDefaultInstance());
-      }
-      /**
-       * repeated .PersistentMessage payload = 1;
-       */
-      public java.util.List 
-           getPayloadBuilderList() {
-        return getPayloadFieldBuilder().getBuilderList();
-      }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.PersistentMessage, akka.persistence.serialization.MessageFormats.PersistentMessage.Builder, akka.persistence.serialization.MessageFormats.PersistentMessageOrBuilder> 
-          getPayloadFieldBuilder() {
-        if (payloadBuilder_ == null) {
-          payloadBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.serialization.MessageFormats.PersistentMessage, akka.persistence.serialization.MessageFormats.PersistentMessage.Builder, akka.persistence.serialization.MessageFormats.PersistentMessageOrBuilder>(
-                  payload_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          payload_ = null;
-        }
-        return payloadBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:AtomicWrite)
-    }
-
-    // @@protoc_insertion_point(class_scope:AtomicWrite)
-    private static final akka.persistence.serialization.MessageFormats.AtomicWrite DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new akka.persistence.serialization.MessageFormats.AtomicWrite();
-    }
-
-    public static akka.persistence.serialization.MessageFormats.AtomicWrite getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
-      @java.lang.Override
-      public AtomicWrite parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return new AtomicWrite(input, extensionRegistry);
-      }
-    };
-
-    public static akka.protobufv3.internal.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.persistence.serialization.MessageFormats.AtomicWrite getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface AtLeastOnceDeliverySnapshotOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:AtLeastOnceDeliverySnapshot)
-      akka.protobufv3.internal.MessageOrBuilder {
-
-    /**
-     * required int64 currentDeliveryId = 1;
-     * @return Whether the currentDeliveryId field is set.
-     */
-    boolean hasCurrentDeliveryId();
-    /**
-     * required int64 currentDeliveryId = 1;
-     * @return The currentDeliveryId.
-     */
-    long getCurrentDeliveryId();
-
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    java.util.List 
-        getUnconfirmedDeliveriesList();
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery getUnconfirmedDeliveries(int index);
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    int getUnconfirmedDeliveriesCount();
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    java.util.List 
-        getUnconfirmedDeliveriesOrBuilderList();
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder getUnconfirmedDeliveriesOrBuilder(
-        int index);
-  }
-  /**
-   * Protobuf type {@code AtLeastOnceDeliverySnapshot}
-   */
-  public  static final class AtLeastOnceDeliverySnapshot extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:AtLeastOnceDeliverySnapshot)
-      AtLeastOnceDeliverySnapshotOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use AtLeastOnceDeliverySnapshot.newBuilder() to construct.
-    private AtLeastOnceDeliverySnapshot(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private AtLeastOnceDeliverySnapshot() {
-      unconfirmedDeliveries_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new AtLeastOnceDeliverySnapshot();
-    }
-
-    @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private AtLeastOnceDeliverySnapshot(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 8: {
-              bitField0_ |= 0x00000001;
-              currentDeliveryId_ = input.readInt64();
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                unconfirmedDeliveries_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              unconfirmedDeliveries_.add(
-                  input.readMessage(akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.PARSER, extensionRegistry));
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          unconfirmedDeliveries_ = java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_descriptor;
-    }
-
-    @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.class, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.Builder.class);
-    }
-
-    public interface UnconfirmedDeliveryOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
-        akka.protobufv3.internal.MessageOrBuilder {
-
-      /**
-       * required int64 deliveryId = 1;
-       * @return Whether the deliveryId field is set.
-       */
-      boolean hasDeliveryId();
-      /**
-       * required int64 deliveryId = 1;
-       * @return The deliveryId.
-       */
-      long getDeliveryId();
-
-      /**
-       * required string destination = 2;
-       * @return Whether the destination field is set.
-       */
-      boolean hasDestination();
-      /**
-       * required string destination = 2;
-       * @return The destination.
-       */
-      java.lang.String getDestination();
-      /**
-       * required string destination = 2;
-       * @return The bytes for destination.
-       */
-      akka.protobufv3.internal.ByteString
-          getDestinationBytes();
-
-      /**
-       * required .PersistentPayload payload = 3;
-       * @return Whether the payload field is set.
-       */
-      boolean hasPayload();
-      /**
-       * required .PersistentPayload payload = 3;
-       * @return The payload.
-       */
-      akka.persistence.serialization.MessageFormats.PersistentPayload getPayload();
-      /**
-       * required .PersistentPayload payload = 3;
-       */
-      akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getPayloadOrBuilder();
-    }
-    /**
-     * Protobuf type {@code AtLeastOnceDeliverySnapshot.UnconfirmedDelivery}
-     */
-    public  static final class UnconfirmedDelivery extends
-        akka.protobufv3.internal.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
-        UnconfirmedDeliveryOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use UnconfirmedDelivery.newBuilder() to construct.
-      private UnconfirmedDelivery(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-        super(builder);
-      }
-      private UnconfirmedDelivery() {
-        destination_ = "";
-      }
-
-      @java.lang.Override
-      @SuppressWarnings({"unused"})
-      protected java.lang.Object newInstance(
-          akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-        return new UnconfirmedDelivery();
-      }
-
-      @java.lang.Override
-      public final akka.protobufv3.internal.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private UnconfirmedDelivery(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-            akka.protobufv3.internal.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8: {
-                bitField0_ |= 0x00000001;
-                deliveryId_ = input.readInt64();
-                break;
-              }
-              case 18: {
-                akka.protobufv3.internal.ByteString bs = input.readBytes();
-                bitField0_ |= 0x00000002;
-                destination_ = bs;
-                break;
-              }
-              case 26: {
-                akka.persistence.serialization.MessageFormats.PersistentPayload.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000004) != 0)) {
-                  subBuilder = payload_.toBuilder();
-                }
-                payload_ = input.readMessage(akka.persistence.serialization.MessageFormats.PersistentPayload.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(payload_);
-                  payload_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000004;
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new akka.protobufv3.internal.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor;
-      }
-
-      @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.class, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder.class);
-      }
-
-      private int bitField0_;
-      public static final int DELIVERYID_FIELD_NUMBER = 1;
-      private long deliveryId_;
-      /**
-       * required int64 deliveryId = 1;
-       * @return Whether the deliveryId field is set.
-       */
-      public boolean hasDeliveryId() {
-        return ((bitField0_ & 0x00000001) != 0);
-      }
-      /**
-       * required int64 deliveryId = 1;
-       * @return The deliveryId.
-       */
-      public long getDeliveryId() {
-        return deliveryId_;
-      }
-
-      public static final int DESTINATION_FIELD_NUMBER = 2;
-      private volatile java.lang.Object destination_;
-      /**
-       * required string destination = 2;
-       * @return Whether the destination field is set.
-       */
-      public boolean hasDestination() {
-        return ((bitField0_ & 0x00000002) != 0);
-      }
-      /**
-       * required string destination = 2;
-       * @return The destination.
-       */
-      public java.lang.String getDestination() {
-        java.lang.Object ref = destination_;
-        if (ref instanceof java.lang.String) {
-          return (java.lang.String) ref;
-        } else {
-          akka.protobufv3.internal.ByteString bs = 
-              (akka.protobufv3.internal.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            destination_ = s;
-          }
-          return s;
-        }
-      }
-      /**
-       * required string destination = 2;
-       * @return The bytes for destination.
-       */
-      public akka.protobufv3.internal.ByteString
-          getDestinationBytes() {
-        java.lang.Object ref = destination_;
-        if (ref instanceof java.lang.String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          destination_ = b;
-          return b;
-        } else {
-          return (akka.protobufv3.internal.ByteString) ref;
-        }
-      }
-
-      public static final int PAYLOAD_FIELD_NUMBER = 3;
-      private akka.persistence.serialization.MessageFormats.PersistentPayload payload_;
-      /**
-       * required .PersistentPayload payload = 3;
-       * @return Whether the payload field is set.
-       */
-      public boolean hasPayload() {
-        return ((bitField0_ & 0x00000004) != 0);
-      }
-      /**
-       * required .PersistentPayload payload = 3;
-       * @return The payload.
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayload getPayload() {
-        return payload_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
-      }
-      /**
-       * required .PersistentPayload payload = 3;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getPayloadOrBuilder() {
-        return payload_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
-      }
-
-      private byte memoizedIsInitialized = -1;
-      @java.lang.Override
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        if (!hasDeliveryId()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-        if (!hasDestination()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-        if (!hasPayload()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-        if (!getPayload().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      @java.lang.Override
-      public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
-                          throws java.io.IOException {
-        if (((bitField0_ & 0x00000001) != 0)) {
-          output.writeInt64(1, deliveryId_);
-        }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, destination_);
-        }
-        if (((bitField0_ & 0x00000004) != 0)) {
-          output.writeMessage(3, getPayload());
-        }
-        unknownFields.writeTo(output);
-      }
-
-      @java.lang.Override
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
-            .computeInt64Size(1, deliveryId_);
-        }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, destination_);
-        }
-        if (((bitField0_ & 0x00000004) != 0)) {
-          size += akka.protobufv3.internal.CodedOutputStream
-            .computeMessageSize(3, getPayload());
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)) {
-          return super.equals(obj);
-        }
-        akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery other = (akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery) obj;
-
-        if (hasDeliveryId() != other.hasDeliveryId()) return false;
-        if (hasDeliveryId()) {
-          if (getDeliveryId()
-              != other.getDeliveryId()) return false;
-        }
-        if (hasDestination() != other.hasDestination()) return false;
-        if (hasDestination()) {
-          if (!getDestination()
-              .equals(other.getDestination())) return false;
-        }
-        if (hasPayload() != other.hasPayload()) return false;
-        if (hasPayload()) {
-          if (!getPayload()
-              .equals(other.getPayload())) return false;
-        }
-        if (!unknownFields.equals(other.unknownFields)) return false;
-        return true;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        if (hasDeliveryId()) {
-          hash = (37 * hash) + DELIVERYID_FIELD_NUMBER;
-          hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
-              getDeliveryId());
-        }
-        if (hasDestination()) {
-          hash = (37 * hash) + DESTINATION_FIELD_NUMBER;
-          hash = (53 * hash) + getDestination().hashCode();
-        }
-        if (hasPayload()) {
-          hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
-          hash = (53 * hash) + getPayload().hashCode();
-        }
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(
-          java.nio.ByteBuffer data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(
-          java.nio.ByteBuffer data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(
-          akka.protobufv3.internal.ByteString data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(
-          akka.protobufv3.internal.ByteString data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(byte[] data)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(
-          byte[] data,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(
-          java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseDelimitedFrom(
-          java.io.InputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(
-          akka.protobufv3.internal.CodedInputStream input)
-          throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parseFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return akka.protobufv3.internal.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      @java.lang.Override
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      @java.lang.Override
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * Protobuf type {@code AtLeastOnceDeliverySnapshot.UnconfirmedDelivery}
-       */
-      public static final class Builder extends
-          akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
-          akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder {
-        public static final akka.protobufv3.internal.Descriptors.Descriptor
-            getDescriptor() {
-          return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor;
-        }
-
-        @java.lang.Override
-        protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.class, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder.class);
-        }
-
-        // Construct using akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (akka.protobufv3.internal.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-            getPayloadFieldBuilder();
-          }
-        }
-        @java.lang.Override
-        public Builder clear() {
-          super.clear();
-          deliveryId_ = 0L;
-          bitField0_ = (bitField0_ & ~0x00000001);
-          destination_ = "";
-          bitField0_ = (bitField0_ & ~0x00000002);
-          if (payloadBuilder_ == null) {
-            payload_ = null;
-          } else {
-            payloadBuilder_.clear();
-          }
-          bitField0_ = (bitField0_ & ~0x00000004);
-          return this;
-        }
-
-        @java.lang.Override
-        public akka.protobufv3.internal.Descriptors.Descriptor
-            getDescriptorForType() {
-          return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor;
-        }
-
-        @java.lang.Override
-        public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery getDefaultInstanceForType() {
-          return akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.getDefaultInstance();
-        }
-
-        @java.lang.Override
-        public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery build() {
-          akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        @java.lang.Override
-        public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery buildPartial() {
-          akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery result = new akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery(this);
-          int from_bitField0_ = bitField0_;
-          int to_bitField0_ = 0;
-          if (((from_bitField0_ & 0x00000001) != 0)) {
-            result.deliveryId_ = deliveryId_;
-            to_bitField0_ |= 0x00000001;
-          }
-          if (((from_bitField0_ & 0x00000002) != 0)) {
-            to_bitField0_ |= 0x00000002;
-          }
-          result.destination_ = destination_;
-          if (((from_bitField0_ & 0x00000004) != 0)) {
-            if (payloadBuilder_ == null) {
-              result.payload_ = payload_;
-            } else {
-              result.payload_ = payloadBuilder_.build();
-            }
-            to_bitField0_ |= 0x00000004;
-          }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
-        }
-
-        @java.lang.Override
-        public Builder clone() {
-          return super.clone();
-        }
-        @java.lang.Override
-        public Builder setField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.setField(field, value);
-        }
-        @java.lang.Override
-        public Builder clearField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
-          return super.clearField(field);
-        }
-        @java.lang.Override
-        public Builder clearOneof(
-            akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
-          return super.clearOneof(oneof);
-        }
-        @java.lang.Override
-        public Builder setRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return super.setRepeatedField(field, index, value);
-        }
-        @java.lang.Override
-        public Builder addRepeatedField(
-            akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.addRepeatedField(field, value);
-        }
-        @java.lang.Override
-        public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-          if (other instanceof akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery) {
-            return mergeFrom((akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery other) {
-          if (other == akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.getDefaultInstance()) return this;
-          if (other.hasDeliveryId()) {
-            setDeliveryId(other.getDeliveryId());
-          }
-          if (other.hasDestination()) {
-            bitField0_ |= 0x00000002;
-            destination_ = other.destination_;
-            onChanged();
-          }
-          if (other.hasPayload()) {
-            mergePayload(other.getPayload());
-          }
-          this.mergeUnknownFields(other.unknownFields);
-          onChanged();
-          return this;
-        }
-
-        @java.lang.Override
-        public final boolean isInitialized() {
-          if (!hasDeliveryId()) {
-            return false;
-          }
-          if (!hasDestination()) {
-            return false;
-          }
-          if (!hasPayload()) {
-            return false;
-          }
-          if (!getPayload().isInitialized()) {
-            return false;
-          }
-          return true;
-        }
-
-        @java.lang.Override
-        public Builder mergeFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-          akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        private long deliveryId_ ;
-        /**
-         * required int64 deliveryId = 1;
-         * @return Whether the deliveryId field is set.
-         */
-        public boolean hasDeliveryId() {
-          return ((bitField0_ & 0x00000001) != 0);
-        }
-        /**
-         * required int64 deliveryId = 1;
-         * @return The deliveryId.
-         */
-        public long getDeliveryId() {
-          return deliveryId_;
-        }
-        /**
-         * required int64 deliveryId = 1;
-         * @param value The deliveryId to set.
-         * @return This builder for chaining.
-         */
-        public Builder setDeliveryId(long value) {
-          bitField0_ |= 0x00000001;
-          deliveryId_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * required int64 deliveryId = 1;
-         * @return This builder for chaining.
-         */
-        public Builder clearDeliveryId() {
-          bitField0_ = (bitField0_ & ~0x00000001);
-          deliveryId_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private java.lang.Object destination_ = "";
-        /**
-         * required string destination = 2;
-         * @return Whether the destination field is set.
-         */
-        public boolean hasDestination() {
-          return ((bitField0_ & 0x00000002) != 0);
-        }
-        /**
-         * required string destination = 2;
-         * @return The destination.
-         */
-        public java.lang.String getDestination() {
-          java.lang.Object ref = destination_;
-          if (!(ref instanceof java.lang.String)) {
-            akka.protobufv3.internal.ByteString bs =
-                (akka.protobufv3.internal.ByteString) ref;
-            java.lang.String s = bs.toStringUtf8();
-            if (bs.isValidUtf8()) {
-              destination_ = s;
-            }
-            return s;
-          } else {
-            return (java.lang.String) ref;
-          }
-        }
-        /**
-         * required string destination = 2;
-         * @return The bytes for destination.
-         */
-        public akka.protobufv3.internal.ByteString
-            getDestinationBytes() {
-          java.lang.Object ref = destination_;
-          if (ref instanceof String) {
-            akka.protobufv3.internal.ByteString b = 
-                akka.protobufv3.internal.ByteString.copyFromUtf8(
-                    (java.lang.String) ref);
-            destination_ = b;
-            return b;
-          } else {
-            return (akka.protobufv3.internal.ByteString) ref;
-          }
-        }
-        /**
-         * required string destination = 2;
-         * @param value The destination to set.
-         * @return This builder for chaining.
-         */
-        public Builder setDestination(
-            java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-          destination_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * required string destination = 2;
-         * @return This builder for chaining.
-         */
-        public Builder clearDestination() {
-          bitField0_ = (bitField0_ & ~0x00000002);
-          destination_ = getDefaultInstance().getDestination();
-          onChanged();
-          return this;
-        }
-        /**
-         * required string destination = 2;
-         * @param value The bytes for destination to set.
-         * @return This builder for chaining.
-         */
-        public Builder setDestinationBytes(
-            akka.protobufv3.internal.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-          destination_ = value;
-          onChanged();
-          return this;
-        }
-
-        private akka.persistence.serialization.MessageFormats.PersistentPayload payload_;
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder> payloadBuilder_;
-        /**
-         * required .PersistentPayload payload = 3;
-         * @return Whether the payload field is set.
-         */
-        public boolean hasPayload() {
-          return ((bitField0_ & 0x00000004) != 0);
-        }
-        /**
-         * required .PersistentPayload payload = 3;
-         * @return The payload.
-         */
-        public akka.persistence.serialization.MessageFormats.PersistentPayload getPayload() {
-          if (payloadBuilder_ == null) {
-            return payload_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
-          } else {
-            return payloadBuilder_.getMessage();
-          }
-        }
-        /**
-         * required .PersistentPayload payload = 3;
-         */
-        public Builder setPayload(akka.persistence.serialization.MessageFormats.PersistentPayload value) {
-          if (payloadBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            payload_ = value;
-            onChanged();
-          } else {
-            payloadBuilder_.setMessage(value);
-          }
-          bitField0_ |= 0x00000004;
-          return this;
-        }
-        /**
-         * required .PersistentPayload payload = 3;
-         */
-        public Builder setPayload(
-            akka.persistence.serialization.MessageFormats.PersistentPayload.Builder builderForValue) {
-          if (payloadBuilder_ == null) {
-            payload_ = builderForValue.build();
-            onChanged();
-          } else {
-            payloadBuilder_.setMessage(builderForValue.build());
-          }
-          bitField0_ |= 0x00000004;
-          return this;
-        }
-        /**
-         * required .PersistentPayload payload = 3;
-         */
-        public Builder mergePayload(akka.persistence.serialization.MessageFormats.PersistentPayload value) {
-          if (payloadBuilder_ == null) {
-            if (((bitField0_ & 0x00000004) != 0) &&
-                payload_ != null &&
-                payload_ != akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
-              payload_ =
-                akka.persistence.serialization.MessageFormats.PersistentPayload.newBuilder(payload_).mergeFrom(value).buildPartial();
-            } else {
-              payload_ = value;
-            }
-            onChanged();
-          } else {
-            payloadBuilder_.mergeFrom(value);
-          }
-          bitField0_ |= 0x00000004;
-          return this;
-        }
-        /**
-         * required .PersistentPayload payload = 3;
-         */
-        public Builder clearPayload() {
-          if (payloadBuilder_ == null) {
-            payload_ = null;
-            onChanged();
-          } else {
-            payloadBuilder_.clear();
-          }
-          bitField0_ = (bitField0_ & ~0x00000004);
-          return this;
-        }
-        /**
-         * required .PersistentPayload payload = 3;
-         */
-        public akka.persistence.serialization.MessageFormats.PersistentPayload.Builder getPayloadBuilder() {
-          bitField0_ |= 0x00000004;
-          onChanged();
-          return getPayloadFieldBuilder().getBuilder();
-        }
-        /**
-         * required .PersistentPayload payload = 3;
-         */
-        public akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getPayloadOrBuilder() {
-          if (payloadBuilder_ != null) {
-            return payloadBuilder_.getMessageOrBuilder();
-          } else {
-            return payload_ == null ?
-                akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : payload_;
-          }
-        }
-        /**
-         * required .PersistentPayload payload = 3;
-         */
-        private akka.protobufv3.internal.SingleFieldBuilderV3<
-            akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder> 
-            getPayloadFieldBuilder() {
-          if (payloadBuilder_ == null) {
-            payloadBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-                akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>(
-                    getPayload(),
-                    getParentForChildren(),
-                    isClean());
-            payload_ = null;
-          }
-          return payloadBuilder_;
-        }
-        @java.lang.Override
-        public final Builder setUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-          return super.setUnknownFields(unknownFields);
-        }
-
-        @java.lang.Override
-        public final Builder mergeUnknownFields(
-            final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
-      }
-
-      // @@protoc_insertion_point(class_scope:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
-      private static final akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery();
-      }
-
-      public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-          PARSER = new akka.protobufv3.internal.AbstractParser() {
-        @java.lang.Override
-        public UnconfirmedDelivery parsePartialFrom(
-            akka.protobufv3.internal.CodedInputStream input,
-            akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobufv3.internal.InvalidProtocolBufferException {
-          return new UnconfirmedDelivery(input, extensionRegistry);
-        }
-      };
-
-      public static akka.protobufv3.internal.Parser parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public akka.protobufv3.internal.Parser getParserForType() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
-    private int bitField0_;
-    public static final int CURRENTDELIVERYID_FIELD_NUMBER = 1;
-    private long currentDeliveryId_;
-    /**
-     * required int64 currentDeliveryId = 1;
-     * @return Whether the currentDeliveryId field is set.
-     */
-    public boolean hasCurrentDeliveryId() {
-      return ((bitField0_ & 0x00000001) != 0);
-    }
-    /**
-     * required int64 currentDeliveryId = 1;
-     * @return The currentDeliveryId.
-     */
-    public long getCurrentDeliveryId() {
-      return currentDeliveryId_;
-    }
-
-    public static final int UNCONFIRMEDDELIVERIES_FIELD_NUMBER = 2;
-    private java.util.List unconfirmedDeliveries_;
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    public java.util.List getUnconfirmedDeliveriesList() {
-      return unconfirmedDeliveries_;
-    }
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    public java.util.List 
-        getUnconfirmedDeliveriesOrBuilderList() {
-      return unconfirmedDeliveries_;
-    }
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    public int getUnconfirmedDeliveriesCount() {
-      return unconfirmedDeliveries_.size();
-    }
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery getUnconfirmedDeliveries(int index) {
-      return unconfirmedDeliveries_.get(index);
-    }
-    /**
-     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-     */
-    public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder getUnconfirmedDeliveriesOrBuilder(
-        int index) {
-      return unconfirmedDeliveries_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (!hasCurrentDeliveryId()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      for (int i = 0; i < getUnconfirmedDeliveriesCount(); i++) {
-        if (!getUnconfirmedDeliveries(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
-        output.writeInt64(1, currentDeliveryId_);
-      }
-      for (int i = 0; i < unconfirmedDeliveries_.size(); i++) {
-        output.writeMessage(2, unconfirmedDeliveries_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeInt64Size(1, currentDeliveryId_);
-      }
-      for (int i = 0; i < unconfirmedDeliveries_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeMessageSize(2, unconfirmedDeliveries_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot)) {
-        return super.equals(obj);
-      }
-      akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot other = (akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot) obj;
-
-      if (hasCurrentDeliveryId() != other.hasCurrentDeliveryId()) return false;
-      if (hasCurrentDeliveryId()) {
-        if (getCurrentDeliveryId()
-            != other.getCurrentDeliveryId()) return false;
-      }
-      if (!getUnconfirmedDeliveriesList()
-          .equals(other.getUnconfirmedDeliveriesList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasCurrentDeliveryId()) {
-        hash = (37 * hash) + CURRENTDELIVERYID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
-            getCurrentDeliveryId());
-      }
-      if (getUnconfirmedDeliveriesCount() > 0) {
-        hash = (37 * hash) + UNCONFIRMEDDELIVERIES_FIELD_NUMBER;
-        hash = (53 * hash) + getUnconfirmedDeliveriesList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(
-        java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(
-        java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(
-        byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseDelimitedFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code AtLeastOnceDeliverySnapshot}
-     */
-    public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:AtLeastOnceDeliverySnapshot)
-        akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshotOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_descriptor;
-      }
-
-      @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.class, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.Builder.class);
-      }
-
-      // Construct using akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getUnconfirmedDeliveriesFieldBuilder();
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        currentDeliveryId_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          unconfirmedDeliveries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        } else {
-          unconfirmedDeliveriesBuilder_.clear();
-        }
-        return this;
-      }
-
-      @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.persistence.serialization.MessageFormats.internal_static_AtLeastOnceDeliverySnapshot_descriptor;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot getDefaultInstanceForType() {
-        return akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot build() {
-        akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot buildPartial() {
-        akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot result = new akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          result.currentDeliveryId_ = currentDeliveryId_;
-          to_bitField0_ |= 0x00000001;
-        }
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
-            unconfirmedDeliveries_ = java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
-            bitField0_ = (bitField0_ & ~0x00000002);
-          }
-          result.unconfirmedDeliveries_ = unconfirmedDeliveries_;
-        } else {
-          result.unconfirmedDeliveries_ = unconfirmedDeliveriesBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot) {
-          return mergeFrom((akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot other) {
-        if (other == akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.getDefaultInstance()) return this;
-        if (other.hasCurrentDeliveryId()) {
-          setCurrentDeliveryId(other.getCurrentDeliveryId());
-        }
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          if (!other.unconfirmedDeliveries_.isEmpty()) {
-            if (unconfirmedDeliveries_.isEmpty()) {
-              unconfirmedDeliveries_ = other.unconfirmedDeliveries_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-            } else {
-              ensureUnconfirmedDeliveriesIsMutable();
-              unconfirmedDeliveries_.addAll(other.unconfirmedDeliveries_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.unconfirmedDeliveries_.isEmpty()) {
-            if (unconfirmedDeliveriesBuilder_.isEmpty()) {
-              unconfirmedDeliveriesBuilder_.dispose();
-              unconfirmedDeliveriesBuilder_ = null;
-              unconfirmedDeliveries_ = other.unconfirmedDeliveries_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-              unconfirmedDeliveriesBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getUnconfirmedDeliveriesFieldBuilder() : null;
-            } else {
-              unconfirmedDeliveriesBuilder_.addAllMessages(other.unconfirmedDeliveries_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        if (!hasCurrentDeliveryId()) {
-          return false;
-        }
-        for (int i = 0; i < getUnconfirmedDeliveriesCount(); i++) {
-          if (!getUnconfirmedDeliveries(i).isInitialized()) {
-            return false;
-          }
-        }
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private long currentDeliveryId_ ;
-      /**
-       * required int64 currentDeliveryId = 1;
-       * @return Whether the currentDeliveryId field is set.
-       */
-      public boolean hasCurrentDeliveryId() {
-        return ((bitField0_ & 0x00000001) != 0);
-      }
-      /**
-       * required int64 currentDeliveryId = 1;
-       * @return The currentDeliveryId.
-       */
-      public long getCurrentDeliveryId() {
-        return currentDeliveryId_;
-      }
-      /**
-       * required int64 currentDeliveryId = 1;
-       * @param value The currentDeliveryId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurrentDeliveryId(long value) {
-        bitField0_ |= 0x00000001;
-        currentDeliveryId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * required int64 currentDeliveryId = 1;
-       * @return This builder for chaining.
-       */
-      public Builder clearCurrentDeliveryId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        currentDeliveryId_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private java.util.List unconfirmedDeliveries_ =
-        java.util.Collections.emptyList();
-      private void ensureUnconfirmedDeliveriesIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          unconfirmedDeliveries_ = new java.util.ArrayList(unconfirmedDeliveries_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder> unconfirmedDeliveriesBuilder_;
-
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public java.util.List getUnconfirmedDeliveriesList() {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
-        } else {
-          return unconfirmedDeliveriesBuilder_.getMessageList();
-        }
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public int getUnconfirmedDeliveriesCount() {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          return unconfirmedDeliveries_.size();
-        } else {
-          return unconfirmedDeliveriesBuilder_.getCount();
-        }
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery getUnconfirmedDeliveries(int index) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          return unconfirmedDeliveries_.get(index);
-        } else {
-          return unconfirmedDeliveriesBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public Builder setUnconfirmedDeliveries(
-          int index, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery value) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureUnconfirmedDeliveriesIsMutable();
-          unconfirmedDeliveries_.set(index, value);
-          onChanged();
-        } else {
-          unconfirmedDeliveriesBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public Builder setUnconfirmedDeliveries(
-          int index, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder builderForValue) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          ensureUnconfirmedDeliveriesIsMutable();
-          unconfirmedDeliveries_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          unconfirmedDeliveriesBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public Builder addUnconfirmedDeliveries(akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery value) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureUnconfirmedDeliveriesIsMutable();
-          unconfirmedDeliveries_.add(value);
-          onChanged();
-        } else {
-          unconfirmedDeliveriesBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public Builder addUnconfirmedDeliveries(
-          int index, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery value) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureUnconfirmedDeliveriesIsMutable();
-          unconfirmedDeliveries_.add(index, value);
-          onChanged();
-        } else {
-          unconfirmedDeliveriesBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public Builder addUnconfirmedDeliveries(
-          akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder builderForValue) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          ensureUnconfirmedDeliveriesIsMutable();
-          unconfirmedDeliveries_.add(builderForValue.build());
-          onChanged();
-        } else {
-          unconfirmedDeliveriesBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public Builder addUnconfirmedDeliveries(
-          int index, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder builderForValue) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          ensureUnconfirmedDeliveriesIsMutable();
-          unconfirmedDeliveries_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          unconfirmedDeliveriesBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public Builder addAllUnconfirmedDeliveries(
-          java.lang.Iterable values) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          ensureUnconfirmedDeliveriesIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
-              values, unconfirmedDeliveries_);
-          onChanged();
-        } else {
-          unconfirmedDeliveriesBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public Builder clearUnconfirmedDeliveries() {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          unconfirmedDeliveries_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-          onChanged();
-        } else {
-          unconfirmedDeliveriesBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public Builder removeUnconfirmedDeliveries(int index) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          ensureUnconfirmedDeliveriesIsMutable();
-          unconfirmedDeliveries_.remove(index);
-          onChanged();
-        } else {
-          unconfirmedDeliveriesBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder getUnconfirmedDeliveriesBuilder(
-          int index) {
-        return getUnconfirmedDeliveriesFieldBuilder().getBuilder(index);
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder getUnconfirmedDeliveriesOrBuilder(
-          int index) {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          return unconfirmedDeliveries_.get(index);  } else {
-          return unconfirmedDeliveriesBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public java.util.List 
-           getUnconfirmedDeliveriesOrBuilderList() {
-        if (unconfirmedDeliveriesBuilder_ != null) {
-          return unconfirmedDeliveriesBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
-        }
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder addUnconfirmedDeliveriesBuilder() {
-        return getUnconfirmedDeliveriesFieldBuilder().addBuilder(
-            akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.getDefaultInstance());
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder addUnconfirmedDeliveriesBuilder(
-          int index) {
-        return getUnconfirmedDeliveriesFieldBuilder().addBuilder(
-            index, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.getDefaultInstance());
-      }
-      /**
-       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
-       */
-      public java.util.List 
-           getUnconfirmedDeliveriesBuilderList() {
-        return getUnconfirmedDeliveriesFieldBuilder().getBuilderList();
-      }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder> 
-          getUnconfirmedDeliveriesFieldBuilder() {
-        if (unconfirmedDeliveriesBuilder_ == null) {
-          unconfirmedDeliveriesBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder, akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder>(
-                  unconfirmedDeliveries_,
-                  ((bitField0_ & 0x00000002) != 0),
-                  getParentForChildren(),
-                  isClean());
-          unconfirmedDeliveries_ = null;
-        }
-        return unconfirmedDeliveriesBuilder_;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:AtLeastOnceDeliverySnapshot)
-    }
-
-    // @@protoc_insertion_point(class_scope:AtLeastOnceDeliverySnapshot)
-    private static final akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot();
-    }
-
-    public static akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
-      @java.lang.Override
-      public AtLeastOnceDeliverySnapshot parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return new AtLeastOnceDeliverySnapshot(input, extensionRegistry);
-      }
-    };
-
-    public static akka.protobufv3.internal.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface PersistentStateChangeEventOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:PersistentStateChangeEvent)
-      akka.protobufv3.internal.MessageOrBuilder {
-
-    /**
-     * required string stateIdentifier = 1;
-     * @return Whether the stateIdentifier field is set.
-     */
-    boolean hasStateIdentifier();
-    /**
-     * required string stateIdentifier = 1;
-     * @return The stateIdentifier.
-     */
-    java.lang.String getStateIdentifier();
-    /**
-     * required string stateIdentifier = 1;
-     * @return The bytes for stateIdentifier.
-     */
-    akka.protobufv3.internal.ByteString
-        getStateIdentifierBytes();
-
-    /**
-     * 
    -     *not used in new records from 2.4.5
-     * 
    
-     *
-     * optional string timeout = 2;
-     * @return Whether the timeout field is set.
-     */
-    boolean hasTimeout();
-    /**
-     * 
    -     *not used in new records from 2.4.5
-     * 
    
-     *
-     * optional string timeout = 2;
-     * @return The timeout.
-     */
-    java.lang.String getTimeout();
-    /**
-     * 
    -     *not used in new records from 2.4.5
-     * 
    
-     *
-     * optional string timeout = 2;
-     * @return The bytes for timeout.
-     */
-    akka.protobufv3.internal.ByteString
-        getTimeoutBytes();
-
-    /**
-     * optional int64 timeoutNanos = 3;
-     * @return Whether the timeoutNanos field is set.
-     */
-    boolean hasTimeoutNanos();
-    /**
-     * optional int64 timeoutNanos = 3;
-     * @return The timeoutNanos.
-     */
-    long getTimeoutNanos();
-  }
-  /**
-   * Protobuf type {@code PersistentStateChangeEvent}
-   */
-  public  static final class PersistentStateChangeEvent extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:PersistentStateChangeEvent)
-      PersistentStateChangeEventOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use PersistentStateChangeEvent.newBuilder() to construct.
-    private PersistentStateChangeEvent(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private PersistentStateChangeEvent() {
-      stateIdentifier_ = "";
-      timeout_ = "";
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new PersistentStateChangeEvent();
-    }
-
-    @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PersistentStateChangeEvent(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              stateIdentifier_ = bs;
-              break;
-            }
-            case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              timeout_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              timeoutNanos_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.persistence.serialization.MessageFormats.internal_static_PersistentStateChangeEvent_descriptor;
-    }
-
-    @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.persistence.serialization.MessageFormats.internal_static_PersistentStateChangeEvent_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent.class, akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent.Builder.class);
-    }
-
-    private int bitField0_;
-    public static final int STATEIDENTIFIER_FIELD_NUMBER = 1;
-    private volatile java.lang.Object stateIdentifier_;
-    /**
-     * required string stateIdentifier = 1;
-     * @return Whether the stateIdentifier field is set.
-     */
-    public boolean hasStateIdentifier() {
-      return ((bitField0_ & 0x00000001) != 0);
-    }
-    /**
-     * required string stateIdentifier = 1;
-     * @return The stateIdentifier.
-     */
-    public java.lang.String getStateIdentifier() {
-      java.lang.Object ref = stateIdentifier_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          stateIdentifier_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * required string stateIdentifier = 1;
-     * @return The bytes for stateIdentifier.
-     */
-    public akka.protobufv3.internal.ByteString
-        getStateIdentifierBytes() {
-      java.lang.Object ref = stateIdentifier_;
-      if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        stateIdentifier_ = b;
-        return b;
-      } else {
-        return (akka.protobufv3.internal.ByteString) ref;
-      }
-    }
-
-    public static final int TIMEOUT_FIELD_NUMBER = 2;
-    private volatile java.lang.Object timeout_;
-    /**
-     * 
    -     *not used in new records from 2.4.5
-     * 
    
-     *
-     * optional string timeout = 2;
-     * @return Whether the timeout field is set.
-     */
-    public boolean hasTimeout() {
-      return ((bitField0_ & 0x00000002) != 0);
-    }
-    /**
-     * 
    -     *not used in new records from 2.4.5
-     * 
    
-     *
-     * optional string timeout = 2;
-     * @return The timeout.
-     */
-    public java.lang.String getTimeout() {
-      java.lang.Object ref = timeout_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          timeout_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * 
    -     *not used in new records from 2.4.5
-     * 
    
-     *
-     * optional string timeout = 2;
-     * @return The bytes for timeout.
-     */
-    public akka.protobufv3.internal.ByteString
-        getTimeoutBytes() {
-      java.lang.Object ref = timeout_;
-      if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        timeout_ = b;
-        return b;
-      } else {
-        return (akka.protobufv3.internal.ByteString) ref;
-      }
-    }
-
-    public static final int TIMEOUTNANOS_FIELD_NUMBER = 3;
-    private long timeoutNanos_;
-    /**
-     * optional int64 timeoutNanos = 3;
-     * @return Whether the timeoutNanos field is set.
-     */
-    public boolean hasTimeoutNanos() {
-      return ((bitField0_ & 0x00000004) != 0);
-    }
-    /**
-     * optional int64 timeoutNanos = 3;
-     * @return The timeoutNanos.
-     */
-    public long getTimeoutNanos() {
-      return timeoutNanos_;
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (!hasStateIdentifier()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stateIdentifier_);
-      }
-      if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, timeout_);
-      }
-      if (((bitField0_ & 0x00000004) != 0)) {
-        output.writeInt64(3, timeoutNanos_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stateIdentifier_);
-      }
-      if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, timeout_);
-      }
-      if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeInt64Size(3, timeoutNanos_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent)) {
-        return super.equals(obj);
-      }
-      akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent other = (akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent) obj;
-
-      if (hasStateIdentifier() != other.hasStateIdentifier()) return false;
-      if (hasStateIdentifier()) {
-        if (!getStateIdentifier()
-            .equals(other.getStateIdentifier())) return false;
-      }
-      if (hasTimeout() != other.hasTimeout()) return false;
-      if (hasTimeout()) {
-        if (!getTimeout()
-            .equals(other.getTimeout())) return false;
-      }
-      if (hasTimeoutNanos() != other.hasTimeoutNanos()) return false;
-      if (hasTimeoutNanos()) {
-        if (getTimeoutNanos()
-            != other.getTimeoutNanos()) return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasStateIdentifier()) {
-        hash = (37 * hash) + STATEIDENTIFIER_FIELD_NUMBER;
-        hash = (53 * hash) + getStateIdentifier().hashCode();
-      }
-      if (hasTimeout()) {
-        hash = (37 * hash) + TIMEOUT_FIELD_NUMBER;
-        hash = (53 * hash) + getTimeout().hashCode();
-      }
-      if (hasTimeoutNanos()) {
-        hash = (37 * hash) + TIMEOUTNANOS_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
-            getTimeoutNanos());
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(
-        java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(
-        java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(
-        byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseDelimitedFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code PersistentStateChangeEvent}
-     */
-    public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:PersistentStateChangeEvent)
-        akka.persistence.serialization.MessageFormats.PersistentStateChangeEventOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentStateChangeEvent_descriptor;
-      }
-
-      @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentStateChangeEvent_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent.class, akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent.Builder.class);
-      }
-
-      // Construct using akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        stateIdentifier_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        timeout_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
-        timeoutNanos_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        return this;
-      }
-
-      @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentStateChangeEvent_descriptor;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent getDefaultInstanceForType() {
-        return akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent build() {
-        akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent buildPartial() {
-        akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent result = new akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.stateIdentifier_ = stateIdentifier_;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.timeout_ = timeout_;
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.timeoutNanos_ = timeoutNanos_;
-          to_bitField0_ |= 0x00000004;
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent) {
-          return mergeFrom((akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent other) {
-        if (other == akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent.getDefaultInstance()) return this;
-        if (other.hasStateIdentifier()) {
-          bitField0_ |= 0x00000001;
-          stateIdentifier_ = other.stateIdentifier_;
-          onChanged();
-        }
-        if (other.hasTimeout()) {
-          bitField0_ |= 0x00000002;
-          timeout_ = other.timeout_;
-          onChanged();
-        }
-        if (other.hasTimeoutNanos()) {
-          setTimeoutNanos(other.getTimeoutNanos());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        if (!hasStateIdentifier()) {
-          return false;
-        }
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.lang.Object stateIdentifier_ = "";
-      /**
-       * required string stateIdentifier = 1;
-       * @return Whether the stateIdentifier field is set.
-       */
-      public boolean hasStateIdentifier() {
-        return ((bitField0_ & 0x00000001) != 0);
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @return The stateIdentifier.
-       */
-      public java.lang.String getStateIdentifier() {
-        java.lang.Object ref = stateIdentifier_;
-        if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            stateIdentifier_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @return The bytes for stateIdentifier.
-       */
-      public akka.protobufv3.internal.ByteString
-          getStateIdentifierBytes() {
-        java.lang.Object ref = stateIdentifier_;
-        if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          stateIdentifier_ = b;
-          return b;
-        } else {
-          return (akka.protobufv3.internal.ByteString) ref;
-        }
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @param value The stateIdentifier to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStateIdentifier(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        stateIdentifier_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @return This builder for chaining.
-       */
-      public Builder clearStateIdentifier() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        stateIdentifier_ = getDefaultInstance().getStateIdentifier();
-        onChanged();
-        return this;
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @param value The bytes for stateIdentifier to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStateIdentifierBytes(
-          akka.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        stateIdentifier_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object timeout_ = "";
-      /**
-       * 
    -       *not used in new records from 2.4.5
-       * 
    
-       *
-       * optional string timeout = 2;
-       * @return Whether the timeout field is set.
-       */
-      public boolean hasTimeout() {
-        return ((bitField0_ & 0x00000002) != 0);
-      }
-      /**
-       * 
    -       *not used in new records from 2.4.5
-       * 
    
-       *
-       * optional string timeout = 2;
-       * @return The timeout.
-       */
-      public java.lang.String getTimeout() {
-        java.lang.Object ref = timeout_;
-        if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            timeout_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
    -       *not used in new records from 2.4.5
-       * 
    
-       *
-       * optional string timeout = 2;
-       * @return The bytes for timeout.
-       */
-      public akka.protobufv3.internal.ByteString
-          getTimeoutBytes() {
-        java.lang.Object ref = timeout_;
-        if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          timeout_ = b;
-          return b;
-        } else {
-          return (akka.protobufv3.internal.ByteString) ref;
-        }
-      }
-      /**
-       * 
    -       *not used in new records from 2.4.5
-       * 
    
-       *
-       * optional string timeout = 2;
-       * @param value The timeout to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTimeout(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        timeout_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
    -       *not used in new records from 2.4.5
-       * 
    
-       *
-       * optional string timeout = 2;
-       * @return This builder for chaining.
-       */
-      public Builder clearTimeout() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        timeout_ = getDefaultInstance().getTimeout();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
    -       *not used in new records from 2.4.5
-       * 
    
-       *
-       * optional string timeout = 2;
-       * @param value The bytes for timeout to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTimeoutBytes(
-          akka.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        timeout_ = value;
-        onChanged();
-        return this;
-      }
-
-      private long timeoutNanos_ ;
-      /**
-       * optional int64 timeoutNanos = 3;
-       * @return Whether the timeoutNanos field is set.
-       */
-      public boolean hasTimeoutNanos() {
-        return ((bitField0_ & 0x00000004) != 0);
-      }
-      /**
-       * optional int64 timeoutNanos = 3;
-       * @return The timeoutNanos.
-       */
-      public long getTimeoutNanos() {
-        return timeoutNanos_;
-      }
-      /**
-       * optional int64 timeoutNanos = 3;
-       * @param value The timeoutNanos to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTimeoutNanos(long value) {
-        bitField0_ |= 0x00000004;
-        timeoutNanos_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * optional int64 timeoutNanos = 3;
-       * @return This builder for chaining.
-       */
-      public Builder clearTimeoutNanos() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        timeoutNanos_ = 0L;
-        onChanged();
-        return this;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:PersistentStateChangeEvent)
-    }
-
-    // @@protoc_insertion_point(class_scope:PersistentStateChangeEvent)
-    private static final akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent();
-    }
-
-    public static akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
-      @java.lang.Override
-      public PersistentStateChangeEvent parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return new PersistentStateChangeEvent(input, extensionRegistry);
-      }
-    };
-
-    public static akka.protobufv3.internal.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.persistence.serialization.MessageFormats.PersistentStateChangeEvent getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface PersistentFSMSnapshotOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:PersistentFSMSnapshot)
-      akka.protobufv3.internal.MessageOrBuilder {
-
-    /**
-     * required string stateIdentifier = 1;
-     * @return Whether the stateIdentifier field is set.
-     */
-    boolean hasStateIdentifier();
-    /**
-     * required string stateIdentifier = 1;
-     * @return The stateIdentifier.
-     */
-    java.lang.String getStateIdentifier();
-    /**
-     * required string stateIdentifier = 1;
-     * @return The bytes for stateIdentifier.
-     */
-    akka.protobufv3.internal.ByteString
-        getStateIdentifierBytes();
-
-    /**
-     * required .PersistentPayload data = 2;
-     * @return Whether the data field is set.
-     */
-    boolean hasData();
-    /**
-     * required .PersistentPayload data = 2;
-     * @return The data.
-     */
-    akka.persistence.serialization.MessageFormats.PersistentPayload getData();
-    /**
-     * required .PersistentPayload data = 2;
-     */
-    akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getDataOrBuilder();
-
-    /**
-     * optional int64 timeoutNanos = 3;
-     * @return Whether the timeoutNanos field is set.
-     */
-    boolean hasTimeoutNanos();
-    /**
-     * optional int64 timeoutNanos = 3;
-     * @return The timeoutNanos.
-     */
-    long getTimeoutNanos();
-  }
-  /**
-   * Protobuf type {@code PersistentFSMSnapshot}
-   */
-  public  static final class PersistentFSMSnapshot extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:PersistentFSMSnapshot)
-      PersistentFSMSnapshotOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use PersistentFSMSnapshot.newBuilder() to construct.
-    private PersistentFSMSnapshot(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private PersistentFSMSnapshot() {
-      stateIdentifier_ = "";
-    }
-
-    @java.lang.Override
-    @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
-      return new PersistentFSMSnapshot();
-    }
-
-    @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PersistentFSMSnapshot(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              stateIdentifier_ = bs;
-              break;
-            }
-            case 18: {
-              akka.persistence.serialization.MessageFormats.PersistentPayload.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = data_.toBuilder();
-              }
-              data_ = input.readMessage(akka.persistence.serialization.MessageFormats.PersistentPayload.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(data_);
-                data_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              timeoutNanos_ = input.readInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.persistence.serialization.MessageFormats.internal_static_PersistentFSMSnapshot_descriptor;
-    }
-
-    @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.persistence.serialization.MessageFormats.internal_static_PersistentFSMSnapshot_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot.class, akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot.Builder.class);
-    }
-
-    private int bitField0_;
-    public static final int STATEIDENTIFIER_FIELD_NUMBER = 1;
-    private volatile java.lang.Object stateIdentifier_;
-    /**
-     * required string stateIdentifier = 1;
-     * @return Whether the stateIdentifier field is set.
-     */
-    public boolean hasStateIdentifier() {
-      return ((bitField0_ & 0x00000001) != 0);
-    }
-    /**
-     * required string stateIdentifier = 1;
-     * @return The stateIdentifier.
-     */
-    public java.lang.String getStateIdentifier() {
-      java.lang.Object ref = stateIdentifier_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          stateIdentifier_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * required string stateIdentifier = 1;
-     * @return The bytes for stateIdentifier.
-     */
-    public akka.protobufv3.internal.ByteString
-        getStateIdentifierBytes() {
-      java.lang.Object ref = stateIdentifier_;
-      if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        stateIdentifier_ = b;
-        return b;
-      } else {
-        return (akka.protobufv3.internal.ByteString) ref;
-      }
-    }
-
-    public static final int DATA_FIELD_NUMBER = 2;
-    private akka.persistence.serialization.MessageFormats.PersistentPayload data_;
-    /**
-     * required .PersistentPayload data = 2;
-     * @return Whether the data field is set.
-     */
-    public boolean hasData() {
-      return ((bitField0_ & 0x00000002) != 0);
-    }
-    /**
-     * required .PersistentPayload data = 2;
-     * @return The data.
-     */
-    public akka.persistence.serialization.MessageFormats.PersistentPayload getData() {
-      return data_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : data_;
-    }
-    /**
-     * required .PersistentPayload data = 2;
-     */
-    public akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getDataOrBuilder() {
-      return data_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : data_;
-    }
-
-    public static final int TIMEOUTNANOS_FIELD_NUMBER = 3;
-    private long timeoutNanos_;
-    /**
-     * optional int64 timeoutNanos = 3;
-     * @return Whether the timeoutNanos field is set.
-     */
-    public boolean hasTimeoutNanos() {
-      return ((bitField0_ & 0x00000004) != 0);
-    }
-    /**
-     * optional int64 timeoutNanos = 3;
-     * @return The timeoutNanos.
-     */
-    public long getTimeoutNanos() {
-      return timeoutNanos_;
-    }
-
-    private byte memoizedIsInitialized = -1;
-    @java.lang.Override
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (!hasStateIdentifier()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasData()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getData().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, stateIdentifier_);
-      }
-      if (((bitField0_ & 0x00000002) != 0)) {
-        output.writeMessage(2, getData());
-      }
-      if (((bitField0_ & 0x00000004) != 0)) {
-        output.writeInt64(3, timeoutNanos_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, stateIdentifier_);
-      }
-      if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeMessageSize(2, getData());
-      }
-      if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
-          .computeInt64Size(3, timeoutNanos_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot)) {
-        return super.equals(obj);
-      }
-      akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot other = (akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot) obj;
-
-      if (hasStateIdentifier() != other.hasStateIdentifier()) return false;
-      if (hasStateIdentifier()) {
-        if (!getStateIdentifier()
-            .equals(other.getStateIdentifier())) return false;
-      }
-      if (hasData() != other.hasData()) return false;
-      if (hasData()) {
-        if (!getData()
-            .equals(other.getData())) return false;
-      }
-      if (hasTimeoutNanos() != other.hasTimeoutNanos()) return false;
-      if (hasTimeoutNanos()) {
-        if (getTimeoutNanos()
-            != other.getTimeoutNanos()) return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) return false;
-      return true;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasStateIdentifier()) {
-        hash = (37 * hash) + STATEIDENTIFIER_FIELD_NUMBER;
-        hash = (53 * hash) + getStateIdentifier().hashCode();
-      }
-      if (hasData()) {
-        hash = (37 * hash) + DATA_FIELD_NUMBER;
-        hash = (53 * hash) + getData().hashCode();
-      }
-      if (hasTimeoutNanos()) {
-        hash = (37 * hash) + TIMEOUTNANOS_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
-            getTimeoutNanos());
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(
-        java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(
-        java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(
-        byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseDelimitedFrom(
-        java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    @java.lang.Override
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    @java.lang.Override
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code PersistentFSMSnapshot}
-     */
-    public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:PersistentFSMSnapshot)
-        akka.persistence.serialization.MessageFormats.PersistentFSMSnapshotOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentFSMSnapshot_descriptor;
-      }
-
-      @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentFSMSnapshot_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot.class, akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot.Builder.class);
-      }
-
-      // Construct using akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getDataFieldBuilder();
-        }
-      }
-      @java.lang.Override
-      public Builder clear() {
-        super.clear();
-        stateIdentifier_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (dataBuilder_ == null) {
-          data_ = null;
-        } else {
-          dataBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        timeoutNanos_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        return this;
-      }
-
-      @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.persistence.serialization.MessageFormats.internal_static_PersistentFSMSnapshot_descriptor;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot getDefaultInstanceForType() {
-        return akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot.getDefaultInstance();
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot build() {
-        akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      @java.lang.Override
-      public akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot buildPartial() {
-        akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot result = new akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.stateIdentifier_ = stateIdentifier_;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (dataBuilder_ == null) {
-            result.data_ = data_;
-          } else {
-            result.data_ = dataBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000002;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.timeoutNanos_ = timeoutNanos_;
-          to_bitField0_ |= 0x00000004;
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      @java.lang.Override
-      public Builder clone() {
-        return super.clone();
-      }
-      @java.lang.Override
-      public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.setField(field, value);
-      }
-      @java.lang.Override
-      public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
-        return super.clearField(field);
-      }
-      @java.lang.Override
-      public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
-        return super.clearOneof(oneof);
-      }
-      @java.lang.Override
-      public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return super.setRepeatedField(field, index, value);
-      }
-      @java.lang.Override
-      public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return super.addRepeatedField(field, value);
-      }
-      @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot) {
-          return mergeFrom((akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot other) {
-        if (other == akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot.getDefaultInstance()) return this;
-        if (other.hasStateIdentifier()) {
-          bitField0_ |= 0x00000001;
-          stateIdentifier_ = other.stateIdentifier_;
-          onChanged();
-        }
-        if (other.hasData()) {
-          mergeData(other.getData());
-        }
-        if (other.hasTimeoutNanos()) {
-          setTimeoutNanos(other.getTimeoutNanos());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        if (!hasStateIdentifier()) {
-          return false;
-        }
-        if (!hasData()) {
-          return false;
-        }
-        if (!getData().isInitialized()) {
-          return false;
-        }
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.lang.Object stateIdentifier_ = "";
-      /**
-       * required string stateIdentifier = 1;
-       * @return Whether the stateIdentifier field is set.
-       */
-      public boolean hasStateIdentifier() {
-        return ((bitField0_ & 0x00000001) != 0);
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @return The stateIdentifier.
-       */
-      public java.lang.String getStateIdentifier() {
-        java.lang.Object ref = stateIdentifier_;
-        if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            stateIdentifier_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @return The bytes for stateIdentifier.
-       */
-      public akka.protobufv3.internal.ByteString
-          getStateIdentifierBytes() {
-        java.lang.Object ref = stateIdentifier_;
-        if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          stateIdentifier_ = b;
-          return b;
-        } else {
-          return (akka.protobufv3.internal.ByteString) ref;
-        }
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @param value The stateIdentifier to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStateIdentifier(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        stateIdentifier_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @return This builder for chaining.
-       */
-      public Builder clearStateIdentifier() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        stateIdentifier_ = getDefaultInstance().getStateIdentifier();
-        onChanged();
-        return this;
-      }
-      /**
-       * required string stateIdentifier = 1;
-       * @param value The bytes for stateIdentifier to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStateIdentifierBytes(
-          akka.protobufv3.internal.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        stateIdentifier_ = value;
-        onChanged();
-        return this;
-      }
-
-      private akka.persistence.serialization.MessageFormats.PersistentPayload data_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder> dataBuilder_;
-      /**
-       * required .PersistentPayload data = 2;
-       * @return Whether the data field is set.
-       */
-      public boolean hasData() {
-        return ((bitField0_ & 0x00000002) != 0);
-      }
-      /**
-       * required .PersistentPayload data = 2;
-       * @return The data.
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayload getData() {
-        if (dataBuilder_ == null) {
-          return data_ == null ? akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : data_;
-        } else {
-          return dataBuilder_.getMessage();
-        }
-      }
-      /**
-       * required .PersistentPayload data = 2;
-       */
-      public Builder setData(akka.persistence.serialization.MessageFormats.PersistentPayload value) {
-        if (dataBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          data_ = value;
-          onChanged();
-        } else {
-          dataBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      /**
-       * required .PersistentPayload data = 2;
-       */
-      public Builder setData(
-          akka.persistence.serialization.MessageFormats.PersistentPayload.Builder builderForValue) {
-        if (dataBuilder_ == null) {
-          data_ = builderForValue.build();
-          onChanged();
-        } else {
-          dataBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      /**
-       * required .PersistentPayload data = 2;
-       */
-      public Builder mergeData(akka.persistence.serialization.MessageFormats.PersistentPayload value) {
-        if (dataBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0) &&
-              data_ != null &&
-              data_ != akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance()) {
-            data_ =
-              akka.persistence.serialization.MessageFormats.PersistentPayload.newBuilder(data_).mergeFrom(value).buildPartial();
-          } else {
-            data_ = value;
-          }
-          onChanged();
-        } else {
-          dataBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      /**
-       * required .PersistentPayload data = 2;
-       */
-      public Builder clearData() {
-        if (dataBuilder_ == null) {
-          data_ = null;
-          onChanged();
-        } else {
-          dataBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      /**
-       * required .PersistentPayload data = 2;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayload.Builder getDataBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getDataFieldBuilder().getBuilder();
-      }
-      /**
-       * required .PersistentPayload data = 2;
-       */
-      public akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder getDataOrBuilder() {
-        if (dataBuilder_ != null) {
-          return dataBuilder_.getMessageOrBuilder();
-        } else {
-          return data_ == null ?
-              akka.persistence.serialization.MessageFormats.PersistentPayload.getDefaultInstance() : data_;
-        }
-      }
-      /**
-       * required .PersistentPayload data = 2;
-       */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder> 
-          getDataFieldBuilder() {
-        if (dataBuilder_ == null) {
-          dataBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.persistence.serialization.MessageFormats.PersistentPayload, akka.persistence.serialization.MessageFormats.PersistentPayload.Builder, akka.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>(
-                  getData(),
-                  getParentForChildren(),
-                  isClean());
-          data_ = null;
-        }
-        return dataBuilder_;
-      }
-
-      private long timeoutNanos_ ;
-      /**
-       * optional int64 timeoutNanos = 3;
-       * @return Whether the timeoutNanos field is set.
-       */
-      public boolean hasTimeoutNanos() {
-        return ((bitField0_ & 0x00000004) != 0);
-      }
-      /**
-       * optional int64 timeoutNanos = 3;
-       * @return The timeoutNanos.
-       */
-      public long getTimeoutNanos() {
-        return timeoutNanos_;
-      }
-      /**
-       * optional int64 timeoutNanos = 3;
-       * @param value The timeoutNanos to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTimeoutNanos(long value) {
-        bitField0_ |= 0x00000004;
-        timeoutNanos_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * optional int64 timeoutNanos = 3;
-       * @return This builder for chaining.
-       */
-      public Builder clearTimeoutNanos() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        timeoutNanos_ = 0L;
-        onChanged();
-        return this;
-      }
-      @java.lang.Override
-      public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.setUnknownFields(unknownFields);
-      }
-
-      @java.lang.Override
-      public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:PersistentFSMSnapshot)
-    }
-
-    // @@protoc_insertion_point(class_scope:PersistentFSMSnapshot)
-    private static final akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot();
-    }
-
-    public static akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
-      @java.lang.Override
-      public PersistentFSMSnapshot parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
-        return new PersistentFSMSnapshot(input, extensionRegistry);
-      }
-    };
-
-    public static akka.protobufv3.internal.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public akka.persistence.serialization.MessageFormats.PersistentFSMSnapshot getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
-    internal_static_PersistentMessage_descriptor;
-  private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_PersistentMessage_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
-    internal_static_PersistentPayload_descriptor;
-  private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_PersistentPayload_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
-    internal_static_AtomicWrite_descriptor;
-  private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AtomicWrite_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
-    internal_static_AtLeastOnceDeliverySnapshot_descriptor;
-  private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AtLeastOnceDeliverySnapshot_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
-    internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor;
-  private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
-    internal_static_PersistentStateChangeEvent_descriptor;
-  private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_PersistentStateChangeEvent_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
-    internal_static_PersistentFSMSnapshot_descriptor;
-  private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_PersistentFSMSnapshot_fieldAccessorTable;
-
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\024MessageFormats.proto\"\343\001\n\021PersistentMes" +
-      "sage\022#\n\007payload\030\001 \001(\0132\022.PersistentPayloa" +
-      "d\022\022\n\nsequenceNr\030\002 \001(\003\022\025\n\rpersistenceId\030\003" +
-      " \001(\t\022\017\n\007deleted\030\004 \001(\010\022\016\n\006sender\030\013 \001(\t\022\020\n" +
-      "\010manifest\030\014 \001(\t\022\022\n\nwriterUuid\030\r \001(\t\022\021\n\tt" +
-      "imestamp\030\016 \001(\022\022$\n\010metadata\030\017 \001(\0132\022.Persi" +
-      "stentPayload\"S\n\021PersistentPayload\022\024\n\014ser" +
-      "ializerId\030\001 \002(\005\022\017\n\007payload\030\002 \002(\014\022\027\n\017payl" +
-      "oadManifest\030\003 \001(\014\"2\n\013AtomicWrite\022#\n\007payl" +
-      "oad\030\001 \003(\0132\022.PersistentMessage\"\356\001\n\033AtLeas" +
-      "tOnceDeliverySnapshot\022\031\n\021currentDelivery" +
-      "Id\030\001 \002(\003\022O\n\025unconfirmedDeliveries\030\002 \003(\0132" +
-      "0.AtLeastOnceDeliverySnapshot.Unconfirme" +
-      "dDelivery\032c\n\023UnconfirmedDelivery\022\022\n\ndeli" +
-      "veryId\030\001 \002(\003\022\023\n\013destination\030\002 \002(\t\022#\n\007pay" +
-      "load\030\003 \002(\0132\022.PersistentPayload\"\\\n\032Persis" +
-      "tentStateChangeEvent\022\027\n\017stateIdentifier\030" +
-      "\001 \002(\t\022\017\n\007timeout\030\002 \001(\t\022\024\n\014timeoutNanos\030\003" +
-      " \001(\003\"h\n\025PersistentFSMSnapshot\022\027\n\017stateId" +
-      "entifier\030\001 \002(\t\022 \n\004data\030\002 \002(\0132\022.Persisten" +
-      "tPayload\022\024\n\014timeoutNanos\030\003 \001(\003B\"\n\036akka.p" +
-      "ersistence.serializationH\001"
-    };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
-        });
-    internal_static_PersistentMessage_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_PersistentMessage_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_PersistentMessage_descriptor,
-        new java.lang.String[] { "Payload", "SequenceNr", "PersistenceId", "Deleted", "Sender", "Manifest", "WriterUuid", "Timestamp", "Metadata", });
-    internal_static_PersistentPayload_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_PersistentPayload_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_PersistentPayload_descriptor,
-        new java.lang.String[] { "SerializerId", "Payload", "PayloadManifest", });
-    internal_static_AtomicWrite_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_AtomicWrite_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AtomicWrite_descriptor,
-        new java.lang.String[] { "Payload", });
-    internal_static_AtLeastOnceDeliverySnapshot_descriptor =
-      getDescriptor().getMessageTypes().get(3);
-    internal_static_AtLeastOnceDeliverySnapshot_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AtLeastOnceDeliverySnapshot_descriptor,
-        new java.lang.String[] { "CurrentDeliveryId", "UnconfirmedDeliveries", });
-    internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor =
-      internal_static_AtLeastOnceDeliverySnapshot_descriptor.getNestedTypes().get(0);
-    internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor,
-        new java.lang.String[] { "DeliveryId", "Destination", "Payload", });
-    internal_static_PersistentStateChangeEvent_descriptor =
-      getDescriptor().getMessageTypes().get(4);
-    internal_static_PersistentStateChangeEvent_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_PersistentStateChangeEvent_descriptor,
-        new java.lang.String[] { "StateIdentifier", "Timeout", "TimeoutNanos", });
-    internal_static_PersistentFSMSnapshot_descriptor =
-      getDescriptor().getMessageTypes().get(5);
-    internal_static_PersistentFSMSnapshot_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_PersistentFSMSnapshot_descriptor,
-        new java.lang.String[] { "StateIdentifier", "Data", "TimeoutNanos", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/akka-persistence/src/main/java/akka/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java b/akka-persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java
similarity index 74%
rename from akka-persistence/src/main/java/akka/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java
rename to akka-persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java
index 0a5b69fb9d..5440b3a4fd 100644
--- a/akka-persistence/src/main/java/akka/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java
+++ b/akka-persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java
@@ -2,16 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.fsm.japi.pf;
+package org.apache.pekko.persistence.fsm.japi.pf;
 
-import akka.japi.pf.FI;
-import akka.japi.pf.PFBuilder;
+import org.apache.pekko.japi.pf.FI;
+import org.apache.pekko.japi.pf.PFBuilder;
 import scala.PartialFunction;
 
 import java.util.List;
 
 /**
- * Builder used to create a partial function for {@link akka.actor.FSM#whenUnhandled}.
+ * Builder used to create a partial function for {@link org.apache.pekko.actor.FSM#whenUnhandled}.
  *
  * @deprecated use EventSourcedBehavior since 2.6.0
  * @param  the state type
@@ -23,12 +23,12 @@ import java.util.List;
 public class FSMStateFunctionBuilder {
 
   private PFBuilder<
-          akka.persistence.fsm.PersistentFSM.Event,
-          akka.persistence.fsm.PersistentFSM.State>
+          org.apache.pekko.persistence.fsm.PersistentFSM.Event,
+          org.apache.pekko.persistence.fsm.PersistentFSM.State>
       builder =
           new PFBuilder<
-              akka.persistence.fsm.PersistentFSM.Event,
-              akka.persistence.fsm.PersistentFSM.State>();
+              org.apache.pekko.persistence.fsm.PersistentFSM.Event,
+              org.apache.pekko.persistence.fsm.PersistentFSM.State>();
 
   /**
    * An erased processing of the event matcher. The compile time checks are enforced by the public
@@ -52,10 +52,10 @@ public class FSMStateFunctionBuilder {
       final FI.TypedPredicate2 predicate,
       final FI.Apply2 apply) {
     builder.match(
-        akka.persistence.fsm.PersistentFSM.Event.class,
-        new FI.TypedPredicate() {
+        org.apache.pekko.persistence.fsm.PersistentFSM.Event.class,
+        new FI.TypedPredicate() {
           @Override
-          public boolean defined(akka.persistence.fsm.PersistentFSM.Event e) {
+          public boolean defined(org.apache.pekko.persistence.fsm.PersistentFSM.Event e) {
             boolean res = true;
             if (eventOrType != null) {
               if (eventOrType instanceof Class) {
@@ -82,13 +82,13 @@ public class FSMStateFunctionBuilder {
           }
         },
         new FI.Apply<
-            akka.persistence.fsm.PersistentFSM.Event,
-            akka.persistence.fsm.PersistentFSM.State>() {
-          public akka.persistence.fsm.PersistentFSM.State apply(
-              akka.persistence.fsm.PersistentFSM.Event e) throws Exception {
+            org.apache.pekko.persistence.fsm.PersistentFSM.Event,
+            org.apache.pekko.persistence.fsm.PersistentFSM.State>() {
+          public org.apache.pekko.persistence.fsm.PersistentFSM.State apply(
+              org.apache.pekko.persistence.fsm.PersistentFSM.Event e) throws Exception {
             @SuppressWarnings("unchecked")
-            akka.persistence.fsm.PersistentFSM.State res =
-                (akka.persistence.fsm.PersistentFSM.State)
+            org.apache.pekko.persistence.fsm.PersistentFSM.State res =
+                (org.apache.pekko.persistence.fsm.PersistentFSM.State)
                     apply.apply(e.event(), e.stateData());
             return res;
           }
@@ -112,7 +112,7 @@ public class FSMStateFunctionBuilder {
       final Class
     eventType,
       final Class dataType,
       final FI.TypedPredicate2 predicate,
-      final FI.Apply2> apply) {
+      final FI.Apply2> apply) {
     erasedEvent(eventType, dataType, predicate, apply);
     return this;
   }
@@ -130,7 +130,7 @@ public class FSMStateFunctionBuilder {
   public  FSMStateFunctionBuilder event(
       final Class
     eventType,
       final Class dataType,
-      final FI.Apply2> apply) {
+      final FI.Apply2> apply) {
     return erasedEvent(eventType, dataType, null, apply);
   }
 
@@ -145,7 +145,7 @@ public class FSMStateFunctionBuilder {
   public 
     FSMStateFunctionBuilder event(
       final Class
     eventType,
       final FI.TypedPredicate2 predicate,
-      final FI.Apply2> apply) {
+      final FI.Apply2> apply) {
     return erasedEvent(eventType, null, predicate, apply);
   }
 
@@ -158,7 +158,7 @@ public class FSMStateFunctionBuilder {
    */
   public 
     FSMStateFunctionBuilder event(
       final Class
     eventType,
-      final FI.Apply2> apply) {
+      final FI.Apply2> apply) {
     return erasedEvent(eventType, null, null, apply);
   }
 
@@ -171,7 +171,8 @@ public class FSMStateFunctionBuilder {
    */
   public FSMStateFunctionBuilder event(
       final FI.TypedPredicate2 predicate,
-      final FI.Apply2> apply) {
+      final FI.Apply2>
+          apply) {
     return erasedEvent(null, null, predicate, apply);
   }
 
@@ -188,12 +189,13 @@ public class FSMStateFunctionBuilder {
   public  FSMStateFunctionBuilder event(
       final List eventMatches,
       final Class dataType,
-      final FI.Apply2> apply) {
+      final FI.Apply2>
+          apply) {
     builder.match(
-        akka.persistence.fsm.PersistentFSM.Event.class,
-        new FI.TypedPredicate() {
+        org.apache.pekko.persistence.fsm.PersistentFSM.Event.class,
+        new FI.TypedPredicate() {
           @Override
-          public boolean defined(akka.persistence.fsm.PersistentFSM.Event e) {
+          public boolean defined(org.apache.pekko.persistence.fsm.PersistentFSM.Event e) {
             if (dataType != null && !dataType.isInstance(e.stateData())) return false;
 
             boolean emMatch = false;
@@ -211,10 +213,10 @@ public class FSMStateFunctionBuilder {
           }
         },
         new FI.Apply<
-            akka.persistence.fsm.PersistentFSM.Event,
-            akka.persistence.fsm.PersistentFSM.State>() {
-          public akka.persistence.fsm.PersistentFSM.State apply(
-              akka.persistence.fsm.PersistentFSM.Event e) throws Exception {
+            org.apache.pekko.persistence.fsm.PersistentFSM.Event,
+            org.apache.pekko.persistence.fsm.PersistentFSM.State>() {
+          public org.apache.pekko.persistence.fsm.PersistentFSM.State apply(
+              org.apache.pekko.persistence.fsm.PersistentFSM.Event e) throws Exception {
             @SuppressWarnings("unchecked")
             Q q = (Q) e.stateData();
             return apply.apply(e.event(), q);
@@ -234,7 +236,8 @@ public class FSMStateFunctionBuilder {
    */
   public FSMStateFunctionBuilder event(
       final List eventMatches,
-      final FI.Apply2> apply) {
+      final FI.Apply2>
+          apply) {
     return event(eventMatches, null, apply);
   }
 
@@ -250,7 +253,7 @@ public class FSMStateFunctionBuilder {
   public  FSMStateFunctionBuilder eventEquals(
       final P event,
       final Class dataType,
-      final FI.Apply2> apply) {
+      final FI.Apply2> apply) {
     return erasedEvent(event, dataType, null, apply);
   }
 
@@ -263,7 +266,7 @@ public class FSMStateFunctionBuilder {
    */
   public 
     FSMStateFunctionBuilder eventEquals(
       final P event,
-      final FI.Apply2> apply) {
+      final FI.Apply2> apply) {
     return erasedEvent(event, null, null, apply);
   }
 
@@ -274,7 +277,8 @@ public class FSMStateFunctionBuilder {
    * @return the builder with the case statement added
    */
   public FSMStateFunctionBuilder anyEvent(
-      final FI.Apply2> apply) {
+      final FI.Apply2>
+          apply) {
     return erasedEvent(null, null, null, apply);
   }
 
@@ -285,8 +289,8 @@ public class FSMStateFunctionBuilder {
    * @return a PartialFunction for this builder.
    */
   public PartialFunction<
-          akka.persistence.fsm.PersistentFSM.Event,
-          akka.persistence.fsm.PersistentFSM.State>
+          org.apache.pekko.persistence.fsm.PersistentFSM.Event,
+          org.apache.pekko.persistence.fsm.PersistentFSM.State>
       build() {
     return builder.build();
   }
diff --git a/akka-persistence/src/main/java/akka/persistence/fsm/japi/pf/FSMStopBuilder.java b/akka-persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStopBuilder.java
similarity index 57%
rename from akka-persistence/src/main/java/akka/persistence/fsm/japi/pf/FSMStopBuilder.java
rename to akka-persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStopBuilder.java
index b36897b58b..efe2199ca6 100644
--- a/akka-persistence/src/main/java/akka/persistence/fsm/japi/pf/FSMStopBuilder.java
+++ b/akka-persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStopBuilder.java
@@ -2,15 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.fsm.japi.pf;
+package org.apache.pekko.persistence.fsm.japi.pf;
 
-import akka.japi.pf.FI;
-import akka.japi.pf.UnitPFBuilder;
+import org.apache.pekko.japi.pf.FI;
+import org.apache.pekko.japi.pf.UnitPFBuilder;
 import scala.PartialFunction;
 import scala.runtime.BoxedUnit;
 
 /**
- * Builder used to create a partial function for {@link akka.actor.FSM#onTermination}.
+ * Builder used to create a partial function for {@link org.apache.pekko.actor.FSM#onTermination}.
  *
  * @deprecated use EventSourcedBehavior since 2.6.0
  * @param  the state type
@@ -19,28 +19,30 @@ import scala.runtime.BoxedUnit;
 @Deprecated
 public class FSMStopBuilder {
 
-  private UnitPFBuilder> builder =
+  private UnitPFBuilder> builder =
       new UnitPFBuilder<>();
 
   /**
-   * Add a case statement that matches on an {@link akka.actor.FSM.Reason}.
+   * Add a case statement that matches on an {@link org.apache.pekko.actor.FSM.Reason}.
    *
    * @param reason the reason for the termination
    * @param apply an action to apply to the event and state data if there is a match
    * @return the builder with the case statement added
    */
   public FSMStopBuilder stop(
-      final akka.persistence.fsm.PersistentFSM.Reason reason, final FI.UnitApply2 apply) {
+      final org.apache.pekko.persistence.fsm.PersistentFSM.Reason reason,
+      final FI.UnitApply2 apply) {
     builder.match(
-        akka.persistence.fsm.PersistentFSM.StopEvent.class,
-        new FI.TypedPredicate() {
+        org.apache.pekko.persistence.fsm.PersistentFSM.StopEvent.class,
+        new FI.TypedPredicate() {
           @Override
-          public boolean defined(akka.persistence.fsm.PersistentFSM.StopEvent e) {
+          public boolean defined(org.apache.pekko.persistence.fsm.PersistentFSM.StopEvent e) {
             return reason.equals(e.reason());
           }
         },
-        new FI.UnitApply() {
-          public void apply(akka.persistence.fsm.PersistentFSM.StopEvent e) throws Exception {
+        new FI.UnitApply() {
+          public void apply(org.apache.pekko.persistence.fsm.PersistentFSM.StopEvent e)
+              throws Exception {
             @SuppressWarnings("unchecked")
             S s = (S) e.currentState();
             @SuppressWarnings("unchecked")
@@ -60,8 +62,8 @@ public class FSMStopBuilder {
    * @param 
     the reason type to match on
    * @return the builder with the case statement added
    */
-  public 
     FSMStopBuilder stop(
-      final Class
     reasonType, final FI.UnitApply3 apply) {
+  public 
    
+      FSMStopBuilder stop(final Class
     reasonType, final FI.UnitApply3 apply) {
     return this.stop(
         reasonType,
         new FI.TypedPredicate
    () {
@@ -82,15 +84,16 @@ public class FSMStopBuilder {
    * @param 
     the reason type to match on
    * @return the builder with the case statement added
    */
-  public 
     FSMStopBuilder stop(
-      final Class
     reasonType,
-      final FI.TypedPredicate
     predicate,
-      final FI.UnitApply3 apply) {
+  public 
    
+      FSMStopBuilder stop(
+          final Class
     reasonType,
+          final FI.TypedPredicate
     predicate,
+          final FI.UnitApply3 apply) {
     builder.match(
-        akka.persistence.fsm.PersistentFSM.StopEvent.class,
-        new FI.TypedPredicate() {
+        org.apache.pekko.persistence.fsm.PersistentFSM.StopEvent.class,
+        new FI.TypedPredicate() {
           @Override
-          public boolean defined(akka.persistence.fsm.PersistentFSM.StopEvent e) {
+          public boolean defined(org.apache.pekko.persistence.fsm.PersistentFSM.StopEvent e) {
             if (reasonType.isInstance(e.reason())) {
               @SuppressWarnings("unchecked")
               P p = (P) e.reason();
@@ -100,8 +103,9 @@ public class FSMStopBuilder {
             }
           }
         },
-        new FI.UnitApply() {
-          public void apply(akka.persistence.fsm.PersistentFSM.StopEvent e) throws Exception {
+        new FI.UnitApply() {
+          public void apply(org.apache.pekko.persistence.fsm.PersistentFSM.StopEvent e)
+              throws Exception {
             @SuppressWarnings("unchecked")
             P p = (P) e.reason();
             @SuppressWarnings("unchecked")
@@ -121,7 +125,8 @@ public class FSMStopBuilder {
    *
    * @return a PartialFunction for this builder.
    */
-  public PartialFunction, BoxedUnit> build() {
+  public PartialFunction, BoxedUnit>
+      build() {
     return builder.build();
   }
 }
diff --git a/akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncRecoveryPlugin.java b/akka-persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncRecoveryPlugin.java
similarity index 93%
rename from akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncRecoveryPlugin.java
rename to akka-persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncRecoveryPlugin.java
index 29e7d78596..cca9f01e94 100644
--- a/akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncRecoveryPlugin.java
+++ b/akka-persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncRecoveryPlugin.java
@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.japi;
+package org.apache.pekko.persistence.journal.japi;
 
 import java.util.function.Consumer;
 
 import scala.concurrent.Future;
 
-import akka.persistence.PersistentRepr;
+import org.apache.pekko.persistence.PersistentRepr;
 
 interface AsyncRecoveryPlugin {
   // #async-replay-plugin-api
@@ -23,7 +23,7 @@ interface AsyncRecoveryPlugin {
    *
    * 
    The `toSequenceNr` is the lowest of what was returned by {@link
    * #doAsyncReadHighestSequenceNr} and what the user specified as recovery {@link
-   * akka.persistence.Recovery} parameter.
+   * org.apache.pekko.persistence.Recovery} parameter.
    *
    * @param persistenceId id of the persistent actor.
    * @param fromSequenceNr sequence number where replay should start (inclusive).
diff --git a/akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncWritePlugin.java b/akka-persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncWritePlugin.java
similarity index 97%
rename from akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncWritePlugin.java
rename to akka-persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncWritePlugin.java
index fd88e7ee07..0adb1c2363 100644
--- a/akka-persistence/src/main/java/akka/persistence/journal/japi/AsyncWritePlugin.java
+++ b/akka-persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncWritePlugin.java
@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.japi;
+package org.apache.pekko.persistence.journal.japi;
 
 import java.util.Optional;
 
 import scala.concurrent.Future;
 
-import akka.persistence.*;
+import org.apache.pekko.persistence.*;
 
 interface AsyncWritePlugin {
   // #async-write-plugin-api
diff --git a/akka-persistence/src/main/java/org/apache/pekko/persistence/serialization/MessageFormats.java b/akka-persistence/src/main/java/org/apache/pekko/persistence/serialization/MessageFormats.java
new file mode 100644
index 0000000000..39e0363b3e
--- /dev/null
+++ b/akka-persistence/src/main/java/org/apache/pekko/persistence/serialization/MessageFormats.java
@@ -0,0 +1,8355 @@
+/*
+ * Copyright (C) 2020-2022 Lightbend Inc. 
+ */
+
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: MessageFormats.proto
+
+package org.apache.pekko.persistence.serialization;
+
+public final class MessageFormats {
+  private MessageFormats() {}
+
+  public static void registerAllExtensions(
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {}
+
+  public static void registerAllExtensions(
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
+    registerAllExtensions((org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
+  }
+
+  public interface PersistentMessageOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:PersistentMessage)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
+
+    /**
+     * optional .PersistentPayload payload = 1;
+     *
+     * @return Whether the payload field is set.
+     */
+    boolean hasPayload();
+    /**
+     * optional .PersistentPayload payload = 1;
+     *
+     * @return The payload.
+     */
+    org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getPayload();
+    /** optional .PersistentPayload payload = 1; */
+    org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+        getPayloadOrBuilder();
+
+    /**
+     * optional int64 sequenceNr = 2;
+     *
+     * @return Whether the sequenceNr field is set.
+     */
+    boolean hasSequenceNr();
+    /**
+     * optional int64 sequenceNr = 2;
+     *
+     * @return The sequenceNr.
+     */
+    long getSequenceNr();
+
+    /**
+     * optional string persistenceId = 3;
+     *
+     * @return Whether the persistenceId field is set.
+     */
+    boolean hasPersistenceId();
+    /**
+     * optional string persistenceId = 3;
+     *
+     * @return The persistenceId.
+     */
+    java.lang.String getPersistenceId();
+    /**
+     * optional string persistenceId = 3;
+     *
+     * @return The bytes for persistenceId.
+     */
+    org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes();
+
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4
+     * 
    
+     *
+     * optional bool deleted = 4;
+     *
+     * @return Whether the deleted field is set.
+     */
+    boolean hasDeleted();
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4
+     * 
    
+     *
+     * optional bool deleted = 4;
+     *
+     * @return The deleted.
+     */
+    boolean getDeleted();
+
+    /**
+     *
+     *
+     * 
    +     * optional int32 redeliveries = 6; // Removed in 2.4
+     * repeated string confirms = 7; // Removed in 2.4
+     * optional bool confirmable = 8;  // Removed in 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+     * optional string confirmTarget = 10; // Removed in 2.4
+     * 
    
+     *
+     * optional string sender = 11;
+     *
+     * @return Whether the sender field is set.
+     */
+    boolean hasSender();
+    /**
+     *
+     *
+     * 
    +     * optional int32 redeliveries = 6; // Removed in 2.4
+     * repeated string confirms = 7; // Removed in 2.4
+     * optional bool confirmable = 8;  // Removed in 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+     * optional string confirmTarget = 10; // Removed in 2.4
+     * 
    
+     *
+     * optional string sender = 11;
+     *
+     * @return The sender.
+     */
+    java.lang.String getSender();
+    /**
+     *
+     *
+     * 
    +     * optional int32 redeliveries = 6; // Removed in 2.4
+     * repeated string confirms = 7; // Removed in 2.4
+     * optional bool confirmable = 8;  // Removed in 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+     * optional string confirmTarget = 10; // Removed in 2.4
+     * 
    
+     *
+     * optional string sender = 11;
+     *
+     * @return The bytes for sender.
+     */
+    org.apache.pekko.protobufv3.internal.ByteString getSenderBytes();
+
+    /**
+     * optional string manifest = 12;
+     *
+     * @return Whether the manifest field is set.
+     */
+    boolean hasManifest();
+    /**
+     * optional string manifest = 12;
+     *
+     * @return The manifest.
+     */
+    java.lang.String getManifest();
+    /**
+     * optional string manifest = 12;
+     *
+     * @return The bytes for manifest.
+     */
+    org.apache.pekko.protobufv3.internal.ByteString getManifestBytes();
+
+    /**
+     * optional string writerUuid = 13;
+     *
+     * @return Whether the writerUuid field is set.
+     */
+    boolean hasWriterUuid();
+    /**
+     * optional string writerUuid = 13;
+     *
+     * @return The writerUuid.
+     */
+    java.lang.String getWriterUuid();
+    /**
+     * optional string writerUuid = 13;
+     *
+     * @return The bytes for writerUuid.
+     */
+    org.apache.pekko.protobufv3.internal.ByteString getWriterUuidBytes();
+
+    /**
+     * optional sint64 timestamp = 14;
+     *
+     * @return Whether the timestamp field is set.
+     */
+    boolean hasTimestamp();
+    /**
+     * optional sint64 timestamp = 14;
+     *
+     * @return The timestamp.
+     */
+    long getTimestamp();
+
+    /**
+     * optional .PersistentPayload metadata = 15;
+     *
+     * @return Whether the metadata field is set.
+     */
+    boolean hasMetadata();
+    /**
+     * optional .PersistentPayload metadata = 15;
+     *
+     * @return The metadata.
+     */
+    org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getMetadata();
+    /** optional .PersistentPayload metadata = 15; */
+    org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+        getMetadataOrBuilder();
+  }
+  /** Protobuf type {@code PersistentMessage} */
+  public static final class PersistentMessage
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:PersistentMessage)
+      PersistentMessageOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use PersistentMessage.newBuilder() to construct.
+    private PersistentMessage(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private PersistentMessage() {
+      persistenceId_ = "";
+      sender_ = "";
+      manifest_ = "";
+      writerUuid_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new PersistentMessage();
+    }
+
+    @java.lang.Override
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    private PersistentMessage(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+                    subBuilder = null;
+                if (((bitField0_ & 0x00000001) != 0)) {
+                  subBuilder = payload_.toBuilder();
+                }
+                payload_ =
+                    input.readMessage(
+                        org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                            .PARSER,
+                        extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(payload_);
+                  payload_ = subBuilder.buildPartial();
+                }
+                bitField0_ |= 0x00000001;
+                break;
+              }
+            case 16:
+              {
+                bitField0_ |= 0x00000002;
+                sequenceNr_ = input.readInt64();
+                break;
+              }
+            case 26:
+              {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                bitField0_ |= 0x00000004;
+                persistenceId_ = bs;
+                break;
+              }
+            case 32:
+              {
+                bitField0_ |= 0x00000008;
+                deleted_ = input.readBool();
+                break;
+              }
+            case 90:
+              {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                bitField0_ |= 0x00000010;
+                sender_ = bs;
+                break;
+              }
+            case 98:
+              {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                bitField0_ |= 0x00000020;
+                manifest_ = bs;
+                break;
+              }
+            case 106:
+              {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                bitField0_ |= 0x00000040;
+                writerUuid_ = bs;
+                break;
+              }
+            case 112:
+              {
+                bitField0_ |= 0x00000080;
+                timestamp_ = input.readSInt64();
+                break;
+              }
+            case 122:
+              {
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+                    subBuilder = null;
+                if (((bitField0_ & 0x00000100) != 0)) {
+                  subBuilder = metadata_.toBuilder();
+                }
+                metadata_ =
+                    input.readMessage(
+                        org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                            .PARSER,
+                        extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(metadata_);
+                  metadata_ = subBuilder.buildPartial();
+                }
+                bitField0_ |= 0x00000100;
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_PersistentMessage_descriptor;
+    }
+
+    @java.lang.Override
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_PersistentMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.class,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder
+                  .class);
+    }
+
+    private int bitField0_;
+    public static final int PAYLOAD_FIELD_NUMBER = 1;
+    private org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload payload_;
+    /**
+     * optional .PersistentPayload payload = 1;
+     *
+     * @return Whether the payload field is set.
+     */
+    public boolean hasPayload() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * optional .PersistentPayload payload = 1;
+     *
+     * @return The payload.
+     */
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        getPayload() {
+      return payload_ == null
+          ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+              .getDefaultInstance()
+          : payload_;
+    }
+    /** optional .PersistentPayload payload = 1; */
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+        getPayloadOrBuilder() {
+      return payload_ == null
+          ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+              .getDefaultInstance()
+          : payload_;
+    }
+
+    public static final int SEQUENCENR_FIELD_NUMBER = 2;
+    private long sequenceNr_;
+    /**
+     * optional int64 sequenceNr = 2;
+     *
+     * @return Whether the sequenceNr field is set.
+     */
+    public boolean hasSequenceNr() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * optional int64 sequenceNr = 2;
+     *
+     * @return The sequenceNr.
+     */
+    public long getSequenceNr() {
+      return sequenceNr_;
+    }
+
+    public static final int PERSISTENCEID_FIELD_NUMBER = 3;
+    private volatile java.lang.Object persistenceId_;
+    /**
+     * optional string persistenceId = 3;
+     *
+     * @return Whether the persistenceId field is set.
+     */
+    public boolean hasPersistenceId() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     * optional string persistenceId = 3;
+     *
+     * @return The persistenceId.
+     */
+    public java.lang.String getPersistenceId() {
+      java.lang.Object ref = persistenceId_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          persistenceId_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * optional string persistenceId = 3;
+     *
+     * @return The bytes for persistenceId.
+     */
+    public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
+      java.lang.Object ref = persistenceId_;
+      if (ref instanceof java.lang.String) {
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        persistenceId_ = b;
+        return b;
+      } else {
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+      }
+    }
+
+    public static final int DELETED_FIELD_NUMBER = 4;
+    private boolean deleted_;
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4
+     * 
    
+     *
+     * optional bool deleted = 4;
+     *
+     * @return Whether the deleted field is set.
+     */
+    public boolean hasDeleted() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4
+     * 
    
+     *
+     * optional bool deleted = 4;
+     *
+     * @return The deleted.
+     */
+    public boolean getDeleted() {
+      return deleted_;
+    }
+
+    public static final int SENDER_FIELD_NUMBER = 11;
+    private volatile java.lang.Object sender_;
+    /**
+     *
+     *
+     * 
    +     * optional int32 redeliveries = 6; // Removed in 2.4
+     * repeated string confirms = 7; // Removed in 2.4
+     * optional bool confirmable = 8;  // Removed in 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+     * optional string confirmTarget = 10; // Removed in 2.4
+     * 
    
+     *
+     * optional string sender = 11;
+     *
+     * @return Whether the sender field is set.
+     */
+    public boolean hasSender() {
+      return ((bitField0_ & 0x00000010) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * optional int32 redeliveries = 6; // Removed in 2.4
+     * repeated string confirms = 7; // Removed in 2.4
+     * optional bool confirmable = 8;  // Removed in 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+     * optional string confirmTarget = 10; // Removed in 2.4
+     * 
    
+     *
+     * optional string sender = 11;
+     *
+     * @return The sender.
+     */
+    public java.lang.String getSender() {
+      java.lang.Object ref = sender_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          sender_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * optional int32 redeliveries = 6; // Removed in 2.4
+     * repeated string confirms = 7; // Removed in 2.4
+     * optional bool confirmable = 8;  // Removed in 2.4
+     * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+     * optional string confirmTarget = 10; // Removed in 2.4
+     * 
    
+     *
+     * optional string sender = 11;
+     *
+     * @return The bytes for sender.
+     */
+    public org.apache.pekko.protobufv3.internal.ByteString getSenderBytes() {
+      java.lang.Object ref = sender_;
+      if (ref instanceof java.lang.String) {
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        sender_ = b;
+        return b;
+      } else {
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+      }
+    }
+
+    public static final int MANIFEST_FIELD_NUMBER = 12;
+    private volatile java.lang.Object manifest_;
+    /**
+     * optional string manifest = 12;
+     *
+     * @return Whether the manifest field is set.
+     */
+    public boolean hasManifest() {
+      return ((bitField0_ & 0x00000020) != 0);
+    }
+    /**
+     * optional string manifest = 12;
+     *
+     * @return The manifest.
+     */
+    public java.lang.String getManifest() {
+      java.lang.Object ref = manifest_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          manifest_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * optional string manifest = 12;
+     *
+     * @return The bytes for manifest.
+     */
+    public org.apache.pekko.protobufv3.internal.ByteString getManifestBytes() {
+      java.lang.Object ref = manifest_;
+      if (ref instanceof java.lang.String) {
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        manifest_ = b;
+        return b;
+      } else {
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+      }
+    }
+
+    public static final int WRITERUUID_FIELD_NUMBER = 13;
+    private volatile java.lang.Object writerUuid_;
+    /**
+     * optional string writerUuid = 13;
+     *
+     * @return Whether the writerUuid field is set.
+     */
+    public boolean hasWriterUuid() {
+      return ((bitField0_ & 0x00000040) != 0);
+    }
+    /**
+     * optional string writerUuid = 13;
+     *
+     * @return The writerUuid.
+     */
+    public java.lang.String getWriterUuid() {
+      java.lang.Object ref = writerUuid_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          writerUuid_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * optional string writerUuid = 13;
+     *
+     * @return The bytes for writerUuid.
+     */
+    public org.apache.pekko.protobufv3.internal.ByteString getWriterUuidBytes() {
+      java.lang.Object ref = writerUuid_;
+      if (ref instanceof java.lang.String) {
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        writerUuid_ = b;
+        return b;
+      } else {
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+      }
+    }
+
+    public static final int TIMESTAMP_FIELD_NUMBER = 14;
+    private long timestamp_;
+    /**
+     * optional sint64 timestamp = 14;
+     *
+     * @return Whether the timestamp field is set.
+     */
+    public boolean hasTimestamp() {
+      return ((bitField0_ & 0x00000080) != 0);
+    }
+    /**
+     * optional sint64 timestamp = 14;
+     *
+     * @return The timestamp.
+     */
+    public long getTimestamp() {
+      return timestamp_;
+    }
+
+    public static final int METADATA_FIELD_NUMBER = 15;
+    private org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload metadata_;
+    /**
+     * optional .PersistentPayload metadata = 15;
+     *
+     * @return Whether the metadata field is set.
+     */
+    public boolean hasMetadata() {
+      return ((bitField0_ & 0x00000100) != 0);
+    }
+    /**
+     * optional .PersistentPayload metadata = 15;
+     *
+     * @return The metadata.
+     */
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        getMetadata() {
+      return metadata_ == null
+          ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+              .getDefaultInstance()
+          : metadata_;
+    }
+    /** optional .PersistentPayload metadata = 15; */
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+        getMetadataOrBuilder() {
+      return metadata_ == null
+          ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+              .getDefaultInstance()
+          : metadata_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (hasPayload()) {
+        if (!getPayload().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      if (hasMetadata()) {
+        if (!getMetadata().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
+        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        output.writeMessage(1, getPayload());
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeInt64(2, sequenceNr_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+            output, 3, persistenceId_);
+      }
+      if (((bitField0_ & 0x00000008) != 0)) {
+        output.writeBool(4, deleted_);
+      }
+      if (((bitField0_ & 0x00000010) != 0)) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 11, sender_);
+      }
+      if (((bitField0_ & 0x00000020) != 0)) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 12, manifest_);
+      }
+      if (((bitField0_ & 0x00000040) != 0)) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+            output, 13, writerUuid_);
+      }
+      if (((bitField0_ & 0x00000080) != 0)) {
+        output.writeSInt64(14, timestamp_);
+      }
+      if (((bitField0_ & 0x00000100) != 0)) {
+        output.writeMessage(15, getMetadata());
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                1, getPayload());
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(2, sequenceNr_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                3, persistenceId_);
+      }
+      if (((bitField0_ & 0x00000008) != 0)) {
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream.computeBoolSize(4, deleted_);
+      }
+      if (((bitField0_ & 0x00000010) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(11, sender_);
+      }
+      if (((bitField0_ & 0x00000020) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                12, manifest_);
+      }
+      if (((bitField0_ & 0x00000040) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                13, writerUuid_);
+      }
+      if (((bitField0_ & 0x00000080) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeSInt64Size(
+                14, timestamp_);
+      }
+      if (((bitField0_ & 0x00000100) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                15, getMetadata());
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj
+          instanceof org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage)) {
+        return super.equals(obj);
+      }
+      org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage other =
+          (org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage) obj;
+
+      if (hasPayload() != other.hasPayload()) return false;
+      if (hasPayload()) {
+        if (!getPayload().equals(other.getPayload())) return false;
+      }
+      if (hasSequenceNr() != other.hasSequenceNr()) return false;
+      if (hasSequenceNr()) {
+        if (getSequenceNr() != other.getSequenceNr()) return false;
+      }
+      if (hasPersistenceId() != other.hasPersistenceId()) return false;
+      if (hasPersistenceId()) {
+        if (!getPersistenceId().equals(other.getPersistenceId())) return false;
+      }
+      if (hasDeleted() != other.hasDeleted()) return false;
+      if (hasDeleted()) {
+        if (getDeleted() != other.getDeleted()) return false;
+      }
+      if (hasSender() != other.hasSender()) return false;
+      if (hasSender()) {
+        if (!getSender().equals(other.getSender())) return false;
+      }
+      if (hasManifest() != other.hasManifest()) return false;
+      if (hasManifest()) {
+        if (!getManifest().equals(other.getManifest())) return false;
+      }
+      if (hasWriterUuid() != other.hasWriterUuid()) return false;
+      if (hasWriterUuid()) {
+        if (!getWriterUuid().equals(other.getWriterUuid())) return false;
+      }
+      if (hasTimestamp() != other.hasTimestamp()) return false;
+      if (hasTimestamp()) {
+        if (getTimestamp() != other.getTimestamp()) return false;
+      }
+      if (hasMetadata() != other.hasMetadata()) return false;
+      if (hasMetadata()) {
+        if (!getMetadata().equals(other.getMetadata())) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasPayload()) {
+        hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
+        hash = (53 * hash) + getPayload().hashCode();
+      }
+      if (hasSequenceNr()) {
+        hash = (37 * hash) + SEQUENCENR_FIELD_NUMBER;
+        hash =
+            (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getSequenceNr());
+      }
+      if (hasPersistenceId()) {
+        hash = (37 * hash) + PERSISTENCEID_FIELD_NUMBER;
+        hash = (53 * hash) + getPersistenceId().hashCode();
+      }
+      if (hasDeleted()) {
+        hash = (37 * hash) + DELETED_FIELD_NUMBER;
+        hash =
+            (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(getDeleted());
+      }
+      if (hasSender()) {
+        hash = (37 * hash) + SENDER_FIELD_NUMBER;
+        hash = (53 * hash) + getSender().hashCode();
+      }
+      if (hasManifest()) {
+        hash = (37 * hash) + MANIFEST_FIELD_NUMBER;
+        hash = (53 * hash) + getManifest().hashCode();
+      }
+      if (hasWriterUuid()) {
+        hash = (37 * hash) + WRITERUUID_FIELD_NUMBER;
+        hash = (53 * hash) + getWriterUuid().hashCode();
+      }
+      if (hasTimestamp()) {
+        hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getTimestamp());
+      }
+      if (hasMetadata()) {
+        hash = (37 * hash) + METADATA_FIELD_NUMBER;
+        hash = (53 * hash) + getMetadata().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(java.nio.ByteBuffer data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(
+            java.nio.ByteBuffer data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /** Protobuf type {@code PersistentMessage} */
+    public static final class Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:PersistentMessage)
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessageOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentMessage_descriptor;
+      }
+
+      @java.lang.Override
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.class,
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder
+                    .class);
+      }
+
+      // Construct using
+      // org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getPayloadFieldBuilder();
+          getMetadataFieldBuilder();
+        }
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (payloadBuilder_ == null) {
+          payload_ = null;
+        } else {
+          payloadBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000001);
+        sequenceNr_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        persistenceId_ = "";
+        bitField0_ = (bitField0_ & ~0x00000004);
+        deleted_ = false;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        sender_ = "";
+        bitField0_ = (bitField0_ & ~0x00000010);
+        manifest_ = "";
+        bitField0_ = (bitField0_ & ~0x00000020);
+        writerUuid_ = "";
+        bitField0_ = (bitField0_ & ~0x00000040);
+        timestamp_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000080);
+        if (metadataBuilder_ == null) {
+          metadata_ = null;
+        } else {
+          metadataBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000100);
+        return this;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentMessage_descriptor;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+          getDefaultInstanceForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage build() {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage result =
+            buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+          buildPartial() {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage result =
+            new org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          if (payloadBuilder_ == null) {
+            result.payload_ = payload_;
+          } else {
+            result.payload_ = payloadBuilder_.build();
+          }
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.sequenceNr_ = sequenceNr_;
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.persistenceId_ = persistenceId_;
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.deleted_ = deleted_;
+          to_bitField0_ |= 0x00000008;
+        }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        result.sender_ = sender_;
+        if (((from_bitField0_ & 0x00000020) != 0)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        result.manifest_ = manifest_;
+        if (((from_bitField0_ & 0x00000040) != 0)) {
+          to_bitField0_ |= 0x00000040;
+        }
+        result.writerUuid_ = writerUuid_;
+        if (((from_bitField0_ & 0x00000080) != 0)) {
+          result.timestamp_ = timestamp_;
+          to_bitField0_ |= 0x00000080;
+        }
+        if (((from_bitField0_ & 0x00000100) != 0)) {
+          if (metadataBuilder_ == null) {
+            result.metadata_ = metadata_;
+          } else {
+            result.metadata_ = metadataBuilder_.build();
+          }
+          to_bitField0_ |= 0x00000100;
+        }
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other
+            instanceof
+            org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage) {
+          return mergeFrom(
+              (org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage) other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage other) {
+        if (other
+            == org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+                .getDefaultInstance()) return this;
+        if (other.hasPayload()) {
+          mergePayload(other.getPayload());
+        }
+        if (other.hasSequenceNr()) {
+          setSequenceNr(other.getSequenceNr());
+        }
+        if (other.hasPersistenceId()) {
+          bitField0_ |= 0x00000004;
+          persistenceId_ = other.persistenceId_;
+          onChanged();
+        }
+        if (other.hasDeleted()) {
+          setDeleted(other.getDeleted());
+        }
+        if (other.hasSender()) {
+          bitField0_ |= 0x00000010;
+          sender_ = other.sender_;
+          onChanged();
+        }
+        if (other.hasManifest()) {
+          bitField0_ |= 0x00000020;
+          manifest_ = other.manifest_;
+          onChanged();
+        }
+        if (other.hasWriterUuid()) {
+          bitField0_ |= 0x00000040;
+          writerUuid_ = other.writerUuid_;
+          onChanged();
+        }
+        if (other.hasTimestamp()) {
+          setTimestamp(other.getTimestamp());
+        }
+        if (other.hasMetadata()) {
+          mergeMetadata(other.getMetadata());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (hasPayload()) {
+          if (!getPayload().isInitialized()) {
+            return false;
+          }
+        }
+        if (hasMetadata()) {
+          if (!getMetadata().isInitialized()) {
+            return false;
+          }
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage parsedMessage =
+            null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage)
+                  e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int bitField0_;
+
+      private org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload payload_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>
+          payloadBuilder_;
+      /**
+       * optional .PersistentPayload payload = 1;
+       *
+       * @return Whether the payload field is set.
+       */
+      public boolean hasPayload() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * optional .PersistentPayload payload = 1;
+       *
+       * @return The payload.
+       */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+          getPayload() {
+        if (payloadBuilder_ == null) {
+          return payload_ == null
+              ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                  .getDefaultInstance()
+              : payload_;
+        } else {
+          return payloadBuilder_.getMessage();
+        }
+      }
+      /** optional .PersistentPayload payload = 1; */
+      public Builder setPayload(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
+        if (payloadBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          payload_ = value;
+          onChanged();
+        } else {
+          payloadBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      /** optional .PersistentPayload payload = 1; */
+      public Builder setPayload(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+              builderForValue) {
+        if (payloadBuilder_ == null) {
+          payload_ = builderForValue.build();
+          onChanged();
+        } else {
+          payloadBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      /** optional .PersistentPayload payload = 1; */
+      public Builder mergePayload(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
+        if (payloadBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)
+              && payload_ != null
+              && payload_
+                  != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                      .getDefaultInstance()) {
+            payload_ =
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                    .newBuilder(payload_)
+                    .mergeFrom(value)
+                    .buildPartial();
+          } else {
+            payload_ = value;
+          }
+          onChanged();
+        } else {
+          payloadBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      /** optional .PersistentPayload payload = 1; */
+      public Builder clearPayload() {
+        if (payloadBuilder_ == null) {
+          payload_ = null;
+          onChanged();
+        } else {
+          payloadBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+      /** optional .PersistentPayload payload = 1; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+          getPayloadBuilder() {
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return getPayloadFieldBuilder().getBuilder();
+      }
+      /** optional .PersistentPayload payload = 1; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+          getPayloadOrBuilder() {
+        if (payloadBuilder_ != null) {
+          return payloadBuilder_.getMessageOrBuilder();
+        } else {
+          return payload_ == null
+              ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                  .getDefaultInstance()
+              : payload_;
+        }
+      }
+      /** optional .PersistentPayload payload = 1; */
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>
+          getPayloadFieldBuilder() {
+        if (payloadBuilder_ == null) {
+          payloadBuilder_ =
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                      .Builder,
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .PersistentPayloadOrBuilder>(getPayload(), getParentForChildren(), isClean());
+          payload_ = null;
+        }
+        return payloadBuilder_;
+      }
+
+      private long sequenceNr_;
+      /**
+       * optional int64 sequenceNr = 2;
+       *
+       * @return Whether the sequenceNr field is set.
+       */
+      public boolean hasSequenceNr() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * optional int64 sequenceNr = 2;
+       *
+       * @return The sequenceNr.
+       */
+      public long getSequenceNr() {
+        return sequenceNr_;
+      }
+      /**
+       * optional int64 sequenceNr = 2;
+       *
+       * @param value The sequenceNr to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSequenceNr(long value) {
+        bitField0_ |= 0x00000002;
+        sequenceNr_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * optional int64 sequenceNr = 2;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearSequenceNr() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        sequenceNr_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object persistenceId_ = "";
+      /**
+       * optional string persistenceId = 3;
+       *
+       * @return Whether the persistenceId field is set.
+       */
+      public boolean hasPersistenceId() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * optional string persistenceId = 3;
+       *
+       * @return The persistenceId.
+       */
+      public java.lang.String getPersistenceId() {
+        java.lang.Object ref = persistenceId_;
+        if (!(ref instanceof java.lang.String)) {
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            persistenceId_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * optional string persistenceId = 3;
+       *
+       * @return The bytes for persistenceId.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getPersistenceIdBytes() {
+        java.lang.Object ref = persistenceId_;
+        if (ref instanceof String) {
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          persistenceId_ = b;
+          return b;
+        } else {
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        }
+      }
+      /**
+       * optional string persistenceId = 3;
+       *
+       * @param value The persistenceId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPersistenceId(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000004;
+        persistenceId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * optional string persistenceId = 3;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearPersistenceId() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        persistenceId_ = getDefaultInstance().getPersistenceId();
+        onChanged();
+        return this;
+      }
+      /**
+       * optional string persistenceId = 3;
+       *
+       * @param value The bytes for persistenceId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPersistenceIdBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000004;
+        persistenceId_ = value;
+        onChanged();
+        return this;
+      }
+
+      private boolean deleted_;
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4
+       * 
    
+       *
+       * optional bool deleted = 4;
+       *
+       * @return Whether the deleted field is set.
+       */
+      public boolean hasDeleted() {
+        return ((bitField0_ & 0x00000008) != 0);
+      }
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4
+       * 
    
+       *
+       * optional bool deleted = 4;
+       *
+       * @return The deleted.
+       */
+      public boolean getDeleted() {
+        return deleted_;
+      }
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4
+       * 
    
+       *
+       * optional bool deleted = 4;
+       *
+       * @param value The deleted to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDeleted(boolean value) {
+        bitField0_ |= 0x00000008;
+        deleted_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4
+       * 
    
+       *
+       * optional bool deleted = 4;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearDeleted() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        deleted_ = false;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object sender_ = "";
+      /**
+       *
+       *
+       * 
    +       * optional int32 redeliveries = 6; // Removed in 2.4
+       * repeated string confirms = 7; // Removed in 2.4
+       * optional bool confirmable = 8;  // Removed in 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+       * optional string confirmTarget = 10; // Removed in 2.4
+       * 
    
+       *
+       * optional string sender = 11;
+       *
+       * @return Whether the sender field is set.
+       */
+      public boolean hasSender() {
+        return ((bitField0_ & 0x00000010) != 0);
+      }
+      /**
+       *
+       *
+       * 
    +       * optional int32 redeliveries = 6; // Removed in 2.4
+       * repeated string confirms = 7; // Removed in 2.4
+       * optional bool confirmable = 8;  // Removed in 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+       * optional string confirmTarget = 10; // Removed in 2.4
+       * 
    
+       *
+       * optional string sender = 11;
+       *
+       * @return The sender.
+       */
+      public java.lang.String getSender() {
+        java.lang.Object ref = sender_;
+        if (!(ref instanceof java.lang.String)) {
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            sender_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * optional int32 redeliveries = 6; // Removed in 2.4
+       * repeated string confirms = 7; // Removed in 2.4
+       * optional bool confirmable = 8;  // Removed in 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+       * optional string confirmTarget = 10; // Removed in 2.4
+       * 
    
+       *
+       * optional string sender = 11;
+       *
+       * @return The bytes for sender.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getSenderBytes() {
+        java.lang.Object ref = sender_;
+        if (ref instanceof String) {
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          sender_ = b;
+          return b;
+        } else {
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * optional int32 redeliveries = 6; // Removed in 2.4
+       * repeated string confirms = 7; // Removed in 2.4
+       * optional bool confirmable = 8;  // Removed in 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+       * optional string confirmTarget = 10; // Removed in 2.4
+       * 
    
+       *
+       * optional string sender = 11;
+       *
+       * @param value The sender to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSender(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000010;
+        sender_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * optional int32 redeliveries = 6; // Removed in 2.4
+       * repeated string confirms = 7; // Removed in 2.4
+       * optional bool confirmable = 8;  // Removed in 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+       * optional string confirmTarget = 10; // Removed in 2.4
+       * 
    
+       *
+       * optional string sender = 11;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearSender() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        sender_ = getDefaultInstance().getSender();
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * optional int32 redeliveries = 6; // Removed in 2.4
+       * repeated string confirms = 7; // Removed in 2.4
+       * optional bool confirmable = 8;  // Removed in 2.4
+       * optional DeliveredMessage confirmMessage = 9; // Removed in 2.4
+       * optional string confirmTarget = 10; // Removed in 2.4
+       * 
    
+       *
+       * optional string sender = 11;
+       *
+       * @param value The bytes for sender to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSenderBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000010;
+        sender_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object manifest_ = "";
+      /**
+       * optional string manifest = 12;
+       *
+       * @return Whether the manifest field is set.
+       */
+      public boolean hasManifest() {
+        return ((bitField0_ & 0x00000020) != 0);
+      }
+      /**
+       * optional string manifest = 12;
+       *
+       * @return The manifest.
+       */
+      public java.lang.String getManifest() {
+        java.lang.Object ref = manifest_;
+        if (!(ref instanceof java.lang.String)) {
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            manifest_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * optional string manifest = 12;
+       *
+       * @return The bytes for manifest.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getManifestBytes() {
+        java.lang.Object ref = manifest_;
+        if (ref instanceof String) {
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          manifest_ = b;
+          return b;
+        } else {
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        }
+      }
+      /**
+       * optional string manifest = 12;
+       *
+       * @param value The manifest to set.
+       * @return This builder for chaining.
+       */
+      public Builder setManifest(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000020;
+        manifest_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * optional string manifest = 12;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearManifest() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        manifest_ = getDefaultInstance().getManifest();
+        onChanged();
+        return this;
+      }
+      /**
+       * optional string manifest = 12;
+       *
+       * @param value The bytes for manifest to set.
+       * @return This builder for chaining.
+       */
+      public Builder setManifestBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000020;
+        manifest_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object writerUuid_ = "";
+      /**
+       * optional string writerUuid = 13;
+       *
+       * @return Whether the writerUuid field is set.
+       */
+      public boolean hasWriterUuid() {
+        return ((bitField0_ & 0x00000040) != 0);
+      }
+      /**
+       * optional string writerUuid = 13;
+       *
+       * @return The writerUuid.
+       */
+      public java.lang.String getWriterUuid() {
+        java.lang.Object ref = writerUuid_;
+        if (!(ref instanceof java.lang.String)) {
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            writerUuid_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * optional string writerUuid = 13;
+       *
+       * @return The bytes for writerUuid.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getWriterUuidBytes() {
+        java.lang.Object ref = writerUuid_;
+        if (ref instanceof String) {
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          writerUuid_ = b;
+          return b;
+        } else {
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        }
+      }
+      /**
+       * optional string writerUuid = 13;
+       *
+       * @param value The writerUuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWriterUuid(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000040;
+        writerUuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * optional string writerUuid = 13;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearWriterUuid() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        writerUuid_ = getDefaultInstance().getWriterUuid();
+        onChanged();
+        return this;
+      }
+      /**
+       * optional string writerUuid = 13;
+       *
+       * @param value The bytes for writerUuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWriterUuidBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000040;
+        writerUuid_ = value;
+        onChanged();
+        return this;
+      }
+
+      private long timestamp_;
+      /**
+       * optional sint64 timestamp = 14;
+       *
+       * @return Whether the timestamp field is set.
+       */
+      public boolean hasTimestamp() {
+        return ((bitField0_ & 0x00000080) != 0);
+      }
+      /**
+       * optional sint64 timestamp = 14;
+       *
+       * @return The timestamp.
+       */
+      public long getTimestamp() {
+        return timestamp_;
+      }
+      /**
+       * optional sint64 timestamp = 14;
+       *
+       * @param value The timestamp to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimestamp(long value) {
+        bitField0_ |= 0x00000080;
+        timestamp_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * optional sint64 timestamp = 14;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearTimestamp() {
+        bitField0_ = (bitField0_ & ~0x00000080);
+        timestamp_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload metadata_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>
+          metadataBuilder_;
+      /**
+       * optional .PersistentPayload metadata = 15;
+       *
+       * @return Whether the metadata field is set.
+       */
+      public boolean hasMetadata() {
+        return ((bitField0_ & 0x00000100) != 0);
+      }
+      /**
+       * optional .PersistentPayload metadata = 15;
+       *
+       * @return The metadata.
+       */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+          getMetadata() {
+        if (metadataBuilder_ == null) {
+          return metadata_ == null
+              ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                  .getDefaultInstance()
+              : metadata_;
+        } else {
+          return metadataBuilder_.getMessage();
+        }
+      }
+      /** optional .PersistentPayload metadata = 15; */
+      public Builder setMetadata(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
+        if (metadataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          metadata_ = value;
+          onChanged();
+        } else {
+          metadataBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000100;
+        return this;
+      }
+      /** optional .PersistentPayload metadata = 15; */
+      public Builder setMetadata(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+              builderForValue) {
+        if (metadataBuilder_ == null) {
+          metadata_ = builderForValue.build();
+          onChanged();
+        } else {
+          metadataBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000100;
+        return this;
+      }
+      /** optional .PersistentPayload metadata = 15; */
+      public Builder mergeMetadata(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
+        if (metadataBuilder_ == null) {
+          if (((bitField0_ & 0x00000100) != 0)
+              && metadata_ != null
+              && metadata_
+                  != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                      .getDefaultInstance()) {
+            metadata_ =
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                    .newBuilder(metadata_)
+                    .mergeFrom(value)
+                    .buildPartial();
+          } else {
+            metadata_ = value;
+          }
+          onChanged();
+        } else {
+          metadataBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000100;
+        return this;
+      }
+      /** optional .PersistentPayload metadata = 15; */
+      public Builder clearMetadata() {
+        if (metadataBuilder_ == null) {
+          metadata_ = null;
+          onChanged();
+        } else {
+          metadataBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000100);
+        return this;
+      }
+      /** optional .PersistentPayload metadata = 15; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+          getMetadataBuilder() {
+        bitField0_ |= 0x00000100;
+        onChanged();
+        return getMetadataFieldBuilder().getBuilder();
+      }
+      /** optional .PersistentPayload metadata = 15; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+          getMetadataOrBuilder() {
+        if (metadataBuilder_ != null) {
+          return metadataBuilder_.getMessageOrBuilder();
+        } else {
+          return metadata_ == null
+              ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                  .getDefaultInstance()
+              : metadata_;
+        }
+      }
+      /** optional .PersistentPayload metadata = 15; */
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>
+          getMetadataFieldBuilder() {
+        if (metadataBuilder_ == null) {
+          metadataBuilder_ =
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                      .Builder,
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .PersistentPayloadOrBuilder>(
+                  getMetadata(), getParentForChildren(), isClean());
+          metadata_ = null;
+        }
+        return metadataBuilder_;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:PersistentMessage)
+    }
+
+    // @@protoc_insertion_point(class_scope:PersistentMessage)
+    private static final org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage();
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
+          @java.lang.Override
+          public PersistentMessage parsePartialFrom(
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+            return new PersistentMessage(input, extensionRegistry);
+          }
+        };
+
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  public interface PersistentPayloadOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:PersistentPayload)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
+
+    /**
+     * required int32 serializerId = 1;
+     *
+     * @return Whether the serializerId field is set.
+     */
+    boolean hasSerializerId();
+    /**
+     * required int32 serializerId = 1;
+     *
+     * @return The serializerId.
+     */
+    int getSerializerId();
+
+    /**
+     * required bytes payload = 2;
+     *
+     * @return Whether the payload field is set.
+     */
+    boolean hasPayload();
+    /**
+     * required bytes payload = 2;
+     *
+     * @return The payload.
+     */
+    org.apache.pekko.protobufv3.internal.ByteString getPayload();
+
+    /**
+     * optional bytes payloadManifest = 3;
+     *
+     * @return Whether the payloadManifest field is set.
+     */
+    boolean hasPayloadManifest();
+    /**
+     * optional bytes payloadManifest = 3;
+     *
+     * @return The payloadManifest.
+     */
+    org.apache.pekko.protobufv3.internal.ByteString getPayloadManifest();
+  }
+  /** Protobuf type {@code PersistentPayload} */
+  public static final class PersistentPayload
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:PersistentPayload)
+      PersistentPayloadOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use PersistentPayload.newBuilder() to construct.
+    private PersistentPayload(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private PersistentPayload() {
+      payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+      payloadManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new PersistentPayload();
+    }
+
+    @java.lang.Override
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    private PersistentPayload(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                bitField0_ |= 0x00000001;
+                serializerId_ = input.readInt32();
+                break;
+              }
+            case 18:
+              {
+                bitField0_ |= 0x00000002;
+                payload_ = input.readBytes();
+                break;
+              }
+            case 26:
+              {
+                bitField0_ |= 0x00000004;
+                payloadManifest_ = input.readBytes();
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_PersistentPayload_descriptor;
+    }
+
+    @java.lang.Override
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_PersistentPayload_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.class,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+                  .class);
+    }
+
+    private int bitField0_;
+    public static final int SERIALIZERID_FIELD_NUMBER = 1;
+    private int serializerId_;
+    /**
+     * required int32 serializerId = 1;
+     *
+     * @return Whether the serializerId field is set.
+     */
+    public boolean hasSerializerId() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * required int32 serializerId = 1;
+     *
+     * @return The serializerId.
+     */
+    public int getSerializerId() {
+      return serializerId_;
+    }
+
+    public static final int PAYLOAD_FIELD_NUMBER = 2;
+    private org.apache.pekko.protobufv3.internal.ByteString payload_;
+    /**
+     * required bytes payload = 2;
+     *
+     * @return Whether the payload field is set.
+     */
+    public boolean hasPayload() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * required bytes payload = 2;
+     *
+     * @return The payload.
+     */
+    public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
+      return payload_;
+    }
+
+    public static final int PAYLOADMANIFEST_FIELD_NUMBER = 3;
+    private org.apache.pekko.protobufv3.internal.ByteString payloadManifest_;
+    /**
+     * optional bytes payloadManifest = 3;
+     *
+     * @return Whether the payloadManifest field is set.
+     */
+    public boolean hasPayloadManifest() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     * optional bytes payloadManifest = 3;
+     *
+     * @return The payloadManifest.
+     */
+    public org.apache.pekko.protobufv3.internal.ByteString getPayloadManifest() {
+      return payloadManifest_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (!hasSerializerId()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!hasPayload()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
+        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        output.writeInt32(1, serializerId_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeBytes(2, payload_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        output.writeBytes(3, payloadManifest_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt32Size(
+                1, serializerId_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeBytesSize(2, payload_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeBytesSize(
+                3, payloadManifest_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj
+          instanceof org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload)) {
+        return super.equals(obj);
+      }
+      org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload other =
+          (org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload) obj;
+
+      if (hasSerializerId() != other.hasSerializerId()) return false;
+      if (hasSerializerId()) {
+        if (getSerializerId() != other.getSerializerId()) return false;
+      }
+      if (hasPayload() != other.hasPayload()) return false;
+      if (hasPayload()) {
+        if (!getPayload().equals(other.getPayload())) return false;
+      }
+      if (hasPayloadManifest() != other.hasPayloadManifest()) return false;
+      if (hasPayloadManifest()) {
+        if (!getPayloadManifest().equals(other.getPayloadManifest())) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasSerializerId()) {
+        hash = (37 * hash) + SERIALIZERID_FIELD_NUMBER;
+        hash = (53 * hash) + getSerializerId();
+      }
+      if (hasPayload()) {
+        hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
+        hash = (53 * hash) + getPayload().hashCode();
+      }
+      if (hasPayloadManifest()) {
+        hash = (37 * hash) + PAYLOADMANIFEST_FIELD_NUMBER;
+        hash = (53 * hash) + getPayloadManifest().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(java.nio.ByteBuffer data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(
+            java.nio.ByteBuffer data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /** Protobuf type {@code PersistentPayload} */
+    public static final class Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:PersistentPayload)
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentPayload_descriptor;
+      }
+
+      @java.lang.Override
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentPayload_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.class,
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+                    .class);
+      }
+
+      // Construct using
+      // org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        serializerId_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        payloadManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentPayload_descriptor;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+          getDefaultInstanceForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload build() {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload result =
+            buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+          buildPartial() {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload result =
+            new org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.serializerId_ = serializerId_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.payload_ = payload_;
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.payloadManifest_ = payloadManifest_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other
+            instanceof
+            org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload) {
+          return mergeFrom(
+              (org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload) other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload other) {
+        if (other
+            == org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                .getDefaultInstance()) return this;
+        if (other.hasSerializerId()) {
+          setSerializerId(other.getSerializerId());
+        }
+        if (other.hasPayload()) {
+          setPayload(other.getPayload());
+        }
+        if (other.hasPayloadManifest()) {
+          setPayloadManifest(other.getPayloadManifest());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (!hasSerializerId()) {
+          return false;
+        }
+        if (!hasPayload()) {
+          return false;
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload parsedMessage =
+            null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload)
+                  e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int bitField0_;
+
+      private int serializerId_;
+      /**
+       * required int32 serializerId = 1;
+       *
+       * @return Whether the serializerId field is set.
+       */
+      public boolean hasSerializerId() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * required int32 serializerId = 1;
+       *
+       * @return The serializerId.
+       */
+      public int getSerializerId() {
+        return serializerId_;
+      }
+      /**
+       * required int32 serializerId = 1;
+       *
+       * @param value The serializerId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSerializerId(int value) {
+        bitField0_ |= 0x00000001;
+        serializerId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * required int32 serializerId = 1;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearSerializerId() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        serializerId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private org.apache.pekko.protobufv3.internal.ByteString payload_ =
+          org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+      /**
+       * required bytes payload = 2;
+       *
+       * @return Whether the payload field is set.
+       */
+      public boolean hasPayload() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * required bytes payload = 2;
+       *
+       * @return The payload.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
+        return payload_;
+      }
+      /**
+       * required bytes payload = 2;
+       *
+       * @param value The payload to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPayload(org.apache.pekko.protobufv3.internal.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000002;
+        payload_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * required bytes payload = 2;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearPayload() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        payload_ = getDefaultInstance().getPayload();
+        onChanged();
+        return this;
+      }
+
+      private org.apache.pekko.protobufv3.internal.ByteString payloadManifest_ =
+          org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+      /**
+       * optional bytes payloadManifest = 3;
+       *
+       * @return Whether the payloadManifest field is set.
+       */
+      public boolean hasPayloadManifest() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * optional bytes payloadManifest = 3;
+       *
+       * @return The payloadManifest.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getPayloadManifest() {
+        return payloadManifest_;
+      }
+      /**
+       * optional bytes payloadManifest = 3;
+       *
+       * @param value The payloadManifest to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPayloadManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000004;
+        payloadManifest_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * optional bytes payloadManifest = 3;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearPayloadManifest() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        payloadManifest_ = getDefaultInstance().getPayloadManifest();
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:PersistentPayload)
+    }
+
+    // @@protoc_insertion_point(class_scope:PersistentPayload)
+    private static final org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload();
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
+          @java.lang.Override
+          public PersistentPayload parsePartialFrom(
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+            return new PersistentPayload(input, extensionRegistry);
+          }
+        };
+
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  public interface AtomicWriteOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:AtomicWrite)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
+
+    /** repeated .PersistentMessage payload = 1; */
+    java.util.List
+        getPayloadList();
+    /** repeated .PersistentMessage payload = 1; */
+    org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage getPayload(
+        int index);
+    /** repeated .PersistentMessage payload = 1; */
+    int getPayloadCount();
+    /** repeated .PersistentMessage payload = 1; */
+    java.util.List<
+            ? extends
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .PersistentMessageOrBuilder>
+        getPayloadOrBuilderList();
+    /** repeated .PersistentMessage payload = 1; */
+    org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessageOrBuilder
+        getPayloadOrBuilder(int index);
+  }
+  /** Protobuf type {@code AtomicWrite} */
+  public static final class AtomicWrite
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:AtomicWrite)
+      AtomicWriteOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use AtomicWrite.newBuilder() to construct.
+    private AtomicWrite(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private AtomicWrite() {
+      payload_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new AtomicWrite();
+    }
+
+    @java.lang.Override
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    private AtomicWrite(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  payload_ =
+                      new java.util.ArrayList<
+                          org.apache.pekko.persistence.serialization.MessageFormats
+                              .PersistentMessage>();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                payload_.add(
+                    input.readMessage(
+                        org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+                            .PARSER,
+                        extensionRegistry));
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          payload_ = java.util.Collections.unmodifiableList(payload_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_AtomicWrite_descriptor;
+    }
+
+    @java.lang.Override
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_AtomicWrite_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite.class,
+              org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite.Builder.class);
+    }
+
+    public static final int PAYLOAD_FIELD_NUMBER = 1;
+    private java.util.List<
+            org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage>
+        payload_;
+    /** repeated .PersistentMessage payload = 1; */
+    public java.util.List<
+            org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage>
+        getPayloadList() {
+      return payload_;
+    }
+    /** repeated .PersistentMessage payload = 1; */
+    public java.util.List<
+            ? extends
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .PersistentMessageOrBuilder>
+        getPayloadOrBuilderList() {
+      return payload_;
+    }
+    /** repeated .PersistentMessage payload = 1; */
+    public int getPayloadCount() {
+      return payload_.size();
+    }
+    /** repeated .PersistentMessage payload = 1; */
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage getPayload(
+        int index) {
+      return payload_.get(index);
+    }
+    /** repeated .PersistentMessage payload = 1; */
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessageOrBuilder
+        getPayloadOrBuilder(int index) {
+      return payload_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      for (int i = 0; i < getPayloadCount(); i++) {
+        if (!getPayload(i).isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
+        throws java.io.IOException {
+      for (int i = 0; i < payload_.size(); i++) {
+        output.writeMessage(1, payload_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (int i = 0; i < payload_.size(); i++) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                1, payload_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj instanceof org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite)) {
+        return super.equals(obj);
+      }
+      org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite other =
+          (org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite) obj;
+
+      if (!getPayloadList().equals(other.getPayloadList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getPayloadCount() > 0) {
+        hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
+        hash = (53 * hash) + getPayloadList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        java.nio.ByteBuffer data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        java.nio.ByteBuffer data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        byte[] data) throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        byte[] data, org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        java.io.InputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /** Protobuf type {@code AtomicWrite} */
+    public static final class Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:AtomicWrite)
+        org.apache.pekko.persistence.serialization.MessageFormats.AtomicWriteOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_AtomicWrite_descriptor;
+      }
+
+      @java.lang.Override
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_AtomicWrite_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite.class,
+                org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite.Builder
+                    .class);
+      }
+
+      // Construct using
+      // org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getPayloadFieldBuilder();
+        }
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (payloadBuilder_ == null) {
+          payload_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          payloadBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_AtomicWrite_descriptor;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite
+          getDefaultInstanceForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite build() {
+        org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite result =
+            buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite buildPartial() {
+        org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite result =
+            new org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite(this);
+        int from_bitField0_ = bitField0_;
+        if (payloadBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            payload_ = java.util.Collections.unmodifiableList(payload_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.payload_ = payload_;
+        } else {
+          result.payload_ = payloadBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other
+            instanceof org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite) {
+          return mergeFrom(
+              (org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite) other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite other) {
+        if (other
+            == org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite
+                .getDefaultInstance()) return this;
+        if (payloadBuilder_ == null) {
+          if (!other.payload_.isEmpty()) {
+            if (payload_.isEmpty()) {
+              payload_ = other.payload_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensurePayloadIsMutable();
+              payload_.addAll(other.payload_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.payload_.isEmpty()) {
+            if (payloadBuilder_.isEmpty()) {
+              payloadBuilder_.dispose();
+              payloadBuilder_ = null;
+              payload_ = other.payload_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              payloadBuilder_ =
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
+                      ? getPayloadFieldBuilder()
+                      : null;
+            } else {
+              payloadBuilder_.addAllMessages(other.payload_);
+            }
+          }
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        for (int i = 0; i < getPayloadCount(); i++) {
+          if (!getPayload(i).isInitialized()) {
+            return false;
+          }
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite)
+                  e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int bitField0_;
+
+      private java.util.List<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage>
+          payload_ = java.util.Collections.emptyList();
+
+      private void ensurePayloadIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          payload_ =
+              new java.util.ArrayList<
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage>(
+                  payload_);
+          bitField0_ |= 0x00000001;
+        }
+      }
+
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessageOrBuilder>
+          payloadBuilder_;
+
+      /** repeated .PersistentMessage payload = 1; */
+      public java.util.List<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage>
+          getPayloadList() {
+        if (payloadBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(payload_);
+        } else {
+          return payloadBuilder_.getMessageList();
+        }
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public int getPayloadCount() {
+        if (payloadBuilder_ == null) {
+          return payload_.size();
+        } else {
+          return payloadBuilder_.getCount();
+        }
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage getPayload(
+          int index) {
+        if (payloadBuilder_ == null) {
+          return payload_.get(index);
+        } else {
+          return payloadBuilder_.getMessage(index);
+        }
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public Builder setPayload(
+          int index,
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage value) {
+        if (payloadBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePayloadIsMutable();
+          payload_.set(index, value);
+          onChanged();
+        } else {
+          payloadBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public Builder setPayload(
+          int index,
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder
+              builderForValue) {
+        if (payloadBuilder_ == null) {
+          ensurePayloadIsMutable();
+          payload_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          payloadBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public Builder addPayload(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage value) {
+        if (payloadBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePayloadIsMutable();
+          payload_.add(value);
+          onChanged();
+        } else {
+          payloadBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public Builder addPayload(
+          int index,
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage value) {
+        if (payloadBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePayloadIsMutable();
+          payload_.add(index, value);
+          onChanged();
+        } else {
+          payloadBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public Builder addPayload(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder
+              builderForValue) {
+        if (payloadBuilder_ == null) {
+          ensurePayloadIsMutable();
+          payload_.add(builderForValue.build());
+          onChanged();
+        } else {
+          payloadBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public Builder addPayload(
+          int index,
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder
+              builderForValue) {
+        if (payloadBuilder_ == null) {
+          ensurePayloadIsMutable();
+          payload_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          payloadBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public Builder addAllPayload(
+          java.lang.Iterable<
+                  ? extends
+                      org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage>
+              values) {
+        if (payloadBuilder_ == null) {
+          ensurePayloadIsMutable();
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(values, payload_);
+          onChanged();
+        } else {
+          payloadBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public Builder clearPayload() {
+        if (payloadBuilder_ == null) {
+          payload_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          payloadBuilder_.clear();
+        }
+        return this;
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public Builder removePayload(int index) {
+        if (payloadBuilder_ == null) {
+          ensurePayloadIsMutable();
+          payload_.remove(index);
+          onChanged();
+        } else {
+          payloadBuilder_.remove(index);
+        }
+        return this;
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder
+          getPayloadBuilder(int index) {
+        return getPayloadFieldBuilder().getBuilder(index);
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessageOrBuilder
+          getPayloadOrBuilder(int index) {
+        if (payloadBuilder_ == null) {
+          return payload_.get(index);
+        } else {
+          return payloadBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public java.util.List<
+              ? extends
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .PersistentMessageOrBuilder>
+          getPayloadOrBuilderList() {
+        if (payloadBuilder_ != null) {
+          return payloadBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(payload_);
+        }
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder
+          addPayloadBuilder() {
+        return getPayloadFieldBuilder()
+            .addBuilder(
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+                    .getDefaultInstance());
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder
+          addPayloadBuilder(int index) {
+        return getPayloadFieldBuilder()
+            .addBuilder(
+                index,
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+                    .getDefaultInstance());
+      }
+      /** repeated .PersistentMessage payload = 1; */
+      public java.util.List<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder>
+          getPayloadBuilderList() {
+        return getPayloadFieldBuilder().getBuilderList();
+      }
+
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessageOrBuilder>
+          getPayloadFieldBuilder() {
+        if (payloadBuilder_ == null) {
+          payloadBuilder_ =
+              new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage,
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentMessage
+                      .Builder,
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .PersistentMessageOrBuilder>(
+                  payload_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+          payload_ = null;
+        }
+        return payloadBuilder_;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:AtomicWrite)
+    }
+
+    // @@protoc_insertion_point(class_scope:AtomicWrite)
+    private static final org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite();
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
+          @java.lang.Override
+          public AtomicWrite parsePartialFrom(
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+            return new AtomicWrite(input, extensionRegistry);
+          }
+        };
+
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.persistence.serialization.MessageFormats.AtomicWrite
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  public interface AtLeastOnceDeliverySnapshotOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:AtLeastOnceDeliverySnapshot)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
+
+    /**
+     * required int64 currentDeliveryId = 1;
+     *
+     * @return Whether the currentDeliveryId field is set.
+     */
+    boolean hasCurrentDeliveryId();
+    /**
+     * required int64 currentDeliveryId = 1;
+     *
+     * @return The currentDeliveryId.
+     */
+    long getCurrentDeliveryId();
+
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    java.util.List<
+            org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                .UnconfirmedDelivery>
+        getUnconfirmedDeliveriesList();
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+            .UnconfirmedDelivery
+        getUnconfirmedDeliveries(int index);
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    int getUnconfirmedDeliveriesCount();
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    java.util.List<
+            ? extends
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder>
+        getUnconfirmedDeliveriesOrBuilderList();
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+            .UnconfirmedDeliveryOrBuilder
+        getUnconfirmedDeliveriesOrBuilder(int index);
+  }
+  /** Protobuf type {@code AtLeastOnceDeliverySnapshot} */
+  public static final class AtLeastOnceDeliverySnapshot
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:AtLeastOnceDeliverySnapshot)
+      AtLeastOnceDeliverySnapshotOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use AtLeastOnceDeliverySnapshot.newBuilder() to construct.
+    private AtLeastOnceDeliverySnapshot(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private AtLeastOnceDeliverySnapshot() {
+      unconfirmedDeliveries_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new AtLeastOnceDeliverySnapshot();
+    }
+
+    @java.lang.Override
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    private AtLeastOnceDeliverySnapshot(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8:
+              {
+                bitField0_ |= 0x00000001;
+                currentDeliveryId_ = input.readInt64();
+                break;
+              }
+            case 18:
+              {
+                if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                  unconfirmedDeliveries_ =
+                      new java.util.ArrayList<
+                          org.apache.pekko.persistence.serialization.MessageFormats
+                              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery>();
+                  mutable_bitField0_ |= 0x00000002;
+                }
+                unconfirmedDeliveries_.add(
+                    input.readMessage(
+                        org.apache.pekko.persistence.serialization.MessageFormats
+                            .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.PARSER,
+                        extensionRegistry));
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          unconfirmedDeliveries_ = java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_AtLeastOnceDeliverySnapshot_descriptor;
+    }
+
+    @java.lang.Override
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_AtLeastOnceDeliverySnapshot_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .class,
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .Builder.class);
+    }
+
+    public interface UnconfirmedDeliveryOrBuilder
+        extends
+        // @@protoc_insertion_point(interface_extends:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
+        org.apache.pekko.protobufv3.internal.MessageOrBuilder {
+
+      /**
+       * required int64 deliveryId = 1;
+       *
+       * @return Whether the deliveryId field is set.
+       */
+      boolean hasDeliveryId();
+      /**
+       * required int64 deliveryId = 1;
+       *
+       * @return The deliveryId.
+       */
+      long getDeliveryId();
+
+      /**
+       * required string destination = 2;
+       *
+       * @return Whether the destination field is set.
+       */
+      boolean hasDestination();
+      /**
+       * required string destination = 2;
+       *
+       * @return The destination.
+       */
+      java.lang.String getDestination();
+      /**
+       * required string destination = 2;
+       *
+       * @return The bytes for destination.
+       */
+      org.apache.pekko.protobufv3.internal.ByteString getDestinationBytes();
+
+      /**
+       * required .PersistentPayload payload = 3;
+       *
+       * @return Whether the payload field is set.
+       */
+      boolean hasPayload();
+      /**
+       * required .PersistentPayload payload = 3;
+       *
+       * @return The payload.
+       */
+      org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getPayload();
+      /** required .PersistentPayload payload = 3; */
+      org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+          getPayloadOrBuilder();
+    }
+    /** Protobuf type {@code AtLeastOnceDeliverySnapshot.UnconfirmedDelivery} */
+    public static final class UnconfirmedDelivery
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+        implements
+        // @@protoc_insertion_point(message_implements:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
+        UnconfirmedDeliveryOrBuilder {
+      private static final long serialVersionUID = 0L;
+      // Use UnconfirmedDelivery.newBuilder() to construct.
+      private UnconfirmedDelivery(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+        super(builder);
+      }
+
+      private UnconfirmedDelivery() {
+        destination_ = "";
+      }
+
+      @java.lang.Override
+      @SuppressWarnings({"unused"})
+      protected java.lang.Object newInstance(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        return new UnconfirmedDelivery();
+      }
+
+      @java.lang.Override
+      public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+        return this.unknownFields;
+      }
+
+      private UnconfirmedDelivery(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+        this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        int mutable_bitField0_ = 0;
+        org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 8:
+                {
+                  bitField0_ |= 0x00000001;
+                  deliveryId_ = input.readInt64();
+                  break;
+                }
+              case 18:
+                {
+                  org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                  bitField0_ |= 0x00000002;
+                  destination_ = bs;
+                  break;
+                }
+              case 26:
+                {
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                          .Builder
+                      subBuilder = null;
+                  if (((bitField0_ & 0x00000004) != 0)) {
+                    subBuilder = payload_.toBuilder();
+                  }
+                  payload_ =
+                      input.readMessage(
+                          org.apache.pekko.persistence.serialization.MessageFormats
+                              .PersistentPayload.PARSER,
+                          extensionRegistry);
+                  if (subBuilder != null) {
+                    subBuilder.mergeFrom(payload_);
+                    payload_ = subBuilder.buildPartial();
+                  }
+                  bitField0_ |= 0x00000004;
+                  break;
+                }
+              default:
+                {
+                  if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                    done = true;
+                  }
+                  break;
+                }
+            }
+          }
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(this);
+        } catch (java.io.IOException e) {
+          throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+              .setUnfinishedMessage(this);
+        } finally {
+          this.unknownFields = unknownFields.build();
+          makeExtensionsImmutable();
+        }
+      }
+
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor;
+      }
+
+      @java.lang.Override
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.class,
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder.class);
+      }
+
+      private int bitField0_;
+      public static final int DELIVERYID_FIELD_NUMBER = 1;
+      private long deliveryId_;
+      /**
+       * required int64 deliveryId = 1;
+       *
+       * @return Whether the deliveryId field is set.
+       */
+      public boolean hasDeliveryId() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * required int64 deliveryId = 1;
+       *
+       * @return The deliveryId.
+       */
+      public long getDeliveryId() {
+        return deliveryId_;
+      }
+
+      public static final int DESTINATION_FIELD_NUMBER = 2;
+      private volatile java.lang.Object destination_;
+      /**
+       * required string destination = 2;
+       *
+       * @return Whether the destination field is set.
+       */
+      public boolean hasDestination() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * required string destination = 2;
+       *
+       * @return The destination.
+       */
+      public java.lang.String getDestination() {
+        java.lang.Object ref = destination_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
+        } else {
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            destination_ = s;
+          }
+          return s;
+        }
+      }
+      /**
+       * required string destination = 2;
+       *
+       * @return The bytes for destination.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getDestinationBytes() {
+        java.lang.Object ref = destination_;
+        if (ref instanceof java.lang.String) {
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          destination_ = b;
+          return b;
+        } else {
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        }
+      }
+
+      public static final int PAYLOAD_FIELD_NUMBER = 3;
+      private org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload payload_;
+      /**
+       * required .PersistentPayload payload = 3;
+       *
+       * @return Whether the payload field is set.
+       */
+      public boolean hasPayload() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * required .PersistentPayload payload = 3;
+       *
+       * @return The payload.
+       */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+          getPayload() {
+        return payload_ == null
+            ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                .getDefaultInstance()
+            : payload_;
+      }
+      /** required .PersistentPayload payload = 3; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+          getPayloadOrBuilder() {
+        return payload_ == null
+            ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                .getDefaultInstance()
+            : payload_;
+      }
+
+      private byte memoizedIsInitialized = -1;
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        if (!hasDeliveryId()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+        if (!hasDestination()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+        if (!hasPayload()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+        if (!getPayload().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+        memoizedIsInitialized = 1;
+        return true;
+      }
+
+      @java.lang.Override
+      public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
+          throws java.io.IOException {
+        if (((bitField0_ & 0x00000001) != 0)) {
+          output.writeInt64(1, deliveryId_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+              output, 2, destination_);
+        }
+        if (((bitField0_ & 0x00000004) != 0)) {
+          output.writeMessage(3, getPayload());
+        }
+        unknownFields.writeTo(output);
+      }
+
+      @java.lang.Override
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
+
+        size = 0;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          size +=
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(
+                  1, deliveryId_);
+        }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          size +=
+              org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                  2, destination_);
+        }
+        if (((bitField0_ & 0x00000004) != 0)) {
+          size +=
+              org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                  3, getPayload());
+        }
+        size += unknownFields.getSerializedSize();
+        memoizedSize = size;
+        return size;
+      }
+
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+          return true;
+        }
+        if (!(obj
+            instanceof
+            org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                .UnconfirmedDelivery)) {
+          return super.equals(obj);
+        }
+        org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                .UnconfirmedDelivery
+            other =
+                (org.apache.pekko.persistence.serialization.MessageFormats
+                        .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
+                    obj;
+
+        if (hasDeliveryId() != other.hasDeliveryId()) return false;
+        if (hasDeliveryId()) {
+          if (getDeliveryId() != other.getDeliveryId()) return false;
+        }
+        if (hasDestination() != other.hasDestination()) return false;
+        if (hasDestination()) {
+          if (!getDestination().equals(other.getDestination())) return false;
+        }
+        if (hasPayload() != other.hasPayload()) return false;
+        if (hasPayload()) {
+          if (!getPayload().equals(other.getPayload())) return false;
+        }
+        if (!unknownFields.equals(other.unknownFields)) return false;
+        return true;
+      }
+
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        if (hasDeliveryId()) {
+          hash = (37 * hash) + DELIVERYID_FIELD_NUMBER;
+          hash =
+              (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getDeliveryId());
+        }
+        if (hasDestination()) {
+          hash = (37 * hash) + DESTINATION_FIELD_NUMBER;
+          hash = (53 * hash) + getDestination().hashCode();
+        }
+        if (hasPayload()) {
+          hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
+          hash = (53 * hash) + getPayload().hashCode();
+        }
+        hash = (29 * hash) + unknownFields.hashCode();
+        memoizedHashCode = hash;
+        return hash;
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(java.nio.ByteBuffer data)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(
+              java.nio.ByteBuffer data,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(
+              org.apache.pekko.protobufv3.internal.ByteString data,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(byte[] data)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(
+              byte[] data,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(java.io.InputStream input) throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+            PARSER, input);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(
+              java.io.InputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+            PARSER, input, extensionRegistry);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseDelimitedFrom(
+              java.io.InputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+            PARSER, input);
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          parseFrom(
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws java.io.IOException {
+        return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+            PARSER, input, extensionRegistry);
+      }
+
+      @java.lang.Override
+      public Builder newBuilderForType() {
+        return newBuilder();
+      }
+
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
+
+      public static Builder newBuilder(
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery
+              prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+
+      @java.lang.Override
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      }
+
+      @java.lang.Override
+      protected Builder newBuilderForType(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
+      }
+      /** Protobuf type {@code AtLeastOnceDeliverySnapshot.UnconfirmedDelivery} */
+      public static final class Builder
+          extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
+          implements
+          // @@protoc_insertion_point(builder_implements:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+              .UnconfirmedDeliveryOrBuilder {
+        public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+            getDescriptor() {
+          return org.apache.pekko.persistence.serialization.MessageFormats
+              .internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor;
+        }
+
+        @java.lang.Override
+        protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return org.apache.pekko.persistence.serialization.MessageFormats
+              .internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.class,
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder.class);
+        }
+
+        // Construct using
+        // org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.newBuilder()
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
+
+        private Builder(
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          super(parent);
+          maybeForceBuilderInitialization();
+        }
+
+        private void maybeForceBuilderInitialization() {
+          if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+            getPayloadFieldBuilder();
+          }
+        }
+
+        @java.lang.Override
+        public Builder clear() {
+          super.clear();
+          deliveryId_ = 0L;
+          bitField0_ = (bitField0_ & ~0x00000001);
+          destination_ = "";
+          bitField0_ = (bitField0_ & ~0x00000002);
+          if (payloadBuilder_ == null) {
+            payload_ = null;
+          } else {
+            payloadBuilder_.clear();
+          }
+          bitField0_ = (bitField0_ & ~0x00000004);
+          return this;
+        }
+
+        @java.lang.Override
+        public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+          return org.apache.pekko.persistence.serialization.MessageFormats
+              .internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor;
+        }
+
+        @java.lang.Override
+        public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                .UnconfirmedDelivery
+            getDefaultInstanceForType() {
+          return org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.getDefaultInstance();
+        }
+
+        @java.lang.Override
+        public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                .UnconfirmedDelivery
+            build() {
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery
+              result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        @java.lang.Override
+        public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                .UnconfirmedDelivery
+            buildPartial() {
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery
+              result =
+                  new org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery(this);
+          int from_bitField0_ = bitField0_;
+          int to_bitField0_ = 0;
+          if (((from_bitField0_ & 0x00000001) != 0)) {
+            result.deliveryId_ = deliveryId_;
+            to_bitField0_ |= 0x00000001;
+          }
+          if (((from_bitField0_ & 0x00000002) != 0)) {
+            to_bitField0_ |= 0x00000002;
+          }
+          result.destination_ = destination_;
+          if (((from_bitField0_ & 0x00000004) != 0)) {
+            if (payloadBuilder_ == null) {
+              result.payload_ = payload_;
+            } else {
+              result.payload_ = payloadBuilder_.build();
+            }
+            to_bitField0_ |= 0x00000004;
+          }
+          result.bitField0_ = to_bitField0_;
+          onBuilt();
+          return result;
+        }
+
+        @java.lang.Override
+        public Builder clone() {
+          return super.clone();
+        }
+
+        @java.lang.Override
+        public Builder setField(
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
+          return super.setField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder clearField(
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          return super.clearField(field);
+        }
+
+        @java.lang.Override
+        public Builder clearOneof(
+            org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          return super.clearOneof(oneof);
+        }
+
+        @java.lang.Override
+        public Builder setRepeatedField(
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+            int index,
+            java.lang.Object value) {
+          return super.setRepeatedField(field, index, value);
+        }
+
+        @java.lang.Override
+        public Builder addRepeatedField(
+            org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
+          return super.addRepeatedField(field, value);
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+          if (other
+              instanceof
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery) {
+            return mergeFrom(
+                (org.apache.pekko.persistence.serialization.MessageFormats
+                        .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
+                    other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(
+            org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                    .UnconfirmedDelivery
+                other) {
+          if (other
+              == org.apache.pekko.persistence.serialization.MessageFormats
+                  .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.getDefaultInstance())
+            return this;
+          if (other.hasDeliveryId()) {
+            setDeliveryId(other.getDeliveryId());
+          }
+          if (other.hasDestination()) {
+            bitField0_ |= 0x00000002;
+            destination_ = other.destination_;
+            onChanged();
+          }
+          if (other.hasPayload()) {
+            mergePayload(other.getPayload());
+          }
+          this.mergeUnknownFields(other.unknownFields);
+          onChanged();
+          return this;
+        }
+
+        @java.lang.Override
+        public final boolean isInitialized() {
+          if (!hasDeliveryId()) {
+            return false;
+          }
+          if (!hasDestination()) {
+            return false;
+          }
+          if (!hasPayload()) {
+            return false;
+          }
+          if (!getPayload().isInitialized()) {
+            return false;
+          }
+          return true;
+        }
+
+        @java.lang.Override
+        public Builder mergeFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery
+              parsedMessage = null;
+          try {
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+            parsedMessage =
+                (org.apache.pekko.persistence.serialization.MessageFormats
+                        .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
+                    e.getUnfinishedMessage();
+            throw e.unwrapIOException();
+          } finally {
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
+            }
+          }
+          return this;
+        }
+
+        private int bitField0_;
+
+        private long deliveryId_;
+        /**
+         * required int64 deliveryId = 1;
+         *
+         * @return Whether the deliveryId field is set.
+         */
+        public boolean hasDeliveryId() {
+          return ((bitField0_ & 0x00000001) != 0);
+        }
+        /**
+         * required int64 deliveryId = 1;
+         *
+         * @return The deliveryId.
+         */
+        public long getDeliveryId() {
+          return deliveryId_;
+        }
+        /**
+         * required int64 deliveryId = 1;
+         *
+         * @param value The deliveryId to set.
+         * @return This builder for chaining.
+         */
+        public Builder setDeliveryId(long value) {
+          bitField0_ |= 0x00000001;
+          deliveryId_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * required int64 deliveryId = 1;
+         *
+         * @return This builder for chaining.
+         */
+        public Builder clearDeliveryId() {
+          bitField0_ = (bitField0_ & ~0x00000001);
+          deliveryId_ = 0L;
+          onChanged();
+          return this;
+        }
+
+        private java.lang.Object destination_ = "";
+        /**
+         * required string destination = 2;
+         *
+         * @return Whether the destination field is set.
+         */
+        public boolean hasDestination() {
+          return ((bitField0_ & 0x00000002) != 0);
+        }
+        /**
+         * required string destination = 2;
+         *
+         * @return The destination.
+         */
+        public java.lang.String getDestination() {
+          java.lang.Object ref = destination_;
+          if (!(ref instanceof java.lang.String)) {
+            org.apache.pekko.protobufv3.internal.ByteString bs =
+                (org.apache.pekko.protobufv3.internal.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            if (bs.isValidUtf8()) {
+              destination_ = s;
+            }
+            return s;
+          } else {
+            return (java.lang.String) ref;
+          }
+        }
+        /**
+         * required string destination = 2;
+         *
+         * @return The bytes for destination.
+         */
+        public org.apache.pekko.protobufv3.internal.ByteString getDestinationBytes() {
+          java.lang.Object ref = destination_;
+          if (ref instanceof String) {
+            org.apache.pekko.protobufv3.internal.ByteString b =
+                org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
+            destination_ = b;
+            return b;
+          } else {
+            return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+          }
+        }
+        /**
+         * required string destination = 2;
+         *
+         * @param value The destination to set.
+         * @return This builder for chaining.
+         */
+        public Builder setDestination(java.lang.String value) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          bitField0_ |= 0x00000002;
+          destination_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * required string destination = 2;
+         *
+         * @return This builder for chaining.
+         */
+        public Builder clearDestination() {
+          bitField0_ = (bitField0_ & ~0x00000002);
+          destination_ = getDefaultInstance().getDestination();
+          onChanged();
+          return this;
+        }
+        /**
+         * required string destination = 2;
+         *
+         * @param value The bytes for destination to set.
+         * @return This builder for chaining.
+         */
+        public Builder setDestinationBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          bitField0_ |= 0x00000002;
+          destination_ = value;
+          onChanged();
+          return this;
+        }
+
+        private org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+            payload_;
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder,
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .PersistentPayloadOrBuilder>
+            payloadBuilder_;
+        /**
+         * required .PersistentPayload payload = 3;
+         *
+         * @return Whether the payload field is set.
+         */
+        public boolean hasPayload() {
+          return ((bitField0_ & 0x00000004) != 0);
+        }
+        /**
+         * required .PersistentPayload payload = 3;
+         *
+         * @return The payload.
+         */
+        public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+            getPayload() {
+          if (payloadBuilder_ == null) {
+            return payload_ == null
+                ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                    .getDefaultInstance()
+                : payload_;
+          } else {
+            return payloadBuilder_.getMessage();
+          }
+        }
+        /** required .PersistentPayload payload = 3; */
+        public Builder setPayload(
+            org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
+          if (payloadBuilder_ == null) {
+            if (value == null) {
+              throw new NullPointerException();
+            }
+            payload_ = value;
+            onChanged();
+          } else {
+            payloadBuilder_.setMessage(value);
+          }
+          bitField0_ |= 0x00000004;
+          return this;
+        }
+        /** required .PersistentPayload payload = 3; */
+        public Builder setPayload(
+            org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+                builderForValue) {
+          if (payloadBuilder_ == null) {
+            payload_ = builderForValue.build();
+            onChanged();
+          } else {
+            payloadBuilder_.setMessage(builderForValue.build());
+          }
+          bitField0_ |= 0x00000004;
+          return this;
+        }
+        /** required .PersistentPayload payload = 3; */
+        public Builder mergePayload(
+            org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
+          if (payloadBuilder_ == null) {
+            if (((bitField0_ & 0x00000004) != 0)
+                && payload_ != null
+                && payload_
+                    != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                        .getDefaultInstance()) {
+              payload_ =
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                      .newBuilder(payload_)
+                      .mergeFrom(value)
+                      .buildPartial();
+            } else {
+              payload_ = value;
+            }
+            onChanged();
+          } else {
+            payloadBuilder_.mergeFrom(value);
+          }
+          bitField0_ |= 0x00000004;
+          return this;
+        }
+        /** required .PersistentPayload payload = 3; */
+        public Builder clearPayload() {
+          if (payloadBuilder_ == null) {
+            payload_ = null;
+            onChanged();
+          } else {
+            payloadBuilder_.clear();
+          }
+          bitField0_ = (bitField0_ & ~0x00000004);
+          return this;
+        }
+        /** required .PersistentPayload payload = 3; */
+        public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+            getPayloadBuilder() {
+          bitField0_ |= 0x00000004;
+          onChanged();
+          return getPayloadFieldBuilder().getBuilder();
+        }
+        /** required .PersistentPayload payload = 3; */
+        public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+            getPayloadOrBuilder() {
+          if (payloadBuilder_ != null) {
+            return payloadBuilder_.getMessageOrBuilder();
+          } else {
+            return payload_ == null
+                ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                    .getDefaultInstance()
+                : payload_;
+          }
+        }
+        /** required .PersistentPayload payload = 3; */
+        private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder,
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .PersistentPayloadOrBuilder>
+            getPayloadFieldBuilder() {
+          if (payloadBuilder_ == null) {
+            payloadBuilder_ =
+                new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                    org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+                    org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                        .Builder,
+                    org.apache.pekko.persistence.serialization.MessageFormats
+                        .PersistentPayloadOrBuilder>(
+                    getPayload(), getParentForChildren(), isClean());
+            payload_ = null;
+          }
+          return payloadBuilder_;
+        }
+
+        @java.lang.Override
+        public final Builder setUnknownFields(
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+          return super.setUnknownFields(unknownFields);
+        }
+
+        @java.lang.Override
+        public final Builder mergeUnknownFields(
+            final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+          return super.mergeUnknownFields(unknownFields);
+        }
+
+        // @@protoc_insertion_point(builder_scope:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
+      }
+
+      // @@protoc_insertion_point(class_scope:AtLeastOnceDeliverySnapshot.UnconfirmedDelivery)
+      private static final org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          DEFAULT_INSTANCE;
+
+      static {
+        DEFAULT_INSTANCE =
+            new org.apache.pekko.persistence.serialization.MessageFormats
+                .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery();
+      }
+
+      public static org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery
+          getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      @java.lang.Deprecated
+      public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+          new org.apache.pekko.protobufv3.internal.AbstractParser() {
+            @java.lang.Override
+            public UnconfirmedDelivery parsePartialFrom(
+                org.apache.pekko.protobufv3.internal.CodedInputStream input,
+                org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+                throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+              return new UnconfirmedDelivery(input, extensionRegistry);
+            }
+          };
+
+      public static org.apache.pekko.protobufv3.internal.Parser parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+              .UnconfirmedDelivery
+          getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
+    }
+
+    private int bitField0_;
+    public static final int CURRENTDELIVERYID_FIELD_NUMBER = 1;
+    private long currentDeliveryId_;
+    /**
+     * required int64 currentDeliveryId = 1;
+     *
+     * @return Whether the currentDeliveryId field is set.
+     */
+    public boolean hasCurrentDeliveryId() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * required int64 currentDeliveryId = 1;
+     *
+     * @return The currentDeliveryId.
+     */
+    public long getCurrentDeliveryId() {
+      return currentDeliveryId_;
+    }
+
+    public static final int UNCONFIRMEDDELIVERIES_FIELD_NUMBER = 2;
+    private java.util.List<
+            org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                .UnconfirmedDelivery>
+        unconfirmedDeliveries_;
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    public java.util.List<
+            org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                .UnconfirmedDelivery>
+        getUnconfirmedDeliveriesList() {
+      return unconfirmedDeliveries_;
+    }
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    public java.util.List<
+            ? extends
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder>
+        getUnconfirmedDeliveriesOrBuilderList() {
+      return unconfirmedDeliveries_;
+    }
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    public int getUnconfirmedDeliveriesCount() {
+      return unconfirmedDeliveries_.size();
+    }
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+            .UnconfirmedDelivery
+        getUnconfirmedDeliveries(int index) {
+      return unconfirmedDeliveries_.get(index);
+    }
+    /**
+     * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+     * 
+     */
+    public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+            .UnconfirmedDeliveryOrBuilder
+        getUnconfirmedDeliveriesOrBuilder(int index) {
+      return unconfirmedDeliveries_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (!hasCurrentDeliveryId()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      for (int i = 0; i < getUnconfirmedDeliveriesCount(); i++) {
+        if (!getUnconfirmedDeliveries(i).isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
+        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        output.writeInt64(1, currentDeliveryId_);
+      }
+      for (int i = 0; i < unconfirmedDeliveries_.size(); i++) {
+        output.writeMessage(2, unconfirmedDeliveries_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(
+                1, currentDeliveryId_);
+      }
+      for (int i = 0; i < unconfirmedDeliveries_.size(); i++) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(
+                2, unconfirmedDeliveries_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj
+          instanceof
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot)) {
+        return super.equals(obj);
+      }
+      org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot other =
+          (org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot)
+              obj;
+
+      if (hasCurrentDeliveryId() != other.hasCurrentDeliveryId()) return false;
+      if (hasCurrentDeliveryId()) {
+        if (getCurrentDeliveryId() != other.getCurrentDeliveryId()) return false;
+      }
+      if (!getUnconfirmedDeliveriesList().equals(other.getUnconfirmedDeliveriesList()))
+        return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasCurrentDeliveryId()) {
+        hash = (37 * hash) + CURRENTDELIVERYID_FIELD_NUMBER;
+        hash =
+            (53 * hash)
+                + org.apache.pekko.protobufv3.internal.Internal.hashLong(getCurrentDeliveryId());
+      }
+      if (getUnconfirmedDeliveriesCount() > 0) {
+        hash = (37 * hash) + UNCONFIRMEDDELIVERIES_FIELD_NUMBER;
+        hash = (53 * hash) + getUnconfirmedDeliveriesList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(java.nio.ByteBuffer data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(
+            java.nio.ByteBuffer data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+            prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /** Protobuf type {@code AtLeastOnceDeliverySnapshot} */
+    public static final class Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:AtLeastOnceDeliverySnapshot)
+        org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshotOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_AtLeastOnceDeliverySnapshot_descriptor;
+      }
+
+      @java.lang.Override
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_AtLeastOnceDeliverySnapshot_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .AtLeastOnceDeliverySnapshot.class,
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .AtLeastOnceDeliverySnapshot.Builder.class);
+      }
+
+      // Construct using
+      // org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getUnconfirmedDeliveriesFieldBuilder();
+        }
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        currentDeliveryId_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          unconfirmedDeliveries_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          unconfirmedDeliveriesBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_AtLeastOnceDeliverySnapshot_descriptor;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+          getDefaultInstanceForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+          build() {
+        org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+            result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+          buildPartial() {
+        org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+            result =
+                new org.apache.pekko.persistence.serialization.MessageFormats
+                    .AtLeastOnceDeliverySnapshot(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.currentDeliveryId_ = currentDeliveryId_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            unconfirmedDeliveries_ = java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.unconfirmedDeliveries_ = unconfirmedDeliveries_;
+        } else {
+          result.unconfirmedDeliveries_ = unconfirmedDeliveriesBuilder_.build();
+        }
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other
+            instanceof
+            org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot) {
+          return mergeFrom(
+              (org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot)
+                  other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+              other) {
+        if (other
+            == org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                .getDefaultInstance()) return this;
+        if (other.hasCurrentDeliveryId()) {
+          setCurrentDeliveryId(other.getCurrentDeliveryId());
+        }
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          if (!other.unconfirmedDeliveries_.isEmpty()) {
+            if (unconfirmedDeliveries_.isEmpty()) {
+              unconfirmedDeliveries_ = other.unconfirmedDeliveries_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensureUnconfirmedDeliveriesIsMutable();
+              unconfirmedDeliveries_.addAll(other.unconfirmedDeliveries_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.unconfirmedDeliveries_.isEmpty()) {
+            if (unconfirmedDeliveriesBuilder_.isEmpty()) {
+              unconfirmedDeliveriesBuilder_.dispose();
+              unconfirmedDeliveriesBuilder_ = null;
+              unconfirmedDeliveries_ = other.unconfirmedDeliveries_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              unconfirmedDeliveriesBuilder_ =
+                  org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders
+                      ? getUnconfirmedDeliveriesFieldBuilder()
+                      : null;
+            } else {
+              unconfirmedDeliveriesBuilder_.addAllMessages(other.unconfirmedDeliveries_);
+            }
+          }
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (!hasCurrentDeliveryId()) {
+          return false;
+        }
+        for (int i = 0; i < getUnconfirmedDeliveriesCount(); i++) {
+          if (!getUnconfirmedDeliveries(i).isInitialized()) {
+            return false;
+          }
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+            parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot)
+                  e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int bitField0_;
+
+      private long currentDeliveryId_;
+      /**
+       * required int64 currentDeliveryId = 1;
+       *
+       * @return Whether the currentDeliveryId field is set.
+       */
+      public boolean hasCurrentDeliveryId() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * required int64 currentDeliveryId = 1;
+       *
+       * @return The currentDeliveryId.
+       */
+      public long getCurrentDeliveryId() {
+        return currentDeliveryId_;
+      }
+      /**
+       * required int64 currentDeliveryId = 1;
+       *
+       * @param value The currentDeliveryId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurrentDeliveryId(long value) {
+        bitField0_ |= 0x00000001;
+        currentDeliveryId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * required int64 currentDeliveryId = 1;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearCurrentDeliveryId() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        currentDeliveryId_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery>
+          unconfirmedDeliveries_ = java.util.Collections.emptyList();
+
+      private void ensureUnconfirmedDeliveriesIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          unconfirmedDeliveries_ =
+              new java.util.ArrayList<
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery>(unconfirmedDeliveries_);
+          bitField0_ |= 0x00000002;
+        }
+      }
+
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery,
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDeliveryOrBuilder>
+          unconfirmedDeliveriesBuilder_;
+
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public java.util.List<
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery>
+          getUnconfirmedDeliveriesList() {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
+        } else {
+          return unconfirmedDeliveriesBuilder_.getMessageList();
+        }
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public int getUnconfirmedDeliveriesCount() {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          return unconfirmedDeliveries_.size();
+        } else {
+          return unconfirmedDeliveriesBuilder_.getCount();
+        }
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+              .UnconfirmedDelivery
+          getUnconfirmedDeliveries(int index) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          return unconfirmedDeliveries_.get(index);
+        } else {
+          return unconfirmedDeliveriesBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public Builder setUnconfirmedDeliveries(
+          int index,
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery
+              value) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureUnconfirmedDeliveriesIsMutable();
+          unconfirmedDeliveries_.set(index, value);
+          onChanged();
+        } else {
+          unconfirmedDeliveriesBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public Builder setUnconfirmedDeliveries(
+          int index,
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery.Builder
+              builderForValue) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          ensureUnconfirmedDeliveriesIsMutable();
+          unconfirmedDeliveries_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          unconfirmedDeliveriesBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public Builder addUnconfirmedDeliveries(
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery
+              value) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureUnconfirmedDeliveriesIsMutable();
+          unconfirmedDeliveries_.add(value);
+          onChanged();
+        } else {
+          unconfirmedDeliveriesBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public Builder addUnconfirmedDeliveries(
+          int index,
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery
+              value) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureUnconfirmedDeliveriesIsMutable();
+          unconfirmedDeliveries_.add(index, value);
+          onChanged();
+        } else {
+          unconfirmedDeliveriesBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public Builder addUnconfirmedDeliveries(
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery.Builder
+              builderForValue) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          ensureUnconfirmedDeliveriesIsMutable();
+          unconfirmedDeliveries_.add(builderForValue.build());
+          onChanged();
+        } else {
+          unconfirmedDeliveriesBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public Builder addUnconfirmedDeliveries(
+          int index,
+          org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery.Builder
+              builderForValue) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          ensureUnconfirmedDeliveriesIsMutable();
+          unconfirmedDeliveries_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          unconfirmedDeliveriesBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public Builder addAllUnconfirmedDeliveries(
+          java.lang.Iterable<
+                  ? extends
+                      org.apache.pekko.persistence.serialization.MessageFormats
+                          .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery>
+              values) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          ensureUnconfirmedDeliveriesIsMutable();
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+              values, unconfirmedDeliveries_);
+          onChanged();
+        } else {
+          unconfirmedDeliveriesBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public Builder clearUnconfirmedDeliveries() {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          unconfirmedDeliveries_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          unconfirmedDeliveriesBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public Builder removeUnconfirmedDeliveries(int index) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          ensureUnconfirmedDeliveriesIsMutable();
+          unconfirmedDeliveries_.remove(index);
+          onChanged();
+        } else {
+          unconfirmedDeliveriesBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+              .UnconfirmedDelivery.Builder
+          getUnconfirmedDeliveriesBuilder(int index) {
+        return getUnconfirmedDeliveriesFieldBuilder().getBuilder(index);
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+              .UnconfirmedDeliveryOrBuilder
+          getUnconfirmedDeliveriesOrBuilder(int index) {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          return unconfirmedDeliveries_.get(index);
+        } else {
+          return unconfirmedDeliveriesBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public java.util.List<
+              ? extends
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder>
+          getUnconfirmedDeliveriesOrBuilderList() {
+        if (unconfirmedDeliveriesBuilder_ != null) {
+          return unconfirmedDeliveriesBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(unconfirmedDeliveries_);
+        }
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+              .UnconfirmedDelivery.Builder
+          addUnconfirmedDeliveriesBuilder() {
+        return getUnconfirmedDeliveriesFieldBuilder()
+            .addBuilder(
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.getDefaultInstance());
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+              .UnconfirmedDelivery.Builder
+          addUnconfirmedDeliveriesBuilder(int index) {
+        return getUnconfirmedDeliveriesFieldBuilder()
+            .addBuilder(
+                index,
+                org.apache.pekko.persistence.serialization.MessageFormats
+                    .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.getDefaultInstance());
+      }
+      /**
+       * repeated .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery unconfirmedDeliveries = 2;
+       * 
+       */
+      public java.util.List<
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery.Builder>
+          getUnconfirmedDeliveriesBuilderList() {
+        return getUnconfirmedDeliveriesFieldBuilder().getBuilderList();
+      }
+
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery,
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDelivery.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+                  .UnconfirmedDeliveryOrBuilder>
+          getUnconfirmedDeliveriesFieldBuilder() {
+        if (unconfirmedDeliveriesBuilder_ == null) {
+          unconfirmedDeliveriesBuilder_ =
+              new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery,
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot.UnconfirmedDelivery.Builder,
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .AtLeastOnceDeliverySnapshot.UnconfirmedDeliveryOrBuilder>(
+                  unconfirmedDeliveries_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          unconfirmedDeliveries_ = null;
+        }
+        return unconfirmedDeliveriesBuilder_;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:AtLeastOnceDeliverySnapshot)
+    }
+
+    // @@protoc_insertion_point(class_scope:AtLeastOnceDeliverySnapshot)
+    private static final org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new org.apache.pekko.persistence.serialization.MessageFormats
+              .AtLeastOnceDeliverySnapshot();
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .AtLeastOnceDeliverySnapshot
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated
+    public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER =
+            new org.apache.pekko.protobufv3.internal.AbstractParser() {
+              @java.lang.Override
+              public AtLeastOnceDeliverySnapshot parsePartialFrom(
+                  org.apache.pekko.protobufv3.internal.CodedInputStream input,
+                  org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+                  throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+                return new AtLeastOnceDeliverySnapshot(input, extensionRegistry);
+              }
+            };
+
+    public static org.apache.pekko.protobufv3.internal.Parser
+        parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.protobufv3.internal.Parser
+        getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.persistence.serialization.MessageFormats.AtLeastOnceDeliverySnapshot
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  public interface PersistentStateChangeEventOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:PersistentStateChangeEvent)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
+
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return Whether the stateIdentifier field is set.
+     */
+    boolean hasStateIdentifier();
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return The stateIdentifier.
+     */
+    java.lang.String getStateIdentifier();
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return The bytes for stateIdentifier.
+     */
+    org.apache.pekko.protobufv3.internal.ByteString getStateIdentifierBytes();
+
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4.5
+     * 
    
+     *
+     * optional string timeout = 2;
+     *
+     * @return Whether the timeout field is set.
+     */
+    boolean hasTimeout();
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4.5
+     * 
    
+     *
+     * optional string timeout = 2;
+     *
+     * @return The timeout.
+     */
+    java.lang.String getTimeout();
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4.5
+     * 
    
+     *
+     * optional string timeout = 2;
+     *
+     * @return The bytes for timeout.
+     */
+    org.apache.pekko.protobufv3.internal.ByteString getTimeoutBytes();
+
+    /**
+     * optional int64 timeoutNanos = 3;
+     *
+     * @return Whether the timeoutNanos field is set.
+     */
+    boolean hasTimeoutNanos();
+    /**
+     * optional int64 timeoutNanos = 3;
+     *
+     * @return The timeoutNanos.
+     */
+    long getTimeoutNanos();
+  }
+  /** Protobuf type {@code PersistentStateChangeEvent} */
+  public static final class PersistentStateChangeEvent
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:PersistentStateChangeEvent)
+      PersistentStateChangeEventOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use PersistentStateChangeEvent.newBuilder() to construct.
+    private PersistentStateChangeEvent(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private PersistentStateChangeEvent() {
+      stateIdentifier_ = "";
+      timeout_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new PersistentStateChangeEvent();
+    }
+
+    @java.lang.Override
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    private PersistentStateChangeEvent(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                bitField0_ |= 0x00000001;
+                stateIdentifier_ = bs;
+                break;
+              }
+            case 18:
+              {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                bitField0_ |= 0x00000002;
+                timeout_ = bs;
+                break;
+              }
+            case 24:
+              {
+                bitField0_ |= 0x00000004;
+                timeoutNanos_ = input.readInt64();
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_PersistentStateChangeEvent_descriptor;
+    }
+
+    @java.lang.Override
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_PersistentStateChangeEvent_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+                  .class,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+                  .Builder.class);
+    }
+
+    private int bitField0_;
+    public static final int STATEIDENTIFIER_FIELD_NUMBER = 1;
+    private volatile java.lang.Object stateIdentifier_;
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return Whether the stateIdentifier field is set.
+     */
+    public boolean hasStateIdentifier() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return The stateIdentifier.
+     */
+    public java.lang.String getStateIdentifier() {
+      java.lang.Object ref = stateIdentifier_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          stateIdentifier_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return The bytes for stateIdentifier.
+     */
+    public org.apache.pekko.protobufv3.internal.ByteString getStateIdentifierBytes() {
+      java.lang.Object ref = stateIdentifier_;
+      if (ref instanceof java.lang.String) {
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        stateIdentifier_ = b;
+        return b;
+      } else {
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+      }
+    }
+
+    public static final int TIMEOUT_FIELD_NUMBER = 2;
+    private volatile java.lang.Object timeout_;
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4.5
+     * 
    
+     *
+     * optional string timeout = 2;
+     *
+     * @return Whether the timeout field is set.
+     */
+    public boolean hasTimeout() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4.5
+     * 
    
+     *
+     * optional string timeout = 2;
+     *
+     * @return The timeout.
+     */
+    public java.lang.String getTimeout() {
+      java.lang.Object ref = timeout_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          timeout_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     *
+     *
+     * 
    +     * not used in new records from 2.4.5
+     * 
    
+     *
+     * optional string timeout = 2;
+     *
+     * @return The bytes for timeout.
+     */
+    public org.apache.pekko.protobufv3.internal.ByteString getTimeoutBytes() {
+      java.lang.Object ref = timeout_;
+      if (ref instanceof java.lang.String) {
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        timeout_ = b;
+        return b;
+      } else {
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+      }
+    }
+
+    public static final int TIMEOUTNANOS_FIELD_NUMBER = 3;
+    private long timeoutNanos_;
+    /**
+     * optional int64 timeoutNanos = 3;
+     *
+     * @return Whether the timeoutNanos field is set.
+     */
+    public boolean hasTimeoutNanos() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     * optional int64 timeoutNanos = 3;
+     *
+     * @return The timeoutNanos.
+     */
+    public long getTimeoutNanos() {
+      return timeoutNanos_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (!hasStateIdentifier()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
+        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+            output, 1, stateIdentifier_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, timeout_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        output.writeInt64(3, timeoutNanos_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                1, stateIdentifier_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, timeout_);
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(
+                3, timeoutNanos_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj
+          instanceof
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent)) {
+        return super.equals(obj);
+      }
+      org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent other =
+          (org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent)
+              obj;
+
+      if (hasStateIdentifier() != other.hasStateIdentifier()) return false;
+      if (hasStateIdentifier()) {
+        if (!getStateIdentifier().equals(other.getStateIdentifier())) return false;
+      }
+      if (hasTimeout() != other.hasTimeout()) return false;
+      if (hasTimeout()) {
+        if (!getTimeout().equals(other.getTimeout())) return false;
+      }
+      if (hasTimeoutNanos() != other.hasTimeoutNanos()) return false;
+      if (hasTimeoutNanos()) {
+        if (getTimeoutNanos() != other.getTimeoutNanos()) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasStateIdentifier()) {
+        hash = (37 * hash) + STATEIDENTIFIER_FIELD_NUMBER;
+        hash = (53 * hash) + getStateIdentifier().hashCode();
+      }
+      if (hasTimeout()) {
+        hash = (37 * hash) + TIMEOUT_FIELD_NUMBER;
+        hash = (53 * hash) + getTimeout().hashCode();
+      }
+      if (hasTimeoutNanos()) {
+        hash = (37 * hash) + TIMEOUTNANOS_FIELD_NUMBER;
+        hash =
+            (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getTimeoutNanos());
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(java.nio.ByteBuffer data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(
+            java.nio.ByteBuffer data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+            prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /** Protobuf type {@code PersistentStateChangeEvent} */
+    public static final class Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:PersistentStateChangeEvent)
+        org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEventOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentStateChangeEvent_descriptor;
+      }
+
+      @java.lang.Override
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentStateChangeEvent_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+                    .class,
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+                    .Builder.class);
+      }
+
+      // Construct using
+      // org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        stateIdentifier_ = "";
+        bitField0_ = (bitField0_ & ~0x00000001);
+        timeout_ = "";
+        bitField0_ = (bitField0_ & ~0x00000002);
+        timeoutNanos_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentStateChangeEvent_descriptor;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+          getDefaultInstanceForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+          build() {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+            result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+          buildPartial() {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+            result =
+                new org.apache.pekko.persistence.serialization.MessageFormats
+                    .PersistentStateChangeEvent(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.stateIdentifier_ = stateIdentifier_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.timeout_ = timeout_;
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.timeoutNanos_ = timeoutNanos_;
+          to_bitField0_ |= 0x00000004;
+        }
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other
+            instanceof
+            org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent) {
+          return mergeFrom(
+              (org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent)
+                  other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+              other) {
+        if (other
+            == org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+                .getDefaultInstance()) return this;
+        if (other.hasStateIdentifier()) {
+          bitField0_ |= 0x00000001;
+          stateIdentifier_ = other.stateIdentifier_;
+          onChanged();
+        }
+        if (other.hasTimeout()) {
+          bitField0_ |= 0x00000002;
+          timeout_ = other.timeout_;
+          onChanged();
+        }
+        if (other.hasTimeoutNanos()) {
+          setTimeoutNanos(other.getTimeoutNanos());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (!hasStateIdentifier()) {
+          return false;
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+            parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent)
+                  e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int bitField0_;
+
+      private java.lang.Object stateIdentifier_ = "";
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @return Whether the stateIdentifier field is set.
+       */
+      public boolean hasStateIdentifier() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @return The stateIdentifier.
+       */
+      public java.lang.String getStateIdentifier() {
+        java.lang.Object ref = stateIdentifier_;
+        if (!(ref instanceof java.lang.String)) {
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            stateIdentifier_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @return The bytes for stateIdentifier.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getStateIdentifierBytes() {
+        java.lang.Object ref = stateIdentifier_;
+        if (ref instanceof String) {
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          stateIdentifier_ = b;
+          return b;
+        } else {
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        }
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @param value The stateIdentifier to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStateIdentifier(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000001;
+        stateIdentifier_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearStateIdentifier() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        stateIdentifier_ = getDefaultInstance().getStateIdentifier();
+        onChanged();
+        return this;
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @param value The bytes for stateIdentifier to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStateIdentifierBytes(
+          org.apache.pekko.protobufv3.internal.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000001;
+        stateIdentifier_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object timeout_ = "";
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4.5
+       * 
    
+       *
+       * optional string timeout = 2;
+       *
+       * @return Whether the timeout field is set.
+       */
+      public boolean hasTimeout() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4.5
+       * 
    
+       *
+       * optional string timeout = 2;
+       *
+       * @return The timeout.
+       */
+      public java.lang.String getTimeout() {
+        java.lang.Object ref = timeout_;
+        if (!(ref instanceof java.lang.String)) {
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            timeout_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4.5
+       * 
    
+       *
+       * optional string timeout = 2;
+       *
+       * @return The bytes for timeout.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getTimeoutBytes() {
+        java.lang.Object ref = timeout_;
+        if (ref instanceof String) {
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          timeout_ = b;
+          return b;
+        } else {
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        }
+      }
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4.5
+       * 
    
+       *
+       * optional string timeout = 2;
+       *
+       * @param value The timeout to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeout(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000002;
+        timeout_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4.5
+       * 
    
+       *
+       * optional string timeout = 2;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeout() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        timeout_ = getDefaultInstance().getTimeout();
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * 
    +       * not used in new records from 2.4.5
+       * 
    
+       *
+       * optional string timeout = 2;
+       *
+       * @param value The bytes for timeout to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeoutBytes(org.apache.pekko.protobufv3.internal.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000002;
+        timeout_ = value;
+        onChanged();
+        return this;
+      }
+
+      private long timeoutNanos_;
+      /**
+       * optional int64 timeoutNanos = 3;
+       *
+       * @return Whether the timeoutNanos field is set.
+       */
+      public boolean hasTimeoutNanos() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * optional int64 timeoutNanos = 3;
+       *
+       * @return The timeoutNanos.
+       */
+      public long getTimeoutNanos() {
+        return timeoutNanos_;
+      }
+      /**
+       * optional int64 timeoutNanos = 3;
+       *
+       * @param value The timeoutNanos to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeoutNanos(long value) {
+        bitField0_ |= 0x00000004;
+        timeoutNanos_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * optional int64 timeoutNanos = 3;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeoutNanos() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        timeoutNanos_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:PersistentStateChangeEvent)
+    }
+
+    // @@protoc_insertion_point(class_scope:PersistentStateChangeEvent)
+    private static final org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new org.apache.pekko.persistence.serialization.MessageFormats
+              .PersistentStateChangeEvent();
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentStateChangeEvent
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated
+    public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER =
+            new org.apache.pekko.protobufv3.internal.AbstractParser() {
+              @java.lang.Override
+              public PersistentStateChangeEvent parsePartialFrom(
+                  org.apache.pekko.protobufv3.internal.CodedInputStream input,
+                  org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+                  throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+                return new PersistentStateChangeEvent(input, extensionRegistry);
+              }
+            };
+
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.protobufv3.internal.Parser
+        getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentStateChangeEvent
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  public interface PersistentFSMSnapshotOrBuilder
+      extends
+      // @@protoc_insertion_point(interface_extends:PersistentFSMSnapshot)
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
+
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return Whether the stateIdentifier field is set.
+     */
+    boolean hasStateIdentifier();
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return The stateIdentifier.
+     */
+    java.lang.String getStateIdentifier();
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return The bytes for stateIdentifier.
+     */
+    org.apache.pekko.protobufv3.internal.ByteString getStateIdentifierBytes();
+
+    /**
+     * required .PersistentPayload data = 2;
+     *
+     * @return Whether the data field is set.
+     */
+    boolean hasData();
+    /**
+     * required .PersistentPayload data = 2;
+     *
+     * @return The data.
+     */
+    org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getData();
+    /** required .PersistentPayload data = 2; */
+    org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+        getDataOrBuilder();
+
+    /**
+     * optional int64 timeoutNanos = 3;
+     *
+     * @return Whether the timeoutNanos field is set.
+     */
+    boolean hasTimeoutNanos();
+    /**
+     * optional int64 timeoutNanos = 3;
+     *
+     * @return The timeoutNanos.
+     */
+    long getTimeoutNanos();
+  }
+  /** Protobuf type {@code PersistentFSMSnapshot} */
+  public static final class PersistentFSMSnapshot
+      extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3
+      implements
+      // @@protoc_insertion_point(message_implements:PersistentFSMSnapshot)
+      PersistentFSMSnapshotOrBuilder {
+    private static final long serialVersionUID = 0L;
+    // Use PersistentFSMSnapshot.newBuilder() to construct.
+    private PersistentFSMSnapshot(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+
+    private PersistentFSMSnapshot() {
+      stateIdentifier_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+      return new PersistentFSMSnapshot();
+    }
+
+    @java.lang.Override
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet getUnknownFields() {
+      return this.unknownFields;
+    }
+
+    private PersistentFSMSnapshot(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10:
+              {
+                org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
+                bitField0_ |= 0x00000001;
+                stateIdentifier_ = bs;
+                break;
+              }
+            case 18:
+              {
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+                    subBuilder = null;
+                if (((bitField0_ & 0x00000002) != 0)) {
+                  subBuilder = data_.toBuilder();
+                }
+                data_ =
+                    input.readMessage(
+                        org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                            .PARSER,
+                        extensionRegistry);
+                if (subBuilder != null) {
+                  subBuilder.mergeFrom(data_);
+                  data_ = subBuilder.buildPartial();
+                }
+                bitField0_ |= 0x00000002;
+                break;
+              }
+            case 24:
+              {
+                bitField0_ |= 0x00000004;
+                timeoutNanos_ = input.readInt64();
+                break;
+              }
+            default:
+              {
+                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+          }
+        }
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_PersistentFSMSnapshot_descriptor;
+    }
+
+    @java.lang.Override
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.apache.pekko.persistence.serialization.MessageFormats
+          .internal_static_PersistentFSMSnapshot_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot.class,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+                  .Builder.class);
+    }
+
+    private int bitField0_;
+    public static final int STATEIDENTIFIER_FIELD_NUMBER = 1;
+    private volatile java.lang.Object stateIdentifier_;
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return Whether the stateIdentifier field is set.
+     */
+    public boolean hasStateIdentifier() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return The stateIdentifier.
+     */
+    public java.lang.String getStateIdentifier() {
+      java.lang.Object ref = stateIdentifier_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        org.apache.pekko.protobufv3.internal.ByteString bs =
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          stateIdentifier_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * required string stateIdentifier = 1;
+     *
+     * @return The bytes for stateIdentifier.
+     */
+    public org.apache.pekko.protobufv3.internal.ByteString getStateIdentifierBytes() {
+      java.lang.Object ref = stateIdentifier_;
+      if (ref instanceof java.lang.String) {
+        org.apache.pekko.protobufv3.internal.ByteString b =
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+        stateIdentifier_ = b;
+        return b;
+      } else {
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+      }
+    }
+
+    public static final int DATA_FIELD_NUMBER = 2;
+    private org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload data_;
+    /**
+     * required .PersistentPayload data = 2;
+     *
+     * @return Whether the data field is set.
+     */
+    public boolean hasData() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * required .PersistentPayload data = 2;
+     *
+     * @return The data.
+     */
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getData() {
+      return data_ == null
+          ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+              .getDefaultInstance()
+          : data_;
+    }
+    /** required .PersistentPayload data = 2; */
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+        getDataOrBuilder() {
+      return data_ == null
+          ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+              .getDefaultInstance()
+          : data_;
+    }
+
+    public static final int TIMEOUTNANOS_FIELD_NUMBER = 3;
+    private long timeoutNanos_;
+    /**
+     * optional int64 timeoutNanos = 3;
+     *
+     * @return Whether the timeoutNanos field is set.
+     */
+    public boolean hasTimeoutNanos() {
+      return ((bitField0_ & 0x00000004) != 0);
+    }
+    /**
+     * optional int64 timeoutNanos = 3;
+     *
+     * @return The timeoutNanos.
+     */
+    public long getTimeoutNanos() {
+      return timeoutNanos_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (!hasStateIdentifier()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!hasData()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!getData().isInitialized()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
+        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) != 0)) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(
+            output, 1, stateIdentifier_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        output.writeMessage(2, getData());
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        output.writeInt64(3, timeoutNanos_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(
+                1, stateIdentifier_);
+      }
+      if (((bitField0_ & 0x00000002) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeMessageSize(2, getData());
+      }
+      if (((bitField0_ & 0x00000004) != 0)) {
+        size +=
+            org.apache.pekko.protobufv3.internal.CodedOutputStream.computeInt64Size(
+                3, timeoutNanos_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+        return true;
+      }
+      if (!(obj
+          instanceof
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot)) {
+        return super.equals(obj);
+      }
+      org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot other =
+          (org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot) obj;
+
+      if (hasStateIdentifier() != other.hasStateIdentifier()) return false;
+      if (hasStateIdentifier()) {
+        if (!getStateIdentifier().equals(other.getStateIdentifier())) return false;
+      }
+      if (hasData() != other.hasData()) return false;
+      if (hasData()) {
+        if (!getData().equals(other.getData())) return false;
+      }
+      if (hasTimeoutNanos() != other.hasTimeoutNanos()) return false;
+      if (hasTimeoutNanos()) {
+        if (getTimeoutNanos() != other.getTimeoutNanos()) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasStateIdentifier()) {
+        hash = (37 * hash) + STATEIDENTIFIER_FIELD_NUMBER;
+        hash = (53 * hash) + getStateIdentifier().hashCode();
+      }
+      if (hasData()) {
+        hash = (37 * hash) + DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getData().hashCode();
+      }
+      if (hasTimeoutNanos()) {
+        hash = (37 * hash) + TIMEOUTNANOS_FIELD_NUMBER;
+        hash =
+            (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(getTimeoutNanos());
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(java.nio.ByteBuffer data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(
+            java.nio.ByteBuffer data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(org.apache.pekko.protobufv3.internal.ByteString data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.ByteString data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(byte[] data)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(
+            byte[] data,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseDelimitedFrom(
+            java.io.InputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseDelimitedWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(org.apache.pekko.protobufv3.internal.CodedInputStream input)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input);
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        parseFrom(
+            org.apache.pekko.protobufv3.internal.CodedInputStream input,
+            org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3.parseWithIOException(
+          PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() {
+      return newBuilder();
+    }
+
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+
+    public static Builder newBuilder(
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /** Protobuf type {@code PersistentFSMSnapshot} */
+    public static final class Builder
+        extends org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder
+        implements
+        // @@protoc_insertion_point(builder_implements:PersistentFSMSnapshot)
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshotOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+          getDescriptor() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentFSMSnapshot_descriptor;
+      }
+
+      @java.lang.Override
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentFSMSnapshot_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+                    .class,
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+                    .Builder.class);
+      }
+
+      // Construct using
+      // org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+
+      private void maybeForceBuilderInitialization() {
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders) {
+          getDataFieldBuilder();
+        }
+      }
+
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        stateIdentifier_ = "";
+        bitField0_ = (bitField0_ & ~0x00000001);
+        if (dataBuilder_ == null) {
+          data_ = null;
+        } else {
+          dataBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000002);
+        timeoutNanos_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats
+            .internal_static_PersistentFSMSnapshot_descriptor;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+          getDefaultInstanceForType() {
+        return org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+            .getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+          build() {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot result =
+            buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+          buildPartial() {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot result =
+            new org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot(
+                this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.stateIdentifier_ = stateIdentifier_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          if (dataBuilder_ == null) {
+            result.data_ = data_;
+          } else {
+            result.data_ = dataBuilder_.build();
+          }
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.timeoutNanos_ = timeoutNanos_;
+          to_bitField0_ |= 0x00000004;
+        }
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+
+      @java.lang.Override
+      public Builder setField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder clearField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+
+      @java.lang.Override
+      public Builder clearOneof(
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+
+      @java.lang.Override
+      public Builder setRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          int index,
+          java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+
+      @java.lang.Override
+      public Builder addRepeatedField(
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other
+            instanceof
+            org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot) {
+          return mergeFrom(
+              (org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot)
+                  other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot other) {
+        if (other
+            == org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+                .getDefaultInstance()) return this;
+        if (other.hasStateIdentifier()) {
+          bitField0_ |= 0x00000001;
+          stateIdentifier_ = other.stateIdentifier_;
+          onChanged();
+        }
+        if (other.hasData()) {
+          mergeData(other.getData());
+        }
+        if (other.hasTimeoutNanos()) {
+          setTimeoutNanos(other.getTimeoutNanos());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (!hasStateIdentifier()) {
+          return false;
+        }
+        if (!hasData()) {
+          return false;
+        }
+        if (!getData().isInitialized()) {
+          return false;
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+            parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage =
+              (org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot)
+                  e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int bitField0_;
+
+      private java.lang.Object stateIdentifier_ = "";
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @return Whether the stateIdentifier field is set.
+       */
+      public boolean hasStateIdentifier() {
+        return ((bitField0_ & 0x00000001) != 0);
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @return The stateIdentifier.
+       */
+      public java.lang.String getStateIdentifier() {
+        java.lang.Object ref = stateIdentifier_;
+        if (!(ref instanceof java.lang.String)) {
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            stateIdentifier_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @return The bytes for stateIdentifier.
+       */
+      public org.apache.pekko.protobufv3.internal.ByteString getStateIdentifierBytes() {
+        java.lang.Object ref = stateIdentifier_;
+        if (ref instanceof String) {
+          org.apache.pekko.protobufv3.internal.ByteString b =
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8((java.lang.String) ref);
+          stateIdentifier_ = b;
+          return b;
+        } else {
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
+        }
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @param value The stateIdentifier to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStateIdentifier(java.lang.String value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000001;
+        stateIdentifier_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearStateIdentifier() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        stateIdentifier_ = getDefaultInstance().getStateIdentifier();
+        onChanged();
+        return this;
+      }
+      /**
+       * required string stateIdentifier = 1;
+       *
+       * @param value The bytes for stateIdentifier to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStateIdentifierBytes(
+          org.apache.pekko.protobufv3.internal.ByteString value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000001;
+        stateIdentifier_ = value;
+        onChanged();
+        return this;
+      }
+
+      private org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload data_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>
+          dataBuilder_;
+      /**
+       * required .PersistentPayload data = 2;
+       *
+       * @return Whether the data field is set.
+       */
+      public boolean hasData() {
+        return ((bitField0_ & 0x00000002) != 0);
+      }
+      /**
+       * required .PersistentPayload data = 2;
+       *
+       * @return The data.
+       */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload getData() {
+        if (dataBuilder_ == null) {
+          return data_ == null
+              ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                  .getDefaultInstance()
+              : data_;
+        } else {
+          return dataBuilder_.getMessage();
+        }
+      }
+      /** required .PersistentPayload data = 2; */
+      public Builder setData(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
+        if (dataBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          data_ = value;
+          onChanged();
+        } else {
+          dataBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /** required .PersistentPayload data = 2; */
+      public Builder setData(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+              builderForValue) {
+        if (dataBuilder_ == null) {
+          data_ = builderForValue.build();
+          onChanged();
+        } else {
+          dataBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /** required .PersistentPayload data = 2; */
+      public Builder mergeData(
+          org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload value) {
+        if (dataBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)
+              && data_ != null
+              && data_
+                  != org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                      .getDefaultInstance()) {
+            data_ =
+                org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                    .newBuilder(data_)
+                    .mergeFrom(value)
+                    .buildPartial();
+          } else {
+            data_ = value;
+          }
+          onChanged();
+        } else {
+          dataBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /** required .PersistentPayload data = 2; */
+      public Builder clearData() {
+        if (dataBuilder_ == null) {
+          data_ = null;
+          onChanged();
+        } else {
+          dataBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+      /** required .PersistentPayload data = 2; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder
+          getDataBuilder() {
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return getDataFieldBuilder().getBuilder();
+      }
+      /** required .PersistentPayload data = 2; */
+      public org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder
+          getDataOrBuilder() {
+        if (dataBuilder_ != null) {
+          return dataBuilder_.getMessageOrBuilder();
+        } else {
+          return data_ == null
+              ? org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                  .getDefaultInstance()
+              : data_;
+        }
+      }
+      /** required .PersistentPayload data = 2; */
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload.Builder,
+              org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayloadOrBuilder>
+          getDataFieldBuilder() {
+        if (dataBuilder_ == null) {
+          dataBuilder_ =
+              new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload,
+                  org.apache.pekko.persistence.serialization.MessageFormats.PersistentPayload
+                      .Builder,
+                  org.apache.pekko.persistence.serialization.MessageFormats
+                      .PersistentPayloadOrBuilder>(getData(), getParentForChildren(), isClean());
+          data_ = null;
+        }
+        return dataBuilder_;
+      }
+
+      private long timeoutNanos_;
+      /**
+       * optional int64 timeoutNanos = 3;
+       *
+       * @return Whether the timeoutNanos field is set.
+       */
+      public boolean hasTimeoutNanos() {
+        return ((bitField0_ & 0x00000004) != 0);
+      }
+      /**
+       * optional int64 timeoutNanos = 3;
+       *
+       * @return The timeoutNanos.
+       */
+      public long getTimeoutNanos() {
+        return timeoutNanos_;
+      }
+      /**
+       * optional int64 timeoutNanos = 3;
+       *
+       * @param value The timeoutNanos to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeoutNanos(long value) {
+        bitField0_ |= 0x00000004;
+        timeoutNanos_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * optional int64 timeoutNanos = 3;
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeoutNanos() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        timeoutNanos_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+      // @@protoc_insertion_point(builder_scope:PersistentFSMSnapshot)
+    }
+
+    // @@protoc_insertion_point(class_scope:PersistentFSMSnapshot)
+    private static final org.apache.pekko.persistence.serialization.MessageFormats
+            .PersistentFSMSnapshot
+        DEFAULT_INSTANCE;
+
+    static {
+      DEFAULT_INSTANCE =
+          new org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot();
+    }
+
+    public static org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated
+    public static final org.apache.pekko.protobufv3.internal.Parser PARSER =
+        new org.apache.pekko.protobufv3.internal.AbstractParser() {
+          @java.lang.Override
+          public PersistentFSMSnapshot parsePartialFrom(
+              org.apache.pekko.protobufv3.internal.CodedInputStream input,
+              org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+              throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
+            return new PersistentFSMSnapshot(input, extensionRegistry);
+          }
+        };
+
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.apache.pekko.persistence.serialization.MessageFormats.PersistentFSMSnapshot
+        getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+  }
+
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+      internal_static_PersistentMessage_descriptor;
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      internal_static_PersistentMessage_fieldAccessorTable;
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+      internal_static_PersistentPayload_descriptor;
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      internal_static_PersistentPayload_fieldAccessorTable;
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+      internal_static_AtomicWrite_descriptor;
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AtomicWrite_fieldAccessorTable;
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+      internal_static_AtLeastOnceDeliverySnapshot_descriptor;
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AtLeastOnceDeliverySnapshot_fieldAccessorTable;
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+      internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor;
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_fieldAccessorTable;
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+      internal_static_PersistentStateChangeEvent_descriptor;
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      internal_static_PersistentStateChangeEvent_fieldAccessorTable;
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
+      internal_static_PersistentFSMSnapshot_descriptor;
+  private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      internal_static_PersistentFSMSnapshot_fieldAccessorTable;
+
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor getDescriptor() {
+    return descriptor;
+  }
+
+  private static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor descriptor;
+
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\024MessageFormats.proto\"\343\001\n\021PersistentMes"
+          + "sage\022#\n\007payload\030\001 \001(\0132\022.PersistentPayloa"
+          + "d\022\022\n\nsequenceNr\030\002 \001(\003\022\025\n\rpersistenceId\030\003"
+          + " \001(\t\022\017\n\007deleted\030\004 \001(\010\022\016\n\006sender\030\013 \001(\t\022\020\n"
+          + "\010manifest\030\014 \001(\t\022\022\n\nwriterUuid\030\r \001(\t\022\021\n\tt"
+          + "imestamp\030\016 \001(\022\022$\n\010metadata\030\017 \001(\0132\022.Persi"
+          + "stentPayload\"S\n\021PersistentPayload\022\024\n\014ser"
+          + "ializerId\030\001 \002(\005\022\017\n\007payload\030\002 \002(\014\022\027\n\017payl"
+          + "oadManifest\030\003 \001(\014\"2\n\013AtomicWrite\022#\n\007payl"
+          + "oad\030\001 \003(\0132\022.PersistentMessage\"\356\001\n\033AtLeas"
+          + "tOnceDeliverySnapshot\022\031\n\021currentDelivery"
+          + "Id\030\001 \002(\003\022O\n\025unconfirmedDeliveries\030\002 \003(\0132"
+          + "0.AtLeastOnceDeliverySnapshot.Unconfirme"
+          + "dDelivery\032c\n\023UnconfirmedDelivery\022\022\n\ndeli"
+          + "veryId\030\001 \002(\003\022\023\n\013destination\030\002 \002(\t\022#\n\007pay"
+          + "load\030\003 \002(\0132\022.PersistentPayload\"\\\n\032Persis"
+          + "tentStateChangeEvent\022\027\n\017stateIdentifier\030"
+          + "\001 \002(\t\022\017\n\007timeout\030\002 \001(\t\022\024\n\014timeoutNanos\030\003"
+          + " \001(\003\"h\n\025PersistentFSMSnapshot\022\027\n\017stateId"
+          + "entifier\030\001 \002(\t\022 \n\004data\030\002 \002(\0132\022.Persisten"
+          + "tPayload\022\024\n\014timeoutNanos\030\003 \001(\003B\"\n\036akka.p"
+          + "ersistence.serializationH\001"
+    };
+    descriptor =
+        org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
+            .internalBuildGeneratedFileFrom(
+                descriptorData,
+                new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {});
+    internal_static_PersistentMessage_descriptor = getDescriptor().getMessageTypes().get(0);
+    internal_static_PersistentMessage_fieldAccessorTable =
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_PersistentMessage_descriptor,
+            new java.lang.String[] {
+              "Payload",
+              "SequenceNr",
+              "PersistenceId",
+              "Deleted",
+              "Sender",
+              "Manifest",
+              "WriterUuid",
+              "Timestamp",
+              "Metadata",
+            });
+    internal_static_PersistentPayload_descriptor = getDescriptor().getMessageTypes().get(1);
+    internal_static_PersistentPayload_fieldAccessorTable =
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_PersistentPayload_descriptor,
+            new java.lang.String[] {
+              "SerializerId", "Payload", "PayloadManifest",
+            });
+    internal_static_AtomicWrite_descriptor = getDescriptor().getMessageTypes().get(2);
+    internal_static_AtomicWrite_fieldAccessorTable =
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_AtomicWrite_descriptor,
+            new java.lang.String[] {
+              "Payload",
+            });
+    internal_static_AtLeastOnceDeliverySnapshot_descriptor =
+        getDescriptor().getMessageTypes().get(3);
+    internal_static_AtLeastOnceDeliverySnapshot_fieldAccessorTable =
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_AtLeastOnceDeliverySnapshot_descriptor,
+            new java.lang.String[] {
+              "CurrentDeliveryId", "UnconfirmedDeliveries",
+            });
+    internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor =
+        internal_static_AtLeastOnceDeliverySnapshot_descriptor.getNestedTypes().get(0);
+    internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_fieldAccessorTable =
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_AtLeastOnceDeliverySnapshot_UnconfirmedDelivery_descriptor,
+            new java.lang.String[] {
+              "DeliveryId", "Destination", "Payload",
+            });
+    internal_static_PersistentStateChangeEvent_descriptor =
+        getDescriptor().getMessageTypes().get(4);
+    internal_static_PersistentStateChangeEvent_fieldAccessorTable =
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_PersistentStateChangeEvent_descriptor,
+            new java.lang.String[] {
+              "StateIdentifier", "Timeout", "TimeoutNanos",
+            });
+    internal_static_PersistentFSMSnapshot_descriptor = getDescriptor().getMessageTypes().get(5);
+    internal_static_PersistentFSMSnapshot_fieldAccessorTable =
+        new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_PersistentFSMSnapshot_descriptor,
+            new java.lang.String[] {
+              "StateIdentifier", "Data", "TimeoutNanos",
+            });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/akka-persistence/src/main/java/akka/persistence/snapshot/japi/SnapshotStorePlugin.java b/akka-persistence/src/main/java/org/apache/pekko/persistence/snapshot/japi/SnapshotStorePlugin.java
similarity index 84%
rename from akka-persistence/src/main/java/akka/persistence/snapshot/japi/SnapshotStorePlugin.java
rename to akka-persistence/src/main/java/org/apache/pekko/persistence/snapshot/japi/SnapshotStorePlugin.java
index 459231a2f5..2144f5baf1 100644
--- a/akka-persistence/src/main/java/akka/persistence/snapshot/japi/SnapshotStorePlugin.java
+++ b/akka-persistence/src/main/java/org/apache/pekko/persistence/snapshot/japi/SnapshotStorePlugin.java
@@ -2,11 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.snapshot.japi;
+package org.apache.pekko.persistence.snapshot.japi;
 
-import akka.persistence.SelectedSnapshot;
-import akka.persistence.SnapshotMetadata;
-import akka.persistence.SnapshotSelectionCriteria;
+import org.apache.pekko.persistence.SelectedSnapshot;
+import org.apache.pekko.persistence.SnapshotMetadata;
+import org.apache.pekko.persistence.SnapshotSelectionCriteria;
 import scala.concurrent.Future;
 
 import java.util.Optional;
diff --git a/akka-persistence/src/main/protobuf/MessageFormats.proto b/akka-persistence/src/main/protobuf/MessageFormats.proto
index 3ee037be1e..f50769f940 100644
--- a/akka-persistence/src/main/protobuf/MessageFormats.proto
+++ b/akka-persistence/src/main/protobuf/MessageFormats.proto
@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-option java_package = "akka.persistence.serialization";
+option java_package = "org.apache.pekko.persistence.serialization";
 option optimize_for = SPEED;
 
 message PersistentMessage {
diff --git a/akka-persistence/src/main/resources/reference.conf b/akka-persistence/src/main/resources/reference.conf
index db9ae1ecbe..7b1ec967a8 100644
--- a/akka-persistence/src/main/resources/reference.conf
+++ b/akka-persistence/src/main/resources/reference.conf
@@ -19,9 +19,9 @@ akka.persistence {
     max-concurrent-recoveries = 50
 
     # Fully qualified class name providing a default internal stash overflow strategy.
-    # It needs to be a subclass of akka.persistence.StashOverflowStrategyConfigurator.
+    # It needs to be a subclass of org.apache.pekko.persistence.StashOverflowStrategyConfigurator.
     # The default strategy throws StashOverflowException.
-    internal-stash-overflow-strategy = "akka.persistence.ThrowExceptionConfigurator"
+    internal-stash-overflow-strategy = "org.apache.pekko.persistence.ThrowExceptionConfigurator"
     journal {
         # Absolute path to the journal plugin configuration entry used by 
         # persistent actor by default.
@@ -47,7 +47,7 @@ akka.persistence {
     # used as default-snapshot store if no plugin configured 
     # (see `akka.persistence.snapshot-store`)
     no-snapshot-store {
-      class = "akka.persistence.snapshot.NoSnapshotStore"
+      class = "org.apache.pekko.persistence.snapshot.NoSnapshotStore"
     }
     # Default reliable delivery settings.
     at-least-once-delivery {
@@ -207,16 +207,16 @@ akka.persistence {
 # Protobuf serialization for the persistent extension messages.
 akka.actor {
     serializers {
-        akka-persistence-message = "akka.persistence.serialization.MessageSerializer"
-        akka-persistence-snapshot = "akka.persistence.serialization.SnapshotSerializer"
+        akka-persistence-message = "org.apache.pekko.persistence.serialization.MessageSerializer"
+        akka-persistence-snapshot = "org.apache.pekko.persistence.serialization.SnapshotSerializer"
     }
     serialization-bindings {
-        "akka.persistence.serialization.Message" = akka-persistence-message
-        "akka.persistence.serialization.Snapshot" = akka-persistence-snapshot
+        "org.apache.pekko.persistence.serialization.Message" = akka-persistence-message
+        "org.apache.pekko.persistence.serialization.Snapshot" = akka-persistence-snapshot
     }
     serialization-identifiers {
-        "akka.persistence.serialization.MessageSerializer" = 7
-        "akka.persistence.serialization.SnapshotSerializer" = 8
+        "org.apache.pekko.persistence.serialization.MessageSerializer" = 7
+        "org.apache.pekko.persistence.serialization.SnapshotSerializer" = 8
     }
 }
 
@@ -228,7 +228,7 @@ akka.actor {
 # In-memory journal plugin.
 akka.persistence.journal.inmem {
     # Class name of the plugin.
-    class = "akka.persistence.journal.inmem.InmemJournal"
+    class = "org.apache.pekko.persistence.journal.inmem.InmemJournal"
     # Dispatcher for the plugin actor.
     plugin-dispatcher = "akka.actor.default-dispatcher"
 
@@ -239,7 +239,7 @@ akka.persistence.journal.inmem {
 # Local file system snapshot store plugin.
 akka.persistence.snapshot-store.local {
     # Class name of the plugin.
-    class = "akka.persistence.snapshot.local.LocalSnapshotStore"
+    class = "org.apache.pekko.persistence.snapshot.local.LocalSnapshotStore"
     # Dispatcher for the plugin actor.
     plugin-dispatcher = "akka.persistence.dispatchers.default-plugin-dispatcher"
     # Dispatcher for streaming snapshot IO.
@@ -258,7 +258,7 @@ akka.persistence.snapshot-store.local {
 # Note: this plugin requires explicit LevelDB dependency, see below. 
 akka.persistence.journal.leveldb {
     # Class name of the plugin.
-    class = "akka.persistence.journal.leveldb.LeveldbJournal"
+    class = "org.apache.pekko.persistence.journal.leveldb.LeveldbJournal"
     # Dispatcher for the plugin actor.
     plugin-dispatcher = "akka.persistence.dispatchers.default-plugin-dispatcher"
     # Dispatcher for message replay.
@@ -280,7 +280,7 @@ akka.persistence.journal.leveldb {
 # Note: this plugin requires explicit LevelDB dependency, see below. 
 akka.persistence.journal.leveldb-shared {
     # Class name of the plugin.
-    class = "akka.persistence.journal.leveldb.SharedLeveldbJournal"
+    class = "org.apache.pekko.persistence.journal.leveldb.SharedLeveldbJournal"
     # Dispatcher for the plugin actor.
     plugin-dispatcher = "akka.actor.default-dispatcher"
     # Timeout for async journal operations.
@@ -306,7 +306,7 @@ akka.persistence.journal.leveldb-shared {
 
 akka.persistence.journal.proxy {
   # Class name of the plugin.
-  class = "akka.persistence.journal.PersistencePluginProxy"
+  class = "org.apache.pekko.persistence.journal.PersistencePluginProxy"
   # Dispatcher for the plugin actor.
   plugin-dispatcher = "akka.actor.default-dispatcher"
   # Set this to on in the configuration of the ActorSystem
@@ -322,7 +322,7 @@ akka.persistence.journal.proxy {
 
 akka.persistence.snapshot-store.proxy {
   # Class name of the plugin.
-  class = "akka.persistence.journal.PersistencePluginProxy"
+  class = "org.apache.pekko.persistence.journal.PersistencePluginProxy"
   # Dispatcher for the plugin actor.
   plugin-dispatcher = "akka.actor.default-dispatcher"
   # Set this to on in the configuration of the ActorSystem
diff --git a/akka-persistence/src/main/scala-2/akka/persistence/TraitOrder.scala b/akka-persistence/src/main/scala-2/org/apache/pekko/persistence/TraitOrder.scala
similarity index 87%
rename from akka-persistence/src/main/scala-2/akka/persistence/TraitOrder.scala
rename to akka-persistence/src/main/scala-2/org/apache/pekko/persistence/TraitOrder.scala
index 56fe3c8818..6a2cd4b2d7 100644
--- a/akka-persistence/src/main/scala-2/akka/persistence/TraitOrder.scala
+++ b/akka-persistence/src/main/scala-2/org/apache/pekko/persistence/TraitOrder.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
diff --git a/akka-persistence/src/main/scala-3/akka/persistence/TraitOrder.scala b/akka-persistence/src/main/scala-3/org/apache/pekko/persistence/TraitOrder.scala
similarity index 77%
rename from akka-persistence/src/main/scala-3/akka/persistence/TraitOrder.scala
rename to akka-persistence/src/main/scala-3/org/apache/pekko/persistence/TraitOrder.scala
index 0e6985f770..9183301bdd 100644
--- a/akka-persistence/src/main/scala-3/akka/persistence/TraitOrder.scala
+++ b/akka-persistence/src/main/scala-3/org/apache/pekko/persistence/TraitOrder.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2021-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
 
 /**
  * INTERNAL API
diff --git a/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/AtLeastOnceDelivery.scala
similarity index 94%
rename from akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/AtLeastOnceDelivery.scala
index 87d48b0b5c..976bd602b6 100644
--- a/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/AtLeastOnceDelivery.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.collection.immutable
 import scala.concurrent.duration.FiniteDuration
 
-import akka.actor.{ ActorPath, ActorSelection, NotInfluenceReceiveTimeout }
-import akka.actor.Cancellable
-import akka.actor.DeadLetterSuppression
-import akka.annotation.InternalApi
-import akka.persistence.serialization.Message
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.{ ActorPath, ActorSelection, NotInfluenceReceiveTimeout }
+import pekko.actor.Cancellable
+import pekko.actor.DeadLetterSuppression
+import pekko.annotation.InternalApi
+import pekko.persistence.serialization.Message
+import pekko.util.ccompat._
 
 @ccompatUsedUntil213
 object AtLeastOnceDelivery {
@@ -33,7 +34,7 @@ object AtLeastOnceDelivery {
      * Java API
      */
     def getUnconfirmedDeliveries: java.util.List[UnconfirmedDelivery] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       unconfirmedDeliveries.asJava
     }
 
@@ -49,7 +50,7 @@ object AtLeastOnceDelivery {
      * Java API
      */
     def getUnconfirmedDeliveries: java.util.List[UnconfirmedDelivery] = {
-      import akka.util.ccompat.JavaConverters._
+      import pekko.util.ccompat.JavaConverters._
       unconfirmedDeliveries.asJava
     }
   }
@@ -74,7 +75,7 @@ object AtLeastOnceDelivery {
   /**
    * INTERNAL API
    */
-  private[akka] object Internal {
+  private[pekko] object Internal {
     case class Delivery(destination: ActorPath, message: Any, timestamp: Long, attempt: Int)
     case object RedeliveryTick extends NotInfluenceReceiveTimeout with DeadLetterSuppression
   }
@@ -260,7 +261,7 @@ trait AtLeastOnceDeliveryLike extends Eventsourced {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] final def internalDeliver(destination: ActorPath)(deliveryIdToMessage: Long => Any): Unit = {
+  private[pekko] final def internalDeliver(destination: ActorPath)(deliveryIdToMessage: Long => Any): Unit = {
     if (unconfirmed.size >= maxUnconfirmedMessages)
       throw new MaxUnconfirmedMessagesExceededException(
         s"Too many unconfirmed messages, maximum allowed is [$maxUnconfirmedMessages]")
@@ -281,7 +282,7 @@ trait AtLeastOnceDeliveryLike extends Eventsourced {
    * INTERNAL API
    */
   @InternalApi
-  private[akka] final def internalDeliver(destination: ActorSelection)(deliveryIdToMessage: Long => Any): Unit = {
+  private[pekko] final def internalDeliver(destination: ActorSelection)(deliveryIdToMessage: Long => Any): Unit = {
     val isWildcardSelection = destination.pathString.contains("*")
     require(
       !isWildcardSelection,
@@ -370,7 +371,7 @@ trait AtLeastOnceDeliveryLike extends Eventsourced {
   /**
    * INTERNAL API
    */
-  override protected[akka] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = {
+  override protected[pekko] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = {
     cancelRedeliveryTask()
     super.aroundPreRestart(reason, message)
   }
@@ -378,12 +379,12 @@ trait AtLeastOnceDeliveryLike extends Eventsourced {
   /**
    * INTERNAL API
    */
-  override protected[akka] def aroundPostStop(): Unit = {
+  override protected[pekko] def aroundPostStop(): Unit = {
     cancelRedeliveryTask()
     super.aroundPostStop()
   }
 
-  override private[akka] def onReplaySuccess(): Unit = {
+  override private[pekko] def onReplaySuccess(): Unit = {
     if (unconfirmed.nonEmpty) {
       redeliverOverdue()
       startRedeliverTask()
@@ -394,7 +395,7 @@ trait AtLeastOnceDeliveryLike extends Eventsourced {
   /**
    * INTERNAL API
    */
-  override protected[akka] def aroundReceive(receive: Receive, message: Any): Unit =
+  override protected[pekko] def aroundReceive(receive: Receive, message: Any): Unit =
     message match {
       case RedeliveryTick =>
         redeliverOverdue()
@@ -438,7 +439,7 @@ abstract class AbstractPersistentActorWithAtLeastOnceDelivery
    * This method will throw [[AtLeastOnceDelivery.MaxUnconfirmedMessagesExceededException]]
    * if [[#numberOfUnconfirmed]] is greater than or equal to [[#maxUnconfirmedMessages]].
    */
-  def deliver(destination: ActorPath, deliveryIdToMessage: akka.japi.Function[java.lang.Long, Object]): Unit =
+  def deliver(destination: ActorPath, deliveryIdToMessage: pekko.japi.Function[java.lang.Long, Object]): Unit =
     internalDeliver(destination)(id => deliveryIdToMessage.apply(id))
 
   /**
@@ -461,6 +462,6 @@ abstract class AbstractPersistentActorWithAtLeastOnceDelivery
    * This method will throw [[AtLeastOnceDelivery.MaxUnconfirmedMessagesExceededException]]
    * if [[#numberOfUnconfirmed]] is greater than or equal to [[#maxUnconfirmedMessages]].
    */
-  def deliver(destination: ActorSelection, deliveryIdToMessage: akka.japi.Function[java.lang.Long, Object]): Unit =
+  def deliver(destination: ActorSelection, deliveryIdToMessage: pekko.japi.Function[java.lang.Long, Object]): Unit =
     internalDeliver(destination)(id => deliveryIdToMessage.apply(id))
 }
diff --git a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Eventsourced.scala
similarity index 94%
rename from akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/Eventsourced.scala
index c0bda5cfe4..888e12c1c6 100644
--- a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Eventsourced.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicInteger
@@ -14,11 +14,12 @@ import scala.util.control.NonFatal
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Actor, ActorCell, DeadLetter, StashOverflowException }
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.dispatch.Envelope
-import akka.event.{ Logging, LoggingAdapter }
-import akka.util.Helpers.ConfigOps
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorCell, DeadLetter, StashOverflowException }
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.dispatch.Envelope
+import pekko.event.{ Logging, LoggingAdapter }
+import pekko.util.Helpers.ConfigOps
 
 /** INTERNAL API */
 @InternalApi
@@ -27,21 +28,22 @@ private[persistence] object Eventsourced {
   private val instanceIdCounter = new AtomicInteger(1)
 
   /** INTERNAL API */
-  private[akka] sealed trait PendingHandlerInvocation {
+  private[pekko] sealed trait PendingHandlerInvocation {
     def evt: Any
 
     def handler: Any => Unit
   }
 
   /** INTERNAL API: forces actor to stash incoming commands until all these invocations are handled */
-  private[akka] final case class StashingHandlerInvocation(evt: Any, handler: Any => Unit)
+  private[pekko] final case class StashingHandlerInvocation(evt: Any, handler: Any => Unit)
       extends PendingHandlerInvocation
 
   /** INTERNAL API: does not force the actor to stash commands; Originates from either `persistAsync` or `defer` calls */
-  private[akka] final case class AsyncHandlerInvocation(evt: Any, handler: Any => Unit) extends PendingHandlerInvocation
+  private[pekko] final case class AsyncHandlerInvocation(evt: Any, handler: Any => Unit)
+      extends PendingHandlerInvocation
 
   /** INTERNAL API: message used to detect that recovery timed out */
-  private[akka] final case class RecoveryTick(snapshot: Boolean)
+  private[pekko] final case class RecoveryTick(snapshot: Boolean)
 }
 
 /**
@@ -58,7 +60,7 @@ private[persistence] trait Eventsourced
   import JournalProtocol._
   import SnapshotProtocol.{ LoadSnapshotFailed, LoadSnapshotResult }
 
-  TraitOrder.checkBefore(getClass, classOf[akka.actor.Timers], classOf[PersistentActor])
+  TraitOrder.checkBefore(getClass, classOf[pekko.actor.Timers], classOf[PersistentActor])
 
   private val extension = Persistence(context.system)
 
@@ -135,7 +137,7 @@ private[persistence] trait Eventsourced
    * May be implemented by subclass.
    */
   @InternalStableApi
-  private[akka] def onReplaySuccess(): Unit = ()
+  private[pekko] def onReplaySuccess(): Unit = ()
 
   /**
    * Called whenever a message replay fails. By default it logs the error.
@@ -241,11 +243,11 @@ private[persistence] trait Eventsourced
   }
 
   /** INTERNAL API. */
-  override protected[akka] def aroundReceive(receive: Receive, message: Any): Unit =
+  override protected[pekko] def aroundReceive(receive: Receive, message: Any): Unit =
     currentState.stateReceive(receive, message)
 
   /** INTERNAL API. */
-  override protected[akka] def aroundPreStart(): Unit = {
+  override protected[pekko] def aroundPreStart(): Unit = {
     require(persistenceId ne null, s"persistenceId is [null] for PersistentActor [${self.path}]")
     require(persistenceId.trim.nonEmpty, s"persistenceId cannot be empty for PersistentActor [${self.path}]")
 
@@ -262,7 +264,7 @@ private[persistence] trait Eventsourced
   }
 
   /** INTERNAL API. */
-  override protected[akka] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = {
+  override protected[pekko] def aroundPreRestart(reason: Throwable, message: Option[Any]): Unit = {
     try {
       internalStash.unstashAll()
       unstashAll(unstashFilterPredicate)
@@ -285,13 +287,13 @@ private[persistence] trait Eventsourced
   }
 
   /** INTERNAL API. */
-  override protected[akka] def aroundPostRestart(reason: Throwable): Unit = {
+  override protected[pekko] def aroundPostRestart(reason: Throwable): Unit = {
     requestRecoveryPermit()
     super.aroundPostRestart(reason)
   }
 
   /** INTERNAL API. */
-  override protected[akka] def aroundPostStop(): Unit =
+  override protected[pekko] def aroundPostStop(): Unit =
     try {
       internalStash.unstashAll()
       unstashAll(unstashFilterPredicate)
@@ -385,7 +387,7 @@ private[persistence] trait Eventsourced
    * Internal API
    */
   @InternalApi
-  final private[akka] def internalPersist[A](event: A)(handler: A => Unit): Unit = {
+  final private[pekko] def internalPersist[A](event: A)(handler: A => Unit): Unit = {
     if (recoveryRunning)
       throw new IllegalStateException(
         "Cannot persist during replay. Events can be persisted when receiving RecoveryCompleted or later.")
@@ -405,7 +407,7 @@ private[persistence] trait Eventsourced
    * Internal API
    */
   @InternalApi
-  final private[akka] def internalPersistAll[A](events: immutable.Seq[A])(handler: A => Unit): Unit = {
+  final private[pekko] def internalPersistAll[A](events: immutable.Seq[A])(handler: A => Unit): Unit = {
     if (recoveryRunning)
       throw new IllegalStateException(
         "Cannot persist during replay. Events can be persisted when receiving RecoveryCompleted or later.")
@@ -435,7 +437,7 @@ private[persistence] trait Eventsourced
    * Internal API
    */
   @InternalApi
-  final private[akka] def internalPersistAsync[A](event: A)(handler: A => Unit): Unit = {
+  final private[pekko] def internalPersistAsync[A](event: A)(handler: A => Unit): Unit = {
     if (recoveryRunning)
       throw new IllegalStateException(
         "Cannot persist during replay. Events can be persisted when receiving RecoveryCompleted or later.")
@@ -453,7 +455,7 @@ private[persistence] trait Eventsourced
    * Internal API
    */
   @InternalApi
-  final private[akka] def internalPersistAllAsync[A](events: immutable.Seq[A])(handler: A => Unit): Unit = {
+  final private[pekko] def internalPersistAllAsync[A](events: immutable.Seq[A])(handler: A => Unit): Unit = {
     if (recoveryRunning)
       throw new IllegalStateException(
         "Cannot persist during replay. Events can be persisted when receiving RecoveryCompleted or later.")
@@ -476,7 +478,7 @@ private[persistence] trait Eventsourced
    * Internal API
    */
   @InternalApi
-  final private[akka] def internalDeferAsync[A](event: A)(handler: A => Unit): Unit = {
+  final private[pekko] def internalDeferAsync[A](event: A)(handler: A => Unit): Unit = {
     if (recoveryRunning)
       throw new IllegalStateException(
         "Cannot defer during replay. Events can be deferred when receiving RecoveryCompleted or later.")
@@ -492,7 +494,7 @@ private[persistence] trait Eventsourced
    * Internal API
    */
   @InternalApi
-  final private[akka] def internalDefer[A](event: A)(handler: A => Unit): Unit = {
+  final private[pekko] def internalDefer[A](event: A)(handler: A => Unit): Unit = {
     if (recoveryRunning)
       throw new IllegalStateException(
         "Cannot defer during replay. Events can be deferred when receiving RecoveryCompleted or later.")
@@ -538,7 +540,7 @@ private[persistence] trait Eventsourced
    * Or delete all by using `Long.MaxValue` as the `toSequenceNr`
    * {{{ m.copy(sequenceNr = Long.MaxValue) }}}
    */
-  @InternalApi private[akka] def internalDeleteMessagesBeforeSnapshot(
+  @InternalApi private[pekko] def internalDeleteMessagesBeforeSnapshot(
       e: SaveSnapshotSuccess,
       keepNrOfBatches: Int,
       snapshotAfter: Int): Unit = {
diff --git a/akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/JournalProtocol.scala
similarity index 98%
rename from akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/JournalProtocol.scala
index 820cf3c1fe..be0bc82982 100644
--- a/akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/JournalProtocol.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.collection.immutable
 
-import akka.actor._
+import org.apache.pekko.actor._
 
 /**
  * INTERNAL API.
diff --git a/akka-persistence/src/main/scala/akka/persistence/Persistence.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala
similarity index 93%
rename from akka-persistence/src/main/scala/akka/persistence/Persistence.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala
index 8999ee283e..4bb076f8e9 100644
--- a/akka-persistence/src/main/scala/akka/persistence/Persistence.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.util.concurrent.atomic.AtomicReference
 import java.util.function.Consumer
@@ -14,15 +14,16 @@ import scala.util.control.NonFatal
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.actor._
-import akka.annotation.InternalApi
-import akka.annotation.InternalStableApi
-import akka.event.{ Logging, LoggingAdapter }
-import akka.japi.Pair
-import akka.persistence.journal.{ EventAdapters, IdentityEventAdapters }
-import akka.util.Collections.EmptyImmutableSeq
-import akka.util.Helpers.ConfigOps
-import akka.util.Reflect
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.InternalApi
+import pekko.annotation.InternalStableApi
+import pekko.event.{ Logging, LoggingAdapter }
+import pekko.japi.Pair
+import pekko.persistence.journal.{ EventAdapters, IdentityEventAdapters }
+import pekko.util.Collections.EmptyImmutableSeq
+import pekko.util.Helpers.ConfigOps
+import pekko.util.Reflect
 
 /**
  * Persistence configuration.
@@ -170,7 +171,7 @@ object Persistence extends ExtensionId[Persistence] with ExtensionIdProvider {
    * INTERNAL API
    * @throws IllegalArgumentException if config path for the `pluginId` doesn't exist
    */
-  @InternalApi private[akka] def verifyPluginConfigExists(
+  @InternalApi private[pekko] def verifyPluginConfigExists(
       config: Config,
       pluginId: String,
       pluginType: String): Unit = {
@@ -182,7 +183,7 @@ object Persistence extends ExtensionId[Persistence] with ExtensionIdProvider {
    * INTERNAL API
    * @throws IllegalArgumentException if `pluginId` is empty (undefined)
    */
-  @InternalApi private[akka] def verifyPluginConfigIsDefined(pluginId: String, pluginType: String): Unit = {
+  @InternalApi private[pekko] def verifyPluginConfigIsDefined(pluginId: String, pluginType: String): Unit = {
     if (isEmpty(pluginId))
       throw new IllegalArgumentException(s"$pluginType plugin is not configured, see 'reference.conf'")
   }
@@ -211,7 +212,7 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
    * its data store is protected from being overloaded by limiting number
    * of recoveries that can be in progress at the same time.
    */
-  @InternalApi private[akka] val recoveryPermitter: ActorRef = {
+  @InternalApi private[pekko] val recoveryPermitter: ActorRef = {
     val maxPermits = config.getInt("max-concurrent-recoveries")
     system.systemActorOf(RecoveryPermitter.props(maxPermits), "recoveryPermitter")
   }
@@ -284,7 +285,7 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
     verifyPluginConfigExists(pluginConfig.withFallback(system.settings.config), configPath, "Snapshot store")
 
   /**
-   * Returns an [[akka.persistence.journal.EventAdapters]] object which serves as a per-journal collection of bound event adapters.
+   * Returns an [[pekko.persistence.journal.EventAdapters]] object which serves as a per-journal collection of bound event adapters.
    * If no adapters are registered for a given journal the EventAdapters object will simply return the identity
    * adapter for each class, otherwise the most specific adapter matching a given class will be returned.
    */
@@ -293,7 +294,7 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
   }
 
   /**
-   * Returns an [[akka.persistence.journal.EventAdapters]] object which serves as a per-journal collection of bound event adapters.
+   * Returns an [[pekko.persistence.journal.EventAdapters]] object which serves as a per-journal collection of bound event adapters.
    * If no adapters are registered for a given journal the EventAdapters object will simply return the identity
    * adapter for each class, otherwise the most specific adapter matching a given class will be returned.
    *
@@ -307,9 +308,9 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
 
   /**
    * INTERNAL API
-   * Looks up [[akka.persistence.journal.EventAdapters]] by journal plugin's ActorRef.
+   * Looks up [[pekko.persistence.journal.EventAdapters]] by journal plugin's ActorRef.
    */
-  private[akka] final def adaptersFor(journalPluginActor: ActorRef): EventAdapters = {
+  private[pekko] final def adaptersFor(journalPluginActor: ActorRef): EventAdapters = {
     pluginExtensionId.get().values.collectFirst {
       case ext if ext(system).actor == journalPluginActor => ext(system).adapters
     } match {
@@ -324,7 +325,7 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
    * When empty, looks in `akka.persistence.journal.plugin` to find configuration entry path.
    * When configured, uses `journalPluginId` as absolute path to the journal configuration entry.
    */
-  private[akka] final def journalConfigFor(
+  private[pekko] final def journalConfigFor(
       journalPluginId: String,
       journalPluginConfig: Config = ConfigFactory.empty): Config = {
     val configPath = if (isEmpty(journalPluginId)) defaultJournalPluginId else journalPluginId
@@ -336,7 +337,7 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
    * INTERNAL API
    * Looks up the plugin config by plugin's ActorRef.
    */
-  private[akka] final def configFor(journalPluginActor: ActorRef): Config =
+  private[pekko] final def configFor(journalPluginActor: ActorRef): Config =
     pluginExtensionId.get().values.collectFirst {
       case ext if ext(system).actor == journalPluginActor => ext(system).config
     } match {
@@ -352,7 +353,7 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
    * Configuration entry must contain few required fields, such as `class`. See `src/main/resources/reference.conf`.
    */
   @InternalStableApi
-  private[akka] final def journalFor(
+  private[pekko] final def journalFor(
       journalPluginId: String,
       journalPluginConfig: Config = ConfigFactory.empty): ActorRef = {
     val configPath = if (isEmpty(journalPluginId)) defaultJournalPluginId else journalPluginId
@@ -369,7 +370,7 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
    * Configuration entry must contain few required fields, such as `class`. See `src/main/resources/reference.conf`.
    */
   @InternalStableApi
-  private[akka] final def snapshotStoreFor(
+  private[pekko] final def snapshotStoreFor(
       snapshotPluginId: String,
       snapshotPluginConfig: Config = ConfigFactory.empty): ActorRef = {
     val configPath = if (isEmpty(snapshotPluginId)) defaultSnapshotPluginId else snapshotPluginId
@@ -485,7 +486,7 @@ class Persistence(val system: ExtendedActorSystem) extends Extension {
    * return ranges (0 to 255), (256 to 511), (512 to 767) and (768 to 1023).
    */
   final def getSliceRanges(numberOfRanges: Int): java.util.List[Pair[Integer, Integer]] = {
-    import akka.util.ccompat.JavaConverters._
+    import org.apache.pekko.util.ccompat.JavaConverters._
     sliceRanges(numberOfRanges).map(range => Pair(Integer.valueOf(range.min), Integer.valueOf(range.max))).asJava
   }
 
diff --git a/akka-persistence/src/main/scala/akka/persistence/PersistencePlugin.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/PersistencePlugin.scala
similarity index 87%
rename from akka-persistence/src/main/scala/akka/persistence/PersistencePlugin.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/PersistencePlugin.scala
index a9b99e6527..39d54c1469 100644
--- a/akka-persistence/src/main/scala/akka/persistence/PersistencePlugin.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/PersistencePlugin.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.util.concurrent.atomic.AtomicReference
 
@@ -12,16 +12,17 @@ import scala.util.Failure
 
 import com.typesafe.config.Config
 
-import akka.actor.{ ExtendedActorSystem, Extension, ExtensionId }
-import akka.annotation.InternalApi
-import akka.event.Logging
-import akka.persistence.PersistencePlugin.PluginHolder
+import org.apache.pekko
+import pekko.actor.{ ExtendedActorSystem, Extension, ExtensionId }
+import pekko.annotation.InternalApi
+import pekko.event.Logging
+import pekko.persistence.PersistencePlugin.PluginHolder
 
 /**
  * INTERNAL API
  */
 @InternalApi
-private[akka] object PersistencePlugin {
+private[pekko] object PersistencePlugin {
   final private[persistence] case class PluginHolder[ScalaDsl, JavaDsl](
       scaladslPlugin: ScalaDsl,
       javadslPlugin: JavaDsl)
@@ -32,7 +33,7 @@ private[akka] object PersistencePlugin {
  * INTERNAL API
  */
 @InternalApi
-private[akka] trait PluginProvider[T, ScalaDsl, JavaDsl] {
+private[pekko] trait PluginProvider[T, ScalaDsl, JavaDsl] {
   def scalaDsl(t: T): ScalaDsl
   def javaDsl(t: T): JavaDsl
 }
@@ -41,7 +42,7 @@ private[akka] trait PluginProvider[T, ScalaDsl, JavaDsl] {
  * INTERNAL API
  */
 @InternalApi
-private[akka] abstract class PersistencePlugin[ScalaDsl, JavaDsl, T: ClassTag](system: ExtendedActorSystem)(
+private[pekko] abstract class PersistencePlugin[ScalaDsl, JavaDsl, T: ClassTag](system: ExtendedActorSystem)(
     implicit ev: PluginProvider[T, ScalaDsl, JavaDsl]) {
 
   private val plugins = new AtomicReference[Map[String, ExtensionId[PluginHolder[ScalaDsl, JavaDsl]]]](Map.empty)
diff --git a/akka-persistence/src/main/scala/akka/persistence/Persistent.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala
similarity index 94%
rename from akka-persistence/src/main/scala/akka/persistence/Persistent.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala
index 16e16ce72f..66afae2645 100644
--- a/akka-persistence/src/main/scala/akka/persistence/Persistent.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Persistent.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.collection.immutable
 
-import akka.actor.{ ActorRef, NoSerializationVerificationNeeded }
-import akka.annotation.DoNotInherit
-import akka.persistence.serialization.Message
-import akka.util.HashCode
+import org.apache.pekko
+import pekko.actor.{ ActorRef, NoSerializationVerificationNeeded }
+import pekko.annotation.DoNotInherit
+import pekko.persistence.serialization.Message
+import pekko.util.HashCode
 
 /**
  * INTERNAL API
  *
- * Marks messages which can be resequenced by the [[akka.persistence.journal.AsyncWriteJournal]].
+ * Marks messages which can be resequenced by the [[pekko.persistence.journal.AsyncWriteJournal]].
  *
  * In essence it is either an [[NonPersistentRepr]] or [[AtomicWrite]].
  */
@@ -65,8 +66,8 @@ final case class AtomicWrite(payload: immutable.Seq[PersistentRepr]) extends Per
 /**
  * Plugin API: representation of a persistent message in the journal plugin API.
  *
- * @see [[akka.persistence.journal.AsyncWriteJournal]]
- * @see [[akka.persistence.journal.AsyncRecovery]]
+ * @see [[pekko.persistence.journal.AsyncWriteJournal]]
+ * @see [[pekko.persistence.journal.AsyncRecovery]]
  */
 @DoNotInherit trait PersistentRepr extends Message {
 
diff --git a/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/PersistentActor.scala
similarity index 97%
rename from akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/PersistentActor.scala
index 439f47a298..0a751d58c6 100644
--- a/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/PersistentActor.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.lang.{ Iterable => JIterable }
 
@@ -11,10 +11,11 @@ import scala.util.control.NoStackTrace
 
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.annotation.InternalApi
-import akka.japi.Procedure
-import akka.japi.Util
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.InternalApi
+import pekko.japi.Procedure
+import pekko.japi.Util
 
 abstract class RecoveryCompleted
 
@@ -112,7 +113,7 @@ final class RecoveryTimedOut(message: String) extends RuntimeException(message)
 sealed trait StashOverflowStrategy
 
 /**
- * Discard the message to [[akka.actor.DeadLetter]].
+ * Discard the message to [[pekko.actor.DeadLetter]].
  */
 case object DiscardToDeadLetterStrategy extends StashOverflowStrategy {
 
@@ -123,7 +124,7 @@ case object DiscardToDeadLetterStrategy extends StashOverflowStrategy {
 }
 
 /**
- * Throw [[akka.actor.StashOverflowException]], hence the persistent actor will starting recovery
+ * Throw [[pekko.actor.StashOverflowException]], hence the persistent actor will starting recovery
  * if guarded by default supervisor strategy.
  * Be carefully if used together with persist/persistAll or has many messages needed
  * to replay.
@@ -326,7 +327,7 @@ abstract class AbstractPersistentActor extends AbstractActor with AbstractPersis
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] trait AbstractPersistentActorLike extends Eventsourced {
+@InternalApi private[pekko] trait AbstractPersistentActorLike extends Eventsourced {
 
   /**
    * Recovery handler that receives persisted events during recovery. If a state snapshot
@@ -473,6 +474,6 @@ abstract class AbstractPersistentActor extends AbstractActor with AbstractPersis
 }
 
 /**
- * Java API: Combination of [[AbstractPersistentActor]] and [[akka.actor.AbstractActorWithTimers]].
+ * Java API: Combination of [[AbstractPersistentActor]] and [[pekko.actor.AbstractActorWithTimers]].
  */
 abstract class AbstractPersistentActorWithTimers extends AbstractActor with Timers with AbstractPersistentActorLike
diff --git a/akka-persistence/src/main/scala/akka/persistence/Protocol.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Protocol.scala
similarity index 88%
rename from akka-persistence/src/main/scala/akka/persistence/Protocol.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/Protocol.scala
index c409fd29e2..23c41acc28 100644
--- a/akka-persistence/src/main/scala/akka/persistence/Protocol.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Protocol.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.actor.NoSerializationVerificationNeeded
+import org.apache.pekko.actor.NoSerializationVerificationNeeded
 
 /**
  * INTERNAL API.
diff --git a/akka-persistence/src/main/scala/akka/persistence/RecoveryPermitter.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/RecoveryPermitter.scala
similarity index 84%
rename from akka-persistence/src/main/scala/akka/persistence/RecoveryPermitter.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/RecoveryPermitter.scala
index a7af55c087..731f101e18 100644
--- a/akka-persistence/src/main/scala/akka/persistence/RecoveryPermitter.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/RecoveryPermitter.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.util.MessageBuffer
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.actor.Terminated
+import pekko.annotation.{ InternalApi, InternalStableApi }
+import pekko.util.MessageBuffer
 
 /**
  * INTERNAL API
  */
-@InternalApi private[akka] object RecoveryPermitter {
+@InternalApi private[pekko] object RecoveryPermitter {
   def props(maxPermits: Int): Props =
     Props(new RecoveryPermitter(maxPermits))
 
@@ -33,7 +34,7 @@ import akka.util.MessageBuffer
  * its data store is protected from being overloaded by limiting number
  * of recoveries that can be in progress at the same time.
  */
-@InternalApi private[akka] class RecoveryPermitter(maxPermits: Int) extends Actor with ActorLogging {
+@InternalApi private[pekko] class RecoveryPermitter(maxPermits: Int) extends Actor with ActorLogging {
   import RecoveryPermitter._
 
   private var usedPermits = 0
diff --git a/akka-persistence/src/main/scala/akka/persistence/SnapshotProtocol.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/SnapshotProtocol.scala
similarity index 98%
rename from akka-persistence/src/main/scala/akka/persistence/SnapshotProtocol.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/SnapshotProtocol.scala
index 995933061f..1499d7f11b 100644
--- a/akka-persistence/src/main/scala/akka/persistence/SnapshotProtocol.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/SnapshotProtocol.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 import scala.runtime.AbstractFunction3
 
 /**
@@ -26,7 +26,7 @@ final class SnapshotMetadata(
     this(persistenceId, sequenceNr, timestamp, None)
   }
 
-  private[akka] def this(persistenceId: String, sequenceNr: Long, meta: Option[Any]) = {
+  private[pekko] def this(persistenceId: String, sequenceNr: Long, meta: Option[Any]) = {
     this(persistenceId, sequenceNr, 0L, meta)
   }
 
diff --git a/akka-persistence/src/main/scala/akka/persistence/Snapshotter.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Snapshotter.scala
similarity index 93%
rename from akka-persistence/src/main/scala/akka/persistence/Snapshotter.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/Snapshotter.scala
index 5fe44b6a46..d335b1479a 100644
--- a/akka-persistence/src/main/scala/akka/persistence/Snapshotter.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/Snapshotter.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.actor._
-import akka.persistence.SnapshotProtocol._
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.SnapshotProtocol._
 
 /**
  * Snapshot API on top of the internal snapshot protocol.
diff --git a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
similarity index 89%
rename from akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
index b399be5ee4..37ef8aae29 100644
--- a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSM.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.fsm
+package org.apache.pekko.persistence.fsm
 
 import scala.annotation.varargs
 import scala.collection.immutable
@@ -13,17 +13,18 @@ import scala.reflect.ClassTag
 import scala.annotation.nowarn
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.annotation.InternalApi
-import akka.persistence.{ PersistentActor, RecoveryCompleted, SnapshotOffer }
-import akka.persistence.fsm.PersistentFSM.FSMState
-import akka.persistence.serialization.Message
-import akka.util.JavaDurationConverters
+import org.apache.pekko
+import pekko.actor._
+import pekko.annotation.InternalApi
+import pekko.persistence.{ PersistentActor, RecoveryCompleted, SnapshotOffer }
+import pekko.persistence.fsm.PersistentFSM.FSMState
+import pekko.persistence.serialization.Message
+import pekko.util.JavaDurationConverters
 
 /**
  * SnapshotAfter Extension Id and factory for creating SnapshotAfter extension
  */
-private[akka] object SnapshotAfter extends ExtensionId[SnapshotAfter] with ExtensionIdProvider {
+private[pekko] object SnapshotAfter extends ExtensionId[SnapshotAfter] with ExtensionIdProvider {
   override def get(system: ActorSystem): SnapshotAfter = super.get(system)
 
   override def get(system: ClassicActorSystemProvider): SnapshotAfter = super.get(system)
@@ -37,7 +38,7 @@ private[akka] object SnapshotAfter extends ExtensionId[SnapshotAfter] with Exten
  * SnapshotAfter enables PersistentFSM to take periodical snapshot.
  * See `akka.persistence.fsm.snapshot-after` for configuration options.
  */
-private[akka] class SnapshotAfter(config: Config) extends Extension {
+private[pekko] class SnapshotAfter(config: Config) extends Extension {
   val key = "akka.persistence.fsm.snapshot-after"
   val snapshotAfterValue = config.getString(key).toLowerCase match {
     case "off" => None
@@ -57,7 +58,7 @@ private[akka] class SnapshotAfter(config: Config) extends Extension {
 /**
  * A FSM implementation with persistent state.
  *
- * Supports the usual [[akka.actor.FSM]] functionality with additional persistence features.
+ * Supports the usual [[pekko.actor.FSM]] functionality with additional persistence features.
  * `PersistentFSM` is identified by 'persistenceId' value.
  * State changes are persisted atomically together with domain events, which means that either both succeed or both fail,
  * i.e. a state transition event will not be stored if persistence of an event related to that change fails.
@@ -67,7 +68,7 @@ private[akka] class SnapshotAfter(config: Config) extends Extension {
  */
 @deprecated("Use EventSourcedBehavior", "2.6.0")
 trait PersistentFSM[S <: FSMState, D, E] extends PersistentActor with PersistentFSMBase[S, D, E] with ActorLogging {
-  import akka.persistence.fsm.PersistentFSM._
+  import org.apache.pekko.persistence.fsm.PersistentFSM._
 
   /**
    * Enables to pass a ClassTag of a domain event base type from the implementing class
@@ -137,7 +138,7 @@ trait PersistentFSM[S <: FSMState, D, E] extends PersistentActor with Persistent
   /**
    * Persist FSM State and FSM State Data
    */
-  override private[akka] def applyState(nextState: State): Unit = {
+  override private[pekko] def applyState(nextState: State): Unit = {
     var eventsToPersist: immutable.Seq[Any] = nextState.domainEvents.toList
 
     // Prevent StateChangeEvent persistence when staying in the same state, except when state defines a timeout
@@ -245,32 +246,32 @@ object PersistentFSM {
 
   /**
    * Message type which is sent directly to the subscribed actor in
-   * [[akka.actor.FSM.SubscribeTransitionCallBack]] before sending any
-   * [[akka.actor.FSM.Transition]] messages.
+   * [[pekko.actor.FSM.SubscribeTransitionCallBack]] before sending any
+   * [[pekko.actor.FSM.Transition]] messages.
    */
   final case class CurrentState[S](fsmRef: ActorRef, state: S, timeout: Option[FiniteDuration])
 
   /**
    * Message type which is used to communicate transitions between states to
-   * all subscribed listeners (use [[akka.actor.FSM.SubscribeTransitionCallBack]]).
+   * all subscribed listeners (use [[pekko.actor.FSM.SubscribeTransitionCallBack]]).
    */
   final case class Transition[S](fsmRef: ActorRef, from: S, to: S, timeout: Option[FiniteDuration])
 
   /**
-   * Send this to an [[akka.actor.FSM]] to request first the [[PersistentFSM.CurrentState]]
+   * Send this to an [[pekko.actor.FSM]] to request first the [[PersistentFSM.CurrentState]]
    * and then a series of [[PersistentFSM.Transition]] updates. Cancel the subscription
    * using [[PersistentFSM.UnsubscribeTransitionCallBack]].
    */
   final case class SubscribeTransitionCallBack(actorRef: ActorRef)
 
   /**
-   * Unsubscribe from [[akka.actor.FSM.Transition]] notifications which was
-   * effected by sending the corresponding [[akka.actor.FSM.SubscribeTransitionCallBack]].
+   * Unsubscribe from [[pekko.actor.FSM.Transition]] notifications which was
+   * effected by sending the corresponding [[pekko.actor.FSM.SubscribeTransitionCallBack]].
    */
   final case class UnsubscribeTransitionCallBack(actorRef: ActorRef)
 
   /**
-   * Reason why this [[akka.actor.FSM]] is shutting down.
+   * Reason why this [[pekko.actor.FSM]] is shutting down.
    */
   sealed trait Reason
 
@@ -286,7 +287,7 @@ object PersistentFSM {
   case object Shutdown extends Reason
 
   /**
-   * Signifies that the [[akka.actor.FSM]] is shutting itself down because of
+   * Signifies that the [[pekko.actor.FSM]] is shutting itself down because of
    * an error, e.g. if the state to transition into does not exist. You can use
    * this to communicate a more precise cause to the `onTermination` block.
    */
@@ -364,12 +365,12 @@ object PersistentFSM {
   val `→` = `->`
 
   /**
-   * Log Entry of the [[akka.actor.LoggingFSM]], can be obtained by calling `getLog`.
+   * Log Entry of the [[pekko.actor.LoggingFSM]], can be obtained by calling `getLog`.
    */
   final case class LogEntry[S, D](stateName: S, stateData: D, event: Any)
 
   /**
-   * This captures all of the managed state of the [[akka.actor.FSM]]: the state
+   * This captures all of the managed state of the [[pekko.actor.FSM]]: the state
    * name, the state data, possibly custom timeout, stop reason, replies
    * accumulated while processing the last message, possibly domain event and handler
    * to be executed after FSM moves to the new state (also triggered when staying in the same state)
@@ -382,13 +383,13 @@ object PersistentFSM {
       replies: List[Any] = Nil,
       domainEvents: Seq[E] = Nil,
       afterTransitionDo: D => Unit = { (_: D) =>
-      })(private[akka] val notifies: Boolean = true) {
+      })(private[pekko] val notifies: Boolean = true) {
 
     /**
      * Copy object and update values if needed.
      */
     @InternalApi
-    private[akka] def copy0(
+    private[pekko] def copy0(
         stateName: S = stateName,
         stateData: D = stateData,
         timeout: Option[FiniteDuration] = timeout,
@@ -438,7 +439,7 @@ object PersistentFSM {
     @deprecated(
       "Internal API easily to be confused with regular FSM's using. Use regular events (`applying`). Internally, `copy` can be used instead.",
       "2.5.5")
-    private[akka] def using(@deprecatedName(Symbol("nextStateDate")) nextStateData: D): State[S, D, E] = {
+    private[pekko] def using(@deprecatedName(Symbol("nextStateDate")) nextStateData: D): State[S, D, E] = {
       copy0(stateData = nextStateData)
     }
 
@@ -446,12 +447,12 @@ object PersistentFSM {
      * INTERNAL API.
      */
     @InternalApi
-    private[akka] def withStopReason(reason: Reason): State[S, D, E] = {
+    private[pekko] def withStopReason(reason: Reason): State[S, D, E] = {
       copy0(stopReason = Some(reason))
     }
 
     @InternalApi
-    private[akka] def withNotification(notifies: Boolean): State[S, D, E] = {
+    private[pekko] def withNotification(notifies: Boolean): State[S, D, E] = {
       copy0(notifies = notifies)
     }
 
@@ -471,13 +472,13 @@ object PersistentFSM {
   }
 
   /**
-   * All messages sent to the [[akka.actor.FSM]] will be wrapped inside an
+   * All messages sent to the [[pekko.actor.FSM]] will be wrapped inside an
    * `Event`, which allows pattern matching to extract both state and data.
    */
   final case class Event[D](event: Any, stateData: D) extends NoSerializationVerificationNeeded
 
   /**
-   * Case class representing the state of the [[akka.actor.FSM]] whithin the
+   * Case class representing the state of the [[pekko.actor.FSM]] whithin the
    * `onTermination` block.
    */
   final case class StopEvent[S, D](reason: Reason, currentState: S, stateData: D)
diff --git a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
similarity index 92%
rename from akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
index faec7a1807..b8b1185497 100644
--- a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/fsm/PersistentFSMBase.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.fsm
+package org.apache.pekko.persistence.fsm
 
 import scala.collection.mutable
 import scala.concurrent.duration.FiniteDuration
 
 import language.implicitConversions
 
-import akka.actor._
-import akka.japi.pf.{ FSMTransitionHandlerBuilder, UnitMatch, UnitPFBuilder }
-import akka.routing.{ Deafen, Listen, Listeners }
-import akka.util.JavaDurationConverters._
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor._
+import pekko.japi.pf.{ FSMTransitionHandlerBuilder, UnitMatch, UnitPFBuilder }
+import pekko.routing.{ Deafen, Listen, Listeners }
+import pekko.util.JavaDurationConverters._
+import pekko.util.unused
 
 /**
  * Finite State Machine actor trait. Use as follows:
@@ -98,7 +99,7 @@ import akka.util.unused
 @deprecated("Use EventSourcedBehavior", "2.6.0")
 trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging {
 
-  import akka.persistence.fsm.PersistentFSM._
+  import pekko.persistence.fsm.PersistentFSM._
 
   type State = PersistentFSM.State[S, D, E]
   type Event = PersistentFSM.Event[D]
@@ -145,7 +146,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
   /**
    * Set initial state. Call this method from the constructor before the [[#initialize]] method.
    * If different state is needed after a restart this method, followed by [[#initialize]], can
-   * be used in the actor life cycle hooks [[akka.actor.Actor#preStart]] and [[akka.actor.Actor#postRestart]].
+   * be used in the actor life cycle hooks [[pekko.actor.Actor#preStart]] and [[pekko.actor.Actor#postRestart]].
    *
    * @param stateName initial state designator
    * @param stateData initial state data
@@ -319,7 +320,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
   /**
    * INTERNAL API, used for testing.
    */
-  private[akka] final def isStateTimerActive = timeoutFuture.isDefined
+  private[pekko] final def isStateTimerActive = timeoutFuture.isDefined
 
   /**
    * Set handler which is called upon each state transition, i.e. not when
@@ -375,15 +376,15 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
     handleEvent = stateFunction.orElse(handleEventDefault)
 
   /**
-   * Verify existence of initial state and setup timers. Used in [[akka.persistence.fsm.PersistentFSM]]
+   * Verify existence of initial state and setup timers. Used in [[pekko.persistence.fsm.PersistentFSM]]
    * on recovery.
    *
    * An initial `currentState -> currentState` notification will be triggered by calling this method.
    *
-   * @see [[akka.persistence.fsm.PersistentFSM#receiveRecover]]
+   * @see [[pekko.persistence.fsm.PersistentFSM#receiveRecover]]
    */
   @deprecated("Removed from API, called internally", "2.4.5")
-  private[akka] final def initialize(): Unit =
+  private[pekko] final def initialize(): Unit =
     if (currentState != null) makeTransition(currentState)
     else throw new IllegalStateException("You must call `startWith` before calling `initialize`")
 
@@ -404,7 +405,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
   /**
    * Return all defined state names
    */
-  private[akka] final def stateNames: Iterable[S] = stateFunctions.keys
+  private[pekko] final def stateNames: Iterable[S] = stateFunctions.keys
 
   /**
    * Return next state data (available in onTransition handlers)
@@ -420,7 +421,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
    * ****************************************************************
    */
 
-  private[akka] def debugEvent: Boolean = false
+  private[pekko] def debugEvent: Boolean = false
 
   /*
    * FSM State data and current timeout handling
@@ -526,7 +527,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
     processEvent(event, source)
   }
 
-  private[akka] def processEvent(event: Event, @unused source: AnyRef): Unit = {
+  private[pekko] def processEvent(event: Event, @unused source: AnyRef): Unit = {
     val stateFunc = stateFunctions(currentState.stateName)
     val nextState = if (stateFunc.isDefinedAt(event)) {
       stateFunc(event)
@@ -537,7 +538,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
     applyState(nextState)
   }
 
-  private[akka] def applyState(nextState: State): Unit = {
+  private[pekko] def applyState(nextState: State): Unit = {
     nextState.stopReason match {
       case None => makeTransition(nextState)
       case _ =>
@@ -549,7 +550,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
     }
   }
 
-  private[akka] def makeTransition(nextState: State): Unit = {
+  private[pekko] def makeTransition(nextState: State): Unit = {
     if (!stateFunctions.contains(nextState.stateName)) {
       terminate(stay().withStopReason(Failure("Next state %s does not exist".format(nextState.stateName))))
     } else {
@@ -624,17 +625,17 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging
 }
 
 /**
- * Stackable trait for [[akka.actor.FSM]] which adds a rolling event log and
- * debug logging capabilities (analogous to [[akka.event.LoggingReceive]]).
+ * Stackable trait for [[pekko.actor.FSM]] which adds a rolling event log and
+ * debug logging capabilities (analogous to [[pekko.event.LoggingReceive]]).
  */
 @deprecated("Use EventSourcedBehavior", "2.6.0")
 trait LoggingPersistentFSM[S, D, E] extends PersistentFSMBase[S, D, E] { this: Actor =>
 
-  import akka.persistence.fsm.PersistentFSM._
+  import pekko.persistence.fsm.PersistentFSM._
 
   def logDepth: Int = 0
 
-  private[akka] override val debugEvent = context.system.settings.FsmDebugEvent
+  private[pekko] override val debugEvent = context.system.settings.FsmDebugEvent
 
   private val events = new Array[Event](logDepth)
   private val states = new Array[AnyRef](logDepth)
@@ -651,7 +652,7 @@ trait LoggingPersistentFSM[S, D, E] extends PersistentFSMBase[S, D, E] { this: A
     }
   }
 
-  private[akka] abstract override def processEvent(event: Event, source: AnyRef): Unit = {
+  private[pekko] abstract override def processEvent(event: Event, source: AnyRef): Unit = {
     if (debugEvent) {
       val srcstr = source match {
         case s: String               => s
@@ -721,9 +722,9 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
 
   import PersistentFSM._
 
-  import akka.japi.pf.FI._
-  import akka.persistence.fsm.japi.pf.FSMStateFunctionBuilder
-  import akka.persistence.fsm.japi.pf.FSMStopBuilder
+  import pekko.japi.pf.FI._
+  import pekko.persistence.fsm.japi.pf.FSMStateFunctionBuilder
+  import pekko.persistence.fsm.japi.pf.FSMStopBuilder
 
   /**
    * Returns this AbstractActor's ActorContext
@@ -790,7 +791,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
   /**
    * Set initial state. Call this method from the constructor before the [[#initialize]] method.
    * If different state is needed after a restart this method, followed by [[#initialize]], can
-   * be used in the actor life cycle hooks [[akka.actor.Actor#preStart]] and [[akka.actor.Actor#postRestart]].
+   * be used in the actor life cycle hooks [[pekko.actor.Actor#preStart]] and [[pekko.actor.Actor#postRestart]].
    *
    * @param stateName initial state designator
    * @param stateData initial state data
@@ -801,7 +802,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
   /**
    * Set initial state. Call this method from the constructor before the [[#initialize]] method.
    * If different state is needed after a restart this method, followed by [[#initialize]], can
-   * be used in the actor life cycle hooks [[akka.actor.Actor#preStart]] and [[akka.actor.Actor#postRestart]].
+   * be used in the actor life cycle hooks [[pekko.actor.Actor#preStart]] and [[pekko.actor.Actor#postRestart]].
    *
    * @param stateName initial state designator
    * @param stateData initial state data
@@ -847,7 +848,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     onTermination(stopBuilder.build().asInstanceOf[PartialFunction[StopEvent, Unit]])
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches on an event and data type and a predicate.
    *
@@ -865,7 +866,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventType, dataType, predicate, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches on an event and data type.
    *
@@ -881,7 +882,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventType, dataType, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches if the event type and predicate matches.
    *
@@ -897,7 +898,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventType, predicate, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches if the event type matches.
    *
@@ -909,7 +910,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventType, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches if the predicate matches.
    *
@@ -923,7 +924,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(predicate, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches on the data type and if any of the event types
    * in the list match or any of the event instances in the list compares equal.
@@ -940,7 +941,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventMatches, dataType, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches if any of the event types in the list match or any
    * of the event instances in the list compares equal.
@@ -953,7 +954,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().event(eventMatches, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches on the data type and if the event compares equal.
    *
@@ -969,7 +970,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().eventEquals(event, dataType, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches if the event compares equal.
    *
@@ -981,7 +982,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().eventEquals(event, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStateFunctionBuilder]] with the first case statement set.
    *
    * A case statement that matches on any type of event.
    *
@@ -992,7 +993,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStateFunctionBuilder[S, D, E]().anyEvent(apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMTransitionHandlerBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first case statement set.
    *
    * A case statement that matches on a from state and a to state.
    *
@@ -1005,7 +1006,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMTransitionHandlerBuilder[S]().state(fromState, toState, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMTransitionHandlerBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMTransitionHandlerBuilder]] with the first case statement set.
    *
    * A case statement that matches on a from state and a to state.
    *
@@ -1018,7 +1019,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMTransitionHandlerBuilder[S]().state(fromState, toState, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStopBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement set.
    *
    * A case statement that matches on an [[PersistentFSM.Reason]].
    *
@@ -1030,7 +1031,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStopBuilder[S, D]().stop(reason, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStopBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement set.
    *
    * A case statement that matches on a reason type.
    *
@@ -1042,7 +1043,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStopBuilder[S, D]().stop(reasonType, apply)
 
   /**
-   * Create an [[akka.japi.pf.FSMStopBuilder]] with the first case statement set.
+   * Create an [[pekko.japi.pf.FSMStopBuilder]] with the first case statement set.
    *
    * A case statement that matches on a reason type and a predicate.
    *
@@ -1058,7 +1059,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     new FSMStopBuilder[S, D]().stop(reasonType, predicate, apply)
 
   /**
-   * Create a [[akka.japi.pf.UnitPFBuilder]] with the first case statement set.
+   * Create a [[pekko.japi.pf.UnitPFBuilder]] with the first case statement set.
    *
    * @param dataType  a type to match the argument against
    * @param apply  an action to apply to the argument if the type matches
@@ -1068,7 +1069,7 @@ abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D
     UnitMatch.`match`(dataType, apply)
 
   /**
-   * Create a [[akka.japi.pf.UnitPFBuilder]] with the first case statement set.
+   * Create a [[pekko.japi.pf.UnitPFBuilder]] with the first case statement set.
    *
    * @param dataType  a type to match the argument against
    * @param predicate  a predicate that will be evaluated on the argument if the type matches
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncRecovery.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncRecovery.scala
similarity index 94%
rename from akka-persistence/src/main/scala/akka/persistence/journal/AsyncRecovery.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncRecovery.scala
index 712d7facc1..a9d9bbaadd 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncRecovery.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncRecovery.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import scala.concurrent.Future
 
-import akka.persistence.PersistentRepr
+import org.apache.pekko
+import pekko.persistence.PersistentRepr
 
 /**
  * Asynchronous message replay and sequence number recovery interface.
@@ -25,7 +26,7 @@ trait AsyncRecovery {
    * `true`.
    *
    * The `toSequenceNr` is the lowest of what was returned by [[#asyncReadHighestSequenceNr]]
-   * and what the user specified as recovery [[akka.persistence.Recovery]] parameter.
+   * and what the user specified as recovery [[pekko.persistence.Recovery]] parameter.
    * This does imply that this call is always preceded by reading the highest sequence
    * number for the given `persistenceId`.
    *
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteJournal.scala
similarity index 98%
rename from akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteJournal.scala
index 8d0b64ea3f..01f94ee6eb 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteJournal.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import scala.collection.immutable
 import scala.concurrent.ExecutionContext
@@ -11,11 +11,12 @@ import scala.concurrent.duration._
 import scala.util.{ Failure, Success, Try }
 import scala.util.control.NonFatal
 
-import akka.actor._
-import akka.pattern.CircuitBreaker
-import akka.pattern.pipe
-import akka.persistence._
-import akka.util.Helpers.toRootLowerCase
+import org.apache.pekko
+import pekko.actor._
+import pekko.pattern.CircuitBreaker
+import pekko.pattern.pipe
+import pekko.persistence._
+import pekko.util.Helpers.toRootLowerCase
 
 /**
  * Abstract journal, optimized for asynchronous, non-blocking writes.
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteProxy.scala
similarity index 93%
rename from akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteProxy.scala
index f159b54d54..5733267027 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/AsyncWriteProxy.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import scala.collection.immutable
 import scala.concurrent._
 import scala.concurrent.duration.Duration
 import scala.util.Try
 
-import akka.AkkaException
-import akka.actor._
-import akka.pattern.ask
-import akka.persistence._
-import akka.util._
+import org.apache.pekko
+import pekko.AkkaException
+import pekko.actor._
+import pekko.pattern.ask
+import pekko.persistence._
+import pekko.util._
 
 /**
  * INTERNAL API.
@@ -34,12 +35,12 @@ private[persistence] trait AsyncWriteProxy extends AsyncWriteJournal with Stash
         "Store not initialized. " +
         "Use `SharedLeveldbJournal.setStore(sharedStore, system)`"))
 
-  override protected[akka] def aroundPreStart(): Unit = {
+  override protected[pekko] def aroundPreStart(): Unit = {
     context.system.scheduler.scheduleOnce(timeout.duration, self, InitTimeout)
     super.aroundPreStart()
   }
 
-  override protected[akka] def aroundReceive(receive: Receive, msg: Any): Unit =
+  override protected[pekko] def aroundReceive(receive: Receive, msg: Any): Unit =
     if (isInitialized) {
       if (msg != InitTimeout) super.aroundReceive(receive, msg)
     } else
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/EventAdapter.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapter.scala
similarity index 89%
rename from akka-persistence/src/main/scala/akka/persistence/journal/EventAdapter.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapter.scala
index 0c1c98cd45..9dc7a2531f 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/EventAdapter.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapter.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import scala.annotation.varargs
 import scala.collection.immutable
@@ -70,9 +70,9 @@ trait ReadEventAdapter {
   /**
    * Convert a event from its journal model to the applications domain model.
    *
-   * One event may be adapter into multiple (or none) events which should be delivered to the [[akka.persistence.PersistentActor]].
-   * Use the specialised [[akka.persistence.journal.EventSeq#single]] method to emit exactly one event,
-   * or [[akka.persistence.journal.EventSeq#empty]] in case the adapter is not handling this event. Multiple [[EventAdapter]] instances are
+   * One event may be adapter into multiple (or none) events which should be delivered to the [[org.apache.pekko.persistence.PersistentActor]].
+   * Use the specialised [[org.apache.pekko.persistence.journal.EventSeq#single]] method to emit exactly one event,
+   * or [[org.apache.pekko.persistence.journal.EventSeq#empty]] in case the adapter is not handling this event. Multiple [[EventAdapter]] instances are
    * applied in order as defined in configuration and their emitted event seqs are concatenated and delivered in order
    * to the PersistentActor.
    *
@@ -119,7 +119,7 @@ case object IdentityEventAdapter extends EventAdapter {
 }
 
 /** INTERNAL API */
-private[akka] case class NoopWriteEventAdapter(private val readEventAdapter: ReadEventAdapter) extends EventAdapter {
+private[pekko] case class NoopWriteEventAdapter(private val readEventAdapter: ReadEventAdapter) extends EventAdapter {
   // pass-through read
   override def fromJournal(event: Any, manifest: String): EventSeq =
     readEventAdapter.fromJournal(event, manifest)
@@ -130,7 +130,7 @@ private[akka] case class NoopWriteEventAdapter(private val readEventAdapter: Rea
 }
 
 /** INTERNAL API */
-private[akka] case class NoopReadEventAdapter(private val writeEventAdapter: WriteEventAdapter) extends EventAdapter {
+private[pekko] case class NoopReadEventAdapter(private val writeEventAdapter: WriteEventAdapter) extends EventAdapter {
   // pass-through write
   override def manifest(event: Any): String = writeEventAdapter.manifest(event)
   override def toJournal(event: Any): Any = writeEventAdapter.toJournal(event)
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/EventAdapters.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapters.scala
similarity index 91%
rename from akka-persistence/src/main/scala/akka/persistence/journal/EventAdapters.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapters.scala
index 0a211f5072..435f969298 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/EventAdapters.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapters.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import java.util
 import java.util.concurrent.ConcurrentHashMap
@@ -14,9 +14,10 @@ import scala.util.Try
 
 import com.typesafe.config.Config
 
-import akka.actor.ExtendedActorSystem
-import akka.event.{ Logging, LoggingAdapter }
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.event.{ Logging, LoggingAdapter }
+import pekko.util.ccompat._
 
 /**
  * `EventAdapters` serves as a per-journal collection of bound event adapters.
@@ -58,7 +59,7 @@ class EventAdapters(
 }
 
 /** INTERNAL API */
-private[akka] object EventAdapters {
+private[pekko] object EventAdapters {
   type Name = String
   type BoundAdapters = immutable.Seq[String]
   type FQN = String
@@ -87,7 +88,7 @@ private[akka] object EventAdapters {
       s"$fqn was bound to undefined event-adapter: $boundAdapter (bindings: ${boundToAdapters
           .mkString("[", ", ", "]")}, known adapters: ${adapters.keys.mkString})")
 
-    // A Map of handler from alias to implementation (i.e. class implementing akka.serialization.Serializer)
+    // A Map of handler from alias to implementation (i.e. class implementing org.apache.pekko.serialization.Serializer)
     // For example this defines a handler named 'country': `"country" -> com.example.comain.CountryTagsAdapter`
     val handlers = for ((k: String, v: String) <- adapters) yield k -> instantiateAdapter(v, system).get
 
@@ -126,7 +127,7 @@ private[akka] object EventAdapters {
   }
 
   /** INTERNAL API */
-  private[akka] case class CombinedReadEventAdapter(adapters: immutable.Seq[EventAdapter]) extends EventAdapter {
+  private[pekko] case class CombinedReadEventAdapter(adapters: immutable.Seq[EventAdapter]) extends EventAdapter {
     private def onlyReadSideException =
       new IllegalStateException("CombinedReadEventAdapter must not be used when writing (creating manifests) events!")
     override def manifest(event: Any): String = throw onlyReadSideException
@@ -141,7 +142,7 @@ private[akka] object EventAdapters {
 
   /**
    * Tries to load the specified Serializer by the fully-qualified name; the actual
-   * loading is performed by the system’s [[akka.actor.DynamicAccess]].
+   * loading is performed by the system’s [[pekko.actor.DynamicAccess]].
    */
   private def instantiate[T: ClassTag](fqn: FQN, system: ExtendedActorSystem): Try[T] =
     system.dynamicAccess.createInstanceFor[T](fqn, List(classOf[ExtendedActorSystem] -> system)).recoverWith {
@@ -163,14 +164,14 @@ private[akka] object EventAdapters {
       .to(immutable.Seq)
 
   private final def configToMap(config: Config, path: String): Map[String, String] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     if (config.hasPath(path)) {
       config.getConfig(path).root.unwrapped.asScala.toMap.map { case (k, v) => k -> v.toString }
     } else Map.empty
   }
 
   private final def configToListMap(config: Config, path: String): Map[String, immutable.Seq[String]] = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     if (config.hasPath(path)) {
       config.getConfig(path).root.unwrapped.asScala.toMap.map {
         case (k, v: util.ArrayList[_]) if v.isInstanceOf[util.ArrayList[_]] => k -> v.asScala.map(_.toString).toList
@@ -181,7 +182,7 @@ private[akka] object EventAdapters {
 
 }
 
-private[akka] case object IdentityEventAdapters extends EventAdapters(null, null, null) {
+private[pekko] case object IdentityEventAdapters extends EventAdapters(null, null, null) {
   override def get(clazz: Class[_]): EventAdapter = IdentityEventAdapter
   override def toString = Logging.simpleName(IdentityEventAdapters)
 }
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/PersistencePluginProxy.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/PersistencePluginProxy.scala
similarity index 98%
rename from akka-persistence/src/main/scala/akka/persistence/journal/PersistencePluginProxy.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/PersistencePluginProxy.scala
index bf2895e38e..4ce1386f59 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/PersistencePluginProxy.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/PersistencePluginProxy.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import java.net.URISyntaxException
 import java.util.concurrent.TimeoutException
@@ -11,8 +11,9 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 
-import akka.actor._
-import akka.persistence.{
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.{
   AtomicWrite,
   DeleteMessagesFailure,
   DeleteSnapshotFailure,
@@ -23,7 +24,7 @@ import akka.persistence.{
   SaveSnapshotFailure,
   SnapshotProtocol
 }
-import akka.util.Helpers.Requiring
+import pekko.util.Helpers.Requiring
 
 object PersistencePluginProxy {
   final case class TargetLocation(address: Address)
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala
similarity index 95%
rename from akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala
index 8e280c12fd..89b7259927 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/ReplayFilter.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import java.util.LinkedList
 
 import scala.collection.mutable.LinkedHashSet
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.persistence.JournalProtocol
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.persistence.JournalProtocol
 
 /**
  * INTERNAL API
@@ -20,7 +21,7 @@ import akka.persistence.JournalProtocol
  * Detect corrupt event stream during replay. It uses the writerUuid and the
  * sequenceNr in the replayed events to find events emitted by overlapping writers.
  */
-private[akka] object ReplayFilter {
+private[pekko] object ReplayFilter {
   def props(
       persistentActor: ActorRef,
       mode: Mode,
@@ -47,7 +48,7 @@ private[akka] object ReplayFilter {
 /**
  * INTERNAL API
  */
-private[akka] class ReplayFilter(
+private[pekko] class ReplayFilter(
     persistentActor: ActorRef,
     mode: ReplayFilter.Mode,
     windowSize: Int,
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/Tagged.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/Tagged.scala
similarity index 78%
rename from akka-persistence/src/main/scala/akka/persistence/journal/Tagged.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/Tagged.scala
index 5a0710c68e..9290f8f0e6 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/Tagged.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/Tagged.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * The journal may support tagging of events that are used by the
  * `EventsByTag` query and it may support specifying the tags via an
- * [[akka.persistence.journal.EventAdapter]] that wraps the events
+ * [[pekko.persistence.journal.EventAdapter]] that wraps the events
  * in a `Tagged` with the given `tags`. The journal may support other
  * ways of doing tagging. Please consult the documentation of the specific
  * journal implementation for more information.
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/WriteJournalBase.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/WriteJournalBase.scala
similarity index 76%
rename from akka-persistence/src/main/scala/akka/persistence/journal/WriteJournalBase.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/WriteJournalBase.scala
index 148d6f2c6f..d6fab5f3db 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/WriteJournalBase.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/WriteJournalBase.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import scala.collection.immutable
 
-import akka.actor.Actor
-import akka.persistence.{ Persistence, PersistentEnvelope, PersistentRepr }
-import akka.persistence.AtomicWrite
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.persistence.{ Persistence, PersistentEnvelope, PersistentRepr }
+import pekko.persistence.AtomicWrite
 
-private[akka] trait WriteJournalBase {
+private[pekko] trait WriteJournalBase {
   this: Actor =>
 
   val persistence = Persistence(context.system)
@@ -24,13 +25,13 @@ private[akka] trait WriteJournalBase {
     }
 
   /** INTERNAL API */
-  private[akka] final def adaptFromJournal(repr: PersistentRepr): immutable.Seq[PersistentRepr] =
+  private[pekko] final def adaptFromJournal(repr: PersistentRepr): immutable.Seq[PersistentRepr] =
     eventAdapters.get(repr.payload.getClass).fromJournal(repr.payload, repr.manifest).events.map { adaptedPayload =>
       repr.withPayload(adaptedPayload)
     }
 
   /** INTERNAL API */
-  private[akka] final def adaptToJournal(repr: PersistentRepr): PersistentRepr = {
+  private[pekko] final def adaptToJournal(repr: PersistentRepr): PersistentRepr = {
     val payload = repr.payload
     val adapter = eventAdapters.get(payload.getClass)
 
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/inmem/InmemJournal.scala
similarity index 90%
rename from akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/inmem/InmemJournal.scala
index db69815a36..dd8ea089d2 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/inmem/InmemJournal.scala
@@ -2,9 +2,10 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.inmem
+package org.apache.pekko.persistence.journal.inmem
 
-import akka.actor.ActorRef
+import org.apache.pekko
+import pekko.actor.ActorRef
 
 import scala.collection.immutable
 import scala.concurrent.Future
@@ -12,17 +13,17 @@ import scala.util.Try
 import scala.util.control.NonFatal
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
-import akka.annotation.ApiMayChange
-import akka.annotation.InternalApi
-import akka.event.Logging
-import akka.persistence.AtomicWrite
-import akka.persistence.JournalProtocol.RecoverySuccess
-import akka.persistence.PersistentRepr
-import akka.persistence.journal.inmem.InmemJournal.{ MessageWithMeta, ReplayWithMeta }
-import akka.persistence.journal.{ AsyncWriteJournal, Tagged }
-import akka.serialization.SerializationExtension
-import akka.serialization.Serializers
-import akka.util.OptionVal
+import pekko.annotation.ApiMayChange
+import pekko.annotation.InternalApi
+import pekko.event.Logging
+import pekko.persistence.AtomicWrite
+import pekko.persistence.JournalProtocol.RecoverySuccess
+import pekko.persistence.PersistentRepr
+import pekko.persistence.journal.inmem.InmemJournal.{ MessageWithMeta, ReplayWithMeta }
+import pekko.persistence.journal.{ AsyncWriteJournal, Tagged }
+import pekko.serialization.SerializationExtension
+import pekko.serialization.Serializers
+import pekko.util.OptionVal
 
 /**
  * The InmemJournal publishes writes and deletes to the `eventStream`, which tests may use to
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncRecovery.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncRecovery.scala
similarity index 81%
rename from akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncRecovery.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncRecovery.scala
index 2a812abe3d..9416084023 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncRecovery.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncRecovery.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.japi
+package org.apache.pekko.persistence.journal.japi
 
 import java.util.function.Consumer
 
 import scala.concurrent.Future
 
-import akka.actor.Actor
-import akka.persistence.PersistentRepr
-import akka.persistence.journal.{ AsyncRecovery => SAsyncReplay }
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.persistence.PersistentRepr
+import pekko.persistence.journal.{ AsyncRecovery => SAsyncReplay }
 
 /**
  * Java API: asynchronous message replay and sequence number recovery interface.
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncWriteJournal.scala
similarity index 79%
rename from akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncWriteJournal.scala
index 808f8c90ef..cbc0cc866b 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncWriteJournal.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.japi
+package org.apache.pekko.persistence.journal.japi
 
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.util.Failure
 import scala.util.Try
 
-import akka.persistence._
-import akka.persistence.journal.{ AsyncWriteJournal => SAsyncWriteJournal }
-import akka.util.ccompat._
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.persistence._
+import pekko.persistence.journal.{ AsyncWriteJournal => SAsyncWriteJournal }
+import pekko.util.ccompat._
+import pekko.util.ccompat.JavaConverters._
 
 /**
  * Java API: abstract journal, optimized for asynchronous, non-blocking writes.
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbCompaction.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbCompaction.scala
similarity index 97%
rename from akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbCompaction.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbCompaction.scala
index af93dc2f09..e066e1c7ac 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbCompaction.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbCompaction.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
-import akka.actor.{ Actor, ActorLogging }
+import org.apache.pekko.actor.{ Actor, ActorLogging }
 
 private[persistence] object LeveldbCompaction {
 
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbIdMapping.scala
similarity index 93%
rename from akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbIdMapping.scala
index 558ae1870b..bead12cd3d 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbIdMapping.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import org.iq80.leveldb.DBIterator
 
-import akka.actor.Actor
-import akka.util.ByteString.UTF_8
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.util.ByteString.UTF_8
+import pekko.util.unused
 
 /**
  * INTERNAL API.
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
similarity index 82%
rename from akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
index 27232a3679..1f131ebdbf 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbJournal.scala
@@ -2,22 +2,23 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import scala.concurrent.Future
 
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.pattern.pipe
-import akka.persistence.JournalProtocol.RecoverySuccess
-import akka.persistence.JournalProtocol.ReplayMessagesFailure
-import akka.persistence.Persistence
-import akka.persistence.PersistentRepr
-import akka.persistence.journal._
-import akka.util.Helpers.ConfigOps
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor._
+import pekko.pattern.pipe
+import pekko.persistence.JournalProtocol.RecoverySuccess
+import pekko.persistence.JournalProtocol.ReplayMessagesFailure
+import pekko.persistence.Persistence
+import pekko.persistence.PersistentRepr
+import pekko.persistence.journal._
+import pekko.util.Helpers.ConfigOps
+import pekko.util.Timeout
 
 /**
  * INTERNAL API.
@@ -102,8 +103,8 @@ private[persistence] object LeveldbJournal {
    * Subscribe the `sender` to changes (appended events) for a specific `tag`.
    * Used by query-side. The journal will send [[TaggedEventAppended]] messages to
    * the subscriber when `asyncWriteMessages` has been called.
-   * Events are tagged by wrapping in [[akka.persistence.journal.Tagged]]
-   * via an [[akka.persistence.journal.EventAdapter]].
+   * Events are tagged by wrapping in [[pekko.persistence.journal.Tagged]]
+   * via an [[pekko.persistence.journal.EventAdapter]].
    */
   final case class SubscribeTag(tag: String) extends SubscriptionCommand
   final case class TaggedEventAppended(tag: String) extends DeadLetterSuppression
@@ -170,13 +171,13 @@ object SharedLeveldbJournal {
   def configToEnableJavaSerializationForTest: Config = {
     ConfigFactory.parseString(s"""
     akka.actor.serialization-bindings {
-      "akka.persistence.journal.AsyncWriteTarget$$WriteMessages" = java-test
-      "akka.persistence.journal.AsyncWriteTarget$$DeleteMessagesTo" = java-test
-      "akka.persistence.journal.AsyncWriteTarget$$ReplayMessages" = java-test
-      "akka.persistence.journal.AsyncWriteTarget$$ReplaySuccess" = java-test
-      "akka.persistence.journal.AsyncWriteTarget$$ReplayFailure" = java-test
-      "akka.persistence.JournalProtocol$$Message" = java-test
-      "akka.persistence.SnapshotProtocol$$Message" = java-test
+      "org.apache.pekko.persistence.journal.AsyncWriteTarget$$WriteMessages" = java-test
+      "org.apache.pekko.persistence.journal.AsyncWriteTarget$$DeleteMessagesTo" = java-test
+      "org.apache.pekko.persistence.journal.AsyncWriteTarget$$ReplayMessages" = java-test
+      "org.apache.pekko.persistence.journal.AsyncWriteTarget$$ReplaySuccess" = java-test
+      "org.apache.pekko.persistence.journal.AsyncWriteTarget$$ReplayFailure" = java-test
+      "org.apache.pekko.persistence.JournalProtocol$$Message" = java-test
+      "org.apache.pekko.persistence.SnapshotProtocol$$Message" = java-test
       "scala.collection.immutable.Vector" = java-test
     }
     """)
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbKey.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbKey.scala
similarity index 95%
rename from akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbKey.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbKey.scala
index 6cdde82f11..c577bb867d 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbKey.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbKey.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import java.nio.ByteBuffer
 
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbRecovery.scala
similarity index 95%
rename from akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbRecovery.scala
index e39f546456..2e1630e72c 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbRecovery.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import scala.concurrent.Future
 
 import org.iq80.leveldb.DBIterator
 
-import akka.persistence._
-import akka.persistence.journal.AsyncRecovery
-import akka.persistence.journal.leveldb.LeveldbJournal.ReplayedTaggedMessage
+import org.apache.pekko
+import pekko.persistence._
+import pekko.persistence.journal.AsyncRecovery
+import pekko.persistence.journal.leveldb.LeveldbJournal.ReplayedTaggedMessage
 
 /**
  * INTERNAL API.
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbStore.scala
similarity index 96%
rename from akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbStore.scala
index 6baf60c3a0..9e1f7af029 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbStore.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import java.io.File
 
@@ -15,12 +15,13 @@ import scala.util.control.NonFatal
 import com.typesafe.config.{ Config, ConfigFactory, ConfigObject }
 import org.iq80.leveldb._
 
-import akka.actor._
-import akka.persistence._
-import akka.persistence.journal.Tagged
-import akka.persistence.journal.WriteJournalBase
-import akka.serialization.SerializationExtension
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence._
+import pekko.persistence.journal.Tagged
+import pekko.persistence.journal.WriteJournalBase
+import pekko.serialization.SerializationExtension
+import pekko.util.ccompat.JavaConverters._
 
 private[persistence] object LeveldbStore {
   val emptyConfig = ConfigFactory.empty()
diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/SharedLeveldbStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/SharedLeveldbStore.scala
similarity index 94%
rename from akka-persistence/src/main/scala/akka/persistence/journal/leveldb/SharedLeveldbStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/SharedLeveldbStore.scala
index 3c25e0416a..79e5c272e2 100644
--- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/SharedLeveldbStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/SharedLeveldbStore.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import scala.concurrent.Future
 import scala.util.Failure
@@ -12,9 +12,10 @@ import scala.util.control.NonFatal
 
 import com.typesafe.config.Config
 
-import akka.pattern.pipe
-import akka.persistence.AtomicWrite
-import akka.persistence.journal.AsyncWriteTarget
+import org.apache.pekko
+import pekko.pattern.pipe
+import pekko.persistence.AtomicWrite
+import pekko.persistence.journal.AsyncWriteTarget
 
 /**
  * A LevelDB store that can be shared by multiple actor systems. The shared store must be
diff --git a/akka-persistence/src/main/scala/akka/persistence/serialization/MessageSerializer.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala
similarity index 90%
rename from akka-persistence/src/main/scala/akka/persistence/serialization/MessageSerializer.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala
index 7d714f7440..5d3709873e 100644
--- a/akka-persistence/src/main/scala/akka/persistence/serialization/MessageSerializer.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.serialization
+package org.apache.pekko.persistence.serialization
 
 import java.io.NotSerializableException
 import scala.collection.immutable
@@ -10,16 +10,17 @@ import scala.collection.immutable.VectorBuilder
 import scala.concurrent.duration
 import scala.concurrent.duration.Duration
 import scala.annotation.nowarn
-import akka.actor.{ ActorPath, ExtendedActorSystem }
-import akka.actor.Actor
-import akka.persistence._
-import akka.persistence.AtLeastOnceDelivery._
-import akka.persistence.fsm.PersistentFSM.{ PersistentFSMSnapshot, StateChangeEvent }
-import akka.persistence.serialization.{ MessageFormats => mf }
-import akka.protobufv3.internal.ByteString
-import akka.protobufv3.internal.UnsafeByteOperations
-import akka.serialization._
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.{ ActorPath, ExtendedActorSystem }
+import pekko.actor.Actor
+import pekko.persistence._
+import pekko.persistence.AtLeastOnceDelivery._
+import pekko.persistence.fsm.PersistentFSM.{ PersistentFSMSnapshot, StateChangeEvent }
+import pekko.persistence.serialization.{ MessageFormats => mf }
+import pekko.protobufv3.internal.ByteString
+import pekko.protobufv3.internal.UnsafeByteOperations
+import pekko.serialization._
+import pekko.util.ccompat._
 
 /**
  * Marker trait for all protobuf-serializable messages in `akka.persistence`.
@@ -27,7 +28,7 @@ import akka.util.ccompat._
 trait Message extends Serializable
 
 /**
- * Protobuf serializer for [[akka.persistence.PersistentRepr]], [[akka.persistence.AtLeastOnceDelivery]] and [[akka.persistence.fsm.PersistentFSM.StateChangeEvent]] messages.
+ * Protobuf serializer for [[pekko.persistence.PersistentRepr]], [[pekko.persistence.AtLeastOnceDelivery]] and [[pekko.persistence.fsm.PersistentFSM.StateChangeEvent]] messages.
  */
 @ccompatUsedUntil213
 class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer {
@@ -46,7 +47,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer
 
   /**
    * Serializes persistent messages. Delegates serialization of a persistent
-   * message's payload to a matching `akka.serialization.Serializer`.
+   * message's payload to a matching `org.apache.pekko.serialization.Serializer`.
    */
   def toBinary(o: AnyRef): Array[Byte] = o match {
     case p: PersistentRepr                        => persistentMessageBuilder(p).build().toByteArray
@@ -59,7 +60,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer
 
   /**
    * Deserializes persistent messages. Delegates deserialization of a persistent
-   * message's payload to a matching `akka.serialization.Serializer`.
+   * message's payload to a matching `org.apache.pekko.serialization.Serializer`.
    */
   def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]]): Message = manifest match {
     case None => persistent(mf.PersistentMessage.parseFrom(bytes))
@@ -115,7 +116,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer
 
   def atLeastOnceDeliverySnapshot(
       atLeastOnceDeliverySnapshot: mf.AtLeastOnceDeliverySnapshot): AtLeastOnceDeliverySnapshot = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     val unconfirmedDeliveries = new VectorBuilder[UnconfirmedDelivery]()
     atLeastOnceDeliverySnapshot.getUnconfirmedDeliveriesList().iterator().asScala.foreach { next =>
       unconfirmedDeliveries += UnconfirmedDelivery(
@@ -218,7 +219,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer
   }
 
   private def atomicWrite(atomicWrite: mf.AtomicWrite): AtomicWrite = {
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     AtomicWrite(atomicWrite.getPayloadList.asScala.iterator.map(persistent).to(immutable.IndexedSeq))
   }
 
diff --git a/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/serialization/SnapshotSerializer.scala
similarity index 93%
rename from akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/serialization/SnapshotSerializer.scala
index 4ba96b731d..233fd3caf1 100644
--- a/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/serialization/SnapshotSerializer.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.serialization
+package org.apache.pekko.persistence.serialization
 
 import java.io._
 
-import akka.actor._
-import akka.serialization._
-import akka.util.ByteString.UTF_8
+import org.apache.pekko
+import pekko.actor._
+import pekko.serialization._
+import pekko.util.ByteString.UTF_8
 
 /**
  * Wrapper for snapshot `data`. Snapshot `data` are the actual snapshot objects captured by
@@ -30,7 +31,7 @@ class SnapshotSerializer(val system: ExtendedActorSystem) extends BaseSerializer
 
   /**
    * Serializes a [[Snapshot]]. Delegates serialization of snapshot `data` to a matching
-   * `akka.serialization.Serializer`.
+   * `org.apache.pekko.serialization.Serializer`.
    */
   def toBinary(o: AnyRef): Array[Byte] = o match {
     case Snapshot(data) => snapshotToBinary(data.asInstanceOf[AnyRef])
@@ -39,7 +40,7 @@ class SnapshotSerializer(val system: ExtendedActorSystem) extends BaseSerializer
 
   /**
    * Deserializes a [[Snapshot]]. Delegates deserialization of snapshot `data` to a matching
-   * `akka.serialization.Serializer`.
+   * `org.apache.pekko.serialization.Serializer`.
    */
   def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]]): AnyRef =
     Snapshot(snapshotFromBinary(bytes))
diff --git a/akka-persistence/src/main/scala/akka/persistence/serialization/package.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/serialization/package.scala
similarity index 94%
rename from akka-persistence/src/main/scala/akka/persistence/serialization/package.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/serialization/package.scala
index 1426a14a9a..b21cf0086a 100644
--- a/akka-persistence/src/main/scala/akka/persistence/serialization/package.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/serialization/package.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.{ ByteArrayOutputStream, InputStream }
 
diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/NoSnapshotStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/NoSnapshotStore.scala
similarity index 80%
rename from akka-persistence/src/main/scala/akka/persistence/snapshot/NoSnapshotStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/NoSnapshotStore.scala
index 5b9b5ab02c..1b284d93ca 100644
--- a/akka-persistence/src/main/scala/akka/persistence/snapshot/NoSnapshotStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/NoSnapshotStore.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.snapshot
+package org.apache.pekko.persistence.snapshot
 
 import scala.concurrent.Future
 
-import akka.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria }
+import org.apache.pekko
+import pekko.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria }
 
 /**
  * Used as default snapshot-store in case no other store was configured.
  *
- * If a [[akka.persistence.PersistentActor]] calls the [[akka.persistence.PersistentActor#saveSnapshot]] method,
+ * If a [[pekko.persistence.PersistentActor]] calls the [[pekko.persistence.PersistentActor#saveSnapshot]] method,
  * and at the same time does not configure a specific snapshot-store to be used *and* no default snapshot-store
  * is available, then the `NoSnapshotStore` will be used to signal a snapshot store failure.
  */
diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStore.scala
similarity index 97%
rename from akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStore.scala
index 5f049e2300..9ca571a6b0 100644
--- a/akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/SnapshotStore.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.snapshot
+package org.apache.pekko.persistence.snapshot
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import akka.actor._
-import akka.pattern.CircuitBreaker
-import akka.pattern.pipe
-import akka.persistence._
+import org.apache.pekko
+import pekko.actor._
+import pekko.pattern.CircuitBreaker
+import pekko.pattern.pipe
+import pekko.persistence._
 
 /**
  * Abstract snapshot store.
diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/japi/SnapshotStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/japi/SnapshotStore.scala
similarity index 82%
rename from akka-persistence/src/main/scala/akka/persistence/snapshot/japi/SnapshotStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/japi/SnapshotStore.scala
index 510dbd0b96..26e86434ce 100644
--- a/akka-persistence/src/main/scala/akka/persistence/snapshot/japi/SnapshotStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/japi/SnapshotStore.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.snapshot.japi
+package org.apache.pekko.persistence.snapshot.japi
 
 import scala.concurrent.Future
 
-import akka.japi.Util._
-import akka.persistence._
-import akka.persistence.snapshot.{ SnapshotStore => SSnapshotStore }
+import org.apache.pekko
+import pekko.japi.Util._
+import pekko.persistence._
+import pekko.persistence.snapshot.{ SnapshotStore => SSnapshotStore }
 
 /**
  * Java API: abstract snapshot store.
diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala
similarity index 95%
rename from akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala
index 6af4b3715f..71b7c57a19 100644
--- a/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/snapshot/local/LocalSnapshotStore.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.snapshot.local
+package org.apache.pekko.persistence.snapshot.local
 
 import java.io._
 import java.net.{ URLDecoder, URLEncoder }
@@ -15,13 +15,14 @@ import scala.util._
 
 import com.typesafe.config.Config
 
-import akka.actor.ActorLogging
-import akka.persistence._
-import akka.persistence.serialization._
-import akka.persistence.snapshot._
-import akka.serialization.SerializationExtension
-import akka.util.ByteString.UTF_8
-import akka.util.ccompat._
+import org.apache.pekko
+import pekko.actor.ActorLogging
+import pekko.persistence._
+import pekko.persistence.serialization._
+import pekko.persistence.snapshot._
+import pekko.serialization.SerializationExtension
+import pekko.util.ByteString.UTF_8
+import pekko.util.ccompat._
 
 /**
  * INTERNAL API
@@ -33,7 +34,7 @@ private[persistence] class LocalSnapshotStore(config: Config) extends SnapshotSt
   private val FilenamePattern = """^snapshot-(.+)-(\d+)-(\d+)""".r
   private val persistenceIdStartIdx = 9 // Persistence ID starts after the "snapshot-" substring
 
-  import akka.util.Helpers._
+  import org.apache.pekko.util.Helpers._
   private val maxLoadAttempts = config.getInt("max-load-attempts").requiring(_ > 1, "max-load-attempts must be >= 1")
 
   private val streamDispatcher = context.system.dispatchers.lookup(config.getString("stream-dispatcher"))
diff --git a/akka-persistence/src/main/scala/akka/persistence/state/DurableStateStoreProvider.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/DurableStateStoreProvider.scala
similarity index 83%
rename from akka-persistence/src/main/scala/akka/persistence/state/DurableStateStoreProvider.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/state/DurableStateStoreProvider.scala
index 5ef4bb697f..e9566d6e2d 100644
--- a/akka-persistence/src/main/scala/akka/persistence/state/DurableStateStoreProvider.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/DurableStateStoreProvider.scala
@@ -2,14 +2,14 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.state
+package org.apache.pekko.persistence.state
 
 /**
  * A durable state store plugin must implement a class that implements this trait.
  * It provides the concrete implementations for the Java and Scala APIs.
  *
  * A durable state store plugin plugin must provide implementations for both
- * `akka.persistence.state.scaladsl.DurableStateStore` and `akka.persistence.state.javadsl.DurableStateStore`.
+ * `org.apache.pekko.persistence.state.scaladsl.DurableStateStore` and `org.apache.pekko.persistence.state.javadsl.DurableStateStore`.
  * One of the implementations can delegate to the other.
  */
 trait DurableStateStoreProvider {
diff --git a/akka-persistence/src/main/scala/akka/persistence/state/DurableStateStoreRegistry.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/DurableStateStoreRegistry.scala
similarity index 79%
rename from akka-persistence/src/main/scala/akka/persistence/state/DurableStateStoreRegistry.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/state/DurableStateStoreRegistry.scala
index 27ac55e0ce..7c00f665b0 100644
--- a/akka-persistence/src/main/scala/akka/persistence/state/DurableStateStoreRegistry.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/DurableStateStoreRegistry.scala
@@ -2,24 +2,25 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.state
+package org.apache.pekko.persistence.state
 
 import scala.reflect.ClassTag
 
 import com.typesafe.config.Config
 
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.annotation.InternalApi
-import akka.persistence.Persistence
-import akka.persistence.PersistencePlugin
-import akka.persistence.PluginProvider
-import akka.persistence.state.scaladsl.DurableStateStore
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.ClassicActorSystemProvider
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Extension
+import pekko.actor.ExtensionId
+import pekko.actor.ExtensionIdProvider
+import pekko.annotation.InternalApi
+import pekko.persistence.Persistence
+import pekko.persistence.PersistencePlugin
+import pekko.persistence.PluginProvider
+import pekko.persistence.state.scaladsl.DurableStateStore
+import pekko.util.unused
 
 /**
  * Persistence extension for queries.
@@ -34,7 +35,7 @@ object DurableStateStoreRegistry extends ExtensionId[DurableStateStoreRegistry]
   def lookup: DurableStateStoreRegistry.type = DurableStateStoreRegistry
 
   @InternalApi
-  private[akka] val pluginProvider
+  private[pekko] val pluginProvider
       : PluginProvider[DurableStateStoreProvider, DurableStateStore[_], javadsl.DurableStateStore[_]] =
     new PluginProvider[DurableStateStoreProvider, scaladsl.DurableStateStore[_], javadsl.DurableStateStore[_]] {
       override def scalaDsl(t: DurableStateStoreProvider): DurableStateStore[_] = t.scaladslDurableStateStore()
@@ -74,7 +75,7 @@ class DurableStateStoreRegistry(system: ExtendedActorSystem)
   }
 
   /**
-   * Scala API: Returns the [[akka.persistence.state.scaladsl.DurableStateStore]] specified by the given
+   * Scala API: Returns the [[pekko.persistence.state.scaladsl.DurableStateStore]] specified by the given
    * configuration entry.
    */
   final def durableStateStoreFor[T <: scaladsl.DurableStateStore[_]](pluginId: String): T = {
@@ -82,7 +83,7 @@ class DurableStateStoreRegistry(system: ExtendedActorSystem)
   }
 
   /**
-   * Java API: Returns the [[akka.persistence.state.javadsl.DurableStateStore]] specified by the given
+   * Java API: Returns the [[pekko.persistence.state.javadsl.DurableStateStore]] specified by the given
    * configuration entry.
    */
   final def getDurableStateStoreFor[T <: javadsl.DurableStateStore[_]](
diff --git a/akka-persistence/src/main/scala/akka/persistence/state/javadsl/DurableStateStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/javadsl/DurableStateStore.scala
similarity index 71%
rename from akka-persistence/src/main/scala/akka/persistence/state/javadsl/DurableStateStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/state/javadsl/DurableStateStore.scala
index 9c4c6755e5..4cacd7e369 100644
--- a/akka-persistence/src/main/scala/akka/persistence/state/javadsl/DurableStateStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/javadsl/DurableStateStore.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.state.javadsl
+package org.apache.pekko.persistence.state.javadsl
 
 import java.util.Optional
 import java.util.concurrent.CompletionStage
 
 import scala.compat.java8.OptionConverters._
 
-import akka.persistence.state.scaladsl.{ GetObjectResult => SGetObjectResult }
+import org.apache.pekko
+import pekko.persistence.state.scaladsl.{ GetObjectResult => SGetObjectResult }
 
 /**
  * API for reading durable state objects with payload `A`.
  *
- * For Scala API see [[akka.persistence.state.scaladsl.DurableStateStore]].
+ * For Scala API see [[pekko.persistence.state.scaladsl.DurableStateStore]].
  *
  * See also [[DurableStateUpdateStore]]
  */
diff --git a/akka-persistence/src/main/scala/akka/persistence/state/javadsl/DurableStateUpdateStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/javadsl/DurableStateUpdateStore.scala
similarity index 79%
rename from akka-persistence/src/main/scala/akka/persistence/state/javadsl/DurableStateUpdateStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/state/javadsl/DurableStateUpdateStore.scala
index 19179e42ba..b5f8e1670a 100644
--- a/akka-persistence/src/main/scala/akka/persistence/state/javadsl/DurableStateUpdateStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/javadsl/DurableStateUpdateStore.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.state.javadsl
+package org.apache.pekko.persistence.state.javadsl
 
 import java.util.concurrent.CompletionStage
 
-import akka.Done
+import org.apache.pekko
+import pekko.Done
 
 /**
  * API for updating durable state objects.
  *
- * For Scala API see [[akka.persistence.state.scaladsl.DurableStateUpdateStore]].
+ * For Scala API see [[pekko.persistence.state.scaladsl.DurableStateUpdateStore]].
  */
 trait DurableStateUpdateStore[A] extends DurableStateStore[A] {
 
diff --git a/akka-persistence/src/main/scala/akka/persistence/state/scaladsl/DurableStateStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/scaladsl/DurableStateStore.scala
similarity index 69%
rename from akka-persistence/src/main/scala/akka/persistence/state/scaladsl/DurableStateStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/state/scaladsl/DurableStateStore.scala
index 3536dcb61c..085a31459c 100644
--- a/akka-persistence/src/main/scala/akka/persistence/state/scaladsl/DurableStateStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/scaladsl/DurableStateStore.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.state.scaladsl
+package org.apache.pekko.persistence.state.scaladsl
 
 import scala.concurrent.Future
 import scala.compat.java8.OptionConverters._
 
-import akka.persistence.state.javadsl.{ GetObjectResult => JGetObjectResult }
+import org.apache.pekko
+import pekko.persistence.state.javadsl.{ GetObjectResult => JGetObjectResult }
 
 /**
  * API for reading durable state objects with payload `A`.
  *
- * For Java API see [[akka.persistence.state.javadsl.DurableStateStore]].
+ * For Java API see [[pekko.persistence.state.javadsl.DurableStateStore]].
  *
  * See also [[DurableStateUpdateStore]]
  */
diff --git a/akka-persistence/src/main/scala/akka/persistence/state/scaladsl/DurableStateUpdateStore.scala b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/scaladsl/DurableStateUpdateStore.scala
similarity index 78%
rename from akka-persistence/src/main/scala/akka/persistence/state/scaladsl/DurableStateUpdateStore.scala
rename to akka-persistence/src/main/scala/org/apache/pekko/persistence/state/scaladsl/DurableStateUpdateStore.scala
index 755d665fa2..2a0aa7e96c 100644
--- a/akka-persistence/src/main/scala/akka/persistence/state/scaladsl/DurableStateUpdateStore.scala
+++ b/akka-persistence/src/main/scala/org/apache/pekko/persistence/state/scaladsl/DurableStateUpdateStore.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.state.scaladsl
+package org.apache.pekko.persistence.state.scaladsl
 
 import scala.concurrent.Future
 
-import akka.Done
+import org.apache.pekko
+import pekko.Done
 
 /**
  * API for updating durable state objects.
  *
- * For Java API see [[akka.persistence.state.javadsl.DurableStateUpdateStore]].
+ * For Java API see [[pekko.persistence.state.javadsl.DurableStateUpdateStore]].
  */
 trait DurableStateUpdateStore[A] extends DurableStateStore[A] {
 
diff --git a/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java b/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java
similarity index 99%
rename from akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java
rename to akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java
index 29d416e4e8..31343c0e46 100644
--- a/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java
+++ b/akka-persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.fsm;
+package org.apache.pekko.persistence.fsm;
 
-import akka.actor.*;
+import org.apache.pekko.actor.*;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryCrashSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryCrashSpec.scala
similarity index 93%
rename from akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryCrashSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryCrashSpec.scala
index dbd483c044..418e672982 100644
--- a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryCrashSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryCrashSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.duration._
 import scala.util.control.NoStackTrace
 
-import akka.actor._
-import akka.actor.SupervisorStrategy.{ Escalate, Stop }
-import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
+import org.apache.pekko
+import pekko.actor._
+import pekko.actor.SupervisorStrategy.{ Escalate, Stop }
+import pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
 
 object AtLeastOnceDeliveryCrashSpec {
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryFailureSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryFailureSpec.scala
similarity index 96%
rename from akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryFailureSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryFailureSpec.scala
index c22564f6bc..99770ed17d 100644
--- a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryFailureSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliveryFailureSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -11,8 +11,9 @@ import scala.language.postfixOps
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit._
 
 object AtLeastOnceDeliveryFailureSpec {
   val config = ConfigFactory.parseString(s"""
@@ -25,7 +26,7 @@ object AtLeastOnceDeliveryFailureSpec {
       akka.persistence.journal.chaos.delete-failure-rate = 0.3
       akka.persistence.journal.chaos.replay-failure-rate = 0.25
       akka.persistence.journal.chaos.read-highest-failure-rate = 0.1
-      akka.persistence.journal.chaos.class = akka.persistence.journal.chaos.ChaosJournal
+      akka.persistence.journal.chaos.class = org.apache.pekko.persistence.journal.chaos.ChaosJournal
       akka.persistence.snapshot-store.plugin = "akka.persistence.snapshot-store.local"
       akka.persistence.snapshot-store.local.dir = "target/snapshots-at-least-once-delivery-failure-spec/"
     """)
diff --git a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliverySpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliverySpec.scala
similarity index 98%
rename from akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliverySpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliverySpec.scala
index 0afef8cc74..aea41a3249 100644
--- a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliverySpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/AtLeastOnceDeliverySpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2014-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.duration._
 import scala.util.Failure
 import scala.util.control.NoStackTrace
 
-import akka.actor._
-import akka.persistence.AtLeastOnceDelivery.{ AtLeastOnceDeliverySnapshot, UnconfirmedWarning }
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.AtLeastOnceDelivery.{ AtLeastOnceDeliverySnapshot, UnconfirmedWarning }
+import pekko.testkit._
 
 object AtLeastOnceDeliverySpec {
 
@@ -193,7 +194,7 @@ class AtLeastOnceDeliverySpec
     extends PersistenceSpec(PersistenceSpec.config("inmem", "AtLeastOnceDeliverySpec"))
     with ImplicitSender {
 
-  import akka.persistence.AtLeastOnceDeliverySpec._
+  import pekko.persistence.AtLeastOnceDeliverySpec._
 
   "AtLeastOnceDelivery" must {
     List(true, false).foreach { deliverUsingActorSelection =>
diff --git a/akka-persistence/src/test/scala/akka/persistence/AtomicWriteSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/AtomicWriteSpec.scala
similarity index 96%
rename from akka-persistence/src/test/scala/akka/persistence/AtomicWriteSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/AtomicWriteSpec.scala
index 35431db76a..f22a58a635 100644
--- a/akka-persistence/src/test/scala/akka/persistence/AtomicWriteSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/AtomicWriteSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
diff --git a/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/EndToEndEventAdapterSpec.scala
similarity index 97%
rename from akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/EndToEndEventAdapterSpec.scala
index db79df9573..e447df3d63 100644
--- a/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/EndToEndEventAdapterSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.File
 
@@ -15,10 +15,11 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
-import akka.actor._
-import akka.persistence.journal.{ EventAdapter, EventSeq }
-import akka.testkit.TestProbe
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.journal.{ EventAdapter, EventSeq }
+import pekko.testkit.TestProbe
+import pekko.util.unused
 
 object EndToEndEventAdapterSpec {
 
@@ -146,7 +147,7 @@ class EndToEndEventAdapterSpec extends AnyWordSpecLike with Matchers with Before
     |    }
     |  }
     |}
-    |akka.loggers = ["akka.testkit.TestEventListener"]
+    |akka.loggers = ["org.apache.pekko.testkit.TestEventListener"]
     """.stripMargin)
 
   val newAdaptersConfig = ConfigFactory.parseString(s"""
diff --git a/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/EventAdapterSpec.scala
similarity index 97%
rename from akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/EventAdapterSpec.scala
index 0da36e6749..c811c33e6a 100644
--- a/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/EventAdapterSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.collection.immutable
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.actor._
-import akka.event.Logging
-import akka.persistence.journal.{ EventAdapter, EventSeq, SingleEventSeq }
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor._
+import pekko.event.Logging
+import pekko.persistence.journal.{ EventAdapter, EventSeq, SingleEventSeq }
+import pekko.testkit.ImplicitSender
 
 object EventAdapterSpec {
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorDeleteFailureSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorDeleteFailureSpec.scala
similarity index 84%
rename from akka-persistence/src/test/scala/akka/persistence/EventSourcedActorDeleteFailureSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorDeleteFailureSpec.scala
index 57cb863063..64fa10af4d 100644
--- a/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorDeleteFailureSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorDeleteFailureSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.util.control.NoStackTrace
 
-import akka.actor._
-import akka.event.Logging
-import akka.event.Logging.Warning
-import akka.persistence.journal.inmem.InmemJournal
-import akka.testkit.{ EventFilter, ImplicitSender, TestEvent }
+import org.apache.pekko
+import pekko.actor._
+import pekko.event.Logging
+import pekko.event.Logging.Warning
+import pekko.persistence.journal.inmem.InmemJournal
+import pekko.testkit.{ EventFilter, ImplicitSender, TestEvent }
 
 object EventSourcedActorDeleteFailureSpec {
 
@@ -51,12 +52,12 @@ class EventSourcedActorDeleteFailureSpec
         "SnapshotFailureRobustnessSpec",
         extraConfig = Some(
           """
-  akka.persistence.journal.inmem.class = "akka.persistence.EventSourcedActorDeleteFailureSpec$DeleteFailingInmemJournal"
+  akka.persistence.journal.inmem.class = "org.apache.pekko.persistence.EventSourcedActorDeleteFailureSpec$DeleteFailingInmemJournal"
   """)))
     with ImplicitSender {
   import EventSourcedActorDeleteFailureSpec._
 
-  system.eventStream.publish(TestEvent.Mute(EventFilter[akka.pattern.AskTimeoutException]()))
+  system.eventStream.publish(TestEvent.Mute(EventFilter[pekko.pattern.AskTimeoutException]()))
 
   "A persistent actor" must {
     "have default warn logging be triggered, when deletion failed" in {
diff --git a/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorFailureSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorFailureSpec.scala
similarity index 96%
rename from akka-persistence/src/test/scala/akka/persistence/EventSourcedActorFailureSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorFailureSpec.scala
index 9b7eb3bfce..4327422fe6 100644
--- a/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorFailureSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/EventSourcedActorFailureSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.util.{ Failure, Try }
 import scala.util.control.NoStackTrace
 
-import akka.actor.{ OneForOneStrategy, _ }
-import akka.persistence.journal.AsyncWriteJournal
-import akka.persistence.journal.inmem.InmemJournal
-import akka.testkit.{ EventFilter, ImplicitSender, TestEvent, TestProbe }
+import org.apache.pekko
+import pekko.actor.{ OneForOneStrategy, _ }
+import pekko.persistence.journal.AsyncWriteJournal
+import pekko.persistence.journal.inmem.InmemJournal
+import pekko.testkit.{ EventFilter, ImplicitSender, TestEvent, TestProbe }
 
 object EventSourcedActorFailureSpec {
   import PersistentActorSpec.{ Cmd, Evt, ExamplePersistentActor }
@@ -149,14 +150,14 @@ class EventSourcedActorFailureSpec
         "SnapshotFailureRobustnessSpec",
         extraConfig = Some(
           """
-  akka.persistence.journal.inmem.class = "akka.persistence.EventSourcedActorFailureSpec$FailingInmemJournal"
+  akka.persistence.journal.inmem.class = "org.apache.pekko.persistence.EventSourcedActorFailureSpec$FailingInmemJournal"
   """)))
     with ImplicitSender {
 
   import EventSourcedActorFailureSpec._
   import PersistentActorSpec._
 
-  system.eventStream.publish(TestEvent.Mute(EventFilter[akka.pattern.AskTimeoutException]()))
+  system.eventStream.publish(TestEvent.Mute(EventFilter[pekko.pattern.AskTimeoutException]()))
 
   def prepareFailingRecovery(): Unit = {
     val persistentActor = namedPersistentActor[FailingRecovery]
diff --git a/akka-persistence/src/test/scala/akka/persistence/LoadPluginSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/LoadPluginSpec.scala
similarity index 79%
rename from akka-persistence/src/test/scala/akka/persistence/LoadPluginSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/LoadPluginSpec.scala
index 2b0f548ccd..77ce137d4e 100644
--- a/akka-persistence/src/test/scala/akka/persistence/LoadPluginSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/LoadPluginSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import com.typesafe.config.Config
 
-import akka.actor.Actor
-import akka.persistence.journal.inmem.InmemJournal
-import akka.testkit.ImplicitSender
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.persistence.journal.inmem.InmemJournal
+import pekko.testkit.ImplicitSender
+import pekko.util.unused
 
 object LoadPluginSpec {
 
@@ -35,11 +36,11 @@ class LoadPluginSpec
         "inmem",
         "LoadJournalSpec",
         extraConfig = Some("""
-  akka.persistence.journal.inmem.class = "akka.persistence.LoadPluginSpec$JournalWithConfig"
+  akka.persistence.journal.inmem.class = "org.apache.pekko.persistence.LoadPluginSpec$JournalWithConfig"
   akka.persistence.journal.inmem.extra-property = 17
   
   test-plugin {
-    class = "akka.persistence.LoadPluginSpec$JournalWithStartupNotification"
+    class = "org.apache.pekko.persistence.LoadPluginSpec$JournalWithStartupNotification"
   }
   """)))
     with ImplicitSender {
diff --git a/akka-persistence/src/test/scala/akka/persistence/ManyRecoveriesSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/ManyRecoveriesSpec.scala
similarity index 95%
rename from akka-persistence/src/test/scala/akka/persistence/ManyRecoveriesSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/ManyRecoveriesSpec.scala
index 6f0760e277..71292a70d4 100644
--- a/akka-persistence/src/test/scala/akka/persistence/ManyRecoveriesSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/ManyRecoveriesSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit._
 
 object ManyRecoveriesSpec {
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/OptimizedRecoverySpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/OptimizedRecoverySpec.scala
similarity index 94%
rename from akka-persistence/src/test/scala/akka/persistence/OptimizedRecoverySpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/OptimizedRecoverySpec.scala
index f0f189ad4d..492efd5a36 100644
--- a/akka-persistence/src/test/scala/akka/persistence/OptimizedRecoverySpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/OptimizedRecoverySpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.testkit.ImplicitSender
 
 object OptimizedRecoverySpec {
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/OptionalSnapshotStoreSpec.scala
similarity index 87%
rename from akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/OptionalSnapshotStoreSpec.scala
index c280edce80..64096030a4 100644
--- a/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/OptionalSnapshotStoreSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Actor, Props }
-import akka.event.Logging
-import akka.event.Logging.Warning
-import akka.testkit.{ EventFilter, ImplicitSender, TestEvent }
+import org.apache.pekko
+import pekko.actor.{ Actor, Props }
+import pekko.event.Logging
+import pekko.event.Logging.Warning
+import pekko.testkit.{ EventFilter, ImplicitSender, TestEvent }
 
 object OptionalSnapshotStoreSpec {
 
@@ -43,7 +44,7 @@ class OptionalSnapshotStoreSpec extends PersistenceSpec(ConfigFactory.parseStrin
   """)) with ImplicitSender {
   import OptionalSnapshotStoreSpec._
 
-  system.eventStream.publish(TestEvent.Mute(EventFilter[akka.pattern.AskTimeoutException]()))
+  system.eventStream.publish(TestEvent.Mute(EventFilter[pekko.pattern.AskTimeoutException]()))
 
   "Persistence extension" must {
     "initialize properly even in absence of configured snapshot store" in {
diff --git a/akka-persistence/src/test/scala/akka/persistence/PerformanceSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PerformanceSpec.scala
similarity index 98%
rename from akka-persistence/src/test/scala/akka/persistence/PerformanceSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/PerformanceSpec.scala
index 6fe42fe9a8..4ccac749f2 100644
--- a/akka-persistence/src/test/scala/akka/persistence/PerformanceSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PerformanceSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit._
 
 object PerformanceSpec {
   val config =
diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistenceSpec.scala
similarity index 97%
rename from akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistenceSpec.scala
index c7e1664cef..1e98f7f523 100644
--- a/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistenceSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.File
 import java.util.concurrent.atomic.AtomicInteger
@@ -16,8 +16,9 @@ import org.apache.commons.io.FileUtils
 import org.scalatest.BeforeAndAfterEach
 import org.scalatest.matchers.{ MatchResult, Matcher }
 
-import akka.actor.Props
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.testkit.AkkaSpec
 
 abstract class PersistenceSpec(config: Config)
     extends AkkaSpec(config)
diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorBoundedStashingSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorBoundedStashingSpec.scala
similarity index 88%
rename from akka-persistence/src/test/scala/akka/persistence/PersistentActorBoundedStashingSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorBoundedStashingSpec.scala
index 34320b640c..9a86c85ed0 100644
--- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorBoundedStashingSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorBoundedStashingSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.Config
 import org.scalatest.BeforeAndAfterEach
 
-import akka.actor.DeadLetter
-import akka.persistence.PersistentActorBoundedStashingSpec._
-import akka.persistence.journal.SteppingInmemJournal
-import akka.testkit.EventFilter
-import akka.testkit.ImplicitSender
-import akka.testkit.TestEvent.Mute
+import org.apache.pekko
+import pekko.actor.DeadLetter
+import pekko.persistence.PersistentActorBoundedStashingSpec._
+import pekko.persistence.journal.SteppingInmemJournal
+import pekko.testkit.EventFilter
+import pekko.testkit.ImplicitSender
+import pekko.testkit.TestEvent.Mute
 
 object PersistentActorBoundedStashingSpec {
   final case class Cmd(data: Any)
@@ -47,14 +48,15 @@ object PersistentActorBoundedStashingSpec {
   val templateConfig =
     s"""
        |akka.actor.default-mailbox.stash-capacity=$capacity
-       |akka.actor.guardian-supervisor-strategy="akka.actor.StoppingSupervisorStrategy"
+       |akka.actor.guardian-supervisor-strategy="org.apache.pekko.actor.StoppingSupervisorStrategy"
        |akka.persistence.internal-stash-overflow-strategy = "%s"
        |""".stripMargin
 
-  val throwConfig = String.format(templateConfig, "akka.persistence.ThrowExceptionConfigurator")
-  val discardConfig = String.format(templateConfig, "akka.persistence.DiscardConfigurator")
+  val throwConfig = String.format(templateConfig, "org.apache.pekko.persistence.ThrowExceptionConfigurator")
+  val discardConfig = String.format(templateConfig, "org.apache.pekko.persistence.DiscardConfigurator")
   val replyToConfig =
-    String.format(templateConfig, "akka.persistence.PersistentActorBoundedStashingSpec$ReplyToWithRejectConfigurator")
+    String.format(templateConfig,
+      "org.apache.pekko.persistence.PersistentActorBoundedStashingSpec$ReplyToWithRejectConfigurator")
 
 }
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorJournalProtocolSpec.scala
similarity index 97%
rename from akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorJournalProtocolSpec.scala
index f31477bde5..89d69703a0 100644
--- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorJournalProtocolSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.persistence.JournalProtocol._
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.JournalProtocol._
+import pekko.testkit._
 
 object PersistentActorJournalProtocolSpec {
 
   val config = ConfigFactory.parseString("""
 puppet {
-  class = "akka.persistence.JournalPuppet"
+  class = "org.apache.pekko.persistence.JournalPuppet"
   max-message-batch-size = 10
 }
 akka.persistence.journal.plugin = puppet
diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorRecoveryTimeoutSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorRecoveryTimeoutSpec.scala
similarity index 94%
rename from akka-persistence/src/test/scala/akka/persistence/PersistentActorRecoveryTimeoutSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorRecoveryTimeoutSpec.scala
index 3c8bfae037..078814f9cf 100644
--- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorRecoveryTimeoutSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorRecoveryTimeoutSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Actor, ActorLogging, ActorRef, Props }
-import akka.actor.Status.Failure
-import akka.persistence.journal.SteppingInmemJournal
-import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, ActorRef, Props }
+import pekko.actor.Status.Failure
+import pekko.persistence.journal.SteppingInmemJournal
+import pekko.testkit.{ AkkaSpec, ImplicitSender, TestProbe }
 
 object PersistentActorRecoveryTimeoutSpec {
   val journalId = "persistent-actor-recovery-timeout-spec"
diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala
similarity index 98%
rename from akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala
index 1c43b6a8bf..11e6f191f5 100644
--- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -14,9 +14,10 @@ import scala.util.control.NoStackTrace
 import scala.annotation.nowarn
 
 import com.typesafe.config.{ Config, ConfigFactory }
-import akka.actor._
-import akka.persistence.PersistentActorSpec._
-import akka.testkit.{ EventFilter, ImplicitSender, TestLatch, TestProbe }
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.PersistentActorSpec._
+import pekko.testkit.{ EventFilter, ImplicitSender, TestLatch, TestProbe }
 import org.scalatest.concurrent.Eventually
 
 object PersistentActorSpec {
@@ -857,27 +858,27 @@ object PersistentActorSpec {
 
     trait BaseActor extends Actor {
       this: StackableTestPersistentActor =>
-      override protected[akka] def aroundPreStart() = {
+      override protected[pekko] def aroundPreStart() = {
         probe ! "base aroundPreStart"
         super.aroundPreStart()
       }
 
-      override protected[akka] def aroundPostStop() = {
+      override protected[pekko] def aroundPostStop() = {
         probe ! "base aroundPostStop"
         super.aroundPostStop()
       }
 
-      override protected[akka] def aroundPreRestart(reason: Throwable, message: Option[Any]) = {
+      override protected[pekko] def aroundPreRestart(reason: Throwable, message: Option[Any]) = {
         probe ! "base aroundPreRestart"
         super.aroundPreRestart(reason, message)
       }
 
-      override protected[akka] def aroundPostRestart(reason: Throwable) = {
+      override protected[pekko] def aroundPostRestart(reason: Throwable) = {
         probe ! "base aroundPostRestart"
         super.aroundPostRestart(reason)
       }
 
-      override protected[akka] def aroundReceive(receive: Receive, message: Any) = {
+      override protected[pekko] def aroundReceive(receive: Receive, message: Any) = {
         if (message == "restart" && recoveryFinished) {
           probe ! s"base aroundReceive $message"
         }
@@ -887,27 +888,27 @@ object PersistentActorSpec {
 
     trait MixinActor extends Actor {
       this: StackableTestPersistentActor =>
-      override protected[akka] def aroundPreStart() = {
+      override protected[pekko] def aroundPreStart() = {
         probe ! "mixin aroundPreStart"
         super.aroundPreStart()
       }
 
-      override protected[akka] def aroundPostStop() = {
+      override protected[pekko] def aroundPostStop() = {
         probe ! "mixin aroundPostStop"
         super.aroundPostStop()
       }
 
-      override protected[akka] def aroundPreRestart(reason: Throwable, message: Option[Any]) = {
+      override protected[pekko] def aroundPreRestart(reason: Throwable, message: Option[Any]) = {
         probe ! "mixin aroundPreRestart"
         super.aroundPreRestart(reason, message)
       }
 
-      override protected[akka] def aroundPostRestart(reason: Throwable) = {
+      override protected[pekko] def aroundPostRestart(reason: Throwable) = {
         probe ! "mixin aroundPostRestart"
         super.aroundPostRestart(reason)
       }
 
-      override protected[akka] def aroundReceive(receive: Receive, message: Any) = {
+      override protected[pekko] def aroundReceive(receive: Receive, message: Any) = {
         if (message == "restart" && recoveryFinished) {
           probe ! s"mixin aroundReceive $message"
         }
@@ -1074,7 +1075,7 @@ abstract class PersistentActorSpec(config: Config) extends PersistenceSpec(confi
 
   "A persistent actor" must {
     "fail fast if persistenceId is null" in {
-      import akka.testkit.filterEvents
+      import pekko.testkit.filterEvents
       filterEvents(EventFilter[ActorInitializationException]()) {
         EventFilter.error(message = "requirement failed: persistenceId is [null] for PersistentActor").intercept {
           val ref = system.actorOf(Props(new NamedPersistentActor(null) {
@@ -1088,7 +1089,7 @@ abstract class PersistentActorSpec(config: Config) extends PersistenceSpec(confi
       }
     }
     "fail fast if persistenceId is an empty string" in {
-      import akka.testkit.filterEvents
+      import pekko.testkit.filterEvents
       filterEvents(EventFilter[ActorInitializationException]()) {
         EventFilter.error(message = "persistenceId cannot be empty for PersistentActor").intercept {
           val ref = system.actorOf(Props(new NamedPersistentActor("  ") {
diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorStashingSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorStashingSpec.scala
similarity index 97%
rename from akka-persistence/src/test/scala/akka/persistence/PersistentActorStashingSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorStashingSpec.scala
index 6cf5d7691c..33236a09db 100644
--- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorStashingSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/PersistentActorStashingSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.duration._
 import scala.reflect.ClassTag
 
 import com.typesafe.config.Config
 
-import akka.actor.{ Actor, ActorRef, OneForOneStrategy, Props }
-import akka.actor.SupervisorStrategy.Resume
-import akka.persistence.journal.SteppingInmemJournal
-import akka.testkit.ImplicitSender
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorRef, OneForOneStrategy, Props }
+import pekko.actor.SupervisorStrategy.Resume
+import pekko.persistence.journal.SteppingInmemJournal
+import pekko.testkit.ImplicitSender
+import pekko.util.unused
 
 object PersistentActorStashingSpec {
   final case class Cmd(data: Any)
diff --git a/akka-persistence/src/test/scala/akka/persistence/RecoveryPermitterSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/RecoveryPermitterSpec.scala
similarity index 96%
rename from akka-persistence/src/test/scala/akka/persistence/RecoveryPermitterSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/RecoveryPermitterSpec.scala
index 59ce46e7f8..42ff1b2249 100644
--- a/akka-persistence/src/test/scala/akka/persistence/RecoveryPermitterSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/RecoveryPermitterSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.duration._
 import scala.util.control.NoStackTrace
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.testkit.{ EventFilter, ImplicitSender, TestEvent }
-import akka.testkit.TestActors
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit.{ EventFilter, ImplicitSender, TestEvent }
+import pekko.testkit.TestActors
+import pekko.testkit.TestProbe
 
 object RecoveryPermitterSpec {
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/SliceRangesSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SliceRangesSpec.scala
similarity index 91%
rename from akka-persistence/src/test/scala/akka/persistence/SliceRangesSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/SliceRangesSpec.scala
index b61e6a7e7d..20f374637d 100644
--- a/akka-persistence/src/test/scala/akka/persistence/SliceRangesSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SliceRangesSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.util
 import java.util.UUID
 
-import akka.japi.Pair
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.japi.Pair
+import pekko.testkit.ImplicitSender
 
 class SliceRangesSpec extends PersistenceSpec(PersistenceSpec.config("inmem", "LoadJournalSpec")) with ImplicitSender {
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotDecodeFailureSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotDecodeFailureSpec.scala
similarity index 91%
rename from akka-persistence/src/test/scala/akka/persistence/SnapshotDecodeFailureSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotDecodeFailureSpec.scala
index 0c5fefe82d..4553947716 100644
--- a/akka-persistence/src/test/scala/akka/persistence/SnapshotDecodeFailureSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotDecodeFailureSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.actor.{ ActorLogging, ActorRef, Props }
-import akka.event.Logging
-import akka.testkit.{ EventFilter, ImplicitSender, TestEvent }
+import org.apache.pekko
+import pekko.actor.{ ActorLogging, ActorRef, Props }
+import pekko.event.Logging
+import pekko.testkit.{ EventFilter, ImplicitSender, TestEvent }
 
 object SnapshotDecodeFailureSpec {
   case class Cmd(payload: String)
diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotDirectoryFailureSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotDirectoryFailureSpec.scala
similarity index 90%
rename from akka-persistence/src/test/scala/akka/persistence/SnapshotDirectoryFailureSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotDirectoryFailureSpec.scala
index 6475e24792..9e4f04d747 100644
--- a/akka-persistence/src/test/scala/akka/persistence/SnapshotDirectoryFailureSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotDirectoryFailureSpec.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.{ File, IOException }
 
-import akka.actor.{ ActorInitializationException, ActorRef, Props }
-import akka.testkit.{ AkkaSpec, EventFilter, ImplicitSender }
+import org.apache.pekko
+import pekko.actor.{ ActorInitializationException, ActorRef, Props }
+import pekko.testkit.{ AkkaSpec, EventFilter, ImplicitSender }
 
 object SnapshotDirectoryFailureSpec {
   val inUseSnapshotPath = "target/inUseSnapshotPath"
diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotFailureRobustnessSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotFailureRobustnessSpec.scala
similarity index 93%
rename from akka-persistence/src/test/scala/akka/persistence/SnapshotFailureRobustnessSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotFailureRobustnessSpec.scala
index f9493a855e..c7d285a05e 100644
--- a/akka-persistence/src/test/scala/akka/persistence/SnapshotFailureRobustnessSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotFailureRobustnessSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.IOException
 import java.util.UUID
@@ -13,10 +13,11 @@ import scala.language.postfixOps
 
 import com.typesafe.config.Config
 
-import akka.actor.{ ActorRef, Props }
-import akka.event.Logging
-import akka.persistence.snapshot.local.LocalSnapshotStore
-import akka.testkit.{ EventFilter, ImplicitSender, TestEvent }
+import org.apache.pekko
+import pekko.actor.{ ActorRef, Props }
+import pekko.event.Logging
+import pekko.persistence.snapshot.local.LocalSnapshotStore
+import pekko.testkit.{ EventFilter, ImplicitSender, TestEvent }
 
 object SnapshotFailureRobustnessSpec {
 
@@ -104,9 +105,9 @@ class SnapshotFailureRobustnessSpec
         "SnapshotFailureRobustnessSpec",
         serialization = "off",
         extraConfig = Some(s"""
-  akka.persistence.snapshot-store.local.class = "akka.persistence.SnapshotFailureRobustnessSpec$$FailingLocalSnapshotStore"
+  akka.persistence.snapshot-store.local.class = "org.apache.pekko.persistence.SnapshotFailureRobustnessSpec$$FailingLocalSnapshotStore"
   akka.persistence.snapshot-store.local-delete-fail = $${akka.persistence.snapshot-store.local}
-  akka.persistence.snapshot-store.local-delete-fail.class = "akka.persistence.SnapshotFailureRobustnessSpec$$DeleteFailingLocalSnapshotStore"
+  akka.persistence.snapshot-store.local-delete-fail.class = "org.apache.pekko.persistence.SnapshotFailureRobustnessSpec$$DeleteFailingLocalSnapshotStore"
   """)))
     with ImplicitSender {
 
@@ -215,7 +216,7 @@ class SnapshotIsOptionalSpec
         serialization = "off",
         extraConfig = Some(s"""
     akka.persistence.snapshot-store.plugin = "akka.persistence.snapshot-store.local"
-    akka.persistence.snapshot-store.local.class = "akka.persistence.SnapshotFailureRobustnessSpec$$FailingLocalSnapshotStore"
+    akka.persistence.snapshot-store.local.class = "org.apache.pekko.persistence.SnapshotFailureRobustnessSpec$$FailingLocalSnapshotStore"
     akka.persistence.snapshot-store.local.dir = "target/persistence-${UUID.randomUUID().toString}"
     akka.persistence.snapshot-store.local.snapshot-is-optional = true
   """)))
diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryLocalStoreSpec.scala
similarity index 93%
rename from akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryLocalStoreSpec.scala
index 3fceaf9d6b..4598ff6d71 100644
--- a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryLocalStoreSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.actor.{ ActorLogging, ActorRef, Props }
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.{ ActorLogging, ActorRef, Props }
+import pekko.testkit.ImplicitSender
 
 object SnapshotRecoveryLocalStoreSpec {
   val persistenceId = "europe"
diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
similarity index 94%
rename from akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
index c8b5bd5fe9..7cb8125adf 100644
--- a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala
@@ -2,16 +2,17 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io.File
 
 import org.apache.commons.io.FileUtils
 
-import akka.actor._
-import akka.persistence.serialization.Snapshot
-import akka.serialization.{ Serialization, SerializationExtension }
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.serialization.Snapshot
+import pekko.serialization.{ Serialization, SerializationExtension }
+import pekko.testkit._
 
 object SnapshotRecoveryWithEmptyJournalSpec {
   val survivingSnapshotPath = "target/survivingSnapshotPath"
diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSerializationSpec.scala
similarity index 88%
rename from akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSerializationSpec.scala
index ee5a3453c2..fb4e17e983 100644
--- a/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSerializationSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import java.io._
 
-import akka.actor.{ ActorRef, Props }
-import akka.serialization.Serializer
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.{ ActorRef, Props }
+import pekko.serialization.Serializer
+import pekko.testkit.ImplicitSender
 
 object SnapshotSerializationSpec {
   trait SerializationMarker
@@ -74,10 +75,10 @@ class SnapshotSerializationSpec
         extraConfig = Some("""
     akka.actor {
       serializers {
-        my-snapshot = "akka.persistence.SnapshotSerializationSpec$MySerializer"
+        my-snapshot = "org.apache.pekko.persistence.SnapshotSerializationSpec$MySerializer"
       }
       serialization-bindings {
-        "akka.persistence.SnapshotSerializationSpec$SerializationMarker" = my-snapshot
+        "org.apache.pekko.persistence.SnapshotSerializationSpec$SerializationMarker" = my-snapshot
       }
     }
   """)))
diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala
similarity index 98%
rename from akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala
index d0360a76f1..f71c1a314b 100644
--- a/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/SnapshotSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
-import akka.actor._
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit._
 
 object SnapshotSpec {
   case object TakeSnapshot
diff --git a/akka-persistence/src/test/scala/akka/persistence/TimerPersistentActorSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/TimerPersistentActorSpec.scala
similarity index 94%
rename from akka-persistence/src/test/scala/akka/persistence/TimerPersistentActorSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/TimerPersistentActorSpec.scala
index f90c5684a0..07b6330dcd 100644
--- a/akka-persistence/src/test/scala/akka/persistence/TimerPersistentActorSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/TimerPersistentActorSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence
+package org.apache.pekko.persistence
 
 import scala.concurrent.duration._
 import scala.runtime.BoxedUnit
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.japi.Procedure
-import akka.testkit.{ EventFilter, ImplicitSender }
-import akka.testkit.TestEvent.Mute
+import org.apache.pekko
+import pekko.actor._
+import pekko.japi.Procedure
+import pekko.testkit.{ EventFilter, ImplicitSender }
+import pekko.testkit.TestEvent.Mute
 
 object TimerPersistentActorSpec {
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala
similarity index 99%
rename from akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala
index 85382ae6e9..4c99a91d70 100644
--- a/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/fsm/PersistentFSMSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.fsm
+package org.apache.pekko.persistence.fsm
 
 import java.io.File
 
@@ -14,10 +14,11 @@ import scala.annotation.nowarn
 import com.typesafe.config.{ Config, ConfigFactory }
 import org.apache.commons.io.FileUtils
 
-import akka.actor.{ ActorSystem, _ }
-import akka.persistence._
-import akka.persistence.fsm.PersistentFSM._
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, _ }
+import pekko.persistence._
+import pekko.persistence.fsm.PersistentFSM._
+import pekko.testkit._
 
 @nowarn("msg=deprecated|Unused import")
 abstract class PersistentFSMSpec(config: Config) extends PersistenceSpec(config) with ImplicitSender {
diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/InmemEventAdaptersSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/InmemEventAdaptersSpec.scala
similarity index 92%
rename from akka-persistence/src/test/scala/akka/persistence/journal/InmemEventAdaptersSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/InmemEventAdaptersSpec.scala
index 2027a7abcd..4afaf64be8 100644
--- a/akka-persistence/src/test/scala/akka/persistence/journal/InmemEventAdaptersSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/InmemEventAdaptersSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import com.typesafe.config.ConfigFactory
-import akka.actor.ExtendedActorSystem
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.testkit.AkkaSpec
 
 import scala.annotation.nowarn
 
@@ -36,10 +37,10 @@ class InmemEventAdaptersSpec extends AkkaSpec {
       |    event-adapter-bindings = {
       |      "${classOf[EventMarkerInterface].getCanonicalName}" = marker
       |      "java.lang.String" = example
-      |      "akka.persistence.journal.PreciseAdapterEvent" = precise
-      |      "akka.persistence.journal.ReadMeEvent" = reader
-      |      "akka.persistence.journal.WriteMeEvent" = writer
-      |      "akka.persistence.journal.ReadMeTwiceEvent" = [reader, another-reader]
+      |      "org.apache.pekko.persistence.journal.PreciseAdapterEvent" = precise
+      |      "org.apache.pekko.persistence.journal.ReadMeEvent" = reader
+      |      "org.apache.pekko.persistence.journal.WriteMeEvent" = writer
+      |      "org.apache.pekko.persistence.journal.ReadMeTwiceEvent" = [reader, another-reader]
       |    }
       |  }
       |}
diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/ReplayFilterSpec.scala
similarity index 98%
rename from akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/ReplayFilterSpec.scala
index b30e050e54..3fd87ac912 100644
--- a/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/ReplayFilterSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2015-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
-import akka.persistence.JournalProtocol
-import akka.persistence.PersistentRepr
-import akka.testkit._
+import org.apache.pekko
+import pekko.persistence.JournalProtocol
+import pekko.persistence.PersistentRepr
+import pekko.testkit._
 
 class ReplayFilterSpec extends AkkaSpec with ImplicitSender {
   import JournalProtocol._
diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/SteppingInmemJournal.scala
similarity index 94%
rename from akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/SteppingInmemJournal.scala
index 1b740eda85..eeb4519c29 100644
--- a/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/SteppingInmemJournal.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal
+package org.apache.pekko.persistence.journal
 
 import scala.collection.immutable.Seq
 import scala.concurrent.{ Await, Future, Promise }
@@ -11,12 +11,13 @@ import scala.util.Try
 
 import com.typesafe.config.{ Config, ConfigFactory }
 
-import akka.actor.{ ActorRef, ActorSystem }
-import akka.pattern.ask
-import akka.persistence.{ AtomicWrite, PersistentRepr }
-import akka.persistence.journal.inmem.InmemJournal
-import akka.testkit._
-import akka.util.Timeout
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ActorSystem }
+import pekko.pattern.ask
+import pekko.persistence.{ AtomicWrite, PersistentRepr }
+import pekko.persistence.journal.inmem.InmemJournal
+import pekko.testkit._
+import pekko.util.Timeout
 
 object SteppingInmemJournal {
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/chaos/ChaosJournal.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/chaos/ChaosJournal.scala
similarity index 93%
rename from akka-persistence/src/test/scala/akka/persistence/journal/chaos/ChaosJournal.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/chaos/ChaosJournal.scala
index b8bfd4871b..ef713446ee 100644
--- a/akka-persistence/src/test/scala/akka/persistence/journal/chaos/ChaosJournal.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/chaos/ChaosJournal.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.chaos
+package org.apache.pekko.persistence.journal.chaos
 
 import java.util.concurrent.ThreadLocalRandom
 
@@ -11,9 +11,10 @@ import scala.concurrent.Future
 import scala.util.Try
 import scala.util.control.NonFatal
 
-import akka.persistence._
-import akka.persistence.journal.AsyncWriteJournal
-import akka.persistence.journal.inmem.InmemMessages
+import org.apache.pekko
+import pekko.persistence._
+import pekko.persistence.journal.AsyncWriteJournal
+import pekko.persistence.journal.inmem.InmemMessages
 
 class WriteFailedException(ps: Seq[PersistentRepr])
     extends TestException(s"write failed for payloads = [${ps.map(_.payload)}]")
diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/inmem/InmemJournalSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/inmem/InmemJournalSpec.scala
similarity index 88%
rename from akka-persistence/src/test/scala/akka/persistence/journal/inmem/InmemJournalSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/inmem/InmemJournalSpec.scala
index e54d6380b1..30429d99cb 100644
--- a/akka-persistence/src/test/scala/akka/persistence/journal/inmem/InmemJournalSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/inmem/InmemJournalSpec.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.inmem
+package org.apache.pekko.persistence.journal.inmem
 
-import akka.actor.Props
-import akka.persistence.PersistenceSpec
-import akka.persistence.PersistentActor
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.PersistenceSpec
+import pekko.persistence.PersistentActor
+import pekko.testkit._
 
 object InmemJournalSpec {
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/leveldb/CompactionSegmentManagementSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/leveldb/CompactionSegmentManagementSpec.scala
similarity index 98%
rename from akka-persistence/src/test/scala/akka/persistence/journal/leveldb/CompactionSegmentManagementSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/leveldb/CompactionSegmentManagementSpec.scala
index cf4bc073bf..a7b0e18dbc 100644
--- a/akka-persistence/src/test/scala/akka/persistence/journal/leveldb/CompactionSegmentManagementSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/leveldb/CompactionSegmentManagementSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import org.scalatest.wordspec.AnyWordSpec
 
diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/leveldb/JournalCompactionSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/leveldb/JournalCompactionSpec.scala
similarity index 93%
rename from akka-persistence/src/test/scala/akka/persistence/journal/leveldb/JournalCompactionSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/leveldb/JournalCompactionSpec.scala
index a1abf02402..1c0929ed98 100644
--- a/akka-persistence/src/test/scala/akka/persistence/journal/leveldb/JournalCompactionSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/journal/leveldb/JournalCompactionSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.persistence.journal.leveldb
+package org.apache.pekko.persistence.journal.leveldb
 
 import java.io.File
 
@@ -11,11 +11,12 @@ import scala.util.Random
 import com.typesafe.config.Config
 import org.apache.commons.io.FileUtils
 
-import akka.actor.{ ActorLogging, ActorRef, ActorSystem, Props }
-import akka.persistence.{ DeleteMessagesSuccess, PersistenceSpec, PersistentActor }
-import akka.persistence.journal.leveldb.JournalCompactionSpec.EventLogger._
-import akka.persistence.journal.leveldb.JournalCompactionSpec.SpecComponentBuilder
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.{ ActorLogging, ActorRef, ActorSystem, Props }
+import pekko.persistence.{ DeleteMessagesSuccess, PersistenceSpec, PersistentActor }
+import pekko.persistence.journal.leveldb.JournalCompactionSpec.EventLogger._
+import pekko.persistence.journal.leveldb.JournalCompactionSpec.SpecComponentBuilder
+import pekko.testkit.TestProbe
 
 class JournalNoCompactionSpec
     extends JournalCompactionSpecBase(SpecComponentBuilder("leveldb-JournalNoCompactionSpec")) {
diff --git a/akka-persistence/src/test/scala/akka/persistence/serialization/MessageSerializerSpec.scala b/akka-persistence/src/test/scala/org/apache/pekko/persistence/serialization/MessageSerializerSpec.scala
similarity index 72%
rename from akka-persistence/src/test/scala/akka/persistence/serialization/MessageSerializerSpec.scala
rename to akka-persistence/src/test/scala/org/apache/pekko/persistence/serialization/MessageSerializerSpec.scala
index c5464ae71a..8b7a8ae62d 100644
--- a/akka-persistence/src/test/scala/akka/persistence/serialization/MessageSerializerSpec.scala
+++ b/akka-persistence/src/test/scala/org/apache/pekko/persistence/serialization/MessageSerializerSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.persistence.serialization
+package org.apache.pekko.persistence.serialization
 
-import akka.persistence.PersistentRepr
-import akka.serialization.SerializationExtension
-import akka.testkit.AkkaSpec
+import org.apache.pekko
+import pekko.persistence.PersistentRepr
+import pekko.serialization.SerializationExtension
+import pekko.testkit.AkkaSpec
 
 class MessageSerializerSpec extends AkkaSpec {
 
diff --git a/akka-pki/src/main/scala/akka/pki/pem/DERPrivateKeyLoader.scala b/akka-pki/src/main/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoader.scala
similarity index 97%
rename from akka-pki/src/main/scala/akka/pki/pem/DERPrivateKeyLoader.scala
rename to akka-pki/src/main/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoader.scala
index 054f0bcc66..19e3ab2079 100644
--- a/akka-pki/src/main/scala/akka/pki/pem/DERPrivateKeyLoader.scala
+++ b/akka-pki/src/main/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoader.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.pki.pem
+package org.apache.pekko.pki.pem
 
 import java.math.BigInteger
 import java.security.KeyFactory
@@ -12,8 +12,9 @@ import java.security.spec.RSAMultiPrimePrivateCrtKeySpec
 import java.security.spec.RSAOtherPrimeInfo
 import java.security.spec.RSAPrivateCrtKeySpec
 
-import akka.annotation.ApiMayChange
-import akka.pki.pem.PEMDecoder.DERData
+import org.apache.pekko
+import pekko.annotation.ApiMayChange
+import pekko.pki.pem.PEMDecoder.DERData
 import com.hierynomus.asn1.ASN1InputStream
 import com.hierynomus.asn1.encodingrules.der.DERDecoder
 import com.hierynomus.asn1.types.constructed.ASN1Sequence
diff --git a/akka-pki/src/main/scala/akka/pki/pem/PEMDecoder.scala b/akka-pki/src/main/scala/org/apache/pekko/pki/pem/PEMDecoder.scala
similarity index 97%
rename from akka-pki/src/main/scala/akka/pki/pem/PEMDecoder.scala
rename to akka-pki/src/main/scala/org/apache/pekko/pki/pem/PEMDecoder.scala
index 029319789f..c8a801e4f3 100644
--- a/akka-pki/src/main/scala/akka/pki/pem/PEMDecoder.scala
+++ b/akka-pki/src/main/scala/org/apache/pekko/pki/pem/PEMDecoder.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.pki.pem
+package org.apache.pekko.pki.pem
 
 import java.util.Base64
 
-import akka.annotation.ApiMayChange
+import org.apache.pekko.annotation.ApiMayChange
 
 /**
  * Decodes lax PEM encoded data, according to
diff --git a/akka-pki/src/test/scala/akka/pki/pem/DERPrivateKeyLoaderSpec.scala b/akka-pki/src/test/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoaderSpec.scala
similarity index 97%
rename from akka-pki/src/test/scala/akka/pki/pem/DERPrivateKeyLoaderSpec.scala
rename to akka-pki/src/test/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoaderSpec.scala
index f934d1e842..dc31c92456 100644
--- a/akka-pki/src/test/scala/akka/pki/pem/DERPrivateKeyLoaderSpec.scala
+++ b/akka-pki/src/test/scala/org/apache/pekko/pki/pem/DERPrivateKeyLoaderSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.pki.pem
+package org.apache.pekko.pki.pem
 
 import java.io.File
 import java.nio.charset.Charset
diff --git a/akka-pki/src/test/scala/akka/pki/pem/PEMDecoderSpec.scala b/akka-pki/src/test/scala/org/apache/pekko/pki/pem/PEMDecoderSpec.scala
similarity index 99%
rename from akka-pki/src/test/scala/akka/pki/pem/PEMDecoderSpec.scala
rename to akka-pki/src/test/scala/org/apache/pekko/pki/pem/PEMDecoderSpec.scala
index 6832d1a131..7fb8761868 100644
--- a/akka-pki/src/test/scala/akka/pki/pem/PEMDecoderSpec.scala
+++ b/akka-pki/src/test/scala/org/apache/pekko/pki/pem/PEMDecoderSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. 
  */
 
-package akka.pki.pem
+package org.apache.pekko.pki.pem
 
 import java.util.Base64
 
diff --git a/akka-protobuf/src/main/java/akka/protobuf/AbstractMessage.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/AbstractMessage.java
similarity index 98%
rename from akka-protobuf/src/main/java/akka/protobuf/AbstractMessage.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/AbstractMessage.java
index e4b835e2a9..b6fc78258d 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/AbstractMessage.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/AbstractMessage.java
@@ -32,12 +32,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
-import akka.protobuf.Descriptors.Descriptor;
-import akka.protobuf.Descriptors.FieldDescriptor;
-import akka.protobuf.GeneratedMessage.ExtendableBuilder;
-import akka.protobuf.Internal.EnumLite;
+import org.apache.pekko.protobuf.Descriptors.Descriptor;
+import org.apache.pekko.protobuf.Descriptors.FieldDescriptor;
+import org.apache.pekko.protobuf.GeneratedMessage.ExtendableBuilder;
+import org.apache.pekko.protobuf.Internal.EnumLite;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -845,11 +845,11 @@ public abstract class AbstractMessage extends AbstractMessageLite
     // not produce weird errors like:
     //
     // java/com/google/protobuf/DynamicMessage.java:203: types
-    //   akka.protobuf.AbstractMessage.Builder<
-    //     akka.protobuf.DynamicMessage.Builder> and
-    //   akka.protobuf.AbstractMessage.Builder<
-    //     akka.protobuf.DynamicMessage.Builder> are incompatible; both
-    //   define mergeFrom(akka.protobuf.ByteString), but with unrelated
+    //   org.apache.pekko.protobuf.AbstractMessage.Builder<
+    //     org.apache.pekko.protobuf.DynamicMessage.Builder> and
+    //   org.apache.pekko.protobuf.AbstractMessage.Builder<
+    //     org.apache.pekko.protobuf.DynamicMessage.Builder> are incompatible; both
+    //   define mergeFrom(org.apache.pekko.protobuf.ByteString), but with unrelated
     //   return types.
     //
     // Strangely, these lines are only needed if javac is invoked separately
diff --git a/akka-protobuf/src/main/java/akka/protobuf/AbstractMessageLite.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/AbstractMessageLite.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/AbstractMessageLite.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/AbstractMessageLite.java
index eee923c002..fce7613632 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/AbstractMessageLite.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/AbstractMessageLite.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.FilterInputStream;
 import java.io.InputStream;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/AbstractParser.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/AbstractParser.java
similarity index 98%
rename from akka-protobuf/src/main/java/akka/protobuf/AbstractParser.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/AbstractParser.java
index 21d1824597..a54b7ce6f3 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/AbstractParser.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/AbstractParser.java
@@ -32,9 +32,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
-import akka.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
+import org.apache.pekko.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/BlockingRpcChannel.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/BlockingRpcChannel.java
similarity index 98%
rename from akka-protobuf/src/main/java/akka/protobuf/BlockingRpcChannel.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/BlockingRpcChannel.java
index c0af10d421..9102c8fbe4 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/BlockingRpcChannel.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/BlockingRpcChannel.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * 
    Abstract interface for a blocking RPC channel.  {@code BlockingRpcChannel}
diff --git a/akka-protobuf/src/main/java/akka/protobuf/BlockingService.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/BlockingService.java
similarity index 98%
rename from akka-protobuf/src/main/java/akka/protobuf/BlockingService.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/BlockingService.java
index 3c9ffc4ef7..7ef047e2dc 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/BlockingService.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/BlockingService.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * Blocking equivalent to {@link Service}.
diff --git a/akka-protobuf/src/main/java/akka/protobuf/BoundedByteString.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/BoundedByteString.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/BoundedByteString.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/BoundedByteString.java
index 1db7646cf0..959c7dbf22 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/BoundedByteString.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/BoundedByteString.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.util.NoSuchElementException;
 
diff --git a/akka-protobuf/src/main/java/akka/protobuf/ByteString.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/ByteString.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/ByteString.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/ByteString.java
index 9cf704b59f..f5bfb615ea 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/ByteString.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/ByteString.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/CodedInputStream.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/CodedInputStream.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/CodedInputStream.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/CodedInputStream.java
index df017b8c23..3824f86e50 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/CodedInputStream.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/CodedInputStream.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/CodedOutputStream.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/CodedOutputStream.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/CodedOutputStream.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/CodedOutputStream.java
index 0b2c100047..76cd73beda 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/CodedOutputStream.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/CodedOutputStream.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/DescriptorProtos.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/DescriptorProtos.java
similarity index 74%
rename from akka-protobuf/src/main/java/akka/protobuf/DescriptorProtos.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/DescriptorProtos.java
index add307b680..0783d560ab 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/DescriptorProtos.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/DescriptorProtos.java
@@ -5,26 +5,26 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/descriptor.proto
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 public final class DescriptorProtos {
   private DescriptorProtos() {}
   public static void registerAllExtensions(
-      akka.protobuf.ExtensionRegistry registry) {
+      org.apache.pekko.protobuf.ExtensionRegistry registry) {
   }
   public interface FileDescriptorSetOrBuilder
-      extends akka.protobuf.MessageOrBuilder {
+      extends org.apache.pekko.protobuf.MessageOrBuilder {
 
     // repeated .google.protobuf.FileDescriptorProto file = 1;
     /**
      * repeated .google.protobuf.FileDescriptorProto file = 1;
      */
-    java.util.List 
+    java.util.List 
         getFileList();
     /**
      * repeated .google.protobuf.FileDescriptorProto file = 1;
      */
-    akka.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index);
     /**
      * repeated .google.protobuf.FileDescriptorProto file = 1;
      */
@@ -32,12 +32,12 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.FileDescriptorProto file = 1;
      */
-    java.util.List 
+    java.util.List 
         getFileOrBuilderList();
     /**
      * repeated .google.protobuf.FileDescriptorProto file = 1;
      */
-    akka.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder(
         int index);
   }
   /**
@@ -49,14 +49,14 @@ public final class DescriptorProtos {
    * 
    */
   public static final class FileDescriptorSet extends
-      akka.protobuf.GeneratedMessage
+      org.apache.pekko.protobuf.GeneratedMessage
       implements FileDescriptorSetOrBuilder {
     // Use FileDescriptorSet.newBuilder() to construct.
-    private FileDescriptorSet(akka.protobuf.GeneratedMessage.Builder builder) {
+    private FileDescriptorSet(org.apache.pekko.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private FileDescriptorSet(boolean noInit) { this.unknownFields = akka.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private FileDescriptorSet(boolean noInit) { this.unknownFields = org.apache.pekko.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
     private static final FileDescriptorSet defaultInstance;
     public static FileDescriptorSet getDefaultInstance() {
@@ -67,20 +67,20 @@ public final class DescriptorProtos {
       return defaultInstance;
     }
 
-    private final akka.protobuf.UnknownFieldSet unknownFields;
+    private final org.apache.pekko.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
-    public final akka.protobuf.UnknownFieldSet
+    public final org.apache.pekko.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
     }
     private FileDescriptorSet(
-        akka.protobuf.CodedInputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+        org.apache.pekko.protobuf.CodedInputStream input,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
-      akka.protobuf.UnknownFieldSet.Builder unknownFields =
-          akka.protobuf.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobuf.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -98,18 +98,18 @@ public final class DescriptorProtos {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                file_ = new java.util.ArrayList();
+                file_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              file_.add(input.readMessage(akka.protobuf.DescriptorProtos.FileDescriptorProto.PARSER, extensionRegistry));
+              file_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.PARSER, extensionRegistry));
               break;
             }
           }
         }
-      } catch (akka.protobuf.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobuf.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobuf.InvalidProtocolBufferException(
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -119,46 +119,46 @@ public final class DescriptorProtos {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobuf.Descriptors.Descriptor
+    public static final org.apache.pekko.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_descriptor;
+      return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_descriptor;
     }
 
-    protected akka.protobuf.GeneratedMessage.FieldAccessorTable
+    protected org.apache.pekko.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_fieldAccessorTable
+      return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.protobuf.DescriptorProtos.FileDescriptorSet.class, akka.protobuf.DescriptorProtos.FileDescriptorSet.Builder.class);
+              org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet.class, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet.Builder.class);
     }
 
-    public static akka.protobuf.Parser PARSER =
-        new akka.protobuf.AbstractParser() {
+    public static org.apache.pekko.protobuf.Parser PARSER =
+        new org.apache.pekko.protobuf.AbstractParser() {
       public FileDescriptorSet parsePartialFrom(
-          akka.protobuf.CodedInputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobuf.InvalidProtocolBufferException {
+          org.apache.pekko.protobuf.CodedInputStream input,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
         return new FileDescriptorSet(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public akka.protobuf.Parser getParserForType() {
+    public org.apache.pekko.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     // repeated .google.protobuf.FileDescriptorProto file = 1;
     public static final int FILE_FIELD_NUMBER = 1;
-    private java.util.List file_;
+    private java.util.List file_;
     /**
      * repeated .google.protobuf.FileDescriptorProto file = 1;
      */
-    public java.util.List getFileList() {
+    public java.util.List getFileList() {
       return file_;
     }
     /**
      * repeated .google.protobuf.FileDescriptorProto file = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getFileOrBuilderList() {
       return file_;
     }
@@ -171,13 +171,13 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.FileDescriptorProto file = 1;
      */
-    public akka.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index) {
       return file_.get(index);
     }
     /**
      * repeated .google.protobuf.FileDescriptorProto file = 1;
      */
-    public akka.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder(
         int index) {
       return file_.get(index);
     }
@@ -200,7 +200,7 @@ public final class DescriptorProtos {
       return true;
     }
 
-    public void writeTo(akka.protobuf.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       for (int i = 0; i < file_.size(); i++) {
@@ -216,7 +216,7 @@ public final class DescriptorProtos {
 
       size = 0;
       for (int i = 0; i < file_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(1, file_.get(i));
       }
       size += getUnknownFields().getSerializedSize();
@@ -231,69 +231,69 @@ public final class DescriptorProtos {
       return super.writeReplace();
     }
 
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
-        akka.protobuf.ByteString data)
-        throws akka.protobuf.InvalidProtocolBufferException {
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
+        org.apache.pekko.protobuf.ByteString data)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
-        akka.protobuf.ByteString data,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
+        org.apache.pekko.protobuf.ByteString data,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(byte[] data)
-        throws akka.protobuf.InvalidProtocolBufferException {
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(byte[] data)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
         byte[] data,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
         java.io.InputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseDelimitedFrom(
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
-        akka.protobuf.CodedInputStream input)
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
+        org.apache.pekko.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
-        akka.protobuf.CodedInputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parseFrom(
+        org.apache.pekko.protobuf.CodedInputStream input,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.protobuf.DescriptorProtos.FileDescriptorSet prototype) {
+    public static Builder newBuilder(org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobuf.GeneratedMessage.BuilderParent parent) {
+        org.apache.pekko.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -306,32 +306,32 @@ public final class DescriptorProtos {
      * 
      */
     public static final class Builder extends
-        akka.protobuf.GeneratedMessage.Builder
-       implements akka.protobuf.DescriptorProtos.FileDescriptorSetOrBuilder {
-      public static final akka.protobuf.Descriptors.Descriptor
+        org.apache.pekko.protobuf.GeneratedMessage.Builder
+       implements org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSetOrBuilder {
+      public static final org.apache.pekko.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_descriptor;
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_descriptor;
       }
 
-      protected akka.protobuf.GeneratedMessage.FieldAccessorTable
+      protected org.apache.pekko.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_fieldAccessorTable
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.protobuf.DescriptorProtos.FileDescriptorSet.class, akka.protobuf.DescriptorProtos.FileDescriptorSet.Builder.class);
+                org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet.class, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet.Builder.class);
       }
 
-      // Construct using akka.protobuf.DescriptorProtos.FileDescriptorSet.newBuilder()
+      // Construct using org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobuf.GeneratedMessage.BuilderParent parent) {
+          org.apache.pekko.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
           getFileFieldBuilder();
         }
       }
@@ -354,25 +354,25 @@ public final class DescriptorProtos {
         return create().mergeFrom(buildPartial());
       }
 
-      public akka.protobuf.Descriptors.Descriptor
+      public org.apache.pekko.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_descriptor;
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorSet_descriptor;
       }
 
-      public akka.protobuf.DescriptorProtos.FileDescriptorSet getDefaultInstanceForType() {
-        return akka.protobuf.DescriptorProtos.FileDescriptorSet.getDefaultInstance();
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet getDefaultInstanceForType() {
+        return org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet.getDefaultInstance();
       }
 
-      public akka.protobuf.DescriptorProtos.FileDescriptorSet build() {
-        akka.protobuf.DescriptorProtos.FileDescriptorSet result = buildPartial();
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet build() {
+        org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public akka.protobuf.DescriptorProtos.FileDescriptorSet buildPartial() {
-        akka.protobuf.DescriptorProtos.FileDescriptorSet result = new akka.protobuf.DescriptorProtos.FileDescriptorSet(this);
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet buildPartial() {
+        org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet result = new org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet(this);
         int from_bitField0_ = bitField0_;
         if (fileBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -387,17 +387,17 @@ public final class DescriptorProtos {
         return result;
       }
 
-      public Builder mergeFrom(akka.protobuf.Message other) {
-        if (other instanceof akka.protobuf.DescriptorProtos.FileDescriptorSet) {
-          return mergeFrom((akka.protobuf.DescriptorProtos.FileDescriptorSet)other);
+      public Builder mergeFrom(org.apache.pekko.protobuf.Message other) {
+        if (other instanceof org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet) {
+          return mergeFrom((org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.protobuf.DescriptorProtos.FileDescriptorSet other) {
-        if (other == akka.protobuf.DescriptorProtos.FileDescriptorSet.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet other) {
+        if (other == org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet.getDefaultInstance()) return this;
         if (fileBuilder_ == null) {
           if (!other.file_.isEmpty()) {
             if (file_.isEmpty()) {
@@ -417,7 +417,7 @@ public final class DescriptorProtos {
               file_ = other.file_;
               bitField0_ = (bitField0_ & ~0x00000001);
               fileBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getFileFieldBuilder() : null;
             } else {
               fileBuilder_.addAllMessages(other.file_);
@@ -439,14 +439,14 @@ public final class DescriptorProtos {
       }
 
       public Builder mergeFrom(
-          akka.protobuf.CodedInputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobuf.CodedInputStream input,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.protobuf.DescriptorProtos.FileDescriptorSet parsedMessage = null;
+        org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.protobuf.DescriptorProtos.FileDescriptorSet) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorSet) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -458,22 +458,22 @@ public final class DescriptorProtos {
       private int bitField0_;
 
       // repeated .google.protobuf.FileDescriptorProto file = 1;
-      private java.util.List file_ =
+      private java.util.List file_ =
         java.util.Collections.emptyList();
       private void ensureFileIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          file_ = new java.util.ArrayList(file_);
+          file_ = new java.util.ArrayList(file_);
           bitField0_ |= 0x00000001;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.FileDescriptorProto, akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder> fileBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder> fileBuilder_;
 
       /**
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
-      public java.util.List getFileList() {
+      public java.util.List getFileList() {
         if (fileBuilder_ == null) {
           return java.util.Collections.unmodifiableList(file_);
         } else {
@@ -493,7 +493,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
-      public akka.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto getFile(int index) {
         if (fileBuilder_ == null) {
           return file_.get(index);
         } else {
@@ -504,7 +504,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
       public Builder setFile(
-          int index, akka.protobuf.DescriptorProtos.FileDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto value) {
         if (fileBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -521,7 +521,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
       public Builder setFile(
-          int index, akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder builderForValue) {
         if (fileBuilder_ == null) {
           ensureFileIsMutable();
           file_.set(index, builderForValue.build());
@@ -534,7 +534,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
-      public Builder addFile(akka.protobuf.DescriptorProtos.FileDescriptorProto value) {
+      public Builder addFile(org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto value) {
         if (fileBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -551,7 +551,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
       public Builder addFile(
-          int index, akka.protobuf.DescriptorProtos.FileDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto value) {
         if (fileBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -568,7 +568,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
       public Builder addFile(
-          akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder builderForValue) {
         if (fileBuilder_ == null) {
           ensureFileIsMutable();
           file_.add(builderForValue.build());
@@ -582,7 +582,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
       public Builder addFile(
-          int index, akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder builderForValue) {
         if (fileBuilder_ == null) {
           ensureFileIsMutable();
           file_.add(index, builderForValue.build());
@@ -596,7 +596,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
       public Builder addAllFile(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (fileBuilder_ == null) {
           ensureFileIsMutable();
           super.addAll(values, file_);
@@ -635,14 +635,14 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
-      public akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder getFileBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder getFileBuilder(
           int index) {
         return getFileFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
-      public akka.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getFileOrBuilder(
           int index) {
         if (fileBuilder_ == null) {
           return file_.get(index);  } else {
@@ -652,7 +652,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getFileOrBuilderList() {
         if (fileBuilder_ != null) {
           return fileBuilder_.getMessageOrBuilderList();
@@ -663,31 +663,31 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
-      public akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder addFileBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder addFileBuilder() {
         return getFileFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.FileDescriptorProto.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
-      public akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder addFileBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder addFileBuilder(
           int index) {
         return getFileFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.FileDescriptorProto.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.FileDescriptorProto file = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getFileBuilderList() {
         return getFileFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.FileDescriptorProto, akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder> 
           getFileFieldBuilder() {
         if (fileBuilder_ == null) {
-          fileBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.FileDescriptorProto, akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder>(
+          fileBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder>(
                   file_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -709,7 +709,7 @@ public final class DescriptorProtos {
   }
 
   public interface FileDescriptorProtoOrBuilder
-      extends akka.protobuf.MessageOrBuilder {
+      extends org.apache.pekko.protobuf.MessageOrBuilder {
 
     // optional string name = 1;
     /**
@@ -735,7 +735,7 @@ public final class DescriptorProtos {
      * file name, relative to root of source tree
      * 
      */
-    akka.protobuf.ByteString
+    org.apache.pekko.protobuf.ByteString
         getNameBytes();
 
     // optional string package = 2;
@@ -762,7 +762,7 @@ public final class DescriptorProtos {
      * e.g. "foo", "foo.bar", etc.
      * 
      */
-    akka.protobuf.ByteString
+    org.apache.pekko.protobuf.ByteString
         getPackageBytes();
 
     // repeated string dependency = 3;
@@ -798,7 +798,7 @@ public final class DescriptorProtos {
      * Names of files imported by this file.
      * 
      */
-    akka.protobuf.ByteString
+    org.apache.pekko.protobuf.ByteString
         getDependencyBytes(int index);
 
     // repeated int32 public_dependency = 10;
@@ -864,7 +864,7 @@ public final class DescriptorProtos {
      * All top-level definitions in this file.
      * 
      */
-    java.util.List 
+    java.util.List 
         getMessageTypeList();
     /**
      * repeated .google.protobuf.DescriptorProto message_type = 4;
@@ -873,7 +873,7 @@ public final class DescriptorProtos {
      * All top-level definitions in this file.
      * 
      */
-    akka.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index);
     /**
      * repeated .google.protobuf.DescriptorProto message_type = 4;
      *
@@ -889,7 +889,7 @@ public final class DescriptorProtos {
      * All top-level definitions in this file.
      * 
      */
-    java.util.List 
+    java.util.List 
         getMessageTypeOrBuilderList();
     /**
      * repeated .google.protobuf.DescriptorProto message_type = 4;
@@ -898,19 +898,19 @@ public final class DescriptorProtos {
      * All top-level definitions in this file.
      * 
      */
-    akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder(
         int index);
 
     // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
      */
-    java.util.List 
+    java.util.List 
         getEnumTypeList();
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
      */
-    akka.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index);
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
      */
@@ -918,24 +918,24 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
      */
-    java.util.List 
+    java.util.List 
         getEnumTypeOrBuilderList();
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
      */
-    akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
         int index);
 
     // repeated .google.protobuf.ServiceDescriptorProto service = 6;
     /**
      * repeated .google.protobuf.ServiceDescriptorProto service = 6;
      */
-    java.util.List 
+    java.util.List 
         getServiceList();
     /**
      * repeated .google.protobuf.ServiceDescriptorProto service = 6;
      */
-    akka.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index);
     /**
      * repeated .google.protobuf.ServiceDescriptorProto service = 6;
      */
@@ -943,24 +943,24 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.ServiceDescriptorProto service = 6;
      */
-    java.util.List 
+    java.util.List 
         getServiceOrBuilderList();
     /**
      * repeated .google.protobuf.ServiceDescriptorProto service = 6;
      */
-    akka.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder(
         int index);
 
     // repeated .google.protobuf.FieldDescriptorProto extension = 7;
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 7;
      */
-    java.util.List 
+    java.util.List 
         getExtensionList();
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 7;
      */
-    akka.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index);
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 7;
      */
@@ -968,12 +968,12 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 7;
      */
-    java.util.List 
+    java.util.List 
         getExtensionOrBuilderList();
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 7;
      */
-    akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
         int index);
 
     // optional .google.protobuf.FileOptions options = 8;
@@ -984,11 +984,11 @@ public final class DescriptorProtos {
     /**
      * optional .google.protobuf.FileOptions options = 8;
      */
-    akka.protobuf.DescriptorProtos.FileOptions getOptions();
+    org.apache.pekko.protobuf.DescriptorProtos.FileOptions getOptions();
     /**
      * optional .google.protobuf.FileOptions options = 8;
      */
-    akka.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder();
+    org.apache.pekko.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder();
 
     // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
     /**
@@ -1012,7 +1012,7 @@ public final class DescriptorProtos {
      * development tools.
      * 
      */
-    akka.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo();
+    org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo();
     /**
      * optional .google.protobuf.SourceCodeInfo source_code_info = 9;
      *
@@ -1023,7 +1023,7 @@ public final class DescriptorProtos {
      * development tools.
      * 
      */
-    akka.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder();
+    org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder();
   }
   /**
    * Protobuf type {@code google.protobuf.FileDescriptorProto}
@@ -1033,14 +1033,14 @@ public final class DescriptorProtos {
    * 
    */
   public static final class FileDescriptorProto extends
-      akka.protobuf.GeneratedMessage
+      org.apache.pekko.protobuf.GeneratedMessage
       implements FileDescriptorProtoOrBuilder {
     // Use FileDescriptorProto.newBuilder() to construct.
-    private FileDescriptorProto(akka.protobuf.GeneratedMessage.Builder builder) {
+    private FileDescriptorProto(org.apache.pekko.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private FileDescriptorProto(boolean noInit) { this.unknownFields = akka.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private FileDescriptorProto(boolean noInit) { this.unknownFields = org.apache.pekko.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
     private static final FileDescriptorProto defaultInstance;
     public static FileDescriptorProto getDefaultInstance() {
@@ -1051,20 +1051,20 @@ public final class DescriptorProtos {
       return defaultInstance;
     }
 
-    private final akka.protobuf.UnknownFieldSet unknownFields;
+    private final org.apache.pekko.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
-    public final akka.protobuf.UnknownFieldSet
+    public final org.apache.pekko.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
     }
     private FileDescriptorProto(
-        akka.protobuf.CodedInputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+        org.apache.pekko.protobuf.CodedInputStream input,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
-      akka.protobuf.UnknownFieldSet.Builder unknownFields =
-          akka.protobuf.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobuf.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1092,7 +1092,7 @@ public final class DescriptorProtos {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                dependency_ = new akka.protobuf.LazyStringArrayList();
+                dependency_ = new org.apache.pekko.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               dependency_.add(input.readBytes());
@@ -1100,42 +1100,42 @@ public final class DescriptorProtos {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                messageType_ = new java.util.ArrayList();
+                messageType_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              messageType_.add(input.readMessage(akka.protobuf.DescriptorProtos.DescriptorProto.PARSER, extensionRegistry));
+              messageType_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.PARSER, extensionRegistry));
               break;
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-                enumType_ = new java.util.ArrayList();
+                enumType_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000040;
               }
-              enumType_.add(input.readMessage(akka.protobuf.DescriptorProtos.EnumDescriptorProto.PARSER, extensionRegistry));
+              enumType_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.PARSER, extensionRegistry));
               break;
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                service_ = new java.util.ArrayList();
+                service_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              service_.add(input.readMessage(akka.protobuf.DescriptorProtos.ServiceDescriptorProto.PARSER, extensionRegistry));
+              service_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.PARSER, extensionRegistry));
               break;
             }
             case 58: {
               if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                extension_ = new java.util.ArrayList();
+                extension_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000100;
               }
-              extension_.add(input.readMessage(akka.protobuf.DescriptorProtos.FieldDescriptorProto.PARSER, extensionRegistry));
+              extension_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.PARSER, extensionRegistry));
               break;
             }
             case 66: {
-              akka.protobuf.DescriptorProtos.FileOptions.Builder subBuilder = null;
+              org.apache.pekko.protobuf.DescriptorProtos.FileOptions.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = options_.toBuilder();
               }
-              options_ = input.readMessage(akka.protobuf.DescriptorProtos.FileOptions.PARSER, extensionRegistry);
+              options_ = input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.FileOptions.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(options_);
                 options_ = subBuilder.buildPartial();
@@ -1144,11 +1144,11 @@ public final class DescriptorProtos {
               break;
             }
             case 74: {
-              akka.protobuf.DescriptorProtos.SourceCodeInfo.Builder subBuilder = null;
+              org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = sourceCodeInfo_.toBuilder();
               }
-              sourceCodeInfo_ = input.readMessage(akka.protobuf.DescriptorProtos.SourceCodeInfo.PARSER, extensionRegistry);
+              sourceCodeInfo_ = input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(sourceCodeInfo_);
                 sourceCodeInfo_ = subBuilder.buildPartial();
@@ -1200,14 +1200,14 @@ public final class DescriptorProtos {
             }
           }
         }
-      } catch (akka.protobuf.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobuf.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobuf.InvalidProtocolBufferException(
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-          dependency_ = new akka.protobuf.UnmodifiableLazyStringList(dependency_);
+          dependency_ = new org.apache.pekko.protobuf.UnmodifiableLazyStringList(dependency_);
         }
         if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
           messageType_ = java.util.Collections.unmodifiableList(messageType_);
@@ -1231,30 +1231,30 @@ public final class DescriptorProtos {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobuf.Descriptors.Descriptor
+    public static final org.apache.pekko.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_descriptor;
+      return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_descriptor;
     }
 
-    protected akka.protobuf.GeneratedMessage.FieldAccessorTable
+    protected org.apache.pekko.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable
+      return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.protobuf.DescriptorProtos.FileDescriptorProto.class, akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder.class);
+              org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.class, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder.class);
     }
 
-    public static akka.protobuf.Parser PARSER =
-        new akka.protobuf.AbstractParser() {
+    public static org.apache.pekko.protobuf.Parser PARSER =
+        new org.apache.pekko.protobuf.AbstractParser() {
       public FileDescriptorProto parsePartialFrom(
-          akka.protobuf.CodedInputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobuf.InvalidProtocolBufferException {
+          org.apache.pekko.protobuf.CodedInputStream input,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
         return new FileDescriptorProto(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public akka.protobuf.Parser getParserForType() {
+    public org.apache.pekko.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
@@ -1284,8 +1284,8 @@ public final class DescriptorProtos {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobuf.ByteString bs = 
-            (akka.protobuf.ByteString) ref;
+        org.apache.pekko.protobuf.ByteString bs = 
+            (org.apache.pekko.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           name_ = s;
@@ -1300,17 +1300,17 @@ public final class DescriptorProtos {
      * file name, relative to root of source tree
      * 
      */
-    public akka.protobuf.ByteString
+    public org.apache.pekko.protobuf.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        akka.protobuf.ByteString b = 
-            akka.protobuf.ByteString.copyFromUtf8(
+        org.apache.pekko.protobuf.ByteString b = 
+            org.apache.pekko.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
-        return (akka.protobuf.ByteString) ref;
+        return (org.apache.pekko.protobuf.ByteString) ref;
       }
     }
 
@@ -1339,8 +1339,8 @@ public final class DescriptorProtos {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobuf.ByteString bs = 
-            (akka.protobuf.ByteString) ref;
+        org.apache.pekko.protobuf.ByteString bs = 
+            (org.apache.pekko.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           package_ = s;
@@ -1355,23 +1355,23 @@ public final class DescriptorProtos {
      * e.g. "foo", "foo.bar", etc.
      * 
      */
-    public akka.protobuf.ByteString
+    public org.apache.pekko.protobuf.ByteString
         getPackageBytes() {
       java.lang.Object ref = package_;
       if (ref instanceof java.lang.String) {
-        akka.protobuf.ByteString b = 
-            akka.protobuf.ByteString.copyFromUtf8(
+        org.apache.pekko.protobuf.ByteString b = 
+            org.apache.pekko.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         package_ = b;
         return b;
       } else {
-        return (akka.protobuf.ByteString) ref;
+        return (org.apache.pekko.protobuf.ByteString) ref;
       }
     }
 
     // repeated string dependency = 3;
     public static final int DEPENDENCY_FIELD_NUMBER = 3;
-    private akka.protobuf.LazyStringList dependency_;
+    private org.apache.pekko.protobuf.LazyStringList dependency_;
     /**
      * repeated string dependency = 3;
      *
@@ -1410,7 +1410,7 @@ public final class DescriptorProtos {
      * Names of files imported by this file.
      * 
      */
-    public akka.protobuf.ByteString
+    public org.apache.pekko.protobuf.ByteString
         getDependencyBytes(int index) {
       return dependency_.getByteString(index);
     }
@@ -1490,7 +1490,7 @@ public final class DescriptorProtos {
 
     // repeated .google.protobuf.DescriptorProto message_type = 4;
     public static final int MESSAGE_TYPE_FIELD_NUMBER = 4;
-    private java.util.List messageType_;
+    private java.util.List messageType_;
     /**
      * repeated .google.protobuf.DescriptorProto message_type = 4;
      *
@@ -1498,7 +1498,7 @@ public final class DescriptorProtos {
      * All top-level definitions in this file.
      * 
      */
-    public java.util.List getMessageTypeList() {
+    public java.util.List getMessageTypeList() {
       return messageType_;
     }
     /**
@@ -1508,7 +1508,7 @@ public final class DescriptorProtos {
      * All top-level definitions in this file.
      * 
      */
-    public java.util.List 
+    public java.util.List 
         getMessageTypeOrBuilderList() {
       return messageType_;
     }
@@ -1529,7 +1529,7 @@ public final class DescriptorProtos {
      * All top-level definitions in this file.
      * 
      */
-    public akka.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index) {
       return messageType_.get(index);
     }
     /**
@@ -1539,24 +1539,24 @@ public final class DescriptorProtos {
      * All top-level definitions in this file.
      * 
      */
-    public akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder(
         int index) {
       return messageType_.get(index);
     }
 
     // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
     public static final int ENUM_TYPE_FIELD_NUMBER = 5;
-    private java.util.List enumType_;
+    private java.util.List enumType_;
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
      */
-    public java.util.List getEnumTypeList() {
+    public java.util.List getEnumTypeList() {
       return enumType_;
     }
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getEnumTypeOrBuilderList() {
       return enumType_;
     }
@@ -1569,30 +1569,30 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
      */
-    public akka.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) {
       return enumType_.get(index);
     }
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
      */
-    public akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
         int index) {
       return enumType_.get(index);
     }
 
     // repeated .google.protobuf.ServiceDescriptorProto service = 6;
     public static final int SERVICE_FIELD_NUMBER = 6;
-    private java.util.List service_;
+    private java.util.List service_;
     /**
      * repeated .google.protobuf.ServiceDescriptorProto service = 6;
      */
-    public java.util.List getServiceList() {
+    public java.util.List getServiceList() {
       return service_;
     }
     /**
      * repeated .google.protobuf.ServiceDescriptorProto service = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getServiceOrBuilderList() {
       return service_;
     }
@@ -1605,30 +1605,30 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.ServiceDescriptorProto service = 6;
      */
-    public akka.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index) {
       return service_.get(index);
     }
     /**
      * repeated .google.protobuf.ServiceDescriptorProto service = 6;
      */
-    public akka.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder(
         int index) {
       return service_.get(index);
     }
 
     // repeated .google.protobuf.FieldDescriptorProto extension = 7;
     public static final int EXTENSION_FIELD_NUMBER = 7;
-    private java.util.List extension_;
+    private java.util.List extension_;
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 7;
      */
-    public java.util.List getExtensionList() {
+    public java.util.List getExtensionList() {
       return extension_;
     }
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 7;
      */
-    public java.util.List 
+    public java.util.List 
         getExtensionOrBuilderList() {
       return extension_;
     }
@@ -1641,20 +1641,20 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 7;
      */
-    public akka.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) {
       return extension_.get(index);
     }
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 7;
      */
-    public akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
         int index) {
       return extension_.get(index);
     }
 
     // optional .google.protobuf.FileOptions options = 8;
     public static final int OPTIONS_FIELD_NUMBER = 8;
-    private akka.protobuf.DescriptorProtos.FileOptions options_;
+    private org.apache.pekko.protobuf.DescriptorProtos.FileOptions options_;
     /**
      * optional .google.protobuf.FileOptions options = 8;
      */
@@ -1664,19 +1664,19 @@ public final class DescriptorProtos {
     /**
      * optional .google.protobuf.FileOptions options = 8;
      */
-    public akka.protobuf.DescriptorProtos.FileOptions getOptions() {
+    public org.apache.pekko.protobuf.DescriptorProtos.FileOptions getOptions() {
       return options_;
     }
     /**
      * optional .google.protobuf.FileOptions options = 8;
      */
-    public akka.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder() {
+    public org.apache.pekko.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder() {
       return options_;
     }
 
     // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
     public static final int SOURCE_CODE_INFO_FIELD_NUMBER = 9;
-    private akka.protobuf.DescriptorProtos.SourceCodeInfo sourceCodeInfo_;
+    private org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo sourceCodeInfo_;
     /**
      * optional .google.protobuf.SourceCodeInfo source_code_info = 9;
      *
@@ -1700,7 +1700,7 @@ public final class DescriptorProtos {
      * development tools.
      * 
      */
-    public akka.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo() {
+    public org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo() {
       return sourceCodeInfo_;
     }
     /**
@@ -1713,22 +1713,22 @@ public final class DescriptorProtos {
      * development tools.
      * 
      */
-    public akka.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder() {
+    public org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder() {
       return sourceCodeInfo_;
     }
 
     private void initFields() {
       name_ = "";
       package_ = "";
-      dependency_ = akka.protobuf.LazyStringArrayList.EMPTY;
+      dependency_ = org.apache.pekko.protobuf.LazyStringArrayList.EMPTY;
       publicDependency_ = java.util.Collections.emptyList();
       weakDependency_ = java.util.Collections.emptyList();
       messageType_ = java.util.Collections.emptyList();
       enumType_ = java.util.Collections.emptyList();
       service_ = java.util.Collections.emptyList();
       extension_ = java.util.Collections.emptyList();
-      options_ = akka.protobuf.DescriptorProtos.FileOptions.getDefaultInstance();
-      sourceCodeInfo_ = akka.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance();
+      options_ = org.apache.pekko.protobuf.DescriptorProtos.FileOptions.getDefaultInstance();
+      sourceCodeInfo_ = org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -1769,7 +1769,7 @@ public final class DescriptorProtos {
       return true;
     }
 
-    public void writeTo(akka.protobuf.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1815,50 +1815,50 @@ public final class DescriptorProtos {
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeBytesSize(1, getNameBytes());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeBytesSize(2, getPackageBytes());
       }
       {
         int dataSize = 0;
         for (int i = 0; i < dependency_.size(); i++) {
-          dataSize += akka.protobuf.CodedOutputStream
+          dataSize += org.apache.pekko.protobuf.CodedOutputStream
             .computeBytesSizeNoTag(dependency_.getByteString(i));
         }
         size += dataSize;
         size += 1 * getDependencyList().size();
       }
       for (int i = 0; i < messageType_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(4, messageType_.get(i));
       }
       for (int i = 0; i < enumType_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(5, enumType_.get(i));
       }
       for (int i = 0; i < service_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(6, service_.get(i));
       }
       for (int i = 0; i < extension_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(7, extension_.get(i));
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(8, options_);
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(9, sourceCodeInfo_);
       }
       {
         int dataSize = 0;
         for (int i = 0; i < publicDependency_.size(); i++) {
-          dataSize += akka.protobuf.CodedOutputStream
+          dataSize += org.apache.pekko.protobuf.CodedOutputStream
             .computeInt32SizeNoTag(publicDependency_.get(i));
         }
         size += dataSize;
@@ -1867,7 +1867,7 @@ public final class DescriptorProtos {
       {
         int dataSize = 0;
         for (int i = 0; i < weakDependency_.size(); i++) {
-          dataSize += akka.protobuf.CodedOutputStream
+          dataSize += org.apache.pekko.protobuf.CodedOutputStream
             .computeInt32SizeNoTag(weakDependency_.get(i));
         }
         size += dataSize;
@@ -1885,69 +1885,69 @@ public final class DescriptorProtos {
       return super.writeReplace();
     }
 
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
-        akka.protobuf.ByteString data)
-        throws akka.protobuf.InvalidProtocolBufferException {
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
+        org.apache.pekko.protobuf.ByteString data)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
-        akka.protobuf.ByteString data,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
+        org.apache.pekko.protobuf.ByteString data,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(byte[] data)
-        throws akka.protobuf.InvalidProtocolBufferException {
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(byte[] data)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
         byte[] data,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
         java.io.InputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseDelimitedFrom(
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
-        akka.protobuf.CodedInputStream input)
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
+        org.apache.pekko.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static akka.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
-        akka.protobuf.CodedInputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parseFrom(
+        org.apache.pekko.protobuf.CodedInputStream input,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.protobuf.DescriptorProtos.FileDescriptorProto prototype) {
+    public static Builder newBuilder(org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobuf.GeneratedMessage.BuilderParent parent) {
+        org.apache.pekko.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1959,32 +1959,32 @@ public final class DescriptorProtos {
      * 
      */
     public static final class Builder extends
-        akka.protobuf.GeneratedMessage.Builder
-       implements akka.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder {
-      public static final akka.protobuf.Descriptors.Descriptor
+        org.apache.pekko.protobuf.GeneratedMessage.Builder
+       implements org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder {
+      public static final org.apache.pekko.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_descriptor;
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_descriptor;
       }
 
-      protected akka.protobuf.GeneratedMessage.FieldAccessorTable
+      protected org.apache.pekko.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.protobuf.DescriptorProtos.FileDescriptorProto.class, akka.protobuf.DescriptorProtos.FileDescriptorProto.Builder.class);
+                org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.class, org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.Builder.class);
       }
 
-      // Construct using akka.protobuf.DescriptorProtos.FileDescriptorProto.newBuilder()
+      // Construct using org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobuf.GeneratedMessage.BuilderParent parent) {
+          org.apache.pekko.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
           getMessageTypeFieldBuilder();
           getEnumTypeFieldBuilder();
           getServiceFieldBuilder();
@@ -2003,7 +2003,7 @@ public final class DescriptorProtos {
         bitField0_ = (bitField0_ & ~0x00000001);
         package_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
-        dependency_ = akka.protobuf.LazyStringArrayList.EMPTY;
+        dependency_ = org.apache.pekko.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         publicDependency_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -2034,13 +2034,13 @@ public final class DescriptorProtos {
           extensionBuilder_.clear();
         }
         if (optionsBuilder_ == null) {
-          options_ = akka.protobuf.DescriptorProtos.FileOptions.getDefaultInstance();
+          options_ = org.apache.pekko.protobuf.DescriptorProtos.FileOptions.getDefaultInstance();
         } else {
           optionsBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000200);
         if (sourceCodeInfoBuilder_ == null) {
-          sourceCodeInfo_ = akka.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance();
+          sourceCodeInfo_ = org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance();
         } else {
           sourceCodeInfoBuilder_.clear();
         }
@@ -2052,25 +2052,25 @@ public final class DescriptorProtos {
         return create().mergeFrom(buildPartial());
       }
 
-      public akka.protobuf.Descriptors.Descriptor
+      public org.apache.pekko.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_descriptor;
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FileDescriptorProto_descriptor;
       }
 
-      public akka.protobuf.DescriptorProtos.FileDescriptorProto getDefaultInstanceForType() {
-        return akka.protobuf.DescriptorProtos.FileDescriptorProto.getDefaultInstance();
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto getDefaultInstanceForType() {
+        return org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.getDefaultInstance();
       }
 
-      public akka.protobuf.DescriptorProtos.FileDescriptorProto build() {
-        akka.protobuf.DescriptorProtos.FileDescriptorProto result = buildPartial();
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto build() {
+        org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public akka.protobuf.DescriptorProtos.FileDescriptorProto buildPartial() {
-        akka.protobuf.DescriptorProtos.FileDescriptorProto result = new akka.protobuf.DescriptorProtos.FileDescriptorProto(this);
+      public org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto buildPartial() {
+        org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto result = new org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2082,7 +2082,7 @@ public final class DescriptorProtos {
         }
         result.package_ = package_;
         if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          dependency_ = new akka.protobuf.UnmodifiableLazyStringList(
+          dependency_ = new org.apache.pekko.protobuf.UnmodifiableLazyStringList(
               dependency_);
           bitField0_ = (bitField0_ & ~0x00000004);
         }
@@ -2154,17 +2154,17 @@ public final class DescriptorProtos {
         return result;
       }
 
-      public Builder mergeFrom(akka.protobuf.Message other) {
-        if (other instanceof akka.protobuf.DescriptorProtos.FileDescriptorProto) {
-          return mergeFrom((akka.protobuf.DescriptorProtos.FileDescriptorProto)other);
+      public Builder mergeFrom(org.apache.pekko.protobuf.Message other) {
+        if (other instanceof org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto) {
+          return mergeFrom((org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.protobuf.DescriptorProtos.FileDescriptorProto other) {
-        if (other == akka.protobuf.DescriptorProtos.FileDescriptorProto.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto other) {
+        if (other == org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto.getDefaultInstance()) return this;
         if (other.hasName()) {
           bitField0_ |= 0x00000001;
           name_ = other.name_;
@@ -2224,7 +2224,7 @@ public final class DescriptorProtos {
               messageType_ = other.messageType_;
               bitField0_ = (bitField0_ & ~0x00000020);
               messageTypeBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getMessageTypeFieldBuilder() : null;
             } else {
               messageTypeBuilder_.addAllMessages(other.messageType_);
@@ -2250,7 +2250,7 @@ public final class DescriptorProtos {
               enumType_ = other.enumType_;
               bitField0_ = (bitField0_ & ~0x00000040);
               enumTypeBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getEnumTypeFieldBuilder() : null;
             } else {
               enumTypeBuilder_.addAllMessages(other.enumType_);
@@ -2276,7 +2276,7 @@ public final class DescriptorProtos {
               service_ = other.service_;
               bitField0_ = (bitField0_ & ~0x00000080);
               serviceBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getServiceFieldBuilder() : null;
             } else {
               serviceBuilder_.addAllMessages(other.service_);
@@ -2302,7 +2302,7 @@ public final class DescriptorProtos {
               extension_ = other.extension_;
               bitField0_ = (bitField0_ & ~0x00000100);
               extensionBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getExtensionFieldBuilder() : null;
             } else {
               extensionBuilder_.addAllMessages(other.extension_);
@@ -2354,14 +2354,14 @@ public final class DescriptorProtos {
       }
 
       public Builder mergeFrom(
-          akka.protobuf.CodedInputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobuf.CodedInputStream input,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.protobuf.DescriptorProtos.FileDescriptorProto parsedMessage = null;
+        org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.protobuf.DescriptorProtos.FileDescriptorProto) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.protobuf.DescriptorProtos.FileDescriptorProto) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2394,7 +2394,7 @@ public final class DescriptorProtos {
       public java.lang.String getName() {
         java.lang.Object ref = name_;
         if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((akka.protobuf.ByteString) ref)
+          java.lang.String s = ((org.apache.pekko.protobuf.ByteString) ref)
               .toStringUtf8();
           name_ = s;
           return s;
@@ -2409,17 +2409,17 @@ public final class DescriptorProtos {
        * file name, relative to root of source tree
        * 
        */
-      public akka.protobuf.ByteString
+      public org.apache.pekko.protobuf.ByteString
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          akka.protobuf.ByteString b = 
-              akka.protobuf.ByteString.copyFromUtf8(
+          org.apache.pekko.protobuf.ByteString b = 
+              org.apache.pekko.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
           return b;
         } else {
-          return (akka.protobuf.ByteString) ref;
+          return (org.apache.pekko.protobuf.ByteString) ref;
         }
       }
       /**
@@ -2460,7 +2460,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder setNameBytes(
-          akka.protobuf.ByteString value) {
+          org.apache.pekko.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2492,7 +2492,7 @@ public final class DescriptorProtos {
       public java.lang.String getPackage() {
         java.lang.Object ref = package_;
         if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((akka.protobuf.ByteString) ref)
+          java.lang.String s = ((org.apache.pekko.protobuf.ByteString) ref)
               .toStringUtf8();
           package_ = s;
           return s;
@@ -2507,17 +2507,17 @@ public final class DescriptorProtos {
        * e.g. "foo", "foo.bar", etc.
        * 
        */
-      public akka.protobuf.ByteString
+      public org.apache.pekko.protobuf.ByteString
           getPackageBytes() {
         java.lang.Object ref = package_;
         if (ref instanceof String) {
-          akka.protobuf.ByteString b = 
-              akka.protobuf.ByteString.copyFromUtf8(
+          org.apache.pekko.protobuf.ByteString b = 
+              org.apache.pekko.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           package_ = b;
           return b;
         } else {
-          return (akka.protobuf.ByteString) ref;
+          return (org.apache.pekko.protobuf.ByteString) ref;
         }
       }
       /**
@@ -2558,7 +2558,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder setPackageBytes(
-          akka.protobuf.ByteString value) {
+          org.apache.pekko.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2569,10 +2569,10 @@ public final class DescriptorProtos {
       }
 
       // repeated string dependency = 3;
-      private akka.protobuf.LazyStringList dependency_ = akka.protobuf.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobuf.LazyStringList dependency_ = org.apache.pekko.protobuf.LazyStringArrayList.EMPTY;
       private void ensureDependencyIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          dependency_ = new akka.protobuf.LazyStringArrayList(dependency_);
+          dependency_ = new org.apache.pekko.protobuf.LazyStringArrayList(dependency_);
           bitField0_ |= 0x00000004;
          }
       }
@@ -2614,7 +2614,7 @@ public final class DescriptorProtos {
        * Names of files imported by this file.
        * 
        */
-      public akka.protobuf.ByteString
+      public org.apache.pekko.protobuf.ByteString
           getDependencyBytes(int index) {
         return dependency_.getByteString(index);
       }
@@ -2674,7 +2674,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder clearDependency() {
-        dependency_ = akka.protobuf.LazyStringArrayList.EMPTY;
+        dependency_ = org.apache.pekko.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -2687,7 +2687,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder addDependencyBytes(
-          akka.protobuf.ByteString value) {
+          org.apache.pekko.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2893,17 +2893,17 @@ public final class DescriptorProtos {
       }
 
       // repeated .google.protobuf.DescriptorProto message_type = 4;
-      private java.util.List messageType_ =
+      private java.util.List messageType_ =
         java.util.Collections.emptyList();
       private void ensureMessageTypeIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          messageType_ = new java.util.ArrayList(messageType_);
+          messageType_ = new java.util.ArrayList(messageType_);
           bitField0_ |= 0x00000020;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.DescriptorProto, akka.protobuf.DescriptorProtos.DescriptorProto.Builder, akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> messageTypeBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> messageTypeBuilder_;
 
       /**
        * repeated .google.protobuf.DescriptorProto message_type = 4;
@@ -2912,7 +2912,7 @@ public final class DescriptorProtos {
        * All top-level definitions in this file.
        * 
        */
-      public java.util.List getMessageTypeList() {
+      public java.util.List getMessageTypeList() {
         if (messageTypeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(messageType_);
         } else {
@@ -2940,7 +2940,7 @@ public final class DescriptorProtos {
        * All top-level definitions in this file.
        * 
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto getMessageType(int index) {
         if (messageTypeBuilder_ == null) {
           return messageType_.get(index);
         } else {
@@ -2955,7 +2955,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder setMessageType(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto value) {
         if (messageTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2976,7 +2976,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder setMessageType(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
         if (messageTypeBuilder_ == null) {
           ensureMessageTypeIsMutable();
           messageType_.set(index, builderForValue.build());
@@ -2993,7 +2993,7 @@ public final class DescriptorProtos {
        * All top-level definitions in this file.
        * 
        */
-      public Builder addMessageType(akka.protobuf.DescriptorProtos.DescriptorProto value) {
+      public Builder addMessageType(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto value) {
         if (messageTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3014,7 +3014,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder addMessageType(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto value) {
         if (messageTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3035,7 +3035,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder addMessageType(
-          akka.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
         if (messageTypeBuilder_ == null) {
           ensureMessageTypeIsMutable();
           messageType_.add(builderForValue.build());
@@ -3053,7 +3053,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder addMessageType(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
         if (messageTypeBuilder_ == null) {
           ensureMessageTypeIsMutable();
           messageType_.add(index, builderForValue.build());
@@ -3071,7 +3071,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder addAllMessageType(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (messageTypeBuilder_ == null) {
           ensureMessageTypeIsMutable();
           super.addAll(values, messageType_);
@@ -3122,7 +3122,7 @@ public final class DescriptorProtos {
        * All top-level definitions in this file.
        * 
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.Builder getMessageTypeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder getMessageTypeBuilder(
           int index) {
         return getMessageTypeFieldBuilder().getBuilder(index);
       }
@@ -3133,7 +3133,7 @@ public final class DescriptorProtos {
        * All top-level definitions in this file.
        * 
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getMessageTypeOrBuilder(
           int index) {
         if (messageTypeBuilder_ == null) {
           return messageType_.get(index);  } else {
@@ -3147,7 +3147,7 @@ public final class DescriptorProtos {
        * All top-level definitions in this file.
        * 
        */
-      public java.util.List 
+      public java.util.List 
            getMessageTypeOrBuilderList() {
         if (messageTypeBuilder_ != null) {
           return messageTypeBuilder_.getMessageOrBuilderList();
@@ -3162,9 +3162,9 @@ public final class DescriptorProtos {
        * All top-level definitions in this file.
        * 
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.Builder addMessageTypeBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder addMessageTypeBuilder() {
         return getMessageTypeFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.DescriptorProto message_type = 4;
@@ -3173,10 +3173,10 @@ public final class DescriptorProtos {
        * All top-level definitions in this file.
        * 
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.Builder addMessageTypeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder addMessageTypeBuilder(
           int index) {
         return getMessageTypeFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.DescriptorProto message_type = 4;
@@ -3185,16 +3185,16 @@ public final class DescriptorProtos {
        * All top-level definitions in this file.
        * 
        */
-      public java.util.List 
+      public java.util.List 
            getMessageTypeBuilderList() {
         return getMessageTypeFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.DescriptorProto, akka.protobuf.DescriptorProtos.DescriptorProto.Builder, akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> 
           getMessageTypeFieldBuilder() {
         if (messageTypeBuilder_ == null) {
-          messageTypeBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.DescriptorProto, akka.protobuf.DescriptorProtos.DescriptorProto.Builder, akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder>(
+          messageTypeBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder>(
                   messageType_,
                   ((bitField0_ & 0x00000020) == 0x00000020),
                   getParentForChildren(),
@@ -3205,22 +3205,22 @@ public final class DescriptorProtos {
       }
 
       // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
-      private java.util.List enumType_ =
+      private java.util.List enumType_ =
         java.util.Collections.emptyList();
       private void ensureEnumTypeIsMutable() {
         if (!((bitField0_ & 0x00000040) == 0x00000040)) {
-          enumType_ = new java.util.ArrayList(enumType_);
+          enumType_ = new java.util.ArrayList(enumType_);
           bitField0_ |= 0x00000040;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.EnumDescriptorProto, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> enumTypeBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> enumTypeBuilder_;
 
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
-      public java.util.List getEnumTypeList() {
+      public java.util.List getEnumTypeList() {
         if (enumTypeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(enumType_);
         } else {
@@ -3240,7 +3240,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) {
         if (enumTypeBuilder_ == null) {
           return enumType_.get(index);
         } else {
@@ -3251,7 +3251,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
       public Builder setEnumType(
-          int index, akka.protobuf.DescriptorProtos.EnumDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto value) {
         if (enumTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3268,7 +3268,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
       public Builder setEnumType(
-          int index, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
         if (enumTypeBuilder_ == null) {
           ensureEnumTypeIsMutable();
           enumType_.set(index, builderForValue.build());
@@ -3281,7 +3281,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
-      public Builder addEnumType(akka.protobuf.DescriptorProtos.EnumDescriptorProto value) {
+      public Builder addEnumType(org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto value) {
         if (enumTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3298,7 +3298,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
       public Builder addEnumType(
-          int index, akka.protobuf.DescriptorProtos.EnumDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto value) {
         if (enumTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3315,7 +3315,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
       public Builder addEnumType(
-          akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
         if (enumTypeBuilder_ == null) {
           ensureEnumTypeIsMutable();
           enumType_.add(builderForValue.build());
@@ -3329,7 +3329,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
       public Builder addEnumType(
-          int index, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
         if (enumTypeBuilder_ == null) {
           ensureEnumTypeIsMutable();
           enumType_.add(index, builderForValue.build());
@@ -3343,7 +3343,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
       public Builder addAllEnumType(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (enumTypeBuilder_ == null) {
           ensureEnumTypeIsMutable();
           super.addAll(values, enumType_);
@@ -3382,14 +3382,14 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder getEnumTypeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder getEnumTypeBuilder(
           int index) {
         return getEnumTypeFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
           int index) {
         if (enumTypeBuilder_ == null) {
           return enumType_.get(index);  } else {
@@ -3399,7 +3399,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getEnumTypeOrBuilderList() {
         if (enumTypeBuilder_ != null) {
           return enumTypeBuilder_.getMessageOrBuilderList();
@@ -3410,31 +3410,31 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder addEnumTypeBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder addEnumTypeBuilder() {
         return getEnumTypeFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.EnumDescriptorProto.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder addEnumTypeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder addEnumTypeBuilder(
           int index) {
         return getEnumTypeFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.EnumDescriptorProto.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getEnumTypeBuilderList() {
         return getEnumTypeFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.EnumDescriptorProto, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> 
           getEnumTypeFieldBuilder() {
         if (enumTypeBuilder_ == null) {
-          enumTypeBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.EnumDescriptorProto, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder>(
+          enumTypeBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder>(
                   enumType_,
                   ((bitField0_ & 0x00000040) == 0x00000040),
                   getParentForChildren(),
@@ -3445,22 +3445,22 @@ public final class DescriptorProtos {
       }
 
       // repeated .google.protobuf.ServiceDescriptorProto service = 6;
-      private java.util.List service_ =
+      private java.util.List service_ =
         java.util.Collections.emptyList();
       private void ensureServiceIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          service_ = new java.util.ArrayList(service_);
+          service_ = new java.util.ArrayList(service_);
           bitField0_ |= 0x00000080;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.ServiceDescriptorProto, akka.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder, akka.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder> serviceBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder> serviceBuilder_;
 
       /**
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
-      public java.util.List getServiceList() {
+      public java.util.List getServiceList() {
         if (serviceBuilder_ == null) {
           return java.util.Collections.unmodifiableList(service_);
         } else {
@@ -3480,7 +3480,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
-      public akka.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto getService(int index) {
         if (serviceBuilder_ == null) {
           return service_.get(index);
         } else {
@@ -3491,7 +3491,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
       public Builder setService(
-          int index, akka.protobuf.DescriptorProtos.ServiceDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto value) {
         if (serviceBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3508,7 +3508,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
       public Builder setService(
-          int index, akka.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder builderForValue) {
         if (serviceBuilder_ == null) {
           ensureServiceIsMutable();
           service_.set(index, builderForValue.build());
@@ -3521,7 +3521,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
-      public Builder addService(akka.protobuf.DescriptorProtos.ServiceDescriptorProto value) {
+      public Builder addService(org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto value) {
         if (serviceBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3538,7 +3538,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
       public Builder addService(
-          int index, akka.protobuf.DescriptorProtos.ServiceDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto value) {
         if (serviceBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3555,7 +3555,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
       public Builder addService(
-          akka.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder builderForValue) {
         if (serviceBuilder_ == null) {
           ensureServiceIsMutable();
           service_.add(builderForValue.build());
@@ -3569,7 +3569,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
       public Builder addService(
-          int index, akka.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder builderForValue) {
         if (serviceBuilder_ == null) {
           ensureServiceIsMutable();
           service_.add(index, builderForValue.build());
@@ -3583,7 +3583,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
       public Builder addAllService(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (serviceBuilder_ == null) {
           ensureServiceIsMutable();
           super.addAll(values, service_);
@@ -3622,14 +3622,14 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
-      public akka.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder getServiceBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder getServiceBuilder(
           int index) {
         return getServiceFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
-      public akka.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder getServiceOrBuilder(
           int index) {
         if (serviceBuilder_ == null) {
           return service_.get(index);  } else {
@@ -3639,7 +3639,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getServiceOrBuilderList() {
         if (serviceBuilder_ != null) {
           return serviceBuilder_.getMessageOrBuilderList();
@@ -3650,31 +3650,31 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
-      public akka.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder addServiceBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder addServiceBuilder() {
         return getServiceFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.ServiceDescriptorProto.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
-      public akka.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder addServiceBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder addServiceBuilder(
           int index) {
         return getServiceFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.ServiceDescriptorProto.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.ServiceDescriptorProto service = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getServiceBuilderList() {
         return getServiceFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.ServiceDescriptorProto, akka.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder, akka.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder> 
           getServiceFieldBuilder() {
         if (serviceBuilder_ == null) {
-          serviceBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.ServiceDescriptorProto, akka.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder, akka.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder>(
+          serviceBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.ServiceDescriptorProtoOrBuilder>(
                   service_,
                   ((bitField0_ & 0x00000080) == 0x00000080),
                   getParentForChildren(),
@@ -3685,22 +3685,22 @@ public final class DescriptorProtos {
       }
 
       // repeated .google.protobuf.FieldDescriptorProto extension = 7;
-      private java.util.List extension_ =
+      private java.util.List extension_ =
         java.util.Collections.emptyList();
       private void ensureExtensionIsMutable() {
         if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-          extension_ = new java.util.ArrayList(extension_);
+          extension_ = new java.util.ArrayList(extension_);
           bitField0_ |= 0x00000100;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.FieldDescriptorProto, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> extensionBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> extensionBuilder_;
 
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
-      public java.util.List getExtensionList() {
+      public java.util.List getExtensionList() {
         if (extensionBuilder_ == null) {
           return java.util.Collections.unmodifiableList(extension_);
         } else {
@@ -3720,7 +3720,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) {
         if (extensionBuilder_ == null) {
           return extension_.get(index);
         } else {
@@ -3731,7 +3731,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
       public Builder setExtension(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto value) {
         if (extensionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3748,7 +3748,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
       public Builder setExtension(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         if (extensionBuilder_ == null) {
           ensureExtensionIsMutable();
           extension_.set(index, builderForValue.build());
@@ -3761,7 +3761,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
-      public Builder addExtension(akka.protobuf.DescriptorProtos.FieldDescriptorProto value) {
+      public Builder addExtension(org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto value) {
         if (extensionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3778,7 +3778,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
       public Builder addExtension(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto value) {
         if (extensionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3795,7 +3795,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
       public Builder addExtension(
-          akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         if (extensionBuilder_ == null) {
           ensureExtensionIsMutable();
           extension_.add(builderForValue.build());
@@ -3809,7 +3809,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
       public Builder addExtension(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         if (extensionBuilder_ == null) {
           ensureExtensionIsMutable();
           extension_.add(index, builderForValue.build());
@@ -3823,7 +3823,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
       public Builder addAllExtension(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (extensionBuilder_ == null) {
           ensureExtensionIsMutable();
           super.addAll(values, extension_);
@@ -3862,14 +3862,14 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder getExtensionBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder getExtensionBuilder(
           int index) {
         return getExtensionFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
           int index) {
         if (extensionBuilder_ == null) {
           return extension_.get(index);  } else {
@@ -3879,7 +3879,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
-      public java.util.List 
+      public java.util.List 
            getExtensionOrBuilderList() {
         if (extensionBuilder_ != null) {
           return extensionBuilder_.getMessageOrBuilderList();
@@ -3890,31 +3890,31 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addExtensionBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addExtensionBuilder() {
         return getExtensionFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addExtensionBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addExtensionBuilder(
           int index) {
         return getExtensionFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 7;
        */
-      public java.util.List 
+      public java.util.List 
            getExtensionBuilderList() {
         return getExtensionFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.FieldDescriptorProto, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> 
           getExtensionFieldBuilder() {
         if (extensionBuilder_ == null) {
-          extensionBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.FieldDescriptorProto, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder>(
+          extensionBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder>(
                   extension_,
                   ((bitField0_ & 0x00000100) == 0x00000100),
                   getParentForChildren(),
@@ -3925,9 +3925,9 @@ public final class DescriptorProtos {
       }
 
       // optional .google.protobuf.FileOptions options = 8;
-      private akka.protobuf.DescriptorProtos.FileOptions options_ = akka.protobuf.DescriptorProtos.FileOptions.getDefaultInstance();
-      private akka.protobuf.SingleFieldBuilder<
-          akka.protobuf.DescriptorProtos.FileOptions, akka.protobuf.DescriptorProtos.FileOptions.Builder, akka.protobuf.DescriptorProtos.FileOptionsOrBuilder> optionsBuilder_;
+      private org.apache.pekko.protobuf.DescriptorProtos.FileOptions options_ = org.apache.pekko.protobuf.DescriptorProtos.FileOptions.getDefaultInstance();
+      private org.apache.pekko.protobuf.SingleFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FileOptions, org.apache.pekko.protobuf.DescriptorProtos.FileOptions.Builder, org.apache.pekko.protobuf.DescriptorProtos.FileOptionsOrBuilder> optionsBuilder_;
       /**
        * optional .google.protobuf.FileOptions options = 8;
        */
@@ -3937,7 +3937,7 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.FileOptions options = 8;
        */
-      public akka.protobuf.DescriptorProtos.FileOptions getOptions() {
+      public org.apache.pekko.protobuf.DescriptorProtos.FileOptions getOptions() {
         if (optionsBuilder_ == null) {
           return options_;
         } else {
@@ -3947,7 +3947,7 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.FileOptions options = 8;
        */
-      public Builder setOptions(akka.protobuf.DescriptorProtos.FileOptions value) {
+      public Builder setOptions(org.apache.pekko.protobuf.DescriptorProtos.FileOptions value) {
         if (optionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3964,7 +3964,7 @@ public final class DescriptorProtos {
        * optional .google.protobuf.FileOptions options = 8;
        */
       public Builder setOptions(
-          akka.protobuf.DescriptorProtos.FileOptions.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.FileOptions.Builder builderForValue) {
         if (optionsBuilder_ == null) {
           options_ = builderForValue.build();
           onChanged();
@@ -3977,12 +3977,12 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.FileOptions options = 8;
        */
-      public Builder mergeOptions(akka.protobuf.DescriptorProtos.FileOptions value) {
+      public Builder mergeOptions(org.apache.pekko.protobuf.DescriptorProtos.FileOptions value) {
         if (optionsBuilder_ == null) {
           if (((bitField0_ & 0x00000200) == 0x00000200) &&
-              options_ != akka.protobuf.DescriptorProtos.FileOptions.getDefaultInstance()) {
+              options_ != org.apache.pekko.protobuf.DescriptorProtos.FileOptions.getDefaultInstance()) {
             options_ =
-              akka.protobuf.DescriptorProtos.FileOptions.newBuilder(options_).mergeFrom(value).buildPartial();
+              org.apache.pekko.protobuf.DescriptorProtos.FileOptions.newBuilder(options_).mergeFrom(value).buildPartial();
           } else {
             options_ = value;
           }
@@ -3998,7 +3998,7 @@ public final class DescriptorProtos {
        */
       public Builder clearOptions() {
         if (optionsBuilder_ == null) {
-          options_ = akka.protobuf.DescriptorProtos.FileOptions.getDefaultInstance();
+          options_ = org.apache.pekko.protobuf.DescriptorProtos.FileOptions.getDefaultInstance();
           onChanged();
         } else {
           optionsBuilder_.clear();
@@ -4009,7 +4009,7 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.FileOptions options = 8;
        */
-      public akka.protobuf.DescriptorProtos.FileOptions.Builder getOptionsBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.FileOptions.Builder getOptionsBuilder() {
         bitField0_ |= 0x00000200;
         onChanged();
         return getOptionsFieldBuilder().getBuilder();
@@ -4017,7 +4017,7 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.FileOptions options = 8;
        */
-      public akka.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.FileOptionsOrBuilder getOptionsOrBuilder() {
         if (optionsBuilder_ != null) {
           return optionsBuilder_.getMessageOrBuilder();
         } else {
@@ -4027,12 +4027,12 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.FileOptions options = 8;
        */
-      private akka.protobuf.SingleFieldBuilder<
-          akka.protobuf.DescriptorProtos.FileOptions, akka.protobuf.DescriptorProtos.FileOptions.Builder, akka.protobuf.DescriptorProtos.FileOptionsOrBuilder> 
+      private org.apache.pekko.protobuf.SingleFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FileOptions, org.apache.pekko.protobuf.DescriptorProtos.FileOptions.Builder, org.apache.pekko.protobuf.DescriptorProtos.FileOptionsOrBuilder> 
           getOptionsFieldBuilder() {
         if (optionsBuilder_ == null) {
-          optionsBuilder_ = new akka.protobuf.SingleFieldBuilder<
-              akka.protobuf.DescriptorProtos.FileOptions, akka.protobuf.DescriptorProtos.FileOptions.Builder, akka.protobuf.DescriptorProtos.FileOptionsOrBuilder>(
+          optionsBuilder_ = new org.apache.pekko.protobuf.SingleFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.FileOptions, org.apache.pekko.protobuf.DescriptorProtos.FileOptions.Builder, org.apache.pekko.protobuf.DescriptorProtos.FileOptionsOrBuilder>(
                   options_,
                   getParentForChildren(),
                   isClean());
@@ -4042,9 +4042,9 @@ public final class DescriptorProtos {
       }
 
       // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
-      private akka.protobuf.DescriptorProtos.SourceCodeInfo sourceCodeInfo_ = akka.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance();
-      private akka.protobuf.SingleFieldBuilder<
-          akka.protobuf.DescriptorProtos.SourceCodeInfo, akka.protobuf.DescriptorProtos.SourceCodeInfo.Builder, akka.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder> sourceCodeInfoBuilder_;
+      private org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo sourceCodeInfo_ = org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance();
+      private org.apache.pekko.protobuf.SingleFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo, org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.Builder, org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder> sourceCodeInfoBuilder_;
       /**
        * optional .google.protobuf.SourceCodeInfo source_code_info = 9;
        *
@@ -4068,7 +4068,7 @@ public final class DescriptorProtos {
        * development tools.
        * 
        */
-      public akka.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo() {
+      public org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo getSourceCodeInfo() {
         if (sourceCodeInfoBuilder_ == null) {
           return sourceCodeInfo_;
         } else {
@@ -4085,7 +4085,7 @@ public final class DescriptorProtos {
        * development tools.
        * 
        */
-      public Builder setSourceCodeInfo(akka.protobuf.DescriptorProtos.SourceCodeInfo value) {
+      public Builder setSourceCodeInfo(org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo value) {
         if (sourceCodeInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4109,7 +4109,7 @@ public final class DescriptorProtos {
        * 
        */
       public Builder setSourceCodeInfo(
-          akka.protobuf.DescriptorProtos.SourceCodeInfo.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.Builder builderForValue) {
         if (sourceCodeInfoBuilder_ == null) {
           sourceCodeInfo_ = builderForValue.build();
           onChanged();
@@ -4129,12 +4129,12 @@ public final class DescriptorProtos {
        * development tools.
        * 
        */
-      public Builder mergeSourceCodeInfo(akka.protobuf.DescriptorProtos.SourceCodeInfo value) {
+      public Builder mergeSourceCodeInfo(org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo value) {
         if (sourceCodeInfoBuilder_ == null) {
           if (((bitField0_ & 0x00000400) == 0x00000400) &&
-              sourceCodeInfo_ != akka.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance()) {
+              sourceCodeInfo_ != org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance()) {
             sourceCodeInfo_ =
-              akka.protobuf.DescriptorProtos.SourceCodeInfo.newBuilder(sourceCodeInfo_).mergeFrom(value).buildPartial();
+              org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.newBuilder(sourceCodeInfo_).mergeFrom(value).buildPartial();
           } else {
             sourceCodeInfo_ = value;
           }
@@ -4157,7 +4157,7 @@ public final class DescriptorProtos {
        */
       public Builder clearSourceCodeInfo() {
         if (sourceCodeInfoBuilder_ == null) {
-          sourceCodeInfo_ = akka.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance();
+          sourceCodeInfo_ = org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.getDefaultInstance();
           onChanged();
         } else {
           sourceCodeInfoBuilder_.clear();
@@ -4175,7 +4175,7 @@ public final class DescriptorProtos {
        * development tools.
        * 
        */
-      public akka.protobuf.DescriptorProtos.SourceCodeInfo.Builder getSourceCodeInfoBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.Builder getSourceCodeInfoBuilder() {
         bitField0_ |= 0x00000400;
         onChanged();
         return getSourceCodeInfoFieldBuilder().getBuilder();
@@ -4190,7 +4190,7 @@ public final class DescriptorProtos {
        * development tools.
        * 
        */
-      public akka.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder getSourceCodeInfoOrBuilder() {
         if (sourceCodeInfoBuilder_ != null) {
           return sourceCodeInfoBuilder_.getMessageOrBuilder();
         } else {
@@ -4207,12 +4207,12 @@ public final class DescriptorProtos {
        * development tools.
        * 
        */
-      private akka.protobuf.SingleFieldBuilder<
-          akka.protobuf.DescriptorProtos.SourceCodeInfo, akka.protobuf.DescriptorProtos.SourceCodeInfo.Builder, akka.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder> 
+      private org.apache.pekko.protobuf.SingleFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo, org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.Builder, org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder> 
           getSourceCodeInfoFieldBuilder() {
         if (sourceCodeInfoBuilder_ == null) {
-          sourceCodeInfoBuilder_ = new akka.protobuf.SingleFieldBuilder<
-              akka.protobuf.DescriptorProtos.SourceCodeInfo, akka.protobuf.DescriptorProtos.SourceCodeInfo.Builder, akka.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder>(
+          sourceCodeInfoBuilder_ = new org.apache.pekko.protobuf.SingleFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo, org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfo.Builder, org.apache.pekko.protobuf.DescriptorProtos.SourceCodeInfoOrBuilder>(
                   sourceCodeInfo_,
                   getParentForChildren(),
                   isClean());
@@ -4233,7 +4233,7 @@ public final class DescriptorProtos {
   }
 
   public interface DescriptorProtoOrBuilder
-      extends akka.protobuf.MessageOrBuilder {
+      extends org.apache.pekko.protobuf.MessageOrBuilder {
 
     // optional string name = 1;
     /**
@@ -4247,19 +4247,19 @@ public final class DescriptorProtos {
     /**
      * optional string name = 1;
      */
-    akka.protobuf.ByteString
+    org.apache.pekko.protobuf.ByteString
         getNameBytes();
 
     // repeated .google.protobuf.FieldDescriptorProto field = 2;
     /**
      * repeated .google.protobuf.FieldDescriptorProto field = 2;
      */
-    java.util.List 
+    java.util.List 
         getFieldList();
     /**
      * repeated .google.protobuf.FieldDescriptorProto field = 2;
      */
-    akka.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index);
     /**
      * repeated .google.protobuf.FieldDescriptorProto field = 2;
      */
@@ -4267,24 +4267,24 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.FieldDescriptorProto field = 2;
      */
-    java.util.List 
+    java.util.List 
         getFieldOrBuilderList();
     /**
      * repeated .google.protobuf.FieldDescriptorProto field = 2;
      */
-    akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder(
         int index);
 
     // repeated .google.protobuf.FieldDescriptorProto extension = 6;
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 6;
      */
-    java.util.List 
+    java.util.List 
         getExtensionList();
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 6;
      */
-    akka.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index);
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 6;
      */
@@ -4292,24 +4292,24 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 6;
      */
-    java.util.List 
+    java.util.List 
         getExtensionOrBuilderList();
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 6;
      */
-    akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
         int index);
 
     // repeated .google.protobuf.DescriptorProto nested_type = 3;
     /**
      * repeated .google.protobuf.DescriptorProto nested_type = 3;
      */
-    java.util.List 
+    java.util.List 
         getNestedTypeList();
     /**
      * repeated .google.protobuf.DescriptorProto nested_type = 3;
      */
-    akka.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index);
     /**
      * repeated .google.protobuf.DescriptorProto nested_type = 3;
      */
@@ -4317,24 +4317,24 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.DescriptorProto nested_type = 3;
      */
-    java.util.List 
+    java.util.List 
         getNestedTypeOrBuilderList();
     /**
      * repeated .google.protobuf.DescriptorProto nested_type = 3;
      */
-    akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder(
         int index);
 
     // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
      */
-    java.util.List 
+    java.util.List 
         getEnumTypeList();
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
      */
-    akka.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index);
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
      */
@@ -4342,24 +4342,24 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
      */
-    java.util.List 
+    java.util.List 
         getEnumTypeOrBuilderList();
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
      */
-    akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
         int index);
 
     // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
     /**
      * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
      */
-    java.util.List 
+    java.util.List 
         getExtensionRangeList();
     /**
      * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
      */
-    akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index);
+    org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index);
     /**
      * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
      */
@@ -4367,12 +4367,12 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
      */
-    java.util.List 
+    java.util.List 
         getExtensionRangeOrBuilderList();
     /**
      * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
      */
-    akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder(
+    org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder(
         int index);
 
     // optional .google.protobuf.MessageOptions options = 7;
@@ -4383,11 +4383,11 @@ public final class DescriptorProtos {
     /**
      * optional .google.protobuf.MessageOptions options = 7;
      */
-    akka.protobuf.DescriptorProtos.MessageOptions getOptions();
+    org.apache.pekko.protobuf.DescriptorProtos.MessageOptions getOptions();
     /**
      * optional .google.protobuf.MessageOptions options = 7;
      */
-    akka.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder();
+    org.apache.pekko.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder();
   }
   /**
    * Protobuf type {@code google.protobuf.DescriptorProto}
@@ -4397,14 +4397,14 @@ public final class DescriptorProtos {
    * 
    */
   public static final class DescriptorProto extends
-      akka.protobuf.GeneratedMessage
+      org.apache.pekko.protobuf.GeneratedMessage
       implements DescriptorProtoOrBuilder {
     // Use DescriptorProto.newBuilder() to construct.
-    private DescriptorProto(akka.protobuf.GeneratedMessage.Builder builder) {
+    private DescriptorProto(org.apache.pekko.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private DescriptorProto(boolean noInit) { this.unknownFields = akka.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private DescriptorProto(boolean noInit) { this.unknownFields = org.apache.pekko.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
     private static final DescriptorProto defaultInstance;
     public static DescriptorProto getDefaultInstance() {
@@ -4415,20 +4415,20 @@ public final class DescriptorProtos {
       return defaultInstance;
     }
 
-    private final akka.protobuf.UnknownFieldSet unknownFields;
+    private final org.apache.pekko.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
-    public final akka.protobuf.UnknownFieldSet
+    public final org.apache.pekko.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
     }
     private DescriptorProto(
-        akka.protobuf.CodedInputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+        org.apache.pekko.protobuf.CodedInputStream input,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
-      akka.protobuf.UnknownFieldSet.Builder unknownFields =
-          akka.protobuf.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobuf.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4451,50 +4451,50 @@ public final class DescriptorProtos {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                field_ = new java.util.ArrayList();
+                field_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              field_.add(input.readMessage(akka.protobuf.DescriptorProtos.FieldDescriptorProto.PARSER, extensionRegistry));
+              field_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.PARSER, extensionRegistry));
               break;
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                nestedType_ = new java.util.ArrayList();
+                nestedType_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
-              nestedType_.add(input.readMessage(akka.protobuf.DescriptorProtos.DescriptorProto.PARSER, extensionRegistry));
+              nestedType_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.PARSER, extensionRegistry));
               break;
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                enumType_ = new java.util.ArrayList();
+                enumType_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              enumType_.add(input.readMessage(akka.protobuf.DescriptorProtos.EnumDescriptorProto.PARSER, extensionRegistry));
+              enumType_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.PARSER, extensionRegistry));
               break;
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                extensionRange_ = new java.util.ArrayList();
+                extensionRange_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              extensionRange_.add(input.readMessage(akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.PARSER, extensionRegistry));
+              extensionRange_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.PARSER, extensionRegistry));
               break;
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                extension_ = new java.util.ArrayList();
+                extension_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              extension_.add(input.readMessage(akka.protobuf.DescriptorProtos.FieldDescriptorProto.PARSER, extensionRegistry));
+              extension_.add(input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.PARSER, extensionRegistry));
               break;
             }
             case 58: {
-              akka.protobuf.DescriptorProtos.MessageOptions.Builder subBuilder = null;
+              org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = options_.toBuilder();
               }
-              options_ = input.readMessage(akka.protobuf.DescriptorProtos.MessageOptions.PARSER, extensionRegistry);
+              options_ = input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(options_);
                 options_ = subBuilder.buildPartial();
@@ -4504,10 +4504,10 @@ public final class DescriptorProtos {
             }
           }
         }
-      } catch (akka.protobuf.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobuf.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobuf.InvalidProtocolBufferException(
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
@@ -4529,35 +4529,35 @@ public final class DescriptorProtos {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobuf.Descriptors.Descriptor
+    public static final org.apache.pekko.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_descriptor;
+      return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_descriptor;
     }
 
-    protected akka.protobuf.GeneratedMessage.FieldAccessorTable
+    protected org.apache.pekko.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_fieldAccessorTable
+      return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.protobuf.DescriptorProtos.DescriptorProto.class, akka.protobuf.DescriptorProtos.DescriptorProto.Builder.class);
+              org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.class, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder.class);
     }
 
-    public static akka.protobuf.Parser PARSER =
-        new akka.protobuf.AbstractParser() {
+    public static org.apache.pekko.protobuf.Parser PARSER =
+        new org.apache.pekko.protobuf.AbstractParser() {
       public DescriptorProto parsePartialFrom(
-          akka.protobuf.CodedInputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobuf.InvalidProtocolBufferException {
+          org.apache.pekko.protobuf.CodedInputStream input,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
         return new DescriptorProto(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public akka.protobuf.Parser getParserForType() {
+    public org.apache.pekko.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
     public interface ExtensionRangeOrBuilder
-        extends akka.protobuf.MessageOrBuilder {
+        extends org.apache.pekko.protobuf.MessageOrBuilder {
 
       // optional int32 start = 1;
       /**
@@ -4583,14 +4583,14 @@ public final class DescriptorProtos {
      * Protobuf type {@code google.protobuf.DescriptorProto.ExtensionRange}
      */
     public static final class ExtensionRange extends
-        akka.protobuf.GeneratedMessage
+        org.apache.pekko.protobuf.GeneratedMessage
         implements ExtensionRangeOrBuilder {
       // Use ExtensionRange.newBuilder() to construct.
-      private ExtensionRange(akka.protobuf.GeneratedMessage.Builder builder) {
+      private ExtensionRange(org.apache.pekko.protobuf.GeneratedMessage.Builder builder) {
         super(builder);
         this.unknownFields = builder.getUnknownFields();
       }
-      private ExtensionRange(boolean noInit) { this.unknownFields = akka.protobuf.UnknownFieldSet.getDefaultInstance(); }
+      private ExtensionRange(boolean noInit) { this.unknownFields = org.apache.pekko.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
       private static final ExtensionRange defaultInstance;
       public static ExtensionRange getDefaultInstance() {
@@ -4601,20 +4601,20 @@ public final class DescriptorProtos {
         return defaultInstance;
       }
 
-      private final akka.protobuf.UnknownFieldSet unknownFields;
+      private final org.apache.pekko.protobuf.UnknownFieldSet unknownFields;
       @java.lang.Override
-      public final akka.protobuf.UnknownFieldSet
+      public final org.apache.pekko.protobuf.UnknownFieldSet
           getUnknownFields() {
         return this.unknownFields;
       }
       private ExtensionRange(
-          akka.protobuf.CodedInputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobuf.InvalidProtocolBufferException {
+          org.apache.pekko.protobuf.CodedInputStream input,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
         initFields();
         int mutable_bitField0_ = 0;
-        akka.protobuf.UnknownFieldSet.Builder unknownFields =
-            akka.protobuf.UnknownFieldSet.newBuilder();
+        org.apache.pekko.protobuf.UnknownFieldSet.Builder unknownFields =
+            org.apache.pekko.protobuf.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -4642,40 +4642,40 @@ public final class DescriptorProtos {
               }
             }
           }
-        } catch (akka.protobuf.InvalidProtocolBufferException e) {
+        } catch (org.apache.pekko.protobuf.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
-          throw new akka.protobuf.InvalidProtocolBufferException(
+          throw new org.apache.pekko.protobuf.InvalidProtocolBufferException(
               e.getMessage()).setUnfinishedMessage(this);
         } finally {
           this.unknownFields = unknownFields.build();
           makeExtensionsImmutable();
         }
       }
-      public static final akka.protobuf.Descriptors.Descriptor
+      public static final org.apache.pekko.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor;
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor;
       }
 
-      protected akka.protobuf.GeneratedMessage.FieldAccessorTable
+      protected org.apache.pekko.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.class, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder.class);
+                org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.class, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder.class);
       }
 
-      public static akka.protobuf.Parser PARSER =
-          new akka.protobuf.AbstractParser() {
+      public static org.apache.pekko.protobuf.Parser PARSER =
+          new org.apache.pekko.protobuf.AbstractParser() {
         public ExtensionRange parsePartialFrom(
-            akka.protobuf.CodedInputStream input,
-            akka.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws akka.protobuf.InvalidProtocolBufferException {
+            org.apache.pekko.protobuf.CodedInputStream input,
+            org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
           return new ExtensionRange(input, extensionRegistry);
         }
       };
 
       @java.lang.Override
-      public akka.protobuf.Parser getParserForType() {
+      public org.apache.pekko.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
@@ -4725,7 +4725,7 @@ public final class DescriptorProtos {
         return true;
       }
 
-      public void writeTo(akka.protobuf.CodedOutputStream output)
+      public void writeTo(org.apache.pekko.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         getSerializedSize();
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4744,11 +4744,11 @@ public final class DescriptorProtos {
 
         size = 0;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          size += akka.protobuf.CodedOutputStream
+          size += org.apache.pekko.protobuf.CodedOutputStream
             .computeInt32Size(1, start_);
         }
         if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          size += akka.protobuf.CodedOutputStream
+          size += org.apache.pekko.protobuf.CodedOutputStream
             .computeInt32Size(2, end_);
         }
         size += getUnknownFields().getSerializedSize();
@@ -4763,69 +4763,69 @@ public final class DescriptorProtos {
         return super.writeReplace();
       }
 
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
-          akka.protobuf.ByteString data)
-          throws akka.protobuf.InvalidProtocolBufferException {
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
+          org.apache.pekko.protobuf.ByteString data)
+          throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
-          akka.protobuf.ByteString data,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobuf.InvalidProtocolBufferException {
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
+          org.apache.pekko.protobuf.ByteString data,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(byte[] data)
-          throws akka.protobuf.InvalidProtocolBufferException {
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(byte[] data)
+          throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
           byte[] data,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobuf.InvalidProtocolBufferException {
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(java.io.InputStream input)
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
           java.io.InputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseDelimitedFrom(java.io.InputStream input)
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseDelimitedFrom(
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseDelimitedFrom(
           java.io.InputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
-          akka.protobuf.CodedInputStream input)
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
+          org.apache.pekko.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
-          akka.protobuf.CodedInputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
+      public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parseFrom(
+          org.apache.pekko.protobuf.CodedInputStream input,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange prototype) {
+      public static Builder newBuilder(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       @java.lang.Override
       protected Builder newBuilderForType(
-          akka.protobuf.GeneratedMessage.BuilderParent parent) {
+          org.apache.pekko.protobuf.GeneratedMessage.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
@@ -4833,32 +4833,32 @@ public final class DescriptorProtos {
        * Protobuf type {@code google.protobuf.DescriptorProto.ExtensionRange}
        */
       public static final class Builder extends
-          akka.protobuf.GeneratedMessage.Builder
-         implements akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder {
-        public static final akka.protobuf.Descriptors.Descriptor
+          org.apache.pekko.protobuf.GeneratedMessage.Builder
+         implements org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder {
+        public static final org.apache.pekko.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor;
+          return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor;
         }
 
-        protected akka.protobuf.GeneratedMessage.FieldAccessorTable
+        protected org.apache.pekko.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable
+          return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.class, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder.class);
+                  org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.class, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder.class);
         }
 
-        // Construct using akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.newBuilder()
+        // Construct using org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
 
         private Builder(
-            akka.protobuf.GeneratedMessage.BuilderParent parent) {
+            org.apache.pekko.protobuf.GeneratedMessage.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
         private void maybeForceBuilderInitialization() {
-          if (akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          if (org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
           }
         }
         private static Builder create() {
@@ -4878,25 +4878,25 @@ public final class DescriptorProtos {
           return create().mergeFrom(buildPartial());
         }
 
-        public akka.protobuf.Descriptors.Descriptor
+        public org.apache.pekko.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor;
+          return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_ExtensionRange_descriptor;
         }
 
-        public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getDefaultInstanceForType() {
-          return akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.getDefaultInstance();
+        public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getDefaultInstanceForType() {
+          return org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.getDefaultInstance();
         }
 
-        public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange build() {
-          akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange result = buildPartial();
+        public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange build() {
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange buildPartial() {
-          akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange result = new akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange(this);
+        public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange buildPartial() {
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange result = new org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4912,17 +4912,17 @@ public final class DescriptorProtos {
           return result;
         }
 
-        public Builder mergeFrom(akka.protobuf.Message other) {
-          if (other instanceof akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange) {
-            return mergeFrom((akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange)other);
+        public Builder mergeFrom(org.apache.pekko.protobuf.Message other) {
+          if (other instanceof org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange) {
+            return mergeFrom((org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange other) {
-          if (other == akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange other) {
+          if (other == org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.getDefaultInstance()) return this;
           if (other.hasStart()) {
             setStart(other.getStart());
           }
@@ -4938,14 +4938,14 @@ public final class DescriptorProtos {
         }
 
         public Builder mergeFrom(
-            akka.protobuf.CodedInputStream input,
-            akka.protobuf.ExtensionRegistryLite extensionRegistry)
+            org.apache.pekko.protobuf.CodedInputStream input,
+            org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parsedMessage = null;
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (akka.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange) e.getUnfinishedMessage();
+          } catch (org.apache.pekko.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage = (org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -5051,8 +5051,8 @@ public final class DescriptorProtos {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobuf.ByteString bs = 
-            (akka.protobuf.ByteString) ref;
+        org.apache.pekko.protobuf.ByteString bs = 
+            (org.apache.pekko.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           name_ = s;
@@ -5063,33 +5063,33 @@ public final class DescriptorProtos {
     /**
      * optional string name = 1;
      */
-    public akka.protobuf.ByteString
+    public org.apache.pekko.protobuf.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        akka.protobuf.ByteString b = 
-            akka.protobuf.ByteString.copyFromUtf8(
+        org.apache.pekko.protobuf.ByteString b = 
+            org.apache.pekko.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
-        return (akka.protobuf.ByteString) ref;
+        return (org.apache.pekko.protobuf.ByteString) ref;
       }
     }
 
     // repeated .google.protobuf.FieldDescriptorProto field = 2;
     public static final int FIELD_FIELD_NUMBER = 2;
-    private java.util.List field_;
+    private java.util.List field_;
     /**
      * repeated .google.protobuf.FieldDescriptorProto field = 2;
      */
-    public java.util.List getFieldList() {
+    public java.util.List getFieldList() {
       return field_;
     }
     /**
      * repeated .google.protobuf.FieldDescriptorProto field = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getFieldOrBuilderList() {
       return field_;
     }
@@ -5102,30 +5102,30 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.FieldDescriptorProto field = 2;
      */
-    public akka.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index) {
       return field_.get(index);
     }
     /**
      * repeated .google.protobuf.FieldDescriptorProto field = 2;
      */
-    public akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder(
         int index) {
       return field_.get(index);
     }
 
     // repeated .google.protobuf.FieldDescriptorProto extension = 6;
     public static final int EXTENSION_FIELD_NUMBER = 6;
-    private java.util.List extension_;
+    private java.util.List extension_;
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 6;
      */
-    public java.util.List getExtensionList() {
+    public java.util.List getExtensionList() {
       return extension_;
     }
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getExtensionOrBuilderList() {
       return extension_;
     }
@@ -5138,30 +5138,30 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 6;
      */
-    public akka.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) {
       return extension_.get(index);
     }
     /**
      * repeated .google.protobuf.FieldDescriptorProto extension = 6;
      */
-    public akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
         int index) {
       return extension_.get(index);
     }
 
     // repeated .google.protobuf.DescriptorProto nested_type = 3;
     public static final int NESTED_TYPE_FIELD_NUMBER = 3;
-    private java.util.List nestedType_;
+    private java.util.List nestedType_;
     /**
      * repeated .google.protobuf.DescriptorProto nested_type = 3;
      */
-    public java.util.List getNestedTypeList() {
+    public java.util.List getNestedTypeList() {
       return nestedType_;
     }
     /**
      * repeated .google.protobuf.DescriptorProto nested_type = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getNestedTypeOrBuilderList() {
       return nestedType_;
     }
@@ -5174,30 +5174,30 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.DescriptorProto nested_type = 3;
      */
-    public akka.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index) {
       return nestedType_.get(index);
     }
     /**
      * repeated .google.protobuf.DescriptorProto nested_type = 3;
      */
-    public akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder(
         int index) {
       return nestedType_.get(index);
     }
 
     // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
     public static final int ENUM_TYPE_FIELD_NUMBER = 4;
-    private java.util.List enumType_;
+    private java.util.List enumType_;
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
      */
-    public java.util.List getEnumTypeList() {
+    public java.util.List getEnumTypeList() {
       return enumType_;
     }
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getEnumTypeOrBuilderList() {
       return enumType_;
     }
@@ -5210,30 +5210,30 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
      */
-    public akka.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) {
       return enumType_.get(index);
     }
     /**
      * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
      */
-    public akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
         int index) {
       return enumType_.get(index);
     }
 
     // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
     public static final int EXTENSION_RANGE_FIELD_NUMBER = 5;
-    private java.util.List extensionRange_;
+    private java.util.List extensionRange_;
     /**
      * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
      */
-    public java.util.List getExtensionRangeList() {
+    public java.util.List getExtensionRangeList() {
       return extensionRange_;
     }
     /**
      * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getExtensionRangeOrBuilderList() {
       return extensionRange_;
     }
@@ -5246,20 +5246,20 @@ public final class DescriptorProtos {
     /**
      * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
      */
-    public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index) {
+    public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index) {
       return extensionRange_.get(index);
     }
     /**
      * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
      */
-    public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder(
+    public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder(
         int index) {
       return extensionRange_.get(index);
     }
 
     // optional .google.protobuf.MessageOptions options = 7;
     public static final int OPTIONS_FIELD_NUMBER = 7;
-    private akka.protobuf.DescriptorProtos.MessageOptions options_;
+    private org.apache.pekko.protobuf.DescriptorProtos.MessageOptions options_;
     /**
      * optional .google.protobuf.MessageOptions options = 7;
      */
@@ -5269,13 +5269,13 @@ public final class DescriptorProtos {
     /**
      * optional .google.protobuf.MessageOptions options = 7;
      */
-    public akka.protobuf.DescriptorProtos.MessageOptions getOptions() {
+    public org.apache.pekko.protobuf.DescriptorProtos.MessageOptions getOptions() {
       return options_;
     }
     /**
      * optional .google.protobuf.MessageOptions options = 7;
      */
-    public akka.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder() {
+    public org.apache.pekko.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder() {
       return options_;
     }
 
@@ -5286,7 +5286,7 @@ public final class DescriptorProtos {
       nestedType_ = java.util.Collections.emptyList();
       enumType_ = java.util.Collections.emptyList();
       extensionRange_ = java.util.Collections.emptyList();
-      options_ = akka.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance();
+      options_ = org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -5327,7 +5327,7 @@ public final class DescriptorProtos {
       return true;
     }
 
-    public void writeTo(akka.protobuf.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5361,31 +5361,31 @@ public final class DescriptorProtos {
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeBytesSize(1, getNameBytes());
       }
       for (int i = 0; i < field_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(2, field_.get(i));
       }
       for (int i = 0; i < nestedType_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(3, nestedType_.get(i));
       }
       for (int i = 0; i < enumType_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(4, enumType_.get(i));
       }
       for (int i = 0; i < extensionRange_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(5, extensionRange_.get(i));
       }
       for (int i = 0; i < extension_.size(); i++) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(6, extension_.get(i));
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += akka.protobuf.CodedOutputStream
+        size += org.apache.pekko.protobuf.CodedOutputStream
           .computeMessageSize(7, options_);
       }
       size += getUnknownFields().getSerializedSize();
@@ -5400,69 +5400,69 @@ public final class DescriptorProtos {
       return super.writeReplace();
     }
 
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseFrom(
-        akka.protobuf.ByteString data)
-        throws akka.protobuf.InvalidProtocolBufferException {
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseFrom(
+        org.apache.pekko.protobuf.ByteString data)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseFrom(
-        akka.protobuf.ByteString data,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseFrom(
+        org.apache.pekko.protobuf.ByteString data,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseFrom(byte[] data)
-        throws akka.protobuf.InvalidProtocolBufferException {
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseFrom(byte[] data)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseFrom(
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseFrom(
         byte[] data,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseFrom(
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseFrom(
         java.io.InputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseDelimitedFrom(
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseFrom(
-        akka.protobuf.CodedInputStream input)
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseFrom(
+        org.apache.pekko.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static akka.protobuf.DescriptorProtos.DescriptorProto parseFrom(
-        akka.protobuf.CodedInputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parseFrom(
+        org.apache.pekko.protobuf.CodedInputStream input,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.protobuf.DescriptorProtos.DescriptorProto prototype) {
+    public static Builder newBuilder(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobuf.GeneratedMessage.BuilderParent parent) {
+        org.apache.pekko.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5474,32 +5474,32 @@ public final class DescriptorProtos {
      * 
      */
     public static final class Builder extends
-        akka.protobuf.GeneratedMessage.Builder
-       implements akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder {
-      public static final akka.protobuf.Descriptors.Descriptor
+        org.apache.pekko.protobuf.GeneratedMessage.Builder
+       implements org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder {
+      public static final org.apache.pekko.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_descriptor;
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_descriptor;
       }
 
-      protected akka.protobuf.GeneratedMessage.FieldAccessorTable
+      protected org.apache.pekko.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_fieldAccessorTable
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.protobuf.DescriptorProtos.DescriptorProto.class, akka.protobuf.DescriptorProtos.DescriptorProto.Builder.class);
+                org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.class, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder.class);
       }
 
-      // Construct using akka.protobuf.DescriptorProtos.DescriptorProto.newBuilder()
+      // Construct using org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobuf.GeneratedMessage.BuilderParent parent) {
+          org.apache.pekko.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
           getFieldFieldBuilder();
           getExtensionFieldBuilder();
           getNestedTypeFieldBuilder();
@@ -5547,7 +5547,7 @@ public final class DescriptorProtos {
           extensionRangeBuilder_.clear();
         }
         if (optionsBuilder_ == null) {
-          options_ = akka.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance();
+          options_ = org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance();
         } else {
           optionsBuilder_.clear();
         }
@@ -5559,25 +5559,25 @@ public final class DescriptorProtos {
         return create().mergeFrom(buildPartial());
       }
 
-      public akka.protobuf.Descriptors.Descriptor
+      public org.apache.pekko.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_descriptor;
+        return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_DescriptorProto_descriptor;
       }
 
-      public akka.protobuf.DescriptorProtos.DescriptorProto getDefaultInstanceForType() {
-        return akka.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance();
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto getDefaultInstanceForType() {
+        return org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance();
       }
 
-      public akka.protobuf.DescriptorProtos.DescriptorProto build() {
-        akka.protobuf.DescriptorProtos.DescriptorProto result = buildPartial();
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto build() {
+        org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public akka.protobuf.DescriptorProtos.DescriptorProto buildPartial() {
-        akka.protobuf.DescriptorProtos.DescriptorProto result = new akka.protobuf.DescriptorProtos.DescriptorProto(this);
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto buildPartial() {
+        org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto result = new org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5642,17 +5642,17 @@ public final class DescriptorProtos {
         return result;
       }
 
-      public Builder mergeFrom(akka.protobuf.Message other) {
-        if (other instanceof akka.protobuf.DescriptorProtos.DescriptorProto) {
-          return mergeFrom((akka.protobuf.DescriptorProtos.DescriptorProto)other);
+      public Builder mergeFrom(org.apache.pekko.protobuf.Message other) {
+        if (other instanceof org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto) {
+          return mergeFrom((org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.protobuf.DescriptorProtos.DescriptorProto other) {
-        if (other == akka.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto other) {
+        if (other == org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance()) return this;
         if (other.hasName()) {
           bitField0_ |= 0x00000001;
           name_ = other.name_;
@@ -5677,7 +5677,7 @@ public final class DescriptorProtos {
               field_ = other.field_;
               bitField0_ = (bitField0_ & ~0x00000002);
               fieldBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getFieldFieldBuilder() : null;
             } else {
               fieldBuilder_.addAllMessages(other.field_);
@@ -5703,7 +5703,7 @@ public final class DescriptorProtos {
               extension_ = other.extension_;
               bitField0_ = (bitField0_ & ~0x00000004);
               extensionBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getExtensionFieldBuilder() : null;
             } else {
               extensionBuilder_.addAllMessages(other.extension_);
@@ -5729,7 +5729,7 @@ public final class DescriptorProtos {
               nestedType_ = other.nestedType_;
               bitField0_ = (bitField0_ & ~0x00000008);
               nestedTypeBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getNestedTypeFieldBuilder() : null;
             } else {
               nestedTypeBuilder_.addAllMessages(other.nestedType_);
@@ -5755,7 +5755,7 @@ public final class DescriptorProtos {
               enumType_ = other.enumType_;
               bitField0_ = (bitField0_ & ~0x00000010);
               enumTypeBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getEnumTypeFieldBuilder() : null;
             } else {
               enumTypeBuilder_.addAllMessages(other.enumType_);
@@ -5781,7 +5781,7 @@ public final class DescriptorProtos {
               extensionRange_ = other.extensionRange_;
               bitField0_ = (bitField0_ & ~0x00000020);
               extensionRangeBuilder_ = 
-                akka.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getExtensionRangeFieldBuilder() : null;
             } else {
               extensionRangeBuilder_.addAllMessages(other.extensionRange_);
@@ -5830,14 +5830,14 @@ public final class DescriptorProtos {
       }
 
       public Builder mergeFrom(
-          akka.protobuf.CodedInputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobuf.CodedInputStream input,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.protobuf.DescriptorProtos.DescriptorProto parsedMessage = null;
+        org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.protobuf.DescriptorProtos.DescriptorProto) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -5862,7 +5862,7 @@ public final class DescriptorProtos {
       public java.lang.String getName() {
         java.lang.Object ref = name_;
         if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((akka.protobuf.ByteString) ref)
+          java.lang.String s = ((org.apache.pekko.protobuf.ByteString) ref)
               .toStringUtf8();
           name_ = s;
           return s;
@@ -5873,17 +5873,17 @@ public final class DescriptorProtos {
       /**
        * optional string name = 1;
        */
-      public akka.protobuf.ByteString
+      public org.apache.pekko.protobuf.ByteString
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          akka.protobuf.ByteString b = 
-              akka.protobuf.ByteString.copyFromUtf8(
+          org.apache.pekko.protobuf.ByteString b = 
+              org.apache.pekko.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
           return b;
         } else {
-          return (akka.protobuf.ByteString) ref;
+          return (org.apache.pekko.protobuf.ByteString) ref;
         }
       }
       /**
@@ -5912,7 +5912,7 @@ public final class DescriptorProtos {
        * optional string name = 1;
        */
       public Builder setNameBytes(
-          akka.protobuf.ByteString value) {
+          org.apache.pekko.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5923,22 +5923,22 @@ public final class DescriptorProtos {
       }
 
       // repeated .google.protobuf.FieldDescriptorProto field = 2;
-      private java.util.List field_ =
+      private java.util.List field_ =
         java.util.Collections.emptyList();
       private void ensureFieldIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          field_ = new java.util.ArrayList(field_);
+          field_ = new java.util.ArrayList(field_);
           bitField0_ |= 0x00000002;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.FieldDescriptorProto, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> fieldBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> fieldBuilder_;
 
       /**
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
-      public java.util.List getFieldList() {
+      public java.util.List getFieldList() {
         if (fieldBuilder_ == null) {
           return java.util.Collections.unmodifiableList(field_);
         } else {
@@ -5958,7 +5958,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto getField(int index) {
         if (fieldBuilder_ == null) {
           return field_.get(index);
         } else {
@@ -5969,7 +5969,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
       public Builder setField(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto value) {
         if (fieldBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5986,7 +5986,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
       public Builder setField(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         if (fieldBuilder_ == null) {
           ensureFieldIsMutable();
           field_.set(index, builderForValue.build());
@@ -5999,7 +5999,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
-      public Builder addField(akka.protobuf.DescriptorProtos.FieldDescriptorProto value) {
+      public Builder addField(org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto value) {
         if (fieldBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6016,7 +6016,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
       public Builder addField(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto value) {
         if (fieldBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6033,7 +6033,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
       public Builder addField(
-          akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         if (fieldBuilder_ == null) {
           ensureFieldIsMutable();
           field_.add(builderForValue.build());
@@ -6047,7 +6047,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
       public Builder addField(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         if (fieldBuilder_ == null) {
           ensureFieldIsMutable();
           field_.add(index, builderForValue.build());
@@ -6061,7 +6061,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
       public Builder addAllField(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (fieldBuilder_ == null) {
           ensureFieldIsMutable();
           super.addAll(values, field_);
@@ -6100,14 +6100,14 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder getFieldBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder getFieldBuilder(
           int index) {
         return getFieldFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getFieldOrBuilder(
           int index) {
         if (fieldBuilder_ == null) {
           return field_.get(index);  } else {
@@ -6117,7 +6117,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getFieldOrBuilderList() {
         if (fieldBuilder_ != null) {
           return fieldBuilder_.getMessageOrBuilderList();
@@ -6128,31 +6128,31 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addFieldBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addFieldBuilder() {
         return getFieldFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addFieldBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addFieldBuilder(
           int index) {
         return getFieldFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.FieldDescriptorProto field = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getFieldBuilderList() {
         return getFieldFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.FieldDescriptorProto, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> 
           getFieldFieldBuilder() {
         if (fieldBuilder_ == null) {
-          fieldBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.FieldDescriptorProto, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder>(
+          fieldBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder>(
                   field_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -6163,22 +6163,22 @@ public final class DescriptorProtos {
       }
 
       // repeated .google.protobuf.FieldDescriptorProto extension = 6;
-      private java.util.List extension_ =
+      private java.util.List extension_ =
         java.util.Collections.emptyList();
       private void ensureExtensionIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          extension_ = new java.util.ArrayList(extension_);
+          extension_ = new java.util.ArrayList(extension_);
           bitField0_ |= 0x00000004;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.FieldDescriptorProto, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> extensionBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> extensionBuilder_;
 
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
-      public java.util.List getExtensionList() {
+      public java.util.List getExtensionList() {
         if (extensionBuilder_ == null) {
           return java.util.Collections.unmodifiableList(extension_);
         } else {
@@ -6198,7 +6198,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto getExtension(int index) {
         if (extensionBuilder_ == null) {
           return extension_.get(index);
         } else {
@@ -6209,7 +6209,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
       public Builder setExtension(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto value) {
         if (extensionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6226,7 +6226,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
       public Builder setExtension(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         if (extensionBuilder_ == null) {
           ensureExtensionIsMutable();
           extension_.set(index, builderForValue.build());
@@ -6239,7 +6239,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
-      public Builder addExtension(akka.protobuf.DescriptorProtos.FieldDescriptorProto value) {
+      public Builder addExtension(org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto value) {
         if (extensionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6256,7 +6256,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
       public Builder addExtension(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto value) {
         if (extensionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6273,7 +6273,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
       public Builder addExtension(
-          akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         if (extensionBuilder_ == null) {
           ensureExtensionIsMutable();
           extension_.add(builderForValue.build());
@@ -6287,7 +6287,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
       public Builder addExtension(
-          int index, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         if (extensionBuilder_ == null) {
           ensureExtensionIsMutable();
           extension_.add(index, builderForValue.build());
@@ -6301,7 +6301,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
       public Builder addAllExtension(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (extensionBuilder_ == null) {
           ensureExtensionIsMutable();
           super.addAll(values, extension_);
@@ -6340,14 +6340,14 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder getExtensionBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder getExtensionBuilder(
           int index) {
         return getExtensionFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder getExtensionOrBuilder(
           int index) {
         if (extensionBuilder_ == null) {
           return extension_.get(index);  } else {
@@ -6357,7 +6357,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getExtensionOrBuilderList() {
         if (extensionBuilder_ != null) {
           return extensionBuilder_.getMessageOrBuilderList();
@@ -6368,31 +6368,31 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addExtensionBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addExtensionBuilder() {
         return getExtensionFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
-      public akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addExtensionBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder addExtensionBuilder(
           int index) {
         return getExtensionFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.FieldDescriptorProto extension = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getExtensionBuilderList() {
         return getExtensionFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.FieldDescriptorProto, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder> 
           getExtensionFieldBuilder() {
         if (extensionBuilder_ == null) {
-          extensionBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.FieldDescriptorProto, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, akka.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder>(
+          extensionBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProtoOrBuilder>(
                   extension_,
                   ((bitField0_ & 0x00000004) == 0x00000004),
                   getParentForChildren(),
@@ -6403,22 +6403,22 @@ public final class DescriptorProtos {
       }
 
       // repeated .google.protobuf.DescriptorProto nested_type = 3;
-      private java.util.List nestedType_ =
+      private java.util.List nestedType_ =
         java.util.Collections.emptyList();
       private void ensureNestedTypeIsMutable() {
         if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          nestedType_ = new java.util.ArrayList(nestedType_);
+          nestedType_ = new java.util.ArrayList(nestedType_);
           bitField0_ |= 0x00000008;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.DescriptorProto, akka.protobuf.DescriptorProtos.DescriptorProto.Builder, akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> nestedTypeBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> nestedTypeBuilder_;
 
       /**
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
-      public java.util.List getNestedTypeList() {
+      public java.util.List getNestedTypeList() {
         if (nestedTypeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(nestedType_);
         } else {
@@ -6438,7 +6438,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto getNestedType(int index) {
         if (nestedTypeBuilder_ == null) {
           return nestedType_.get(index);
         } else {
@@ -6449,7 +6449,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
       public Builder setNestedType(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto value) {
         if (nestedTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6466,7 +6466,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
       public Builder setNestedType(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
         if (nestedTypeBuilder_ == null) {
           ensureNestedTypeIsMutable();
           nestedType_.set(index, builderForValue.build());
@@ -6479,7 +6479,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
-      public Builder addNestedType(akka.protobuf.DescriptorProtos.DescriptorProto value) {
+      public Builder addNestedType(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto value) {
         if (nestedTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6496,7 +6496,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
       public Builder addNestedType(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto value) {
         if (nestedTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6513,7 +6513,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
       public Builder addNestedType(
-          akka.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
         if (nestedTypeBuilder_ == null) {
           ensureNestedTypeIsMutable();
           nestedType_.add(builderForValue.build());
@@ -6527,7 +6527,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
       public Builder addNestedType(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) {
         if (nestedTypeBuilder_ == null) {
           ensureNestedTypeIsMutable();
           nestedType_.add(index, builderForValue.build());
@@ -6541,7 +6541,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
       public Builder addAllNestedType(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (nestedTypeBuilder_ == null) {
           ensureNestedTypeIsMutable();
           super.addAll(values, nestedType_);
@@ -6580,14 +6580,14 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.Builder getNestedTypeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder getNestedTypeBuilder(
           int index) {
         return getNestedTypeFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getNestedTypeOrBuilder(
           int index) {
         if (nestedTypeBuilder_ == null) {
           return nestedType_.get(index);  } else {
@@ -6597,7 +6597,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getNestedTypeOrBuilderList() {
         if (nestedTypeBuilder_ != null) {
           return nestedTypeBuilder_.getMessageOrBuilderList();
@@ -6608,31 +6608,31 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.Builder addNestedTypeBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder addNestedTypeBuilder() {
         return getNestedTypeFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.Builder addNestedTypeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder addNestedTypeBuilder(
           int index) {
         return getNestedTypeFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.DescriptorProto nested_type = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getNestedTypeBuilderList() {
         return getNestedTypeFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.DescriptorProto, akka.protobuf.DescriptorProtos.DescriptorProto.Builder, akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> 
           getNestedTypeFieldBuilder() {
         if (nestedTypeBuilder_ == null) {
-          nestedTypeBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.DescriptorProto, akka.protobuf.DescriptorProtos.DescriptorProto.Builder, akka.protobuf.DescriptorProtos.DescriptorProtoOrBuilder>(
+          nestedTypeBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProtoOrBuilder>(
                   nestedType_,
                   ((bitField0_ & 0x00000008) == 0x00000008),
                   getParentForChildren(),
@@ -6643,22 +6643,22 @@ public final class DescriptorProtos {
       }
 
       // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
-      private java.util.List enumType_ =
+      private java.util.List enumType_ =
         java.util.Collections.emptyList();
       private void ensureEnumTypeIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          enumType_ = new java.util.ArrayList(enumType_);
+          enumType_ = new java.util.ArrayList(enumType_);
           bitField0_ |= 0x00000010;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.EnumDescriptorProto, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> enumTypeBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> enumTypeBuilder_;
 
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
-      public java.util.List getEnumTypeList() {
+      public java.util.List getEnumTypeList() {
         if (enumTypeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(enumType_);
         } else {
@@ -6678,7 +6678,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto getEnumType(int index) {
         if (enumTypeBuilder_ == null) {
           return enumType_.get(index);
         } else {
@@ -6689,7 +6689,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
       public Builder setEnumType(
-          int index, akka.protobuf.DescriptorProtos.EnumDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto value) {
         if (enumTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6706,7 +6706,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
       public Builder setEnumType(
-          int index, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
         if (enumTypeBuilder_ == null) {
           ensureEnumTypeIsMutable();
           enumType_.set(index, builderForValue.build());
@@ -6719,7 +6719,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
-      public Builder addEnumType(akka.protobuf.DescriptorProtos.EnumDescriptorProto value) {
+      public Builder addEnumType(org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto value) {
         if (enumTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6736,7 +6736,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
       public Builder addEnumType(
-          int index, akka.protobuf.DescriptorProtos.EnumDescriptorProto value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto value) {
         if (enumTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6753,7 +6753,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
       public Builder addEnumType(
-          akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
         if (enumTypeBuilder_ == null) {
           ensureEnumTypeIsMutable();
           enumType_.add(builderForValue.build());
@@ -6767,7 +6767,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
       public Builder addEnumType(
-          int index, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
         if (enumTypeBuilder_ == null) {
           ensureEnumTypeIsMutable();
           enumType_.add(index, builderForValue.build());
@@ -6781,7 +6781,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
       public Builder addAllEnumType(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (enumTypeBuilder_ == null) {
           ensureEnumTypeIsMutable();
           super.addAll(values, enumType_);
@@ -6820,14 +6820,14 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder getEnumTypeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder getEnumTypeBuilder(
           int index) {
         return getEnumTypeFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder getEnumTypeOrBuilder(
           int index) {
         if (enumTypeBuilder_ == null) {
           return enumType_.get(index);  } else {
@@ -6837,7 +6837,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getEnumTypeOrBuilderList() {
         if (enumTypeBuilder_ != null) {
           return enumTypeBuilder_.getMessageOrBuilderList();
@@ -6848,31 +6848,31 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder addEnumTypeBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder addEnumTypeBuilder() {
         return getEnumTypeFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.EnumDescriptorProto.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
-      public akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder addEnumTypeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder addEnumTypeBuilder(
           int index) {
         return getEnumTypeFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.EnumDescriptorProto.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getEnumTypeBuilderList() {
         return getEnumTypeFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.EnumDescriptorProto, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder> 
           getEnumTypeFieldBuilder() {
         if (enumTypeBuilder_ == null) {
-          enumTypeBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.EnumDescriptorProto, akka.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, akka.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder>(
+          enumTypeBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProto.Builder, org.apache.pekko.protobuf.DescriptorProtos.EnumDescriptorProtoOrBuilder>(
                   enumType_,
                   ((bitField0_ & 0x00000010) == 0x00000010),
                   getParentForChildren(),
@@ -6883,22 +6883,22 @@ public final class DescriptorProtos {
       }
 
       // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
-      private java.util.List extensionRange_ =
+      private java.util.List extensionRange_ =
         java.util.Collections.emptyList();
       private void ensureExtensionRangeIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          extensionRange_ = new java.util.ArrayList(extensionRange_);
+          extensionRange_ = new java.util.ArrayList(extensionRange_);
           bitField0_ |= 0x00000020;
          }
       }
 
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder> extensionRangeBuilder_;
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder> extensionRangeBuilder_;
 
       /**
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
-      public java.util.List getExtensionRangeList() {
+      public java.util.List getExtensionRangeList() {
         if (extensionRangeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(extensionRange_);
         } else {
@@ -6918,7 +6918,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index) {
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange getExtensionRange(int index) {
         if (extensionRangeBuilder_ == null) {
           return extensionRange_.get(index);
         } else {
@@ -6929,7 +6929,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
       public Builder setExtensionRange(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange value) {
         if (extensionRangeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6946,7 +6946,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
       public Builder setExtensionRange(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder builderForValue) {
         if (extensionRangeBuilder_ == null) {
           ensureExtensionRangeIsMutable();
           extensionRange_.set(index, builderForValue.build());
@@ -6959,7 +6959,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
-      public Builder addExtensionRange(akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange value) {
+      public Builder addExtensionRange(org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange value) {
         if (extensionRangeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6976,7 +6976,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
       public Builder addExtensionRange(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange value) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange value) {
         if (extensionRangeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6993,7 +6993,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
       public Builder addExtensionRange(
-          akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder builderForValue) {
         if (extensionRangeBuilder_ == null) {
           ensureExtensionRangeIsMutable();
           extensionRange_.add(builderForValue.build());
@@ -7007,7 +7007,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
       public Builder addExtensionRange(
-          int index, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder builderForValue) {
+          int index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder builderForValue) {
         if (extensionRangeBuilder_ == null) {
           ensureExtensionRangeIsMutable();
           extensionRange_.add(index, builderForValue.build());
@@ -7021,7 +7021,7 @@ public final class DescriptorProtos {
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
       public Builder addAllExtensionRange(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (extensionRangeBuilder_ == null) {
           ensureExtensionRangeIsMutable();
           super.addAll(values, extensionRange_);
@@ -7060,14 +7060,14 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder getExtensionRangeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder getExtensionRangeBuilder(
           int index) {
         return getExtensionRangeFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder getExtensionRangeOrBuilder(
           int index) {
         if (extensionRangeBuilder_ == null) {
           return extensionRange_.get(index);  } else {
@@ -7077,7 +7077,7 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getExtensionRangeOrBuilderList() {
         if (extensionRangeBuilder_ != null) {
           return extensionRangeBuilder_.getMessageOrBuilderList();
@@ -7088,31 +7088,31 @@ public final class DescriptorProtos {
       /**
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder addExtensionRangeBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder addExtensionRangeBuilder() {
         return getExtensionRangeFieldBuilder().addBuilder(
-            akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.getDefaultInstance());
+            org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
-      public akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder addExtensionRangeBuilder(
+      public org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder addExtensionRangeBuilder(
           int index) {
         return getExtensionRangeFieldBuilder().addBuilder(
-            index, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.getDefaultInstance());
+            index, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.getDefaultInstance());
       }
       /**
        * repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getExtensionRangeBuilderList() {
         return getExtensionRangeFieldBuilder().getBuilderList();
       }
-      private akka.protobuf.RepeatedFieldBuilder<
-          akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder> 
+      private org.apache.pekko.protobuf.RepeatedFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder> 
           getExtensionRangeFieldBuilder() {
         if (extensionRangeBuilder_ == null) {
-          extensionRangeBuilder_ = new akka.protobuf.RepeatedFieldBuilder<
-              akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder, akka.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder>(
+          extensionRangeBuilder_ = new org.apache.pekko.protobuf.RepeatedFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRange.Builder, org.apache.pekko.protobuf.DescriptorProtos.DescriptorProto.ExtensionRangeOrBuilder>(
                   extensionRange_,
                   ((bitField0_ & 0x00000020) == 0x00000020),
                   getParentForChildren(),
@@ -7123,9 +7123,9 @@ public final class DescriptorProtos {
       }
 
       // optional .google.protobuf.MessageOptions options = 7;
-      private akka.protobuf.DescriptorProtos.MessageOptions options_ = akka.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance();
-      private akka.protobuf.SingleFieldBuilder<
-          akka.protobuf.DescriptorProtos.MessageOptions, akka.protobuf.DescriptorProtos.MessageOptions.Builder, akka.protobuf.DescriptorProtos.MessageOptionsOrBuilder> optionsBuilder_;
+      private org.apache.pekko.protobuf.DescriptorProtos.MessageOptions options_ = org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance();
+      private org.apache.pekko.protobuf.SingleFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.MessageOptions, org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.Builder, org.apache.pekko.protobuf.DescriptorProtos.MessageOptionsOrBuilder> optionsBuilder_;
       /**
        * optional .google.protobuf.MessageOptions options = 7;
        */
@@ -7135,7 +7135,7 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.MessageOptions options = 7;
        */
-      public akka.protobuf.DescriptorProtos.MessageOptions getOptions() {
+      public org.apache.pekko.protobuf.DescriptorProtos.MessageOptions getOptions() {
         if (optionsBuilder_ == null) {
           return options_;
         } else {
@@ -7145,7 +7145,7 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.MessageOptions options = 7;
        */
-      public Builder setOptions(akka.protobuf.DescriptorProtos.MessageOptions value) {
+      public Builder setOptions(org.apache.pekko.protobuf.DescriptorProtos.MessageOptions value) {
         if (optionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7162,7 +7162,7 @@ public final class DescriptorProtos {
        * optional .google.protobuf.MessageOptions options = 7;
        */
       public Builder setOptions(
-          akka.protobuf.DescriptorProtos.MessageOptions.Builder builderForValue) {
+          org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.Builder builderForValue) {
         if (optionsBuilder_ == null) {
           options_ = builderForValue.build();
           onChanged();
@@ -7175,12 +7175,12 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.MessageOptions options = 7;
        */
-      public Builder mergeOptions(akka.protobuf.DescriptorProtos.MessageOptions value) {
+      public Builder mergeOptions(org.apache.pekko.protobuf.DescriptorProtos.MessageOptions value) {
         if (optionsBuilder_ == null) {
           if (((bitField0_ & 0x00000040) == 0x00000040) &&
-              options_ != akka.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance()) {
+              options_ != org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance()) {
             options_ =
-              akka.protobuf.DescriptorProtos.MessageOptions.newBuilder(options_).mergeFrom(value).buildPartial();
+              org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.newBuilder(options_).mergeFrom(value).buildPartial();
           } else {
             options_ = value;
           }
@@ -7196,7 +7196,7 @@ public final class DescriptorProtos {
        */
       public Builder clearOptions() {
         if (optionsBuilder_ == null) {
-          options_ = akka.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance();
+          options_ = org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.getDefaultInstance();
           onChanged();
         } else {
           optionsBuilder_.clear();
@@ -7207,7 +7207,7 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.MessageOptions options = 7;
        */
-      public akka.protobuf.DescriptorProtos.MessageOptions.Builder getOptionsBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.Builder getOptionsBuilder() {
         bitField0_ |= 0x00000040;
         onChanged();
         return getOptionsFieldBuilder().getBuilder();
@@ -7215,7 +7215,7 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.MessageOptions options = 7;
        */
-      public akka.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder() {
+      public org.apache.pekko.protobuf.DescriptorProtos.MessageOptionsOrBuilder getOptionsOrBuilder() {
         if (optionsBuilder_ != null) {
           return optionsBuilder_.getMessageOrBuilder();
         } else {
@@ -7225,12 +7225,12 @@ public final class DescriptorProtos {
       /**
        * optional .google.protobuf.MessageOptions options = 7;
        */
-      private akka.protobuf.SingleFieldBuilder<
-          akka.protobuf.DescriptorProtos.MessageOptions, akka.protobuf.DescriptorProtos.MessageOptions.Builder, akka.protobuf.DescriptorProtos.MessageOptionsOrBuilder> 
+      private org.apache.pekko.protobuf.SingleFieldBuilder<
+          org.apache.pekko.protobuf.DescriptorProtos.MessageOptions, org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.Builder, org.apache.pekko.protobuf.DescriptorProtos.MessageOptionsOrBuilder> 
           getOptionsFieldBuilder() {
         if (optionsBuilder_ == null) {
-          optionsBuilder_ = new akka.protobuf.SingleFieldBuilder<
-              akka.protobuf.DescriptorProtos.MessageOptions, akka.protobuf.DescriptorProtos.MessageOptions.Builder, akka.protobuf.DescriptorProtos.MessageOptionsOrBuilder>(
+          optionsBuilder_ = new org.apache.pekko.protobuf.SingleFieldBuilder<
+              org.apache.pekko.protobuf.DescriptorProtos.MessageOptions, org.apache.pekko.protobuf.DescriptorProtos.MessageOptions.Builder, org.apache.pekko.protobuf.DescriptorProtos.MessageOptionsOrBuilder>(
                   options_,
                   getParentForChildren(),
                   isClean());
@@ -7251,7 +7251,7 @@ public final class DescriptorProtos {
   }
 
   public interface FieldDescriptorProtoOrBuilder
-      extends akka.protobuf.MessageOrBuilder {
+      extends org.apache.pekko.protobuf.MessageOrBuilder {
 
     // optional string name = 1;
     /**
@@ -7265,7 +7265,7 @@ public final class DescriptorProtos {
     /**
      * optional string name = 1;
      */
-    akka.protobuf.ByteString
+    org.apache.pekko.protobuf.ByteString
         getNameBytes();
 
     // optional int32 number = 3;
@@ -7286,7 +7286,7 @@ public final class DescriptorProtos {
     /**
      * optional .google.protobuf.FieldDescriptorProto.Label label = 4;
      */
-    akka.protobuf.DescriptorProtos.FieldDescriptorProto.Label getLabel();
+    org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Label getLabel();
 
     // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
     /**
@@ -7306,7 +7306,7 @@ public final class DescriptorProtos {
      * are set, this must be either TYPE_ENUM or TYPE_MESSAGE.
      * 
      */
-    akka.protobuf.DescriptorProtos.FieldDescriptorProto.Type getType();
+    org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Type getType();
 
     // optional string type_name = 6;
     /**
@@ -7344,7 +7344,7 @@ public final class DescriptorProtos {
      * namespace).
      * 
      */
-    akka.protobuf.ByteString
+    org.apache.pekko.protobuf.ByteString
         getTypeNameBytes();
 
     // optional string extendee = 2;
@@ -7374,7 +7374,7 @@ public final class DescriptorProtos {
      * resolved in the same manner as type_name.
      * 
      */
-    akka.protobuf.ByteString
+    org.apache.pekko.protobuf.ByteString
         getExtendeeBytes();
 
     // optional string default_value = 7;
@@ -7413,7 +7413,7 @@ public final class DescriptorProtos {
      * TODO(kenton):  Base-64 encode?
      * 
      */
-    akka.protobuf.ByteString
+    org.apache.pekko.protobuf.ByteString
         getDefaultValueBytes();
 
     // optional .google.protobuf.FieldOptions options = 8;
@@ -7424,11 +7424,11 @@ public final class DescriptorProtos {
     /**
      * optional .google.protobuf.FieldOptions options = 8;
      */
-    akka.protobuf.DescriptorProtos.FieldOptions getOptions();
+    org.apache.pekko.protobuf.DescriptorProtos.FieldOptions getOptions();
     /**
      * optional .google.protobuf.FieldOptions options = 8;
      */
-    akka.protobuf.DescriptorProtos.FieldOptionsOrBuilder getOptionsOrBuilder();
+    org.apache.pekko.protobuf.DescriptorProtos.FieldOptionsOrBuilder getOptionsOrBuilder();
   }
   /**
    * Protobuf type {@code google.protobuf.FieldDescriptorProto}
@@ -7438,14 +7438,14 @@ public final class DescriptorProtos {
    * 
    */
   public static final class FieldDescriptorProto extends
-      akka.protobuf.GeneratedMessage
+      org.apache.pekko.protobuf.GeneratedMessage
       implements FieldDescriptorProtoOrBuilder {
     // Use FieldDescriptorProto.newBuilder() to construct.
-    private FieldDescriptorProto(akka.protobuf.GeneratedMessage.Builder builder) {
+    private FieldDescriptorProto(org.apache.pekko.protobuf.GeneratedMessage.Builder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private FieldDescriptorProto(boolean noInit) { this.unknownFields = akka.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private FieldDescriptorProto(boolean noInit) { this.unknownFields = org.apache.pekko.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
     private static final FieldDescriptorProto defaultInstance;
     public static FieldDescriptorProto getDefaultInstance() {
@@ -7456,20 +7456,20 @@ public final class DescriptorProtos {
       return defaultInstance;
     }
 
-    private final akka.protobuf.UnknownFieldSet unknownFields;
+    private final org.apache.pekko.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
-    public final akka.protobuf.UnknownFieldSet
+    public final org.apache.pekko.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
     }
     private FieldDescriptorProto(
-        akka.protobuf.CodedInputStream input,
-        akka.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobuf.InvalidProtocolBufferException {
+        org.apache.pekko.protobuf.CodedInputStream input,
+        org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
-      akka.protobuf.UnknownFieldSet.Builder unknownFields =
-          akka.protobuf.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobuf.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7502,7 +7502,7 @@ public final class DescriptorProtos {
             }
             case 32: {
               int rawValue = input.readEnum();
-              akka.protobuf.DescriptorProtos.FieldDescriptorProto.Label value = akka.protobuf.DescriptorProtos.FieldDescriptorProto.Label.valueOf(rawValue);
+              org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Label value = org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Label.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(4, rawValue);
               } else {
@@ -7513,7 +7513,7 @@ public final class DescriptorProtos {
             }
             case 40: {
               int rawValue = input.readEnum();
-              akka.protobuf.DescriptorProtos.FieldDescriptorProto.Type value = akka.protobuf.DescriptorProtos.FieldDescriptorProto.Type.valueOf(rawValue);
+              org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Type value = org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Type.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(5, rawValue);
               } else {
@@ -7533,11 +7533,11 @@ public final class DescriptorProtos {
               break;
             }
             case 66: {
-              akka.protobuf.DescriptorProtos.FieldOptions.Builder subBuilder = null;
+              org.apache.pekko.protobuf.DescriptorProtos.FieldOptions.Builder subBuilder = null;
               if (((bitField0_ & 0x00000080) == 0x00000080)) {
                 subBuilder = options_.toBuilder();
               }
-              options_ = input.readMessage(akka.protobuf.DescriptorProtos.FieldOptions.PARSER, extensionRegistry);
+              options_ = input.readMessage(org.apache.pekko.protobuf.DescriptorProtos.FieldOptions.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(options_);
                 options_ = subBuilder.buildPartial();
@@ -7547,40 +7547,40 @@ public final class DescriptorProtos {
             }
           }
         }
-      } catch (akka.protobuf.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobuf.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobuf.InvalidProtocolBufferException(
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobuf.Descriptors.Descriptor
+    public static final org.apache.pekko.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FieldDescriptorProto_descriptor;
+      return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FieldDescriptorProto_descriptor;
     }
 
-    protected akka.protobuf.GeneratedMessage.FieldAccessorTable
+    protected org.apache.pekko.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.protobuf.DescriptorProtos.internal_static_google_protobuf_FieldDescriptorProto_fieldAccessorTable
+      return org.apache.pekko.protobuf.DescriptorProtos.internal_static_google_protobuf_FieldDescriptorProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.protobuf.DescriptorProtos.FieldDescriptorProto.class, akka.protobuf.DescriptorProtos.FieldDescriptorProto.Builder.class);
+              org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.class, org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.Builder.class);
     }
 
-    public static akka.protobuf.Parser PARSER =
-        new akka.protobuf.AbstractParser() {
+    public static org.apache.pekko.protobuf.Parser PARSER =
+        new org.apache.pekko.protobuf.AbstractParser() {
       public FieldDescriptorProto parsePartialFrom(
-          akka.protobuf.CodedInputStream input,
-          akka.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobuf.InvalidProtocolBufferException {
+          org.apache.pekko.protobuf.CodedInputStream input,
+          org.apache.pekko.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobuf.InvalidProtocolBufferException {
         return new FieldDescriptorProto(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public akka.protobuf.Parser getParserForType() {
+    public org.apache.pekko.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
@@ -7588,7 +7588,7 @@ public final class DescriptorProtos {
      * Protobuf enum {@code google.protobuf.FieldDescriptorProto.Type}
      */
     public enum Type
-        implements akka.protobuf.ProtocolMessageEnum {
+        implements org.apache.pekko.protobuf.ProtocolMessageEnum {
       /**
        * TYPE_DOUBLE = 1;
        *
@@ -7833,35 +7833,35 @@ public final class DescriptorProtos {
         }
       }
 
-      public static akka.protobuf.Internal.EnumLiteMap
+      public static org.apache.pekko.protobuf.Internal.EnumLiteMap
           internalGetValueMap() {
         return internalValueMap;
       }
-      private static akka.protobuf.Internal.EnumLiteMap
+      private static org.apache.pekko.protobuf.Internal.EnumLiteMap
           internalValueMap =
-            new akka.protobuf.Internal.EnumLiteMap() {
+            new org.apache.pekko.protobuf.Internal.EnumLiteMap() {
               public Type findValueByNumber(int number) {
                 return Type.valueOf(number);
               }
             };
 
-      public final akka.protobuf.Descriptors.EnumValueDescriptor
+      public final org.apache.pekko.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
         return getDescriptor().getValues().get(index);
       }
-      public final akka.protobuf.Descriptors.EnumDescriptor
+      public final org.apache.pekko.protobuf.Descriptors.EnumDescriptor
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final akka.protobuf.Descriptors.EnumDescriptor
+      public static final org.apache.pekko.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return akka.protobuf.DescriptorProtos.FieldDescriptorProto.getDescriptor().getEnumTypes().get(0);
+        return org.apache.pekko.protobuf.DescriptorProtos.FieldDescriptorProto.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Type[] VALUES = values();
 
       public static Type valueOf(
-          akka.protobuf.Descriptors.EnumValueDescriptor desc) {
+          org.apache.pekko.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
           throw new java.lang.IllegalArgumentException(
             "EnumValueDescriptor is not for this type.");
@@ -7884,7 +7884,7 @@ public final class DescriptorProtos {
      * Protobuf enum {@code google.protobuf.FieldDescriptorProto.Label}
      */
     public enum Label
-        implements akka.protobuf.ProtocolMessageEnum {
+        implements org.apache.pekko.protobuf.ProtocolMessageEnum {
       /**
        * LABEL_OPTIONAL = 1;
        *
@@ -7940,35 +7940,35 @@ public final class DescriptorProtos {
         }
       }
 
-      public static akka.protobuf.Internal.EnumLiteMap
    Users should ignore the contents of this class and only use objects of this type as
+   * parameters to extension accessors and ExtensionRegistry.add().
    */
-  public static final class GeneratedExtension<
-      ContainingType extends MessageLite, Type> {
+  public static final class GeneratedExtension {
 
     private GeneratedExtension(
         final ContainingType containingTypeDefaultInstance,
@@ -702,13 +644,11 @@ public abstract class GeneratedMessageLite extends AbstractMessageLite
       // Defensive checks to verify the correct initialization order of
       // GeneratedExtensions and their related GeneratedMessages.
       if (containingTypeDefaultInstance == null) {
-        throw new IllegalArgumentException(
-            "Null containingTypeDefaultInstance");
+        throw new IllegalArgumentException("Null containingTypeDefaultInstance");
       }
-      if (descriptor.getLiteType() == WireFormat.FieldType.MESSAGE &&
-          messageDefaultInstance == null) {
-        throw new IllegalArgumentException(
-            "Null messageDefaultInstance");
+      if (descriptor.getLiteType() == WireFormat.FieldType.MESSAGE
+          && messageDefaultInstance == null) {
+        throw new IllegalArgumentException("Null messageDefaultInstance");
       }
       this.containingTypeDefaultInstance = containingTypeDefaultInstance;
       this.defaultValue = defaultValue;
@@ -721,9 +661,7 @@ public abstract class GeneratedMessageLite extends AbstractMessageLite
     private final MessageLite messageDefaultInstance;
     private final ExtensionDescriptor descriptor;
 
-    /**
-     * Default instance of the type being extended, used to identify that type.
-     */
+    /** Default instance of the type being extended, used to identify that type. */
     public ContainingType getContainingTypeDefaultInstance() {
       return containingTypeDefaultInstance;
     }
@@ -733,18 +671,15 @@ public abstract class GeneratedMessageLite extends AbstractMessageLite
       return descriptor.getNumber();
     }
 
-    /**
-     * If the extension is an embedded message, this is the default instance of
-     * that type.
-     */
+    /** If the extension is an embedded message, this is the default instance of that type. */
     public MessageLite getMessageDefaultInstance() {
       return messageDefaultInstance;
     }
   }
 
   /**
-   * A serialized (serializable) form of the generated message.  Stores the
-   * message as a class name and a byte array.
+   * A serialized (serializable) form of the generated message. Stores the message as a class name
+   * and a byte array.
    */
   static final class SerializedForm implements Serializable {
     private static final long serialVersionUID = 0L;
@@ -753,7 +688,8 @@ public abstract class GeneratedMessageLite extends AbstractMessageLite
     private byte[] asBytes;
 
     /**
-     * Creates the serialized form by calling {@link akka.protobuf.MessageLite#toByteArray}.
+     * Creates the serialized form by calling {@link org.apache.pekko.protobuf.MessageLite#toByteArray}.
+     *
      * @param regularForm the message to serialize
      */
     SerializedForm(MessageLite regularForm) {
@@ -762,8 +698,9 @@ public abstract class GeneratedMessageLite extends AbstractMessageLite
     }
 
     /**
-     * When read from an ObjectInputStream, this method converts this object
-     * back to the regular form.  Part of Java's serialization magic.
+     * When read from an ObjectInputStream, this method converts this object back to the regular
+     * form. Part of Java's serialization magic.
+     *
      * @return a GeneratedMessage of the type that was serialized
      */
     @SuppressWarnings("unchecked")
@@ -771,8 +708,7 @@ public abstract class GeneratedMessageLite extends AbstractMessageLite
       try {
         Class messageClass = Class.forName(messageClassName);
         Method newBuilder = messageClass.getMethod("newBuilder");
-        MessageLite.Builder builder =
-            (MessageLite.Builder) newBuilder.invoke(null);
+        MessageLite.Builder builder = (MessageLite.Builder) newBuilder.invoke(null);
         builder.mergeFrom(asBytes);
         return builder.buildPartial();
       } catch (ClassNotFoundException e) {
@@ -790,9 +726,10 @@ public abstract class GeneratedMessageLite extends AbstractMessageLite
   }
 
   /**
-   * Replaces this object in the output stream with a serialized form.
-   * Part of Java's serialization magic.  Generated sub-classes must override
-   * this method by calling {@code return super.writeReplace();}
+   * Replaces this object in the output stream with a serialized form. Part of Java's serialization
+   * magic. Generated sub-classes must override this method by calling {@code return
+   * super.writeReplace();}
+   *
    * @return a SerializedForm of this message
    */
   protected Object writeReplace() throws ObjectStreamException {
diff --git a/akka-protobuf/src/main/java/akka/protobuf/Internal.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Internal.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/Internal.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/Internal.java
index 6ddc6926aa..e588df96d3 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/Internal.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Internal.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.UnsupportedEncodingException;
 
diff --git a/akka-protobuf/src/main/java/akka/protobuf/InvalidProtocolBufferException.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/InvalidProtocolBufferException.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/InvalidProtocolBufferException.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/InvalidProtocolBufferException.java
index be2fb9dfc7..9882acf8db 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/InvalidProtocolBufferException.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/InvalidProtocolBufferException.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.IOException;
 
diff --git a/akka-protobuf/src/main/java/akka/protobuf/LazyField.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/LazyField.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/LazyField.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/LazyField.java
index d3f1e9df03..0a7655e227 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/LazyField.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/LazyField.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.IOException;
 import java.util.Iterator;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/LazyStringArrayList.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/LazyStringArrayList.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/LazyStringArrayList.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/LazyStringArrayList.java
index a5d89e53f9..a659e965c8 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/LazyStringArrayList.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/LazyStringArrayList.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.util.List;
 import java.util.AbstractList;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/LazyStringList.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/LazyStringList.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/LazyStringList.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/LazyStringList.java
index e26ba7760e..2646f507b7 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/LazyStringList.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/LazyStringList.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.util.List;
 
diff --git a/akka-protobuf/src/main/java/akka/protobuf/LiteralByteString.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/LiteralByteString.java
similarity index 98%
rename from akka-protobuf/src/main/java/akka/protobuf/LiteralByteString.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/LiteralByteString.java
index fecfd01e6b..1320c68c52 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/LiteralByteString.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/LiteralByteString.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -45,7 +45,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 
 /**
- * This class implements a {@link akka.protobuf.ByteString} backed by a
+ * This class implements a {@link org.apache.pekko.protobuf.ByteString} backed by a
  * single array of bytes, contiguous in memory. It supports substring by
  * pointing to only a sub-range of the underlying byte array, meaning that a
  * substring will reference the full byte-array of the string it's made from,
diff --git a/akka-protobuf/src/main/java/akka/protobuf/Message.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Message.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/Message.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/Message.java
index 8ed0a17997..15f0c9bb28 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/Message.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Message.java
@@ -35,7 +35,7 @@
 // TODO(kenton):  Use generics?  E.g. Builder, then
 //   mergeFrom*() could return BuilderType for better type-safety.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/MessageLite.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/MessageLite.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/MessageLite.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/MessageLite.java
index eaf2802df0..a5b32138eb 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/MessageLite.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/MessageLite.java
@@ -35,7 +35,7 @@
 // TODO(kenton):  Use generics?  E.g. Builder, then
 //   mergeFrom*() could return BuilderType for better type-safety.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/MessageLiteOrBuilder.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/MessageLiteOrBuilder.java
similarity index 98%
rename from akka-protobuf/src/main/java/akka/protobuf/MessageLiteOrBuilder.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/MessageLiteOrBuilder.java
index 06e7178b7b..c78e266985 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/MessageLiteOrBuilder.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/MessageLiteOrBuilder.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * Base interface for methods common to {@link MessageLite}
diff --git a/akka-protobuf/src/main/java/akka/protobuf/MessageOrBuilder.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/MessageOrBuilder.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/MessageOrBuilder.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/MessageOrBuilder.java
index 14238cf8ba..09ef03a756 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/MessageOrBuilder.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/MessageOrBuilder.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.util.List;
 import java.util.Map;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/Parser.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Parser.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/Parser.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/Parser.java
index 669c2f8d24..c2433bf166 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/Parser.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Parser.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.InputStream;
 
diff --git a/akka-protobuf/src/main/java/akka/protobuf/ProtocolMessageEnum.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/ProtocolMessageEnum.java
similarity index 93%
rename from akka-protobuf/src/main/java/akka/protobuf/ProtocolMessageEnum.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/ProtocolMessageEnum.java
index 3b2e7aac5c..81463c084d 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/ProtocolMessageEnum.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/ProtocolMessageEnum.java
@@ -32,10 +32,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
-import akka.protobuf.Descriptors.EnumDescriptor;
-import akka.protobuf.Descriptors.EnumValueDescriptor;
+import org.apache.pekko.protobuf.Descriptors.EnumDescriptor;
+import org.apache.pekko.protobuf.Descriptors.EnumValueDescriptor;
 
 /**
  * Interface of useful methods added to all enums generated by the protocol
diff --git a/akka-protobuf/src/main/java/akka/protobuf/RepeatedFieldBuilder.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RepeatedFieldBuilder.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/RepeatedFieldBuilder.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/RepeatedFieldBuilder.java
index 4578e72da5..e5df9fcd8a 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/RepeatedFieldBuilder.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RepeatedFieldBuilder.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.util.AbstractList;
 import java.util.ArrayList;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/RopeByteString.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RopeByteString.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/RopeByteString.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/RopeByteString.java
index 04e6c2f0e5..274ae084c2 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/RopeByteString.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RopeByteString.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/RpcCallback.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcCallback.java
similarity index 98%
rename from akka-protobuf/src/main/java/akka/protobuf/RpcCallback.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcCallback.java
index dd6b90cc68..87206eda7b 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/RpcCallback.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcCallback.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * Interface for an RPC callback, normally called when an RPC completes.
diff --git a/akka-protobuf/src/main/java/akka/protobuf/RpcChannel.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcChannel.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/RpcChannel.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcChannel.java
index 013b89fbb9..ab223cdcb7 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/RpcChannel.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcChannel.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * 
    Abstract interface for an RPC channel.  An {@code RpcChannel} represents a
diff --git a/akka-protobuf/src/main/java/akka/protobuf/RpcController.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcController.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/RpcController.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcController.java
index 25e099b488..5d4f98d014 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/RpcController.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcController.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * 
    An {@code RpcController} mediates a single method call.  The primary
diff --git a/akka-protobuf/src/main/java/akka/protobuf/RpcUtil.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcUtil.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/RpcUtil.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcUtil.java
index 1dc71518d3..6b4c8895b4 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/RpcUtil.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/RpcUtil.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * Grab-bag of utility functions useful when dealing with RPCs.
diff --git a/akka-protobuf/src/main/java/akka/protobuf/Service.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Service.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/Service.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/Service.java
index 1fe470b2e8..1adb45f12d 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/Service.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Service.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * Abstract base interface for protocol-buffer-based RPC services.  Services
diff --git a/akka-protobuf/src/main/java/akka/protobuf/ServiceException.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/ServiceException.java
similarity index 98%
rename from akka-protobuf/src/main/java/akka/protobuf/ServiceException.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/ServiceException.java
index b7943a1e68..0246a48b1d 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/ServiceException.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/ServiceException.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * Thrown by blocking RPC methods when a failure occurs.
diff --git a/akka-protobuf/src/main/java/akka/protobuf/SingleFieldBuilder.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/SingleFieldBuilder.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/SingleFieldBuilder.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/SingleFieldBuilder.java
index 9a51d955e9..897534dce9 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/SingleFieldBuilder.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/SingleFieldBuilder.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * {@code SingleFieldBuilder} implements a structure that a protocol
diff --git a/akka-protobuf/src/main/java/akka/protobuf/SmallSortedMap.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/SmallSortedMap.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/SmallSortedMap.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/SmallSortedMap.java
index e156a2c8da..47f5d91ef3 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/SmallSortedMap.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/SmallSortedMap.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.util.AbstractMap;
 import java.util.AbstractSet;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/TextFormat.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/TextFormat.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/TextFormat.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/TextFormat.java
index 0d05a63ae8..7beea47357 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/TextFormat.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/TextFormat.java
@@ -32,12 +32,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
-import akka.protobuf.Descriptors.Descriptor;
-import akka.protobuf.Descriptors.FieldDescriptor;
-import akka.protobuf.Descriptors.EnumDescriptor;
-import akka.protobuf.Descriptors.EnumValueDescriptor;
+import org.apache.pekko.protobuf.Descriptors.Descriptor;
+import org.apache.pekko.protobuf.Descriptors.FieldDescriptor;
+import org.apache.pekko.protobuf.Descriptors.EnumDescriptor;
+import org.apache.pekko.protobuf.Descriptors.EnumValueDescriptor;
 
 import java.io.IOException;
 import java.nio.CharBuffer;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/UninitializedMessageException.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/UninitializedMessageException.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/UninitializedMessageException.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/UninitializedMessageException.java
index 723a2aaefd..3def0e0b09 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/UninitializedMessageException.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/UninitializedMessageException.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/UnknownFieldSet.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/UnknownFieldSet.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/UnknownFieldSet.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/UnknownFieldSet.java
index 8b38e1c74d..442b89d202 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/UnknownFieldSet.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/UnknownFieldSet.java
@@ -32,9 +32,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
-import akka.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
+import org.apache.pekko.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/UnmodifiableLazyStringList.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/UnmodifiableLazyStringList.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/UnmodifiableLazyStringList.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/UnmodifiableLazyStringList.java
index 924dfb6d78..e13e6314ab 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/UnmodifiableLazyStringList.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/UnmodifiableLazyStringList.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 import java.util.AbstractList;
 import java.util.RandomAccess;
diff --git a/akka-protobuf/src/main/java/akka/protobuf/Utf8.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Utf8.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/Utf8.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/Utf8.java
index 2218fa4025..b07bb8117d 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/Utf8.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/Utf8.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * A set of low-level, high-performance static utility methods related
diff --git a/akka-protobuf/src/main/java/akka/protobuf/WireFormat.java b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/WireFormat.java
similarity index 99%
rename from akka-protobuf/src/main/java/akka/protobuf/WireFormat.java
rename to akka-protobuf/src/main/java/org/apache/pekko/protobuf/WireFormat.java
index 7aeb3305b0..1f533e4834 100644
--- a/akka-protobuf/src/main/java/akka/protobuf/WireFormat.java
+++ b/akka-protobuf/src/main/java/org/apache/pekko/protobuf/WireFormat.java
@@ -32,7 +32,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package akka.protobuf;
+package org.apache.pekko.protobuf;
 
 /**
  * This class is used internally by the Protocol Buffer library and generated
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/io/DnsSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/io/DnsSpec.scala
similarity index 92%
rename from akka-remote-tests/src/multi-jvm/scala/akka/io/DnsSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/io/DnsSpec.scala
index 992812b537..e58bca7e8a 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/io/DnsSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/io/DnsSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.io
+package org.apache.pekko.io
 
 import java.net.Inet4Address
 import java.net.Inet6Address
@@ -10,8 +10,9 @@ import java.net.InetAddress
 
 import scala.annotation.nowarn
 
-import akka.remote.RemotingMultiNodeSpec
-import akka.remote.testkit.MultiNodeConfig
+import org.apache.pekko
+import pekko.remote.RemotingMultiNodeSpec
+import pekko.remote.testkit.MultiNodeConfig
 
 object DnsSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/AttemptSysMsgRedeliverySpec.scala
similarity index 90%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/AttemptSysMsgRedeliverySpec.scala
index ff2843bb9f..3be84f27d0 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/AttemptSysMsgRedeliverySpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import testkit.MultiNodeConfig
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 class AttemptSysMsgRedeliveryMultiJvmSpec(artery: Boolean) extends MultiNodeConfig {
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/LookupRemoteActorSpec.scala
similarity index 89%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/LookupRemoteActorSpec.scala
index 53ffd94ab2..13b90a2fe9 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/LookupRemoteActorSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import com.typesafe.config.ConfigFactory
 import testkit.MultiNodeConfig
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.Props
-import akka.pattern.ask
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.pattern.ask
+import pekko.testkit._
 
 class LookupRemoteActorMultiJvmSpec(artery: Boolean) extends MultiNodeConfig {
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/NewRemoteActorSpec.scala
similarity index 96%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/NewRemoteActorSpec.scala
index 64a9556eb9..fbe86548eb 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/NewRemoteActorSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import scala.concurrent.duration._
 
@@ -10,11 +10,12 @@ import com.typesafe.config.ConfigFactory
 import language.postfixOps
 import testkit.MultiNodeConfig
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.actor.Terminated
+import pekko.util.unused
 
 class NewRemoteActorMultiJvmSpec(artery: Boolean) extends MultiNodeConfig {
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/PiercingShouldKeepQuarantineSpec.scala
similarity index 95%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/PiercingShouldKeepQuarantineSpec.scala
index 7ddc35f111..3bcfabef71 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/PiercingShouldKeepQuarantineSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 class PiercingShouldKeepQuarantineConfig(artery: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteDeliverySpec.scala
similarity index 88%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteDeliverySpec.scala
index 956f280f91..a5d3d8aee4 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteDeliverySpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import scala.concurrent.duration._
 import scala.language.postfixOps
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.Props
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.serialization.jackson.CborSerializable
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.serialization.jackson.CborSerializable
 
 class RemoteDeliveryConfig(artery: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteDeploymentDeathWatchSpec.scala
similarity index 95%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteDeploymentDeathWatchSpec.scala
index fff9470195..58e83cbf13 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteDeploymentDeathWatchSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import java.util.concurrent.TimeoutException
 
@@ -12,11 +12,12 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Actor
-import akka.actor.ActorSystemImpl
-import akka.actor.Props
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorSystemImpl
+import pekko.actor.Props
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 class RemoteDeploymentDeathWatchMultiJvmSpec(artery: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteFeaturesSpec.scala
similarity index 93%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteFeaturesSpec.scala
index 9eceb9c277..351cd236e1 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteFeaturesSpec.scala
@@ -2,33 +2,34 @@
  * Copyright (C) 2019-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.ActorSystemImpl
-import akka.actor.Address
-import akka.actor.AddressFromURIString
-import akka.actor.Identify
-import akka.actor.Nobody
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.remote.RemoteNodeDeathWatchSpec.UnwatchIt
-import akka.remote.RemoteNodeDeathWatchSpec.WatchIt
-import akka.remote.RemoteWatcher.Stats
-import akka.remote.routing.RemoteRouterConfig
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.routing.Broadcast
-import akka.routing.FromConfig
-import akka.routing.RoundRobinGroup
-import akka.routing.RoundRobinPool
-import akka.routing.RoutedActorRef
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystemImpl
+import pekko.actor.Address
+import pekko.actor.AddressFromURIString
+import pekko.actor.Identify
+import pekko.actor.Nobody
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.remote.RemoteNodeDeathWatchSpec.UnwatchIt
+import pekko.remote.RemoteNodeDeathWatchSpec.WatchIt
+import pekko.remote.RemoteWatcher.Stats
+import pekko.remote.routing.RemoteRouterConfig
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.routing.Broadcast
+import pekko.routing.FromConfig
+import pekko.routing.RoundRobinGroup
+import pekko.routing.RoundRobinPool
+import pekko.routing.RoutedActorRef
+import pekko.testkit.TestProbe
 
 class RemotingFeaturesConfig(val useUnsafe: Boolean, artery: Boolean) extends MultiNodeConfig {
 
@@ -232,7 +233,7 @@ abstract class RemotingFeaturesSpec(val multiNodeConfig: RemotingFeaturesConfig)
   import RemoteWatcher._
   import multiNodeConfig._
 
-  import akka.remote.routing.RemoteRoundRobinSpec._
+  import pekko.remote.routing.RemoteRoundRobinSpec._
 
   override def initialParticipants: Int = roles.size
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteNodeDeathWatchSpec.scala
similarity index 97%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeDeathWatchSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteNodeDeathWatchSpec.scala
index 6340796492..c3bc1651ff 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeDeathWatchSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteNodeDeathWatchSpec.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.actor.Terminated
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 class RemoteNodeDeathWatchConfig(artery: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteNodeRestartDeathWatchSpec.scala
similarity index 88%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteNodeRestartDeathWatchSpec.scala
index ff51c421a7..72bb3f3184 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteNodeRestartDeathWatchSpec.scala
@@ -2,25 +2,26 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.ExtendedActorSystem
-import akka.actor.Identify
-import akka.actor.Props
-import akka.actor.RootActorPath
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.actor.RootActorPath
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 class RemoteNodeRestartDeathWatchConfig(artery: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteQuarantinePiercingSpec.scala
similarity index 96%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteQuarantinePiercingSpec.scala
index a22c328ade..1500ea8111 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteQuarantinePiercingSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 class RemoteQuarantinePiercingConfig(artery: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteReDeploymentSpec.scala
similarity index 94%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteReDeploymentSpec.scala
index 2c03f36ef9..bf9b3f4763 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemoteReDeploymentSpec.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorLogging
-import akka.actor.ActorRef
-import akka.actor.ActorSystem
-import akka.actor.Identify
-import akka.actor.Props
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction._
-import akka.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorLogging
+import pekko.actor.ActorRef
+import pekko.actor.ActorSystem
+import pekko.actor.Identify
+import pekko.actor.Props
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction._
+import pekko.testkit.TestProbe
 
 class RemoteReDeploymentConfig(artery: Boolean) extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemotingMultiNodeSpec.scala
similarity index 71%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemotingMultiNodeSpec.scala
index 3903cc4b5c..a9d651d216 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/RemotingMultiNodeSpec.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.Suite
 
-import akka.remote.artery.ArterySpecSupport
-import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec }
-import akka.testkit.{ DefaultTimeout, ImplicitSender }
+import org.apache.pekko
+import pekko.remote.artery.ArterySpecSupport
+import pekko.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec }
+import pekko.testkit.{ DefaultTimeout, ImplicitSender }
 
 object RemotingMultiNodeSpec {
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/TransportFailSpec.scala
similarity index 90%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/TransportFailSpec.scala
index 9cc7502ab2..115e2518a3 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/TransportFailSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.remote
+package org.apache.pekko.remote
 
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -12,17 +12,18 @@ import scala.annotation.nowarn
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorIdentity
-import akka.actor.ActorRef
-import akka.actor.Identify
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.event.EventStream
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
-import akka.util.unused
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorIdentity
+import pekko.actor.ActorRef
+import pekko.actor.Identify
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.event.EventStream
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
+import pekko.util.unused
 
 object TransportFailConfig extends MultiNodeConfig {
   val first = role("first")
@@ -33,7 +34,7 @@ object TransportFailConfig extends MultiNodeConfig {
       akka.remote.use-unsafe-remote-features-outside-cluster = on
       akka.remote.classic {
         transport-failure-detector {
-          implementation-class = "akka.remote.TransportFailSpec$$TestFailureDetector"
+          implementation-class = "org.apache.pekko.remote.TransportFailSpec$$TestFailureDetector"
           heartbeat-interval = 1 s
         }
         retry-gate-closed-for = 3 s
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/BenchmarkFileReporter.scala
similarity index 87%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/BenchmarkFileReporter.scala
index 7eda49b141..52dc6503be 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/BenchmarkFileReporter.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.io.File
 import java.nio.file.Files
@@ -13,7 +13,7 @@ import java.time.format.DateTimeFormatter
 
 import scala.util.Try
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 
 /**
  * Simple to file logger for benchmark results. Will log relevant settings first to make sure
@@ -36,11 +36,11 @@ object BenchmarkFileReporter {
   def apply(test: String, system: ActorSystem): BenchmarkFileReporter = {
     val settingsToReport =
       Seq(
-        "akka.test.MaxThroughputSpec.totalMessagesFactor",
-        "akka.test.MaxThroughputSpec.real-message",
-        "akka.test.LatencySpec.totalMessagesFactor",
-        "akka.test.LatencySpec.repeatCount",
-        "akka.test.LatencySpec.real-message",
+        "org.apache.pekko.test.MaxThroughputSpec.totalMessagesFactor",
+        "org.apache.pekko.test.MaxThroughputSpec.real-message",
+        "org.apache.pekko.test.LatencySpec.totalMessagesFactor",
+        "org.apache.pekko.test.LatencySpec.repeatCount",
+        "org.apache.pekko.test.LatencySpec.real-message",
         "akka.remote.artery.enabled",
         "akka.remote.artery.advanced.inbound-lanes",
         "akka.remote.artery.advanced.buffer-pool-size",
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/DirectMemorySpec.scala
similarity index 89%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/DirectMemorySpec.scala
index 11c17593d9..3421b4ecf8 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/DirectMemorySpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Actor, ActorPath, ActorRef, Props }
-import akka.remote.RemotingMultiNodeSpec
-import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec }
-import akka.testkit.ImplicitSender
-import akka.testkit.JavaSerializable
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorPath, ActorRef, Props }
+import pekko.remote.RemotingMultiNodeSpec
+import pekko.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec }
+import pekko.testkit.ImplicitSender
+import pekko.testkit.JavaSerializable
 
 object DirectMemorySpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpecMultiJvmNode1.opts b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/DirectMemorySpecMultiJvmNode1.opts
similarity index 100%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpecMultiJvmNode1.opts
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/DirectMemorySpecMultiJvmNode1.opts
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpecMultiJvmNode2.opts b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/DirectMemorySpecMultiJvmNode2.opts
similarity index 100%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpecMultiJvmNode2.opts
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/DirectMemorySpecMultiJvmNode2.opts
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/FanInThrougputSpec.scala
similarity index 83%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/FanInThrougputSpec.scala
index c8c719e1a3..0595da77e2 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/FanInThrougputSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.util.concurrent.Executors
 
@@ -10,16 +10,17 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec }
-import akka.remote.artery.MaxThroughputSpec._
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.{ MultiNodeConfig, PerfFlamesSupport }
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec }
+import pekko.remote.artery.MaxThroughputSpec._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.{ MultiNodeConfig, PerfFlamesSupport }
+import pekko.testkit._
 
 object FanInThroughputSpec extends MultiNodeConfig {
   val totalNumberOfNodes =
-    System.getProperty("akka.test.FanInThroughputSpec.nrOfNodes") match {
+    System.getProperty("org.apache.pekko.test.FanInThroughputSpec.nrOfNodes") match {
       case null  => 4
       case value => value.toInt
     }
@@ -31,9 +32,9 @@ object FanInThroughputSpec extends MultiNodeConfig {
 
   commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString(s"""
        # for serious measurements you should increase the totalMessagesFactor (20)
-       akka.test.FanInThroughputSpec.totalMessagesFactor = 10.0
-       akka.test.FanInThroughputSpec.real-message = off
-       akka.test.FanInThroughputSpec.actor-selection = off
+       org.apache.pekko.test.FanInThroughputSpec.totalMessagesFactor = 10.0
+       org.apache.pekko.test.FanInThroughputSpec.real-message = off
+       org.apache.pekko.test.FanInThroughputSpec.actor-selection = off
        akka.remote.artery.advanced {
          # inbound-lanes = 4
        }
@@ -53,9 +54,10 @@ abstract class FanInThroughputSpec extends RemotingMultiNodeSpec(FanInThroughput
 
   import FanInThroughputSpec._
 
-  val totalMessagesFactor = system.settings.config.getDouble("akka.test.FanInThroughputSpec.totalMessagesFactor")
-  val realMessage = system.settings.config.getBoolean("akka.test.FanInThroughputSpec.real-message")
-  val actorSelection = system.settings.config.getBoolean("akka.test.FanInThroughputSpec.actor-selection")
+  val totalMessagesFactor =
+    system.settings.config.getDouble("org.apache.pekko.test.FanInThroughputSpec.totalMessagesFactor")
+  val realMessage = system.settings.config.getBoolean("org.apache.pekko.test.FanInThroughputSpec.real-message")
+  val actorSelection = system.settings.config.getBoolean("org.apache.pekko.test.FanInThroughputSpec.actor-selection")
 
   var plot = PlotResult()
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/FanOutThrougputSpec.scala
similarity index 83%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/FanOutThrougputSpec.scala
index 75ecd9d98b..b4a7c561ec 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/FanOutThrougputSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.util.concurrent.Executors
 
@@ -10,17 +10,18 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec }
-import akka.remote.artery.MaxThroughputSpec._
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.PerfFlamesSupport
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec }
+import pekko.remote.artery.MaxThroughputSpec._
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.PerfFlamesSupport
+import pekko.testkit._
 
 object FanOutThroughputSpec extends MultiNodeConfig {
   val totalNumberOfNodes =
-    System.getProperty("akka.test.FanOutThroughputSpec.nrOfNodes") match {
+    System.getProperty("org.apache.pekko.test.FanOutThroughputSpec.nrOfNodes") match {
       case null  => 4
       case value => value.toInt
     }
@@ -32,9 +33,9 @@ object FanOutThroughputSpec extends MultiNodeConfig {
 
   commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString(s"""
        # for serious measurements you should increase the totalMessagesFactor (20)
-       akka.test.FanOutThroughputSpec.totalMessagesFactor = 10.0
-       akka.test.FanOutThroughputSpec.real-message = off
-       akka.test.FanOutThroughputSpec.actor-selection = off
+       org.apache.pekko.test.FanOutThroughputSpec.totalMessagesFactor = 10.0
+       org.apache.pekko.test.FanOutThroughputSpec.real-message = off
+       org.apache.pekko.test.FanOutThroughputSpec.actor-selection = off
        """)).withFallback(MaxThroughputSpec.cfg).withFallback(RemotingMultiNodeSpec.commonConfig))
 
 }
@@ -51,9 +52,10 @@ abstract class FanOutThroughputSpec extends RemotingMultiNodeSpec(FanOutThroughp
 
   import FanOutThroughputSpec._
 
-  val totalMessagesFactor = system.settings.config.getDouble("akka.test.FanOutThroughputSpec.totalMessagesFactor")
-  val realMessage = system.settings.config.getBoolean("akka.test.FanOutThroughputSpec.real-message")
-  val actorSelection = system.settings.config.getBoolean("akka.test.FanOutThroughputSpec.actor-selection")
+  val totalMessagesFactor =
+    system.settings.config.getDouble("org.apache.pekko.test.FanOutThroughputSpec.totalMessagesFactor")
+  val realMessage = system.settings.config.getBoolean("org.apache.pekko.test.FanOutThroughputSpec.real-message")
+  val actorSelection = system.settings.config.getBoolean("org.apache.pekko.test.FanOutThroughputSpec.actor-selection")
 
   var plot = PlotResult()
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/HandshakeRestartReceiverSpec.scala
similarity index 92%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/HandshakeRestartReceiverSpec.scala
index 696cc0cf4a..8249076b04 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/HandshakeRestartReceiverSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import scala.concurrent.Await
 import scala.concurrent.Future
@@ -11,14 +11,15 @@ import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.remote.AddressUidExtension
-import akka.remote.RARP
-import akka.remote.UniqueAddress
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.remote.testkit.STMultiNodeSpec
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.remote.AddressUidExtension
+import pekko.remote.RARP
+import pekko.remote.UniqueAddress
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.testkit._
 
 object HandshakeRestartReceiverSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/LatencySpec.scala
similarity index 91%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/LatencySpec.scala
index 6687a42773..3eae30dc36 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/LatencySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicLongArray
@@ -13,15 +13,16 @@ import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
 import org.HdrHistogram.Histogram
 
-import akka.actor._
-import akka.dispatch.Dispatchers
-import akka.remote.RemotingMultiNodeSpec
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.serialization.jackson.CborSerializable
-import akka.stream.ThrottleMode
-import akka.stream.scaladsl.Source
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.dispatch.Dispatchers
+import pekko.remote.RemotingMultiNodeSpec
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.serialization.jackson.CborSerializable
+import pekko.stream.ThrottleMode
+import pekko.stream.scaladsl.Source
+import pekko.testkit._
 
 object LatencySpec extends MultiNodeConfig {
   val first = role("first")
@@ -31,13 +32,13 @@ object LatencySpec extends MultiNodeConfig {
 
   commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString(s"""
        # for serious measurements you should increase the totalMessagesFactor (30) and repeatCount (3)
-       akka.test.LatencySpec.totalMessagesFactor = 1.0
-       akka.test.LatencySpec.repeatCount = 1
-       akka.test.LatencySpec.real-message = off
+       org.apache.pekko.test.LatencySpec.totalMessagesFactor = 1.0
+       org.apache.pekko.test.LatencySpec.repeatCount = 1
+       org.apache.pekko.test.LatencySpec.real-message = off
        akka {
          loglevel = ERROR
          # avoid TestEventListener
-         loggers = ["akka.event.Logging$$DefaultLogger"]
+         loggers = ["org.apache.pekko.event.Logging$$DefaultLogger"]
          testconductor.barrier-timeout = ${barrierTimeout.toSeconds}s
          actor {
            provider = remote
@@ -182,9 +183,9 @@ abstract class LatencySpec extends RemotingMultiNodeSpec(LatencySpec) {
 
   import LatencySpec._
 
-  val totalMessagesFactor = system.settings.config.getDouble("akka.test.LatencySpec.totalMessagesFactor")
-  val repeatCount = system.settings.config.getInt("akka.test.LatencySpec.repeatCount")
-  val realMessage = system.settings.config.getBoolean("akka.test.LatencySpec.real-message")
+  val totalMessagesFactor = system.settings.config.getDouble("org.apache.pekko.test.LatencySpec.totalMessagesFactor")
+  val repeatCount = system.settings.config.getInt("org.apache.pekko.test.LatencySpec.repeatCount")
+  val realMessage = system.settings.config.getBoolean("org.apache.pekko.test.LatencySpec.real-message")
 
   var plots = LatencyPlots()
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/MaxThroughputSpec.scala
similarity index 91%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/MaxThroughputSpec.scala
index ac5ca777f6..086f236a61 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/MaxThroughputSpec.scala
@@ -2,21 +2,22 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.nio.ByteBuffer
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit.NANOSECONDS
 import scala.concurrent.duration._
 import com.typesafe.config.ConfigFactory
-import akka.actor._
-import akka.remote.{ RARP, RemoteActorRefProvider, RemotingMultiNodeSpec }
-import akka.remote.artery.compress.CompressionProtocol.Events.ReceivedActorRefCompressionTable
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.{ MultiNodeConfig, PerfFlamesSupport }
-import akka.serialization.{ ByteBufferSerializer, SerializerWithStringManifest }
-import akka.serialization.jackson.CborSerializable
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.remote.{ RARP, RemoteActorRefProvider, RemotingMultiNodeSpec }
+import pekko.remote.artery.compress.CompressionProtocol.Events.ReceivedActorRefCompressionTable
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.{ MultiNodeConfig, PerfFlamesSupport }
+import pekko.serialization.{ ByteBufferSerializer, SerializerWithStringManifest }
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit._
 
 import java.io.NotSerializableException
 
@@ -28,25 +29,25 @@ object MaxThroughputSpec extends MultiNodeConfig {
 
   val cfg = ConfigFactory.parseString(s"""
      # for serious measurements you should increase the totalMessagesFactor (80)
-     akka.test.MaxThroughputSpec.totalMessagesFactor = 160.0
-     akka.test.MaxThroughputSpec.real-message = off
-     akka.test.MaxThroughputSpec.actor-selection = off
+     org.apache.pekko.test.MaxThroughputSpec.totalMessagesFactor = 160.0
+     org.apache.pekko.test.MaxThroughputSpec.real-message = off
+     org.apache.pekko.test.MaxThroughputSpec.actor-selection = off
      akka {
        loglevel = INFO
        log-dead-letters = 100
        # avoid TestEventListener
-       loggers = ["akka.event.Logging$$DefaultLogger"]
+       loggers = ["org.apache.pekko.event.Logging$$DefaultLogger"]
        testconductor.barrier-timeout = ${barrierTimeout.toSeconds}s
        actor {
          provider = remote
 
          serializers {
-           test = "akka.remote.artery.MaxThroughputSpec$$TestSerializer"
-           test-message = "akka.remote.artery.TestMessageSerializer"
+           test = "org.apache.pekko.remote.artery.MaxThroughputSpec$$TestSerializer"
+           test-message = "org.apache.pekko.remote.artery.TestMessageSerializer"
          }
          serialization-bindings {
-           "akka.remote.artery.MaxThroughputSpec$$FlowControl" = test
-           "akka.remote.artery.TestMessage" = test-message
+           "org.apache.pekko.remote.artery.MaxThroughputSpec$$FlowControl" = test
+           "org.apache.pekko.remote.artery.TestMessage" = test-message
          }
        }
        remote.artery {
@@ -366,9 +367,10 @@ abstract class MaxThroughputSpec extends RemotingMultiNodeSpec(MaxThroughputSpec
 
   import MaxThroughputSpec._
 
-  val totalMessagesFactor = system.settings.config.getDouble("akka.test.MaxThroughputSpec.totalMessagesFactor")
-  val realMessage = system.settings.config.getBoolean("akka.test.MaxThroughputSpec.real-message")
-  val actorSelection = system.settings.config.getBoolean("akka.test.MaxThroughputSpec.actor-selection")
+  val totalMessagesFactor =
+    system.settings.config.getDouble("org.apache.pekko.test.MaxThroughputSpec.totalMessagesFactor")
+  val realMessage = system.settings.config.getBoolean("org.apache.pekko.test.MaxThroughputSpec.real-message")
+  val actorSelection = system.settings.config.getBoolean("org.apache.pekko.test.MaxThroughputSpec.actor-selection")
 
   var plot = PlotResult()
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/PlotResult.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/PlotResult.scala
similarity index 95%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/PlotResult.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/PlotResult.scala
index 54dcc00a7e..42ebf7cc16 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/PlotResult.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/PlotResult.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 final case class PlotResult(values: Vector[(String, Number)] = Vector.empty) {
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/RemoteRestartedQuarantinedSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/RemoteRestartedQuarantinedSpec.scala
similarity index 93%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/RemoteRestartedQuarantinedSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/RemoteRestartedQuarantinedSpec.scala
index 850b6a864d..21bd3bf600 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/RemoteRestartedQuarantinedSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/RemoteRestartedQuarantinedSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,11 +10,12 @@ import scala.language.postfixOps
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ ActorIdentity, Identify, _ }
-import akka.remote.{ AddressUidExtension, RARP, RemotingMultiNodeSpec }
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.{ ActorIdentity, Identify, _ }
+import pekko.remote.{ AddressUidExtension, RARP, RemotingMultiNodeSpec }
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object RemoteRestartedQuarantinedSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala
similarity index 94%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala
index 8d01228d2e..ee6a29b77f 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala
@@ -2,19 +2,20 @@
  * Copyright (C) 2017-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import scala.util.control.NoStackTrace
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.concurrent.ScalaFutures
 
-import akka.actor._
-import akka.actor.ActorIdentity
-import akka.actor.Identify
-import akka.remote.{ RARP, RemotingMultiNodeSpec }
-import akka.remote.testkit.MultiNodeConfig
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.actor.ActorIdentity
+import pekko.actor.Identify
+import pekko.remote.{ RARP, RemotingMultiNodeSpec }
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.testkit._
 
 object SurviveInboundStreamRestartWithCompressionInFlightSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/SurviveNetworkPartitionSpec.scala
similarity index 91%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/SurviveNetworkPartitionSpec.scala
index ab6c970677..39e662a7ff 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/SurviveNetworkPartitionSpec.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import scala.concurrent.duration._
 
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 
-import akka.actor._
-import akka.actor.ActorIdentity
-import akka.actor.Identify
-import akka.remote.{ RARP, RemotingMultiNodeSpec }
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor._
+import pekko.actor.ActorIdentity
+import pekko.actor.Identify
+import pekko.remote.{ RARP, RemotingMultiNodeSpec }
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit._
 
 object SurviveNetworkPartitionSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestMessage.scala
similarity index 84%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestMessage.scala
index c44939d83b..b43cc14355 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestMessage.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
-import akka.actor.ExtendedActorSystem
-import akka.protobufv3.internal.ByteString
-import akka.remote.artery.protobuf.{ TestMessages => proto }
-import akka.serialization.SerializerWithStringManifest
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.protobufv3.internal.ByteString
+import pekko.remote.artery.protobuf.{ TestMessages => proto }
+import pekko.serialization.SerializerWithStringManifest
 
 import java.io.NotSerializableException
 
@@ -53,7 +54,7 @@ class TestMessageSerializer(val system: ExtendedActorSystem) extends SerializerW
 
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef = {
     val protoMsg = proto.TestMessage.parseFrom(bytes)
-    import akka.util.ccompat.JavaConverters._
+    import pekko.util.ccompat.JavaConverters._
     val items = protoMsg.getItemsList.asScala.map { item =>
       TestMessage.Item(item.getId, item.getName)
     }.toVector
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestRateReporter.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestRateReporter.scala
similarity index 95%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestRateReporter.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestRateReporter.scala
index 36a71105a7..08af3b8ef1 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestRateReporter.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestRateReporter.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import java.util.concurrent.TimeUnit.SECONDS
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/UdpPortActor.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/UdpPortActor.scala
similarity index 70%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/UdpPortActor.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/UdpPortActor.scala
index 5d5e5f4944..4fb58dfbf3 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/UdpPortActor.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/UdpPortActor.scala
@@ -2,12 +2,13 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
-import akka.actor.Actor
-import akka.remote.RARP
-import akka.serialization.jackson.CborSerializable
-import akka.testkit.SocketUtil
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.remote.RARP
+import pekko.serialization.jackson.CborSerializable
+import pekko.testkit.SocketUtil
 
 object UdpPortActor {
   case object GetUdpPort extends CborSerializable
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamConcistencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamConcistencySpec.scala
similarity index 92%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamConcistencySpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamConcistencySpec.scala
index 96062498d8..da55338e61 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamConcistencySpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamConcistencySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 package aeron
 
 import java.io.File
@@ -15,16 +15,17 @@ import com.typesafe.config.ConfigFactory
 import io.aeron.Aeron
 import org.agrona.IoUtil
 
-import akka.Done
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.STMultiNodeSpec
-import akka.stream.KillSwitches
-import akka.stream.ThrottleMode
-import akka.stream.scaladsl.Source
-import akka.testkit._
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ExtendedActorSystem
+import pekko.actor.Props
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.stream.KillSwitches
+import pekko.stream.ThrottleMode
+import pekko.stream.scaladsl.Source
+import pekko.testkit._
+import pekko.util.ByteString
 
 object AeronStreamConsistencySpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamLatencySpec.scala
similarity index 92%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamLatencySpec.scala
index 813c975a88..c7607f5722 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamLatencySpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 package aeron
 
 import java.io.File
@@ -23,16 +23,17 @@ import org.HdrHistogram.Histogram
 import org.agrona.IoUtil
 import org.agrona.concurrent.ManyToOneConcurrentArrayQueue
 
-import akka.Done
-import akka.actor._
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.STMultiNodeSpec
-import akka.stream.KillSwitches
-import akka.stream.ThrottleMode
-import akka.stream.scaladsl.Flow
-import akka.stream.scaladsl.Source
-import akka.testkit._
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.Done
+import pekko.actor._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.stream.KillSwitches
+import pekko.stream.ThrottleMode
+import pekko.stream.scaladsl.Flow
+import pekko.stream.scaladsl.Source
+import pekko.testkit._
+import pekko.util.ByteString
 
 object AeronStreamLatencySpec extends MultiNodeConfig {
   val first = role("first")
@@ -42,8 +43,8 @@ object AeronStreamLatencySpec extends MultiNodeConfig {
 
   commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString(s"""
        # for serious measurements you should increase the totalMessagesFactor (10) and repeatCount (3)
-       akka.test.AeronStreamLatencySpec.totalMessagesFactor = 1.0
-       akka.test.AeronStreamLatencySpec.repeatCount = 1
+       org.apache.pekko.test.AeronStreamLatencySpec.totalMessagesFactor = 1.0
+       org.apache.pekko.test.AeronStreamLatencySpec.repeatCount = 1
        akka {
          loglevel = INFO
          testconductor.barrier-timeout = ${barrierTimeout.toSeconds}s
@@ -75,8 +76,9 @@ abstract class AeronStreamLatencySpec
 
   import AeronStreamLatencySpec._
 
-  val totalMessagesFactor = system.settings.config.getDouble("akka.test.AeronStreamLatencySpec.totalMessagesFactor")
-  val repeatCount = system.settings.config.getInt("akka.test.AeronStreamLatencySpec.repeatCount")
+  val totalMessagesFactor =
+    system.settings.config.getDouble("org.apache.pekko.test.AeronStreamLatencySpec.totalMessagesFactor")
+  val repeatCount = system.settings.config.getInt("org.apache.pekko.test.AeronStreamLatencySpec.repeatCount")
 
   var plots = LatencyPlots()
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala
similarity index 92%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala
index 2a37dc2d5e..b55e30ab93 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 package aeron
 
 import java.io.File
@@ -17,13 +17,14 @@ import io.aeron.Aeron
 import io.aeron.CncFileDescriptor
 import org.agrona.IoUtil
 
-import akka.actor._
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.STMultiNodeSpec
-import akka.stream.KillSwitches
-import akka.stream.scaladsl.Source
-import akka.testkit._
-import akka.util.ByteString
+import org.apache.pekko
+import pekko.actor._
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.testkit.STMultiNodeSpec
+import pekko.stream.KillSwitches
+import pekko.stream.scaladsl.Source
+import pekko.testkit._
+import pekko.util.ByteString
 
 object AeronStreamMaxThroughputSpec extends MultiNodeConfig {
   val first = role("first")
@@ -33,7 +34,7 @@ object AeronStreamMaxThroughputSpec extends MultiNodeConfig {
 
   commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString(s"""
        # for serious measurements you should increase the totalMessagesFactor (20)
-       akka.test.AeronStreamMaxThroughputSpec.totalMessagesFactor = 1.0
+       org.apache.pekko.test.AeronStreamMaxThroughputSpec.totalMessagesFactor = 1.0
        akka {
          loglevel = ERROR
          testconductor.barrier-timeout = ${barrierTimeout.toSeconds}s
@@ -72,7 +73,7 @@ abstract class AeronStreamMaxThroughputSpec
   import AeronStreamMaxThroughputSpec._
 
   val totalMessagesFactor =
-    system.settings.config.getDouble("akka.test.AeronStreamMaxThroughputSpec.totalMessagesFactor")
+    system.settings.config.getDouble("org.apache.pekko.test.AeronStreamMaxThroughputSpec.totalMessagesFactor")
 
   var plot = PlotResult()
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMultiNodeSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMultiNodeSpec.scala
similarity index 84%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMultiNodeSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMultiNodeSpec.scala
index 6c89289814..ebc5839f7a 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMultiNodeSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/aeron/AeronStreamMultiNodeSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2016-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery.aeron
+package org.apache.pekko.remote.artery.aeron
 
 import java.io.File
 import java.util.UUID
@@ -10,9 +10,10 @@ import java.util.UUID
 import io.aeron.CommonContext
 import io.aeron.driver.MediaDriver
 
-import akka.remote.artery.UdpPortActor
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
+import org.apache.pekko
+import pekko.remote.artery.UdpPortActor
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
 
 abstract class AeronStreamMultiNodeSpec(config: MultiNodeConfig) extends MultiNodeSpec(config) {
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteGatePiercingSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/RemoteGatePiercingSpec.scala
similarity index 86%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteGatePiercingSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/RemoteGatePiercingSpec.scala
index db49dc2b3a..2584d5372c 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteGatePiercingSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/RemoteGatePiercingSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.classic
+package org.apache.pekko.remote.classic
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,13 +10,14 @@ import scala.concurrent.duration._
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ ActorIdentity, Identify, _ }
-import akka.remote.{ RARP, RemotingMultiNodeSpec }
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.AssociationHandle
-import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.{ ActorIdentity, Identify, _ }
+import pekko.remote.{ RARP, RemotingMultiNodeSpec }
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.AssociationHandle
+import pekko.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly
+import pekko.testkit._
 
 object RemoteGatePiercingSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeRestartGateSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/RemoteNodeRestartGateSpec.scala
similarity index 89%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeRestartGateSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/RemoteNodeRestartGateSpec.scala
index 900fead3ad..60952d1236 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeRestartGateSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/RemoteNodeRestartGateSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.classic
+package org.apache.pekko.remote.classic
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,13 +10,14 @@ import scala.concurrent.duration._
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ ActorIdentity, Identify, _ }
-import akka.remote.{ RARP, RemotingMultiNodeSpec }
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.AssociationHandle
-import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.{ ActorIdentity, Identify, _ }
+import pekko.remote.{ RARP, RemotingMultiNodeSpec }
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.AssociationHandle
+import pekko.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly
+import pekko.testkit._
 
 object RemoteNodeRestartGateSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala
similarity index 93%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala
index c3e422d327..a00df33971 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.classic
+package org.apache.pekko.remote.classic
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,12 +10,13 @@ import scala.language.postfixOps
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ ActorIdentity, Identify, _ }
-import akka.remote.{ RARP, RemotingMultiNodeSpec }
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.{ Direction, ForceDisassociate }
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.{ ActorIdentity, Identify, _ }
+import pekko.remote.{ RARP, RemotingMultiNodeSpec }
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.{ Direction, ForceDisassociate }
+import pekko.testkit._
 
 object RemoteNodeShutdownAndComesBackSpec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/Ticket15109Spec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/Ticket15109Spec.scala
similarity index 86%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/Ticket15109Spec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/Ticket15109Spec.scala
index acfa24c021..381d65ea0d 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/Ticket15109Spec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/classic/Ticket15109Spec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.classic
+package org.apache.pekko.remote.classic
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -10,13 +10,14 @@ import scala.concurrent.duration._
 import scala.annotation.nowarn
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ ActorIdentity, Identify, _ }
-import akka.remote.{ RARP, RemotingMultiNodeSpec }
-import akka.remote.testconductor.RoleName
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.AssociationHandle
-import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.{ ActorIdentity, Identify, _ }
+import pekko.remote.{ RARP, RemotingMultiNodeSpec }
+import pekko.remote.testconductor.RoleName
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.AssociationHandle
+import pekko.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly
+import pekko.testkit._
 
 object Ticket15109Spec extends MultiNodeConfig {
   val first = role("first")
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/routing/RemoteRandomSpec.scala
similarity index 89%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/routing/RemoteRandomSpec.scala
index 9f0927b60f..e9e8d927cf 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/routing/RemoteRandomSpec.scala
@@ -2,23 +2,24 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.routing
+package org.apache.pekko.remote.routing
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.remote.RemotingMultiNodeSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.routing.Broadcast
-import akka.routing.RandomPool
-import akka.routing.RoutedActorRef
-import akka.testkit._
+import org.apache.pekko
+import pekko.actor.Actor
+import pekko.actor.ActorRef
+import pekko.actor.Address
+import pekko.actor.PoisonPill
+import pekko.actor.Props
+import pekko.remote.RemotingMultiNodeSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.routing.Broadcast
+import pekko.routing.RandomPool
+import pekko.routing.RoutedActorRef
+import pekko.testkit._
 
 class RemoteRandomConfig(artery: Boolean) extends MultiNodeConfig {
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/routing/RemoteRoundRobinSpec.scala
similarity index 95%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/routing/RemoteRoundRobinSpec.scala
index 83ce02ee70..8a4da71af0 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/routing/RemoteRoundRobinSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.routing
+package org.apache.pekko.remote.routing
 
 import scala.collection.immutable
 import scala.concurrent.Await
@@ -11,12 +11,12 @@ import scala.language.postfixOps
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.{ Actor, ActorRef, Address, PoisonPill, Props }
-import akka.pattern.ask
-import akka.remote.RemotingMultiNodeSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.routing._
-import akka.testkit._
+import org.apache.pekko.actor.{ Actor, ActorRef, Address, PoisonPill, Props }
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.remote.RemotingMultiNodeSpec
+import org.apache.pekko.remote.testkit.MultiNodeConfig
+import org.apache.pekko.routing._
+import org.apache.pekko.testkit._
 
 class RemoteRoundRobinConfig(artery: Boolean) extends MultiNodeConfig {
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/routing/RemoteScatterGatherSpec.scala
similarity index 87%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/routing/RemoteScatterGatherSpec.scala
index bd7ffbff81..41d8d9fb70 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/routing/RemoteScatterGatherSpec.scala
@@ -2,24 +2,24 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.routing
+package org.apache.pekko.remote.routing
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.PoisonPill
-import akka.actor.Props
-import akka.remote.RemotingMultiNodeSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.routing.Broadcast
-import akka.routing.RoutedActorRef
-import akka.routing.ScatterGatherFirstCompletedPool
-import akka.testkit._
-import akka.testkit.TestEvent._
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.actor.Address
+import org.apache.pekko.actor.PoisonPill
+import org.apache.pekko.actor.Props
+import org.apache.pekko.remote.RemotingMultiNodeSpec
+import org.apache.pekko.remote.testkit.MultiNodeConfig
+import org.apache.pekko.routing.Broadcast
+import org.apache.pekko.routing.RoutedActorRef
+import org.apache.pekko.routing.ScatterGatherFirstCompletedPool
+import org.apache.pekko.testkit._
+import org.apache.pekko.testkit.TestEvent._
 
 class RemoteScatterGatherConfig(artery: Boolean) extends MultiNodeConfig {
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/sample/MultiNodeSample.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/sample/MultiNodeSample.scala
similarity index 83%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/sample/MultiNodeSample.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/sample/MultiNodeSample.scala
index 4cc69cec0b..c290eed731 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/sample/MultiNodeSample.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/sample/MultiNodeSample.scala
@@ -3,12 +3,12 @@
  */
 
 //#package
-package akka.remote.sample
+package org.apache.pekko.remote.sample
 
 //#package
 
 //#config
-import akka.remote.testkit.{ MultiNodeConfig, STMultiNodeSpec }
+import org.apache.pekko.remote.testkit.{ MultiNodeConfig, STMultiNodeSpec }
 
 object MultiNodeSampleConfig extends MultiNodeConfig {
   val node1 = role("node1")
@@ -17,9 +17,10 @@ object MultiNodeSampleConfig extends MultiNodeConfig {
 //#config
 
 //#spec
-import akka.actor.{ Actor, Props }
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit.ImplicitSender
+import org.apache.pekko
+import pekko.actor.{ Actor, Props }
+import pekko.remote.testkit.MultiNodeSpec
+import pekko.testkit.ImplicitSender
 
 class MultiNodeSampleSpecMultiJvmNode1 extends MultiNodeSample
 class MultiNodeSampleSpecMultiJvmNode2 extends MultiNodeSample
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/testconductor/TestConductorSpec.scala
similarity index 88%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/testconductor/TestConductorSpec.scala
index dc3183532c..a192af8630 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/testconductor/TestConductorSpec.scala
@@ -2,18 +2,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testconductor
+package org.apache.pekko.remote.testconductor
 
 import scala.concurrent.duration._
 
 import com.typesafe.config.ConfigFactory
 import language.postfixOps
 
-import akka.actor.{ Actor, ActorIdentity, Deploy, Identify, Props }
-import akka.remote.RemotingMultiNodeSpec
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.transport.ThrottlerTransportAdapter.Direction
-import akka.testkit.LongRunningTest
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorIdentity, Deploy, Identify, Props }
+import pekko.remote.RemotingMultiNodeSpec
+import pekko.remote.testkit.MultiNodeConfig
+import pekko.remote.transport.ThrottlerTransportAdapter.Direction
+import pekko.testkit.LongRunningTest
 
 object TestConductorMultiJvmSpec extends MultiNodeConfig {
   commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString("""
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/testkit/MultiNodeSpecSpec.scala
similarity index 87%
rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala
rename to akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/testkit/MultiNodeSpecSpec.scala
index 780c631913..e219bd16ab 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/testkit/MultiNodeSpecSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testkit
+package org.apache.pekko.remote.testkit
 
-import akka.remote.RemotingMultiNodeSpec
-import akka.testkit.LongRunningTest
+import org.apache.pekko
+import pekko.remote.RemotingMultiNodeSpec
+import pekko.testkit.LongRunningTest
 
 object MultiNodeSpecMultiJvmSpec extends MultiNodeConfig {
   commonConfig(debugConfig(on = false).withFallback(RemotingMultiNodeSpec.commonConfig))
diff --git a/akka-remote-tests/src/test/java/akka/remote/artery/protobuf/TestMessages.java b/akka-remote-tests/src/test/java/org/apache/pekko/remote/artery/protobuf/TestMessages.java
similarity index 64%
rename from akka-remote-tests/src/test/java/akka/remote/artery/protobuf/TestMessages.java
rename to akka-remote-tests/src/test/java/org/apache/pekko/remote/artery/protobuf/TestMessages.java
index 1840b05533..d602e44537 100644
--- a/akka-remote-tests/src/test/java/akka/remote/artery/protobuf/TestMessages.java
+++ b/akka-remote-tests/src/test/java/org/apache/pekko/remote/artery/protobuf/TestMessages.java
@@ -5,22 +5,22 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: TestMessages.proto
 
-package akka.remote.artery.protobuf;
+package org.apache.pekko.remote.artery.protobuf;
 
 public final class TestMessages {
   private TestMessages() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface TestMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:TestMessage)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required uint64 id = 1;
@@ -47,7 +47,7 @@ public final class TestMessages {
      * required string name = 2;
      * @return The bytes for name.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes();
 
     /**
@@ -75,7 +75,7 @@ public final class TestMessages {
      * optional string description = 4;
      * @return The bytes for description.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getDescriptionBytes();
 
     /**
@@ -87,17 +87,17 @@ public final class TestMessages {
      * optional bytes payload = 5;
      * @return The payload.
      */
-    akka.protobufv3.internal.ByteString getPayload();
+    org.apache.pekko.protobufv3.internal.ByteString getPayload();
 
     /**
      * repeated .Item items = 6;
      */
-    java.util.List 
+    java.util.List 
         getItemsList();
     /**
      * repeated .Item items = 6;
      */
-    akka.remote.artery.protobuf.TestMessages.Item getItems(int index);
+    org.apache.pekko.remote.artery.protobuf.TestMessages.Item getItems(int index);
     /**
      * repeated .Item items = 6;
      */
@@ -105,56 +105,56 @@ public final class TestMessages {
     /**
      * repeated .Item items = 6;
      */
-    java.util.List 
+    java.util.List 
         getItemsOrBuilderList();
     /**
      * repeated .Item items = 6;
      */
-    akka.remote.artery.protobuf.TestMessages.ItemOrBuilder getItemsOrBuilder(
+    org.apache.pekko.remote.artery.protobuf.TestMessages.ItemOrBuilder getItemsOrBuilder(
         int index);
   }
   /**
    * Protobuf type {@code TestMessage}
    */
   public  static final class TestMessage extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:TestMessage)
       TestMessageOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use TestMessage.newBuilder() to construct.
-    private TestMessage(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private TestMessage(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private TestMessage() {
       name_ = "";
       description_ = "";
-      payload_ = akka.protobufv3.internal.ByteString.EMPTY;
+      payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       items_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new TestMessage();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private TestMessage(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -169,7 +169,7 @@ public final class TestMessages {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               name_ = bs;
               break;
@@ -180,7 +180,7 @@ public final class TestMessages {
               break;
             }
             case 34: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000008;
               description_ = bs;
               break;
@@ -192,11 +192,11 @@ public final class TestMessages {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                items_ = new java.util.ArrayList();
+                items_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
               items_.add(
-                  input.readMessage(akka.remote.artery.protobuf.TestMessages.Item.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.remote.artery.protobuf.TestMessages.Item.PARSER, extensionRegistry));
               break;
             }
             default: {
@@ -208,10 +208,10 @@ public final class TestMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000020) != 0)) {
@@ -221,17 +221,17 @@ public final class TestMessages {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.artery.protobuf.TestMessages.internal_static_TestMessage_descriptor;
+      return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_TestMessage_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.artery.protobuf.TestMessages.internal_static_TestMessage_fieldAccessorTable
+      return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_TestMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.artery.protobuf.TestMessages.TestMessage.class, akka.remote.artery.protobuf.TestMessages.TestMessage.Builder.class);
+              org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage.class, org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage.Builder.class);
     }
 
     private int bitField0_;
@@ -270,8 +270,8 @@ public final class TestMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           name_ = s;
@@ -283,17 +283,17 @@ public final class TestMessages {
      * required string name = 2;
      * @return The bytes for name.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -332,8 +332,8 @@ public final class TestMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           description_ = s;
@@ -345,22 +345,22 @@ public final class TestMessages {
      * optional string description = 4;
      * @return The bytes for description.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getDescriptionBytes() {
       java.lang.Object ref = description_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         description_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
     public static final int PAYLOAD_FIELD_NUMBER = 5;
-    private akka.protobufv3.internal.ByteString payload_;
+    private org.apache.pekko.protobufv3.internal.ByteString payload_;
     /**
      * optional bytes payload = 5;
      * @return Whether the payload field is set.
@@ -372,22 +372,22 @@ public final class TestMessages {
      * optional bytes payload = 5;
      * @return The payload.
      */
-    public akka.protobufv3.internal.ByteString getPayload() {
+    public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
       return payload_;
     }
 
     public static final int ITEMS_FIELD_NUMBER = 6;
-    private java.util.List items_;
+    private java.util.List items_;
     /**
      * repeated .Item items = 6;
      */
-    public java.util.List getItemsList() {
+    public java.util.List getItemsList() {
       return items_;
     }
     /**
      * repeated .Item items = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getItemsOrBuilderList() {
       return items_;
     }
@@ -400,13 +400,13 @@ public final class TestMessages {
     /**
      * repeated .Item items = 6;
      */
-    public akka.remote.artery.protobuf.TestMessages.Item getItems(int index) {
+    public org.apache.pekko.remote.artery.protobuf.TestMessages.Item getItems(int index) {
       return items_.get(index);
     }
     /**
      * repeated .Item items = 6;
      */
-    public akka.remote.artery.protobuf.TestMessages.ItemOrBuilder getItemsOrBuilder(
+    public org.apache.pekko.remote.artery.protobuf.TestMessages.ItemOrBuilder getItemsOrBuilder(
         int index) {
       return items_.get(index);
     }
@@ -441,19 +441,19 @@ public final class TestMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt64(1, id_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, name_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, name_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBool(3, status_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, description_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, description_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
         output.writeBytes(5, payload_);
@@ -471,25 +471,25 @@ public final class TestMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(1, id_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, name_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, name_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(3, status_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, description_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(4, description_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(5, payload_);
       }
       for (int i = 0; i < items_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(6, items_.get(i));
       }
       size += unknownFields.getSerializedSize();
@@ -502,10 +502,10 @@ public final class TestMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.artery.protobuf.TestMessages.TestMessage)) {
+      if (!(obj instanceof org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage)) {
         return super.equals(obj);
       }
-      akka.remote.artery.protobuf.TestMessages.TestMessage other = (akka.remote.artery.protobuf.TestMessages.TestMessage) obj;
+      org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage other = (org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage) obj;
 
       if (hasId() != other.hasId()) return false;
       if (hasId()) {
@@ -547,7 +547,7 @@ public final class TestMessages {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasId()) {
         hash = (37 * hash) + ID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getId());
       }
       if (hasName()) {
@@ -556,7 +556,7 @@ public final class TestMessages {
       }
       if (hasStatus()) {
         hash = (37 * hash) + STATUS_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getStatus());
       }
       if (hasDescription()) {
@@ -576,73 +576,73 @@ public final class TestMessages {
       return hash;
     }
 
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseDelimitedFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -651,7 +651,7 @@ public final class TestMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.artery.protobuf.TestMessages.TestMessage prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -662,7 +662,7 @@ public final class TestMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -670,34 +670,34 @@ public final class TestMessages {
      * Protobuf type {@code TestMessage}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:TestMessage)
-        akka.remote.artery.protobuf.TestMessages.TestMessageOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessageOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.artery.protobuf.TestMessages.internal_static_TestMessage_descriptor;
+        return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_TestMessage_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.artery.protobuf.TestMessages.internal_static_TestMessage_fieldAccessorTable
+        return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_TestMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.artery.protobuf.TestMessages.TestMessage.class, akka.remote.artery.protobuf.TestMessages.TestMessage.Builder.class);
+                org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage.class, org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage.Builder.class);
       }
 
-      // Construct using akka.remote.artery.protobuf.TestMessages.TestMessage.newBuilder()
+      // Construct using org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getItemsFieldBuilder();
         }
@@ -713,7 +713,7 @@ public final class TestMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         description_ = "";
         bitField0_ = (bitField0_ & ~0x00000008);
-        payload_ = akka.protobufv3.internal.ByteString.EMPTY;
+        payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000010);
         if (itemsBuilder_ == null) {
           items_ = java.util.Collections.emptyList();
@@ -725,19 +725,19 @@ public final class TestMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.artery.protobuf.TestMessages.internal_static_TestMessage_descriptor;
+        return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_TestMessage_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.artery.protobuf.TestMessages.TestMessage getDefaultInstanceForType() {
-        return akka.remote.artery.protobuf.TestMessages.TestMessage.getDefaultInstance();
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage getDefaultInstanceForType() {
+        return org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.artery.protobuf.TestMessages.TestMessage build() {
-        akka.remote.artery.protobuf.TestMessages.TestMessage result = buildPartial();
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage build() {
+        org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -745,8 +745,8 @@ public final class TestMessages {
       }
 
       @java.lang.Override
-      public akka.remote.artery.protobuf.TestMessages.TestMessage buildPartial() {
-        akka.remote.artery.protobuf.TestMessages.TestMessage result = new akka.remote.artery.protobuf.TestMessages.TestMessage(this);
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage buildPartial() {
+        org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage result = new org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -789,44 +789,44 @@ public final class TestMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.artery.protobuf.TestMessages.TestMessage) {
-          return mergeFrom((akka.remote.artery.protobuf.TestMessages.TestMessage)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage) {
+          return mergeFrom((org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.artery.protobuf.TestMessages.TestMessage other) {
-        if (other == akka.remote.artery.protobuf.TestMessages.TestMessage.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage other) {
+        if (other == org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -865,7 +865,7 @@ public final class TestMessages {
               items_ = other.items_;
               bitField0_ = (bitField0_ & ~0x00000020);
               itemsBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getItemsFieldBuilder() : null;
             } else {
               itemsBuilder_.addAllMessages(other.items_);
@@ -898,14 +898,14 @@ public final class TestMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.artery.protobuf.TestMessages.TestMessage parsedMessage = null;
+        org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.artery.protobuf.TestMessages.TestMessage) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -968,8 +968,8 @@ public final class TestMessages {
       public java.lang.String getName() {
         java.lang.Object ref = name_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             name_ = s;
@@ -983,17 +983,17 @@ public final class TestMessages {
        * required string name = 2;
        * @return The bytes for name.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1027,7 +1027,7 @@ public final class TestMessages {
        * @return This builder for chaining.
        */
       public Builder setNameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1089,8 +1089,8 @@ public final class TestMessages {
       public java.lang.String getDescription() {
         java.lang.Object ref = description_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             description_ = s;
@@ -1104,17 +1104,17 @@ public final class TestMessages {
        * optional string description = 4;
        * @return The bytes for description.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getDescriptionBytes() {
         java.lang.Object ref = description_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           description_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -1148,7 +1148,7 @@ public final class TestMessages {
        * @return This builder for chaining.
        */
       public Builder setDescriptionBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1158,7 +1158,7 @@ public final class TestMessages {
         return this;
       }
 
-      private akka.protobufv3.internal.ByteString payload_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString payload_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * optional bytes payload = 5;
        * @return Whether the payload field is set.
@@ -1170,7 +1170,7 @@ public final class TestMessages {
        * optional bytes payload = 5;
        * @return The payload.
        */
-      public akka.protobufv3.internal.ByteString getPayload() {
+      public org.apache.pekko.protobufv3.internal.ByteString getPayload() {
         return payload_;
       }
       /**
@@ -1178,7 +1178,7 @@ public final class TestMessages {
        * @param value The payload to set.
        * @return This builder for chaining.
        */
-      public Builder setPayload(akka.protobufv3.internal.ByteString value) {
+      public Builder setPayload(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1198,22 +1198,22 @@ public final class TestMessages {
         return this;
       }
 
-      private java.util.List items_ =
+      private java.util.List items_ =
         java.util.Collections.emptyList();
       private void ensureItemsIsMutable() {
         if (!((bitField0_ & 0x00000020) != 0)) {
-          items_ = new java.util.ArrayList(items_);
+          items_ = new java.util.ArrayList(items_);
           bitField0_ |= 0x00000020;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.remote.artery.protobuf.TestMessages.Item, akka.remote.artery.protobuf.TestMessages.Item.Builder, akka.remote.artery.protobuf.TestMessages.ItemOrBuilder> itemsBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.remote.artery.protobuf.TestMessages.Item, org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder, org.apache.pekko.remote.artery.protobuf.TestMessages.ItemOrBuilder> itemsBuilder_;
 
       /**
        * repeated .Item items = 6;
        */
-      public java.util.List getItemsList() {
+      public java.util.List getItemsList() {
         if (itemsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(items_);
         } else {
@@ -1233,7 +1233,7 @@ public final class TestMessages {
       /**
        * repeated .Item items = 6;
        */
-      public akka.remote.artery.protobuf.TestMessages.Item getItems(int index) {
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.Item getItems(int index) {
         if (itemsBuilder_ == null) {
           return items_.get(index);
         } else {
@@ -1244,7 +1244,7 @@ public final class TestMessages {
        * repeated .Item items = 6;
        */
       public Builder setItems(
-          int index, akka.remote.artery.protobuf.TestMessages.Item value) {
+          int index, org.apache.pekko.remote.artery.protobuf.TestMessages.Item value) {
         if (itemsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1261,7 +1261,7 @@ public final class TestMessages {
        * repeated .Item items = 6;
        */
       public Builder setItems(
-          int index, akka.remote.artery.protobuf.TestMessages.Item.Builder builderForValue) {
+          int index, org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder builderForValue) {
         if (itemsBuilder_ == null) {
           ensureItemsIsMutable();
           items_.set(index, builderForValue.build());
@@ -1274,7 +1274,7 @@ public final class TestMessages {
       /**
        * repeated .Item items = 6;
        */
-      public Builder addItems(akka.remote.artery.protobuf.TestMessages.Item value) {
+      public Builder addItems(org.apache.pekko.remote.artery.protobuf.TestMessages.Item value) {
         if (itemsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1291,7 +1291,7 @@ public final class TestMessages {
        * repeated .Item items = 6;
        */
       public Builder addItems(
-          int index, akka.remote.artery.protobuf.TestMessages.Item value) {
+          int index, org.apache.pekko.remote.artery.protobuf.TestMessages.Item value) {
         if (itemsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1308,7 +1308,7 @@ public final class TestMessages {
        * repeated .Item items = 6;
        */
       public Builder addItems(
-          akka.remote.artery.protobuf.TestMessages.Item.Builder builderForValue) {
+          org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder builderForValue) {
         if (itemsBuilder_ == null) {
           ensureItemsIsMutable();
           items_.add(builderForValue.build());
@@ -1322,7 +1322,7 @@ public final class TestMessages {
        * repeated .Item items = 6;
        */
       public Builder addItems(
-          int index, akka.remote.artery.protobuf.TestMessages.Item.Builder builderForValue) {
+          int index, org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder builderForValue) {
         if (itemsBuilder_ == null) {
           ensureItemsIsMutable();
           items_.add(index, builderForValue.build());
@@ -1336,10 +1336,10 @@ public final class TestMessages {
        * repeated .Item items = 6;
        */
       public Builder addAllItems(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (itemsBuilder_ == null) {
           ensureItemsIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, items_);
           onChanged();
         } else {
@@ -1376,14 +1376,14 @@ public final class TestMessages {
       /**
        * repeated .Item items = 6;
        */
-      public akka.remote.artery.protobuf.TestMessages.Item.Builder getItemsBuilder(
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder getItemsBuilder(
           int index) {
         return getItemsFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Item items = 6;
        */
-      public akka.remote.artery.protobuf.TestMessages.ItemOrBuilder getItemsOrBuilder(
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.ItemOrBuilder getItemsOrBuilder(
           int index) {
         if (itemsBuilder_ == null) {
           return items_.get(index);  } else {
@@ -1393,7 +1393,7 @@ public final class TestMessages {
       /**
        * repeated .Item items = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getItemsOrBuilderList() {
         if (itemsBuilder_ != null) {
           return itemsBuilder_.getMessageOrBuilderList();
@@ -1404,31 +1404,31 @@ public final class TestMessages {
       /**
        * repeated .Item items = 6;
        */
-      public akka.remote.artery.protobuf.TestMessages.Item.Builder addItemsBuilder() {
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder addItemsBuilder() {
         return getItemsFieldBuilder().addBuilder(
-            akka.remote.artery.protobuf.TestMessages.Item.getDefaultInstance());
+            org.apache.pekko.remote.artery.protobuf.TestMessages.Item.getDefaultInstance());
       }
       /**
        * repeated .Item items = 6;
        */
-      public akka.remote.artery.protobuf.TestMessages.Item.Builder addItemsBuilder(
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder addItemsBuilder(
           int index) {
         return getItemsFieldBuilder().addBuilder(
-            index, akka.remote.artery.protobuf.TestMessages.Item.getDefaultInstance());
+            index, org.apache.pekko.remote.artery.protobuf.TestMessages.Item.getDefaultInstance());
       }
       /**
        * repeated .Item items = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getItemsBuilderList() {
         return getItemsFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.remote.artery.protobuf.TestMessages.Item, akka.remote.artery.protobuf.TestMessages.Item.Builder, akka.remote.artery.protobuf.TestMessages.ItemOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.remote.artery.protobuf.TestMessages.Item, org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder, org.apache.pekko.remote.artery.protobuf.TestMessages.ItemOrBuilder> 
           getItemsFieldBuilder() {
         if (itemsBuilder_ == null) {
-          itemsBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.remote.artery.protobuf.TestMessages.Item, akka.remote.artery.protobuf.TestMessages.Item.Builder, akka.remote.artery.protobuf.TestMessages.ItemOrBuilder>(
+          itemsBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.remote.artery.protobuf.TestMessages.Item, org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder, org.apache.pekko.remote.artery.protobuf.TestMessages.ItemOrBuilder>(
                   items_,
                   ((bitField0_ & 0x00000020) != 0),
                   getParentForChildren(),
@@ -1439,13 +1439,13 @@ public final class TestMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -1454,37 +1454,37 @@ public final class TestMessages {
     }
 
     // @@protoc_insertion_point(class_scope:TestMessage)
-    private static final akka.remote.artery.protobuf.TestMessages.TestMessage DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.artery.protobuf.TestMessages.TestMessage();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage();
     }
 
-    public static akka.remote.artery.protobuf.TestMessages.TestMessage getDefaultInstance() {
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public TestMessage parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new TestMessage(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.artery.protobuf.TestMessages.TestMessage getDefaultInstanceForType() {
+    public org.apache.pekko.remote.artery.protobuf.TestMessages.TestMessage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1492,7 +1492,7 @@ public final class TestMessages {
 
   public interface ItemOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Item)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required uint64 id = 1;
@@ -1519,19 +1519,19 @@ public final class TestMessages {
      * required string name = 2;
      * @return The bytes for name.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes();
   }
   /**
    * Protobuf type {@code Item}
    */
   public  static final class Item extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Item)
       ItemOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Item.newBuilder() to construct.
-    private Item(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Item(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Item() {
@@ -1541,26 +1541,26 @@ public final class TestMessages {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Item();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Item(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1575,7 +1575,7 @@ public final class TestMessages {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               name_ = bs;
               break;
@@ -1589,27 +1589,27 @@ public final class TestMessages {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.artery.protobuf.TestMessages.internal_static_Item_descriptor;
+      return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_Item_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.artery.protobuf.TestMessages.internal_static_Item_fieldAccessorTable
+      return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_Item_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.artery.protobuf.TestMessages.Item.class, akka.remote.artery.protobuf.TestMessages.Item.Builder.class);
+              org.apache.pekko.remote.artery.protobuf.TestMessages.Item.class, org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder.class);
     }
 
     private int bitField0_;
@@ -1648,8 +1648,8 @@ public final class TestMessages {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           name_ = s;
@@ -1661,17 +1661,17 @@ public final class TestMessages {
      * required string name = 2;
      * @return The bytes for name.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -1695,13 +1695,13 @@ public final class TestMessages {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt64(1, id_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, name_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, name_);
       }
       unknownFields.writeTo(output);
     }
@@ -1713,11 +1713,11 @@ public final class TestMessages {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(1, id_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, name_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, name_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1729,10 +1729,10 @@ public final class TestMessages {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.artery.protobuf.TestMessages.Item)) {
+      if (!(obj instanceof org.apache.pekko.remote.artery.protobuf.TestMessages.Item)) {
         return super.equals(obj);
       }
-      akka.remote.artery.protobuf.TestMessages.Item other = (akka.remote.artery.protobuf.TestMessages.Item) obj;
+      org.apache.pekko.remote.artery.protobuf.TestMessages.Item other = (org.apache.pekko.remote.artery.protobuf.TestMessages.Item) obj;
 
       if (hasId() != other.hasId()) return false;
       if (hasId()) {
@@ -1757,7 +1757,7 @@ public final class TestMessages {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasId()) {
         hash = (37 * hash) + ID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getId());
       }
       if (hasName()) {
@@ -1769,73 +1769,73 @@ public final class TestMessages {
       return hash;
     }
 
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseDelimitedFrom(
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.artery.protobuf.TestMessages.Item parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1844,7 +1844,7 @@ public final class TestMessages {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.artery.protobuf.TestMessages.Item prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.artery.protobuf.TestMessages.Item prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1855,7 +1855,7 @@ public final class TestMessages {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1863,34 +1863,34 @@ public final class TestMessages {
      * Protobuf type {@code Item}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Item)
-        akka.remote.artery.protobuf.TestMessages.ItemOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.artery.protobuf.TestMessages.ItemOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.artery.protobuf.TestMessages.internal_static_Item_descriptor;
+        return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_Item_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.artery.protobuf.TestMessages.internal_static_Item_fieldAccessorTable
+        return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_Item_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.artery.protobuf.TestMessages.Item.class, akka.remote.artery.protobuf.TestMessages.Item.Builder.class);
+                org.apache.pekko.remote.artery.protobuf.TestMessages.Item.class, org.apache.pekko.remote.artery.protobuf.TestMessages.Item.Builder.class);
       }
 
-      // Construct using akka.remote.artery.protobuf.TestMessages.Item.newBuilder()
+      // Construct using org.apache.pekko.remote.artery.protobuf.TestMessages.Item.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -1905,19 +1905,19 @@ public final class TestMessages {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.artery.protobuf.TestMessages.internal_static_Item_descriptor;
+        return org.apache.pekko.remote.artery.protobuf.TestMessages.internal_static_Item_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.artery.protobuf.TestMessages.Item getDefaultInstanceForType() {
-        return akka.remote.artery.protobuf.TestMessages.Item.getDefaultInstance();
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.Item getDefaultInstanceForType() {
+        return org.apache.pekko.remote.artery.protobuf.TestMessages.Item.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.artery.protobuf.TestMessages.Item build() {
-        akka.remote.artery.protobuf.TestMessages.Item result = buildPartial();
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.Item build() {
+        org.apache.pekko.remote.artery.protobuf.TestMessages.Item result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1925,8 +1925,8 @@ public final class TestMessages {
       }
 
       @java.lang.Override
-      public akka.remote.artery.protobuf.TestMessages.Item buildPartial() {
-        akka.remote.artery.protobuf.TestMessages.Item result = new akka.remote.artery.protobuf.TestMessages.Item(this);
+      public org.apache.pekko.remote.artery.protobuf.TestMessages.Item buildPartial() {
+        org.apache.pekko.remote.artery.protobuf.TestMessages.Item result = new org.apache.pekko.remote.artery.protobuf.TestMessages.Item(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1948,44 +1948,44 @@ public final class TestMessages {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.artery.protobuf.TestMessages.Item) {
-          return mergeFrom((akka.remote.artery.protobuf.TestMessages.Item)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.artery.protobuf.TestMessages.Item) {
+          return mergeFrom((org.apache.pekko.remote.artery.protobuf.TestMessages.Item)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.artery.protobuf.TestMessages.Item other) {
-        if (other == akka.remote.artery.protobuf.TestMessages.Item.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.artery.protobuf.TestMessages.Item other) {
+        if (other == org.apache.pekko.remote.artery.protobuf.TestMessages.Item.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -2012,14 +2012,14 @@ public final class TestMessages {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.artery.protobuf.TestMessages.Item parsedMessage = null;
+        org.apache.pekko.remote.artery.protobuf.TestMessages.Item parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.artery.protobuf.TestMessages.Item) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.artery.protobuf.TestMessages.Item) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2082,8 +2082,8 @@ public final class TestMessages {
       public java.lang.String getName() {
         java.lang.Object ref = name_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             name_ = s;
@@ -2097,17 +2097,17 @@ public final class TestMessages {
        * required string name = 2;
        * @return The bytes for name.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           name_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -2141,7 +2141,7 @@ public final class TestMessages {
        * @return This builder for chaining.
        */
       public Builder setNameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2152,13 +2152,13 @@ public final class TestMessages {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2167,58 +2167,58 @@ public final class TestMessages {
     }
 
     // @@protoc_insertion_point(class_scope:Item)
-    private static final akka.remote.artery.protobuf.TestMessages.Item DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.artery.protobuf.TestMessages.Item DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.artery.protobuf.TestMessages.Item();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.artery.protobuf.TestMessages.Item();
     }
 
-    public static akka.remote.artery.protobuf.TestMessages.Item getDefaultInstance() {
+    public static org.apache.pekko.remote.artery.protobuf.TestMessages.Item getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Item parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Item(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.artery.protobuf.TestMessages.Item getDefaultInstanceForType() {
+    public org.apache.pekko.remote.artery.protobuf.TestMessages.Item getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_TestMessage_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_TestMessage_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Item_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Item_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -2226,23 +2226,23 @@ public final class TestMessages {
       "d\030\001 \002(\004\022\014\n\004name\030\002 \002(\t\022\016\n\006status\030\003 \002(\010\022\023\n" +
       "\013description\030\004 \001(\t\022\017\n\007payload\030\005 \001(\014\022\024\n\005i" +
       "tems\030\006 \003(\0132\005.Item\" \n\004Item\022\n\n\002id\030\001 \002(\004\022\014\n" +
-      "\004name\030\002 \002(\tB\035\n\033akka.remote.artery.protob" +
+      "\004name\030\002 \002(\tB\035\n\033org.apache.pekko.remote.artery.protob" +
       "uf"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_TestMessage_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_TestMessage_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TestMessage_descriptor,
         new java.lang.String[] { "Id", "Name", "Status", "Description", "Payload", "Items", });
     internal_static_Item_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_Item_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Item_descriptor,
         new java.lang.String[] { "Id", "Name", });
   }
diff --git a/akka-remote-tests/src/test/protobuf/TestMessages.proto b/akka-remote-tests/src/test/protobuf/TestMessages.proto
index d16db5ec4e..fafa8df9a9 100644
--- a/akka-remote-tests/src/test/protobuf/TestMessages.proto
+++ b/akka-remote-tests/src/test/protobuf/TestMessages.proto
@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-option java_package = "akka.remote.artery.protobuf";
+option java_package = "org.apache.pekko.remote.artery.protobuf";
 
 message TestMessage {
   required uint64 id = 1;
diff --git a/akka-remote-tests/src/test/scala/akka/remote/artery/ArteryFailedToBindSpec.scala b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/artery/ArteryFailedToBindSpec.scala
similarity index 88%
rename from akka-remote-tests/src/test/scala/akka/remote/artery/ArteryFailedToBindSpec.scala
rename to akka-remote-tests/src/test/scala/org/apache/pekko/remote/artery/ArteryFailedToBindSpec.scala
index d3f7d6a715..65bd5e6af9 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/artery/ArteryFailedToBindSpec.scala
+++ b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/artery/ArteryFailedToBindSpec.scala
@@ -2,17 +2,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.remote.artery
+package org.apache.pekko.remote.artery
 
 import com.typesafe.config.ConfigFactory
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.ActorSystem
-import akka.remote.RARP
-import akka.remote.RemoteTransportException
-import akka.testkit.SocketUtil
-import akka.testkit.TestKit
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.remote.RARP
+import pekko.remote.RemoteTransportException
+import pekko.testkit.SocketUtil
+import pekko.testkit.TestKit
 
 class ArteryFailedToBindSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-remote-tests/src/test/scala/akka/remote/classic/RemotingFailedToBindSpec.scala b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/classic/RemotingFailedToBindSpec.scala
similarity index 89%
rename from akka-remote-tests/src/test/scala/akka/remote/classic/RemotingFailedToBindSpec.scala
rename to akka-remote-tests/src/test/scala/org/apache/pekko/remote/classic/RemotingFailedToBindSpec.scala
index 28c4602f1c..7ee83be718 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/classic/RemotingFailedToBindSpec.scala
+++ b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/classic/RemotingFailedToBindSpec.scala
@@ -2,15 +2,16 @@
  * Copyright (C) 2018-2022 Lightbend Inc. 
  */
 
-package akka.remote.classic
+package org.apache.pekko.remote.classic
 
 import com.typesafe.config.ConfigFactory
 import org.jboss.netty.channel.ChannelException
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import akka.actor.ActorSystem
-import akka.testkit.SocketUtil
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.testkit.SocketUtil
 
 class RemotingFailedToBindSpec extends AnyWordSpec with Matchers {
 
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/testconductor/BarrierSpec.scala
similarity index 99%
rename from akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
rename to akka-remote-tests/src/test/scala/org/apache/pekko/remote/testconductor/BarrierSpec.scala
index 9c2c1a328b..ecd1ca2128 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
+++ b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/testconductor/BarrierSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testconductor
+package org.apache.pekko.remote.testconductor
 
 import java.net.{ InetAddress, InetSocketAddress }
 
@@ -10,8 +10,9 @@ import scala.concurrent.duration._
 
 import language.postfixOps
 
-import akka.actor._
-import akka.testkit.{ AkkaSpec, EventFilter, ImplicitSender, TestProbe, TimingTest }
+import org.apache.pekko
+import pekko.actor._
+import pekko.testkit.{ AkkaSpec, EventFilter, ImplicitSender, TestProbe, TimingTest }
 
 object BarrierSpec {
   final case class Failed(ref: ActorRef, thr: Throwable)
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/testconductor/ControllerSpec.scala
similarity index 79%
rename from akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala
rename to akka-remote-tests/src/test/scala/org/apache/pekko/remote/testconductor/ControllerSpec.scala
index 2181c5e42f..a7d43a0e5a 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala
+++ b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/testconductor/ControllerSpec.scala
@@ -2,15 +2,15 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testconductor
+package org.apache.pekko.remote.testconductor
 
 import java.net.InetAddress
 import java.net.InetSocketAddress
 
-import akka.actor.{ AddressFromURIString, PoisonPill, Props }
-import akka.remote.testconductor.Controller.NodeInfo
-import akka.testkit.AkkaSpec
-import akka.testkit.ImplicitSender
+import org.apache.pekko.actor.{ AddressFromURIString, PoisonPill, Props }
+import org.apache.pekko.remote.testconductor.Controller.NodeInfo
+import org.apache.pekko.testkit.AkkaSpec
+import org.apache.pekko.testkit.ImplicitSender
 
 object ControllerSpec {
   val config = """
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/testkit/LogRoleReplace.scala
similarity index 99%
rename from akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
rename to akka-remote-tests/src/test/scala/org/apache/pekko/remote/testkit/LogRoleReplace.scala
index 7185c2e512..563dd9b0ba 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
+++ b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/testkit/LogRoleReplace.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2022 Lightbend Inc. 
  */
 
-package akka.remote.testkit
+package org.apache.pekko.remote.testkit
 
 import java.awt.Toolkit
 import java.awt.datatransfer.Clipboard
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/STMultiNodeSpec.scala b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/testkit/STMultiNodeSpec.scala
similarity index 95%
rename from akka-remote-tests/src/test/scala/akka/remote/testkit/STMultiNodeSpec.scala
rename to akka-remote-tests/src/test/scala/org/apache/pekko/remote/testkit/STMultiNodeSpec.scala
index 080fe0b852..373b736506 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testkit/STMultiNodeSpec.scala
+++ b/akka-remote-tests/src/test/scala/org/apache/pekko/remote/testkit/STMultiNodeSpec.scala
@@ -3,7 +3,7 @@
  */
 
 //#example
-package akka.remote.testkit
+package org.apache.pekko.remote.testkit
 
 import scala.language.implicitConversions
 
diff --git a/akka-remote/src/main/java/akka/remote/ArteryControlFormats.java b/akka-remote/src/main/java/org/apache/pekko/remote/ArteryControlFormats.java
similarity index 59%
rename from akka-remote/src/main/java/akka/remote/ArteryControlFormats.java
rename to akka-remote/src/main/java/org/apache/pekko/remote/ArteryControlFormats.java
index 7f4e446906..cda7685eb6 100644
--- a/akka-remote/src/main/java/akka/remote/ArteryControlFormats.java
+++ b/akka-remote/src/main/java/org/apache/pekko/remote/ArteryControlFormats.java
@@ -5,22 +5,22 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ArteryControlFormats.proto
 
-package akka.remote;
+package org.apache.pekko.remote;
 
 public final class ArteryControlFormats {
   private ArteryControlFormats() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   public interface QuarantinedOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Quarantined)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress from = 1;
@@ -31,11 +31,11 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    akka.remote.ArteryControlFormats.UniqueAddress getFrom();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom();
     /**
      * required .UniqueAddress from = 1;
      */
-    akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
 
     /**
      * required .UniqueAddress to = 2;
@@ -46,22 +46,22 @@ public final class ArteryControlFormats {
      * required .UniqueAddress to = 2;
      * @return The to.
      */
-    akka.remote.ArteryControlFormats.UniqueAddress getTo();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getTo();
     /**
      * required .UniqueAddress to = 2;
      */
-    akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getToOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getToOrBuilder();
   }
   /**
    * Protobuf type {@code Quarantined}
    */
   public  static final class Quarantined extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Quarantined)
       QuarantinedOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Quarantined.newBuilder() to construct.
-    private Quarantined(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Quarantined(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Quarantined() {
@@ -70,26 +70,26 @@ public final class ArteryControlFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Quarantined();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Quarantined(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -99,11 +99,11 @@ public final class ArteryControlFormats {
               done = true;
               break;
             case 10: {
-              akka.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -112,11 +112,11 @@ public final class ArteryControlFormats {
               break;
             }
             case 18: {
-              akka.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = to_.toBuilder();
               }
-              to_ = input.readMessage(akka.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
+              to_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(to_);
                 to_ = subBuilder.buildPartial();
@@ -133,32 +133,32 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_Quarantined_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_Quarantined_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_Quarantined_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_Quarantined_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.Quarantined.class, akka.remote.ArteryControlFormats.Quarantined.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.Quarantined.class, org.apache.pekko.remote.ArteryControlFormats.Quarantined.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.remote.ArteryControlFormats.UniqueAddress from_;
+    private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
     /**
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
@@ -170,18 +170,18 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
-    public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int TO_FIELD_NUMBER = 2;
-    private akka.remote.ArteryControlFormats.UniqueAddress to_;
+    private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress to_;
     /**
      * required .UniqueAddress to = 2;
      * @return Whether the to field is set.
@@ -193,14 +193,14 @@ public final class ArteryControlFormats {
      * required .UniqueAddress to = 2;
      * @return The to.
      */
-    public akka.remote.ArteryControlFormats.UniqueAddress getTo() {
-      return to_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getTo() {
+      return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
     }
     /**
      * required .UniqueAddress to = 2;
      */
-    public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getToOrBuilder() {
-      return to_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getToOrBuilder() {
+      return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -231,7 +231,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
@@ -249,11 +249,11 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getTo());
       }
       size += unknownFields.getSerializedSize();
@@ -266,10 +266,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.Quarantined)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.Quarantined)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.Quarantined other = (akka.remote.ArteryControlFormats.Quarantined) obj;
+      org.apache.pekko.remote.ArteryControlFormats.Quarantined other = (org.apache.pekko.remote.ArteryControlFormats.Quarantined) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -305,73 +305,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.Quarantined parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -380,7 +380,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.Quarantined prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.Quarantined prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -391,7 +391,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -399,34 +399,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code Quarantined}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Quarantined)
-        akka.remote.ArteryControlFormats.QuarantinedOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.QuarantinedOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_Quarantined_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_Quarantined_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_Quarantined_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_Quarantined_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.Quarantined.class, akka.remote.ArteryControlFormats.Quarantined.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.Quarantined.class, org.apache.pekko.remote.ArteryControlFormats.Quarantined.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.Quarantined.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.Quarantined.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
           getToFieldBuilder();
@@ -451,19 +451,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_Quarantined_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_Quarantined_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.Quarantined getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.Quarantined.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.Quarantined getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.Quarantined.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.Quarantined build() {
-        akka.remote.ArteryControlFormats.Quarantined result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.Quarantined build() {
+        org.apache.pekko.remote.ArteryControlFormats.Quarantined result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -471,8 +471,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.Quarantined buildPartial() {
-        akka.remote.ArteryControlFormats.Quarantined result = new akka.remote.ArteryControlFormats.Quarantined(this);
+      public org.apache.pekko.remote.ArteryControlFormats.Quarantined buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.Quarantined result = new org.apache.pekko.remote.ArteryControlFormats.Quarantined(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -502,44 +502,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.Quarantined) {
-          return mergeFrom((akka.remote.ArteryControlFormats.Quarantined)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.Quarantined) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.Quarantined)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.Quarantined other) {
-        if (other == akka.remote.ArteryControlFormats.Quarantined.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.Quarantined other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.Quarantined.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -570,14 +570,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.Quarantined parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.Quarantined parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.Quarantined) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.Quarantined) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -588,9 +588,9 @@ public final class ArteryControlFormats {
       }
       private int bitField0_;
 
-      private akka.remote.ArteryControlFormats.UniqueAddress from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
       /**
        * required .UniqueAddress from = 1;
        * @return Whether the from field is set.
@@ -602,9 +602,9 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 1;
        * @return The from.
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -612,7 +612,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder setFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -629,7 +629,7 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 1;
        */
       public Builder setFrom(
-          akka.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -642,13 +642,13 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
             from_ =
-              akka.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -675,7 +675,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -683,23 +683,23 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         }
       }
       /**
        * required .UniqueAddress from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -708,9 +708,9 @@ public final class ArteryControlFormats {
         return fromBuilder_;
       }
 
-      private akka.remote.ArteryControlFormats.UniqueAddress to_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> toBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress to_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> toBuilder_;
       /**
        * required .UniqueAddress to = 2;
        * @return Whether the to field is set.
@@ -722,9 +722,9 @@ public final class ArteryControlFormats {
        * required .UniqueAddress to = 2;
        * @return The to.
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress getTo() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getTo() {
         if (toBuilder_ == null) {
-          return to_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
+          return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
         } else {
           return toBuilder_.getMessage();
         }
@@ -732,7 +732,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress to = 2;
        */
-      public Builder setTo(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder setTo(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (toBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -749,7 +749,7 @@ public final class ArteryControlFormats {
        * required .UniqueAddress to = 2;
        */
       public Builder setTo(
-          akka.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (toBuilder_ == null) {
           to_ = builderForValue.build();
           onChanged();
@@ -762,13 +762,13 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress to = 2;
        */
-      public Builder mergeTo(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder mergeTo(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (toBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               to_ != null &&
-              to_ != akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+              to_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
             to_ =
-              akka.remote.ArteryControlFormats.UniqueAddress.newBuilder(to_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(to_).mergeFrom(value).buildPartial();
           } else {
             to_ = value;
           }
@@ -795,7 +795,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress to = 2;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress.Builder getToBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder getToBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getToFieldBuilder().getBuilder();
@@ -803,23 +803,23 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress to = 2;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getToOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getToOrBuilder() {
         if (toBuilder_ != null) {
           return toBuilder_.getMessageOrBuilder();
         } else {
           return to_ == null ?
-              akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : to_;
         }
       }
       /**
        * required .UniqueAddress to = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
           getToFieldBuilder() {
         if (toBuilder_ == null) {
-          toBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
+          toBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
                   getTo(),
                   getParentForChildren(),
                   isClean());
@@ -829,13 +829,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -844,37 +844,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:Quarantined)
-    private static final akka.remote.ArteryControlFormats.Quarantined DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.Quarantined DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.Quarantined();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.Quarantined();
     }
 
-    public static akka.remote.ArteryControlFormats.Quarantined getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.Quarantined getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Quarantined parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Quarantined(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.Quarantined getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.Quarantined getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -882,7 +882,7 @@ public final class ArteryControlFormats {
 
   public interface MessageWithAddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:MessageWithAddress)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress address = 1;
@@ -893,11 +893,11 @@ public final class ArteryControlFormats {
      * required .UniqueAddress address = 1;
      * @return The address.
      */
-    akka.remote.ArteryControlFormats.UniqueAddress getAddress();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getAddress();
     /**
      * required .UniqueAddress address = 1;
      */
-    akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getAddressOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getAddressOrBuilder();
   }
   /**
    * 
    @@ -911,12 +911,12 @@ public final class ArteryControlFormats {
    * Protobuf type {@code MessageWithAddress}
    */
   public  static final class MessageWithAddress extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:MessageWithAddress)
       MessageWithAddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use MessageWithAddress.newBuilder() to construct.
-    private MessageWithAddress(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private MessageWithAddress(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private MessageWithAddress() {
@@ -925,26 +925,26 @@ public final class ArteryControlFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new MessageWithAddress();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private MessageWithAddress(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -954,11 +954,11 @@ public final class ArteryControlFormats {
               done = true;
               break;
             case 10: {
-              akka.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = address_.toBuilder();
               }
-              address_ = input.readMessage(akka.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
+              address_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(address_);
                 address_ = subBuilder.buildPartial();
@@ -975,32 +975,32 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_MessageWithAddress_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_MessageWithAddress_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_MessageWithAddress_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_MessageWithAddress_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.MessageWithAddress.class, akka.remote.ArteryControlFormats.MessageWithAddress.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress.class, org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress.Builder.class);
     }
 
     private int bitField0_;
     public static final int ADDRESS_FIELD_NUMBER = 1;
-    private akka.remote.ArteryControlFormats.UniqueAddress address_;
+    private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress address_;
     /**
      * required .UniqueAddress address = 1;
      * @return Whether the address field is set.
@@ -1012,14 +1012,14 @@ public final class ArteryControlFormats {
      * required .UniqueAddress address = 1;
      * @return The address.
      */
-    public akka.remote.ArteryControlFormats.UniqueAddress getAddress() {
-      return address_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getAddress() {
+      return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
     }
     /**
      * required .UniqueAddress address = 1;
      */
-    public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getAddressOrBuilder() {
-      return address_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getAddressOrBuilder() {
+      return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1042,7 +1042,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getAddress());
@@ -1057,7 +1057,7 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getAddress());
       }
       size += unknownFields.getSerializedSize();
@@ -1070,10 +1070,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.MessageWithAddress)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.MessageWithAddress other = (akka.remote.ArteryControlFormats.MessageWithAddress) obj;
+      org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress other = (org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress) obj;
 
       if (hasAddress() != other.hasAddress()) return false;
       if (hasAddress()) {
@@ -1100,73 +1100,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.MessageWithAddress parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1175,7 +1175,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.MessageWithAddress prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1186,7 +1186,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1202,34 +1202,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code MessageWithAddress}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:MessageWithAddress)
-        akka.remote.ArteryControlFormats.MessageWithAddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.MessageWithAddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_MessageWithAddress_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_MessageWithAddress_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_MessageWithAddress_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_MessageWithAddress_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.MessageWithAddress.class, akka.remote.ArteryControlFormats.MessageWithAddress.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress.class, org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.MessageWithAddress.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAddressFieldBuilder();
         }
@@ -1247,19 +1247,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_MessageWithAddress_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_MessageWithAddress_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.MessageWithAddress getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.MessageWithAddress.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.MessageWithAddress build() {
-        akka.remote.ArteryControlFormats.MessageWithAddress result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress build() {
+        org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1267,8 +1267,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.MessageWithAddress buildPartial() {
-        akka.remote.ArteryControlFormats.MessageWithAddress result = new akka.remote.ArteryControlFormats.MessageWithAddress(this);
+      public org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress result = new org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1290,44 +1290,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.MessageWithAddress) {
-          return mergeFrom((akka.remote.ArteryControlFormats.MessageWithAddress)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.MessageWithAddress other) {
-        if (other == akka.remote.ArteryControlFormats.MessageWithAddress.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress.getDefaultInstance()) return this;
         if (other.hasAddress()) {
           mergeAddress(other.getAddress());
         }
@@ -1349,14 +1349,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.MessageWithAddress parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.MessageWithAddress) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1367,9 +1367,9 @@ public final class ArteryControlFormats {
       }
       private int bitField0_;
 
-      private akka.remote.ArteryControlFormats.UniqueAddress address_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> addressBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress address_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> addressBuilder_;
       /**
        * required .UniqueAddress address = 1;
        * @return Whether the address field is set.
@@ -1381,9 +1381,9 @@ public final class ArteryControlFormats {
        * required .UniqueAddress address = 1;
        * @return The address.
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress getAddress() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getAddress() {
         if (addressBuilder_ == null) {
-          return address_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
+          return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
         } else {
           return addressBuilder_.getMessage();
         }
@@ -1391,7 +1391,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress address = 1;
        */
-      public Builder setAddress(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder setAddress(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (addressBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1408,7 +1408,7 @@ public final class ArteryControlFormats {
        * required .UniqueAddress address = 1;
        */
       public Builder setAddress(
-          akka.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
           onChanged();
@@ -1421,13 +1421,13 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress address = 1;
        */
-      public Builder mergeAddress(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder mergeAddress(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               address_ != null &&
-              address_ != akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+              address_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
             address_ =
-              akka.remote.ArteryControlFormats.UniqueAddress.newBuilder(address_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(address_).mergeFrom(value).buildPartial();
           } else {
             address_ = value;
           }
@@ -1454,7 +1454,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress address = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress.Builder getAddressBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder getAddressBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getAddressFieldBuilder().getBuilder();
@@ -1462,23 +1462,23 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress address = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getAddressOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getAddressOrBuilder() {
         if (addressBuilder_ != null) {
           return addressBuilder_.getMessageOrBuilder();
         } else {
           return address_ == null ?
-              akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : address_;
         }
       }
       /**
        * required .UniqueAddress address = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
           getAddressFieldBuilder() {
         if (addressBuilder_ == null) {
-          addressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
+          addressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
                   getAddress(),
                   getParentForChildren(),
                   isClean());
@@ -1488,13 +1488,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -1503,37 +1503,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:MessageWithAddress)
-    private static final akka.remote.ArteryControlFormats.MessageWithAddress DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.MessageWithAddress();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress();
     }
 
-    public static akka.remote.ArteryControlFormats.MessageWithAddress getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public MessageWithAddress parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new MessageWithAddress(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.MessageWithAddress getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.MessageWithAddress getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1541,7 +1541,7 @@ public final class ArteryControlFormats {
 
   public interface HandshakeReqOrBuilder extends
       // @@protoc_insertion_point(interface_extends:HandshakeReq)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress from = 1;
@@ -1552,11 +1552,11 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    akka.remote.ArteryControlFormats.UniqueAddress getFrom();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom();
     /**
      * required .UniqueAddress from = 1;
      */
-    akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
 
     /**
      * required .Address to = 2;
@@ -1567,22 +1567,22 @@ public final class ArteryControlFormats {
      * required .Address to = 2;
      * @return The to.
      */
-    akka.remote.ArteryControlFormats.Address getTo();
+    org.apache.pekko.remote.ArteryControlFormats.Address getTo();
     /**
      * required .Address to = 2;
      */
-    akka.remote.ArteryControlFormats.AddressOrBuilder getToOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder getToOrBuilder();
   }
   /**
    * Protobuf type {@code HandshakeReq}
    */
   public  static final class HandshakeReq extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:HandshakeReq)
       HandshakeReqOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use HandshakeReq.newBuilder() to construct.
-    private HandshakeReq(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private HandshakeReq(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private HandshakeReq() {
@@ -1591,26 +1591,26 @@ public final class ArteryControlFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new HandshakeReq();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private HandshakeReq(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1620,11 +1620,11 @@ public final class ArteryControlFormats {
               done = true;
               break;
             case 10: {
-              akka.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -1633,11 +1633,11 @@ public final class ArteryControlFormats {
               break;
             }
             case 18: {
-              akka.remote.ArteryControlFormats.Address.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = to_.toBuilder();
               }
-              to_ = input.readMessage(akka.remote.ArteryControlFormats.Address.PARSER, extensionRegistry);
+              to_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(to_);
                 to_ = subBuilder.buildPartial();
@@ -1654,32 +1654,32 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_HandshakeReq_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_HandshakeReq_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_HandshakeReq_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_HandshakeReq_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.HandshakeReq.class, akka.remote.ArteryControlFormats.HandshakeReq.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.HandshakeReq.class, org.apache.pekko.remote.ArteryControlFormats.HandshakeReq.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.remote.ArteryControlFormats.UniqueAddress from_;
+    private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
     /**
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
@@ -1691,18 +1691,18 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
-    public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int TO_FIELD_NUMBER = 2;
-    private akka.remote.ArteryControlFormats.Address to_;
+    private org.apache.pekko.remote.ArteryControlFormats.Address to_;
     /**
      * required .Address to = 2;
      * @return Whether the to field is set.
@@ -1714,14 +1714,14 @@ public final class ArteryControlFormats {
      * required .Address to = 2;
      * @return The to.
      */
-    public akka.remote.ArteryControlFormats.Address getTo() {
-      return to_ == null ? akka.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
+    public org.apache.pekko.remote.ArteryControlFormats.Address getTo() {
+      return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
     }
     /**
      * required .Address to = 2;
      */
-    public akka.remote.ArteryControlFormats.AddressOrBuilder getToOrBuilder() {
-      return to_ == null ? akka.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
+    public org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder getToOrBuilder() {
+      return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1752,7 +1752,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
@@ -1770,11 +1770,11 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getTo());
       }
       size += unknownFields.getSerializedSize();
@@ -1787,10 +1787,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.HandshakeReq)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.HandshakeReq)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.HandshakeReq other = (akka.remote.ArteryControlFormats.HandshakeReq) obj;
+      org.apache.pekko.remote.ArteryControlFormats.HandshakeReq other = (org.apache.pekko.remote.ArteryControlFormats.HandshakeReq) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -1826,73 +1826,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.HandshakeReq parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1901,7 +1901,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.HandshakeReq prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.HandshakeReq prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1912,7 +1912,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1920,34 +1920,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code HandshakeReq}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:HandshakeReq)
-        akka.remote.ArteryControlFormats.HandshakeReqOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.HandshakeReqOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_HandshakeReq_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_HandshakeReq_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_HandshakeReq_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_HandshakeReq_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.HandshakeReq.class, akka.remote.ArteryControlFormats.HandshakeReq.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.HandshakeReq.class, org.apache.pekko.remote.ArteryControlFormats.HandshakeReq.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.HandshakeReq.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.HandshakeReq.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
           getToFieldBuilder();
@@ -1972,19 +1972,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_HandshakeReq_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_HandshakeReq_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.HandshakeReq getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.HandshakeReq.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.HandshakeReq getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.HandshakeReq.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.HandshakeReq build() {
-        akka.remote.ArteryControlFormats.HandshakeReq result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.HandshakeReq build() {
+        org.apache.pekko.remote.ArteryControlFormats.HandshakeReq result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1992,8 +1992,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.HandshakeReq buildPartial() {
-        akka.remote.ArteryControlFormats.HandshakeReq result = new akka.remote.ArteryControlFormats.HandshakeReq(this);
+      public org.apache.pekko.remote.ArteryControlFormats.HandshakeReq buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.HandshakeReq result = new org.apache.pekko.remote.ArteryControlFormats.HandshakeReq(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2023,44 +2023,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.HandshakeReq) {
-          return mergeFrom((akka.remote.ArteryControlFormats.HandshakeReq)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.HandshakeReq) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.HandshakeReq)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.HandshakeReq other) {
-        if (other == akka.remote.ArteryControlFormats.HandshakeReq.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.HandshakeReq other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.HandshakeReq.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -2091,14 +2091,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.HandshakeReq parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.HandshakeReq parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.HandshakeReq) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.HandshakeReq) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2109,9 +2109,9 @@ public final class ArteryControlFormats {
       }
       private int bitField0_;
 
-      private akka.remote.ArteryControlFormats.UniqueAddress from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
       /**
        * required .UniqueAddress from = 1;
        * @return Whether the from field is set.
@@ -2123,9 +2123,9 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 1;
        * @return The from.
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -2133,7 +2133,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder setFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2150,7 +2150,7 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 1;
        */
       public Builder setFrom(
-          akka.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -2163,13 +2163,13 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
             from_ =
-              akka.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -2196,7 +2196,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -2204,23 +2204,23 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         }
       }
       /**
        * required .UniqueAddress from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -2229,9 +2229,9 @@ public final class ArteryControlFormats {
         return fromBuilder_;
       }
 
-      private akka.remote.ArteryControlFormats.Address to_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.Address, akka.remote.ArteryControlFormats.Address.Builder, akka.remote.ArteryControlFormats.AddressOrBuilder> toBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.Address to_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.Address, org.apache.pekko.remote.ArteryControlFormats.Address.Builder, org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder> toBuilder_;
       /**
        * required .Address to = 2;
        * @return Whether the to field is set.
@@ -2243,9 +2243,9 @@ public final class ArteryControlFormats {
        * required .Address to = 2;
        * @return The to.
        */
-      public akka.remote.ArteryControlFormats.Address getTo() {
+      public org.apache.pekko.remote.ArteryControlFormats.Address getTo() {
         if (toBuilder_ == null) {
-          return to_ == null ? akka.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
+          return to_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
         } else {
           return toBuilder_.getMessage();
         }
@@ -2253,7 +2253,7 @@ public final class ArteryControlFormats {
       /**
        * required .Address to = 2;
        */
-      public Builder setTo(akka.remote.ArteryControlFormats.Address value) {
+      public Builder setTo(org.apache.pekko.remote.ArteryControlFormats.Address value) {
         if (toBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2270,7 +2270,7 @@ public final class ArteryControlFormats {
        * required .Address to = 2;
        */
       public Builder setTo(
-          akka.remote.ArteryControlFormats.Address.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.Address.Builder builderForValue) {
         if (toBuilder_ == null) {
           to_ = builderForValue.build();
           onChanged();
@@ -2283,13 +2283,13 @@ public final class ArteryControlFormats {
       /**
        * required .Address to = 2;
        */
-      public Builder mergeTo(akka.remote.ArteryControlFormats.Address value) {
+      public Builder mergeTo(org.apache.pekko.remote.ArteryControlFormats.Address value) {
         if (toBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               to_ != null &&
-              to_ != akka.remote.ArteryControlFormats.Address.getDefaultInstance()) {
+              to_ != org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance()) {
             to_ =
-              akka.remote.ArteryControlFormats.Address.newBuilder(to_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.Address.newBuilder(to_).mergeFrom(value).buildPartial();
           } else {
             to_ = value;
           }
@@ -2316,7 +2316,7 @@ public final class ArteryControlFormats {
       /**
        * required .Address to = 2;
        */
-      public akka.remote.ArteryControlFormats.Address.Builder getToBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.Address.Builder getToBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getToFieldBuilder().getBuilder();
@@ -2324,23 +2324,23 @@ public final class ArteryControlFormats {
       /**
        * required .Address to = 2;
        */
-      public akka.remote.ArteryControlFormats.AddressOrBuilder getToOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder getToOrBuilder() {
         if (toBuilder_ != null) {
           return toBuilder_.getMessageOrBuilder();
         } else {
           return to_ == null ?
-              akka.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
+              org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : to_;
         }
       }
       /**
        * required .Address to = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.Address, akka.remote.ArteryControlFormats.Address.Builder, akka.remote.ArteryControlFormats.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.Address, org.apache.pekko.remote.ArteryControlFormats.Address.Builder, org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder> 
           getToFieldBuilder() {
         if (toBuilder_ == null) {
-          toBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.Address, akka.remote.ArteryControlFormats.Address.Builder, akka.remote.ArteryControlFormats.AddressOrBuilder>(
+          toBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.Address, org.apache.pekko.remote.ArteryControlFormats.Address.Builder, org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder>(
                   getTo(),
                   getParentForChildren(),
                   isClean());
@@ -2350,13 +2350,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2365,37 +2365,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:HandshakeReq)
-    private static final akka.remote.ArteryControlFormats.HandshakeReq DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.HandshakeReq DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.HandshakeReq();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.HandshakeReq();
     }
 
-    public static akka.remote.ArteryControlFormats.HandshakeReq getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.HandshakeReq getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public HandshakeReq parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new HandshakeReq(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.HandshakeReq getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.HandshakeReq getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2403,7 +2403,7 @@ public final class ArteryControlFormats {
 
   public interface CompressionTableAdvertisementOrBuilder extends
       // @@protoc_insertion_point(interface_extends:CompressionTableAdvertisement)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress from = 1;
@@ -2414,11 +2414,11 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    akka.remote.ArteryControlFormats.UniqueAddress getFrom();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom();
     /**
      * required .UniqueAddress from = 1;
      */
-    akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
 
     /**
      * required uint64 originUid = 2;
@@ -2488,7 +2488,7 @@ public final class ArteryControlFormats {
      * @param index The index of the value to return.
      * @return The bytes of the keys at the given index.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getKeysBytes(int index);
 
     /**
@@ -2517,42 +2517,42 @@ public final class ArteryControlFormats {
    * Protobuf type {@code CompressionTableAdvertisement}
    */
   public  static final class CompressionTableAdvertisement extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CompressionTableAdvertisement)
       CompressionTableAdvertisementOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use CompressionTableAdvertisement.newBuilder() to construct.
-    private CompressionTableAdvertisement(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private CompressionTableAdvertisement(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private CompressionTableAdvertisement() {
-      keys_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       values_ = emptyIntList();
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new CompressionTableAdvertisement();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private CompressionTableAdvertisement(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2562,11 +2562,11 @@ public final class ArteryControlFormats {
               done = true;
               break;
             case 10: {
-              akka.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -2585,9 +2585,9 @@ public final class ArteryControlFormats {
               break;
             }
             case 34: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                keys_ = new akka.protobufv3.internal.LazyStringArrayList();
+                keys_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
               keys_.add(bs);
@@ -2623,10 +2623,10 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000008) != 0)) {
@@ -2639,22 +2639,22 @@ public final class ArteryControlFormats {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.CompressionTableAdvertisement.class, akka.remote.ArteryControlFormats.CompressionTableAdvertisement.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement.class, org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.remote.ArteryControlFormats.UniqueAddress from_;
+    private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
     /**
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
@@ -2666,14 +2666,14 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
-    public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int ORIGINUID_FIELD_NUMBER = 2;
@@ -2711,7 +2711,7 @@ public final class ArteryControlFormats {
     }
 
     public static final int KEYS_FIELD_NUMBER = 4;
-    private akka.protobufv3.internal.LazyStringList keys_;
+    private org.apache.pekko.protobufv3.internal.LazyStringList keys_;
     /**
      * 
          * actual Map is represented by separate sequences of keys and values,
@@ -2722,7 +2722,7 @@ public final class ArteryControlFormats {
      * repeated string keys = 4;
      * @return A list containing the keys.
      */
-    public akka.protobufv3.internal.ProtocolStringList
+    public org.apache.pekko.protobufv3.internal.ProtocolStringList
         getKeysList() {
       return keys_;
     }
@@ -2764,13 +2764,13 @@ public final class ArteryControlFormats {
      * @param index The index of the value to return.
      * @return The bytes of the keys at the given index.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getKeysBytes(int index) {
       return keys_.getByteString(index);
     }
 
     public static final int VALUES_FIELD_NUMBER = 5;
-    private akka.protobufv3.internal.Internal.IntList values_;
+    private org.apache.pekko.protobufv3.internal.Internal.IntList values_;
     /**
      * repeated uint32 values = 5;
      * @return A list containing the values.
@@ -2823,7 +2823,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
@@ -2835,7 +2835,7 @@ public final class ArteryControlFormats {
         output.writeUInt32(3, tableVersion_);
       }
       for (int i = 0; i < keys_.size(); i++) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, keys_.getRaw(i));
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 4, keys_.getRaw(i));
       }
       for (int i = 0; i < values_.size(); i++) {
         output.writeUInt32(5, values_.getInt(i));
@@ -2850,15 +2850,15 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(2, originUid_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(3, tableVersion_);
       }
       {
@@ -2872,7 +2872,7 @@ public final class ArteryControlFormats {
       {
         int dataSize = 0;
         for (int i = 0; i < values_.size(); i++) {
-          dataSize += akka.protobufv3.internal.CodedOutputStream
+          dataSize += org.apache.pekko.protobufv3.internal.CodedOutputStream
             .computeUInt32SizeNoTag(values_.getInt(i));
         }
         size += dataSize;
@@ -2888,10 +2888,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.CompressionTableAdvertisement)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.CompressionTableAdvertisement other = (akka.remote.ArteryControlFormats.CompressionTableAdvertisement) obj;
+      org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement other = (org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -2929,7 +2929,7 @@ public final class ArteryControlFormats {
       }
       if (hasOriginUid()) {
         hash = (37 * hash) + ORIGINUID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getOriginUid());
       }
       if (hasTableVersion()) {
@@ -2949,73 +2949,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3024,7 +3024,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.CompressionTableAdvertisement prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3035,7 +3035,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3048,34 +3048,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code CompressionTableAdvertisement}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:CompressionTableAdvertisement)
-        akka.remote.ArteryControlFormats.CompressionTableAdvertisementOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.CompressionTableAdvertisement.class, akka.remote.ArteryControlFormats.CompressionTableAdvertisement.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement.class, org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.CompressionTableAdvertisement.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
         }
@@ -3093,7 +3093,7 @@ public final class ArteryControlFormats {
         bitField0_ = (bitField0_ & ~0x00000002);
         tableVersion_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
-        keys_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000008);
         values_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -3101,19 +3101,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisement_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.CompressionTableAdvertisement getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.CompressionTableAdvertisement.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.CompressionTableAdvertisement build() {
-        akka.remote.ArteryControlFormats.CompressionTableAdvertisement result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement build() {
+        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3121,8 +3121,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.CompressionTableAdvertisement buildPartial() {
-        akka.remote.ArteryControlFormats.CompressionTableAdvertisement result = new akka.remote.ArteryControlFormats.CompressionTableAdvertisement(this);
+      public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement result = new org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3162,44 +3162,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.CompressionTableAdvertisement) {
-          return mergeFrom((akka.remote.ArteryControlFormats.CompressionTableAdvertisement)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.CompressionTableAdvertisement other) {
-        if (other == akka.remote.ArteryControlFormats.CompressionTableAdvertisement.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -3253,14 +3253,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.CompressionTableAdvertisement parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.CompressionTableAdvertisement) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3271,9 +3271,9 @@ public final class ArteryControlFormats {
       }
       private int bitField0_;
 
-      private akka.remote.ArteryControlFormats.UniqueAddress from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
       /**
        * required .UniqueAddress from = 1;
        * @return Whether the from field is set.
@@ -3285,9 +3285,9 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 1;
        * @return The from.
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -3295,7 +3295,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder setFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3312,7 +3312,7 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 1;
        */
       public Builder setFrom(
-          akka.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -3325,13 +3325,13 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
             from_ =
-              akka.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -3358,7 +3358,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -3366,23 +3366,23 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         }
       }
       /**
        * required .UniqueAddress from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -3465,10 +3465,10 @@ public final class ArteryControlFormats {
         return this;
       }
 
-      private akka.protobufv3.internal.LazyStringList keys_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+      private org.apache.pekko.protobufv3.internal.LazyStringList keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
       private void ensureKeysIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          keys_ = new akka.protobufv3.internal.LazyStringArrayList(keys_);
+          keys_ = new org.apache.pekko.protobufv3.internal.LazyStringArrayList(keys_);
           bitField0_ |= 0x00000008;
          }
       }
@@ -3482,7 +3482,7 @@ public final class ArteryControlFormats {
        * repeated string keys = 4;
        * @return A list containing the keys.
        */
-      public akka.protobufv3.internal.ProtocolStringList
+      public org.apache.pekko.protobufv3.internal.ProtocolStringList
           getKeysList() {
         return keys_.getUnmodifiableView();
       }
@@ -3524,7 +3524,7 @@ public final class ArteryControlFormats {
        * @param index The index of the value to return.
        * @return The bytes of the keys at the given index.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getKeysBytes(int index) {
         return keys_.getByteString(index);
       }
@@ -3585,7 +3585,7 @@ public final class ArteryControlFormats {
       public Builder addAllKeys(
           java.lang.Iterable values) {
         ensureKeysIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, keys_);
         onChanged();
         return this;
@@ -3601,7 +3601,7 @@ public final class ArteryControlFormats {
        * @return This builder for chaining.
        */
       public Builder clearKeys() {
-        keys_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
+        keys_ = org.apache.pekko.protobufv3.internal.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
@@ -3618,7 +3618,7 @@ public final class ArteryControlFormats {
        * @return This builder for chaining.
        */
       public Builder addKeysBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -3628,7 +3628,7 @@ public final class ArteryControlFormats {
         return this;
       }
 
-      private akka.protobufv3.internal.Internal.IntList values_ = emptyIntList();
+      private org.apache.pekko.protobufv3.internal.Internal.IntList values_ = emptyIntList();
       private void ensureValuesIsMutable() {
         if (!((bitField0_ & 0x00000010) != 0)) {
           values_ = mutableCopy(values_);
@@ -3691,7 +3691,7 @@ public final class ArteryControlFormats {
       public Builder addAllValues(
           java.lang.Iterable values) {
         ensureValuesIsMutable();
-        akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+        org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
             values, values_);
         onChanged();
         return this;
@@ -3708,13 +3708,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -3723,37 +3723,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:CompressionTableAdvertisement)
-    private static final akka.remote.ArteryControlFormats.CompressionTableAdvertisement DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.CompressionTableAdvertisement();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement();
     }
 
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisement getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public CompressionTableAdvertisement parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new CompressionTableAdvertisement(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.CompressionTableAdvertisement getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisement getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3761,7 +3761,7 @@ public final class ArteryControlFormats {
 
   public interface CompressionTableAdvertisementAckOrBuilder extends
       // @@protoc_insertion_point(interface_extends:CompressionTableAdvertisementAck)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .UniqueAddress from = 1;
@@ -3772,11 +3772,11 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    akka.remote.ArteryControlFormats.UniqueAddress getFrom();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom();
     /**
      * required .UniqueAddress from = 1;
      */
-    akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
 
     /**
      * required uint32 version = 2;
@@ -3798,12 +3798,12 @@ public final class ArteryControlFormats {
    * Protobuf type {@code CompressionTableAdvertisementAck}
    */
   public  static final class CompressionTableAdvertisementAck extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:CompressionTableAdvertisementAck)
       CompressionTableAdvertisementAckOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use CompressionTableAdvertisementAck.newBuilder() to construct.
-    private CompressionTableAdvertisementAck(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private CompressionTableAdvertisementAck(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private CompressionTableAdvertisementAck() {
@@ -3812,26 +3812,26 @@ public final class ArteryControlFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new CompressionTableAdvertisementAck();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private CompressionTableAdvertisementAck(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3841,11 +3841,11 @@ public final class ArteryControlFormats {
               done = true;
               break;
             case 10: {
-              akka.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -3867,32 +3867,32 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck.class, akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck.class, org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck.Builder.class);
     }
 
     private int bitField0_;
     public static final int FROM_FIELD_NUMBER = 1;
-    private akka.remote.ArteryControlFormats.UniqueAddress from_;
+    private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
     /**
      * required .UniqueAddress from = 1;
      * @return Whether the from field is set.
@@ -3904,14 +3904,14 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 1;
      * @return The from.
      */
-    public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 1;
      */
-    public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
 
     public static final int VERSION_FIELD_NUMBER = 2;
@@ -3955,7 +3955,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getFrom());
@@ -3973,11 +3973,11 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getFrom());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(2, version_);
       }
       size += unknownFields.getSerializedSize();
@@ -3990,10 +3990,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck other = (akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck) obj;
+      org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck other = (org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck) obj;
 
       if (hasFrom() != other.hasFrom()) return false;
       if (hasFrom()) {
@@ -4029,73 +4029,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -4104,7 +4104,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4115,7 +4115,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4128,34 +4128,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code CompressionTableAdvertisementAck}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:CompressionTableAdvertisementAck)
-        akka.remote.ArteryControlFormats.CompressionTableAdvertisementAckOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAckOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck.class, akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck.class, org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
         }
@@ -4175,19 +4175,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_CompressionTableAdvertisementAck_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck build() {
-        akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck build() {
+        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4195,8 +4195,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck buildPartial() {
-        akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck result = new akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck(this);
+      public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck result = new org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4222,44 +4222,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck) {
-          return mergeFrom((akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck other) {
-        if (other == akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck.getDefaultInstance()) return this;
         if (other.hasFrom()) {
           mergeFrom(other.getFrom());
         }
@@ -4287,14 +4287,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4305,9 +4305,9 @@ public final class ArteryControlFormats {
       }
       private int bitField0_;
 
-      private akka.remote.ArteryControlFormats.UniqueAddress from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
       /**
        * required .UniqueAddress from = 1;
        * @return Whether the from field is set.
@@ -4319,9 +4319,9 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 1;
        * @return The from.
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -4329,7 +4329,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder setFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4346,7 +4346,7 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 1;
        */
       public Builder setFrom(
-          akka.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -4359,13 +4359,13 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               from_ != null &&
-              from_ != akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
             from_ =
-              akka.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -4392,7 +4392,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -4400,23 +4400,23 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 1;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         }
       }
       /**
        * required .UniqueAddress from = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -4463,13 +4463,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -4478,37 +4478,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:CompressionTableAdvertisementAck)
-    private static final akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck();
     }
 
-    public static akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public CompressionTableAdvertisementAck parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new CompressionTableAdvertisementAck(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.CompressionTableAdvertisementAck getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.CompressionTableAdvertisementAck getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4516,7 +4516,7 @@ public final class ArteryControlFormats {
 
   public interface SystemMessageEnvelopeOrBuilder extends
       // @@protoc_insertion_point(interface_extends:SystemMessageEnvelope)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required bytes message = 1;
@@ -4527,7 +4527,7 @@ public final class ArteryControlFormats {
      * required bytes message = 1;
      * @return The message.
      */
-    akka.protobufv3.internal.ByteString getMessage();
+    org.apache.pekko.protobufv3.internal.ByteString getMessage();
 
     /**
      * required int32 serializerId = 2;
@@ -4549,7 +4549,7 @@ public final class ArteryControlFormats {
      * optional bytes messageManifest = 3;
      * @return The messageManifest.
      */
-    akka.protobufv3.internal.ByteString getMessageManifest();
+    org.apache.pekko.protobufv3.internal.ByteString getMessageManifest();
 
     /**
      * required uint64 seqNo = 4;
@@ -4571,11 +4571,11 @@ public final class ArteryControlFormats {
      * required .UniqueAddress ackReplyTo = 5;
      * @return The ackReplyTo.
      */
-    akka.remote.ArteryControlFormats.UniqueAddress getAckReplyTo();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getAckReplyTo();
     /**
      * required .UniqueAddress ackReplyTo = 5;
      */
-    akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getAckReplyToOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getAckReplyToOrBuilder();
   }
   /**
    * 
    @@ -4585,42 +4585,42 @@ public final class ArteryControlFormats {
    * Protobuf type {@code SystemMessageEnvelope}
    */
   public  static final class SystemMessageEnvelope extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SystemMessageEnvelope)
       SystemMessageEnvelopeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use SystemMessageEnvelope.newBuilder() to construct.
-    private SystemMessageEnvelope(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private SystemMessageEnvelope(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private SystemMessageEnvelope() {
-      message_ = akka.protobufv3.internal.ByteString.EMPTY;
-      messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      message_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
+      messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new SystemMessageEnvelope();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private SystemMessageEnvelope(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4650,11 +4650,11 @@ public final class ArteryControlFormats {
               break;
             }
             case 42: {
-              akka.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) != 0)) {
                 subBuilder = ackReplyTo_.toBuilder();
               }
-              ackReplyTo_ = input.readMessage(akka.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
+              ackReplyTo_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(ackReplyTo_);
                 ackReplyTo_ = subBuilder.buildPartial();
@@ -4671,32 +4671,32 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.SystemMessageEnvelope.class, akka.remote.ArteryControlFormats.SystemMessageEnvelope.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope.class, org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope.Builder.class);
     }
 
     private int bitField0_;
     public static final int MESSAGE_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.ByteString message_;
+    private org.apache.pekko.protobufv3.internal.ByteString message_;
     /**
      * required bytes message = 1;
      * @return Whether the message field is set.
@@ -4708,7 +4708,7 @@ public final class ArteryControlFormats {
      * required bytes message = 1;
      * @return The message.
      */
-    public akka.protobufv3.internal.ByteString getMessage() {
+    public org.apache.pekko.protobufv3.internal.ByteString getMessage() {
       return message_;
     }
 
@@ -4730,7 +4730,7 @@ public final class ArteryControlFormats {
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 3;
-    private akka.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
     /**
      * optional bytes messageManifest = 3;
      * @return Whether the messageManifest field is set.
@@ -4742,7 +4742,7 @@ public final class ArteryControlFormats {
      * optional bytes messageManifest = 3;
      * @return The messageManifest.
      */
-    public akka.protobufv3.internal.ByteString getMessageManifest() {
+    public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
 
@@ -4764,7 +4764,7 @@ public final class ArteryControlFormats {
     }
 
     public static final int ACKREPLYTO_FIELD_NUMBER = 5;
-    private akka.remote.ArteryControlFormats.UniqueAddress ackReplyTo_;
+    private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress ackReplyTo_;
     /**
      * required .UniqueAddress ackReplyTo = 5;
      * @return Whether the ackReplyTo field is set.
@@ -4776,14 +4776,14 @@ public final class ArteryControlFormats {
      * required .UniqueAddress ackReplyTo = 5;
      * @return The ackReplyTo.
      */
-    public akka.remote.ArteryControlFormats.UniqueAddress getAckReplyTo() {
-      return ackReplyTo_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getAckReplyTo() {
+      return ackReplyTo_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
     }
     /**
      * required .UniqueAddress ackReplyTo = 5;
      */
-    public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getAckReplyToOrBuilder() {
-      return ackReplyTo_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getAckReplyToOrBuilder() {
+      return ackReplyTo_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -4818,7 +4818,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, message_);
@@ -4845,23 +4845,23 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(1, message_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(2, serializerId_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(3, messageManifest_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(4, seqNo_);
       }
       if (((bitField0_ & 0x00000010) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(5, getAckReplyTo());
       }
       size += unknownFields.getSerializedSize();
@@ -4874,10 +4874,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.SystemMessageEnvelope)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.SystemMessageEnvelope other = (akka.remote.ArteryControlFormats.SystemMessageEnvelope) obj;
+      org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope other = (org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope) obj;
 
       if (hasMessage() != other.hasMessage()) return false;
       if (hasMessage()) {
@@ -4929,7 +4929,7 @@ public final class ArteryControlFormats {
       }
       if (hasSeqNo()) {
         hash = (37 * hash) + SEQNO_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSeqNo());
       }
       if (hasAckReplyTo()) {
@@ -4941,73 +4941,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5016,7 +5016,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.SystemMessageEnvelope prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5027,7 +5027,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5039,34 +5039,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code SystemMessageEnvelope}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:SystemMessageEnvelope)
-        akka.remote.ArteryControlFormats.SystemMessageEnvelopeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelopeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.SystemMessageEnvelope.class, akka.remote.ArteryControlFormats.SystemMessageEnvelope.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope.class, org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.SystemMessageEnvelope.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAckReplyToFieldBuilder();
         }
@@ -5074,11 +5074,11 @@ public final class ArteryControlFormats {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        message_ = akka.protobufv3.internal.ByteString.EMPTY;
+        message_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+        messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         seqNo_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -5092,19 +5092,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageEnvelope_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.SystemMessageEnvelope getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.SystemMessageEnvelope.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.SystemMessageEnvelope build() {
-        akka.remote.ArteryControlFormats.SystemMessageEnvelope result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope build() {
+        org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5112,8 +5112,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.SystemMessageEnvelope buildPartial() {
-        akka.remote.ArteryControlFormats.SystemMessageEnvelope result = new akka.remote.ArteryControlFormats.SystemMessageEnvelope(this);
+      public org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope result = new org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5151,44 +5151,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.SystemMessageEnvelope) {
-          return mergeFrom((akka.remote.ArteryControlFormats.SystemMessageEnvelope)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.SystemMessageEnvelope other) {
-        if (other == akka.remote.ArteryControlFormats.SystemMessageEnvelope.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope.getDefaultInstance()) return this;
         if (other.hasMessage()) {
           setMessage(other.getMessage());
         }
@@ -5231,14 +5231,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.SystemMessageEnvelope parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.SystemMessageEnvelope) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5249,7 +5249,7 @@ public final class ArteryControlFormats {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.ByteString message_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString message_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes message = 1;
        * @return Whether the message field is set.
@@ -5261,7 +5261,7 @@ public final class ArteryControlFormats {
        * required bytes message = 1;
        * @return The message.
        */
-      public akka.protobufv3.internal.ByteString getMessage() {
+      public org.apache.pekko.protobufv3.internal.ByteString getMessage() {
         return message_;
       }
       /**
@@ -5269,7 +5269,7 @@ public final class ArteryControlFormats {
        * @param value The message to set.
        * @return This builder for chaining.
        */
-      public Builder setMessage(akka.protobufv3.internal.ByteString value) {
+      public Builder setMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5326,7 +5326,7 @@ public final class ArteryControlFormats {
         return this;
       }
 
-      private akka.protobufv3.internal.ByteString messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * optional bytes messageManifest = 3;
        * @return Whether the messageManifest field is set.
@@ -5338,7 +5338,7 @@ public final class ArteryControlFormats {
        * optional bytes messageManifest = 3;
        * @return The messageManifest.
        */
-      public akka.protobufv3.internal.ByteString getMessageManifest() {
+      public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
       /**
@@ -5346,7 +5346,7 @@ public final class ArteryControlFormats {
        * @param value The messageManifest to set.
        * @return This builder for chaining.
        */
-      public Builder setMessageManifest(akka.protobufv3.internal.ByteString value) {
+      public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -5403,9 +5403,9 @@ public final class ArteryControlFormats {
         return this;
       }
 
-      private akka.remote.ArteryControlFormats.UniqueAddress ackReplyTo_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> ackReplyToBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress ackReplyTo_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> ackReplyToBuilder_;
       /**
        * required .UniqueAddress ackReplyTo = 5;
        * @return Whether the ackReplyTo field is set.
@@ -5417,9 +5417,9 @@ public final class ArteryControlFormats {
        * required .UniqueAddress ackReplyTo = 5;
        * @return The ackReplyTo.
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress getAckReplyTo() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getAckReplyTo() {
         if (ackReplyToBuilder_ == null) {
-          return ackReplyTo_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
+          return ackReplyTo_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
         } else {
           return ackReplyToBuilder_.getMessage();
         }
@@ -5427,7 +5427,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress ackReplyTo = 5;
        */
-      public Builder setAckReplyTo(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder setAckReplyTo(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (ackReplyToBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5444,7 +5444,7 @@ public final class ArteryControlFormats {
        * required .UniqueAddress ackReplyTo = 5;
        */
       public Builder setAckReplyTo(
-          akka.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (ackReplyToBuilder_ == null) {
           ackReplyTo_ = builderForValue.build();
           onChanged();
@@ -5457,13 +5457,13 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress ackReplyTo = 5;
        */
-      public Builder mergeAckReplyTo(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder mergeAckReplyTo(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (ackReplyToBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
               ackReplyTo_ != null &&
-              ackReplyTo_ != akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+              ackReplyTo_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
             ackReplyTo_ =
-              akka.remote.ArteryControlFormats.UniqueAddress.newBuilder(ackReplyTo_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(ackReplyTo_).mergeFrom(value).buildPartial();
           } else {
             ackReplyTo_ = value;
           }
@@ -5490,7 +5490,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress ackReplyTo = 5;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress.Builder getAckReplyToBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder getAckReplyToBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getAckReplyToFieldBuilder().getBuilder();
@@ -5498,23 +5498,23 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress ackReplyTo = 5;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getAckReplyToOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getAckReplyToOrBuilder() {
         if (ackReplyToBuilder_ != null) {
           return ackReplyToBuilder_.getMessageOrBuilder();
         } else {
           return ackReplyTo_ == null ?
-              akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : ackReplyTo_;
         }
       }
       /**
        * required .UniqueAddress ackReplyTo = 5;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
           getAckReplyToFieldBuilder() {
         if (ackReplyToBuilder_ == null) {
-          ackReplyToBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
+          ackReplyToBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
                   getAckReplyTo(),
                   getParentForChildren(),
                   isClean());
@@ -5524,13 +5524,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -5539,37 +5539,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:SystemMessageEnvelope)
-    private static final akka.remote.ArteryControlFormats.SystemMessageEnvelope DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.SystemMessageEnvelope();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope();
     }
 
-    public static akka.remote.ArteryControlFormats.SystemMessageEnvelope getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public SystemMessageEnvelope parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new SystemMessageEnvelope(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.SystemMessageEnvelope getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.SystemMessageEnvelope getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5577,7 +5577,7 @@ public final class ArteryControlFormats {
 
   public interface SystemMessageDeliveryAckOrBuilder extends
       // @@protoc_insertion_point(interface_extends:SystemMessageDeliveryAck)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required uint64 seqNo = 1;
@@ -5599,11 +5599,11 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 2;
      * @return The from.
      */
-    akka.remote.ArteryControlFormats.UniqueAddress getFrom();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom();
     /**
      * required .UniqueAddress from = 2;
      */
-    akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder();
   }
   /**
    * 
    @@ -5614,12 +5614,12 @@ public final class ArteryControlFormats {
    * Protobuf type {@code SystemMessageDeliveryAck}
    */
   public  static final class SystemMessageDeliveryAck extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SystemMessageDeliveryAck)
       SystemMessageDeliveryAckOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use SystemMessageDeliveryAck.newBuilder() to construct.
-    private SystemMessageDeliveryAck(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private SystemMessageDeliveryAck(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private SystemMessageDeliveryAck() {
@@ -5628,26 +5628,26 @@ public final class ArteryControlFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new SystemMessageDeliveryAck();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private SystemMessageDeliveryAck(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -5662,11 +5662,11 @@ public final class ArteryControlFormats {
               break;
             }
             case 18: {
-              akka.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = from_.toBuilder();
               }
-              from_ = input.readMessage(akka.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
+              from_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(from_);
                 from_ = subBuilder.buildPartial();
@@ -5683,27 +5683,27 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.SystemMessageDeliveryAck.class, akka.remote.ArteryControlFormats.SystemMessageDeliveryAck.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck.class, org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck.Builder.class);
     }
 
     private int bitField0_;
@@ -5725,7 +5725,7 @@ public final class ArteryControlFormats {
     }
 
     public static final int FROM_FIELD_NUMBER = 2;
-    private akka.remote.ArteryControlFormats.UniqueAddress from_;
+    private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
     /**
      * required .UniqueAddress from = 2;
      * @return Whether the from field is set.
@@ -5737,14 +5737,14 @@ public final class ArteryControlFormats {
      * required .UniqueAddress from = 2;
      * @return The from.
      */
-    public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
     /**
      * required .UniqueAddress from = 2;
      */
-    public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
-      return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -5771,7 +5771,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt64(1, seqNo_);
@@ -5789,11 +5789,11 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(1, seqNo_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getFrom());
       }
       size += unknownFields.getSerializedSize();
@@ -5806,10 +5806,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.SystemMessageDeliveryAck)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.SystemMessageDeliveryAck other = (akka.remote.ArteryControlFormats.SystemMessageDeliveryAck) obj;
+      org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck other = (org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck) obj;
 
       if (hasSeqNo() != other.hasSeqNo()) return false;
       if (hasSeqNo()) {
@@ -5834,7 +5834,7 @@ public final class ArteryControlFormats {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasSeqNo()) {
         hash = (37 * hash) + SEQNO_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getSeqNo());
       }
       if (hasFrom()) {
@@ -5846,73 +5846,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -5921,7 +5921,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.SystemMessageDeliveryAck prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5932,7 +5932,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5945,34 +5945,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code SystemMessageDeliveryAck}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:SystemMessageDeliveryAck)
-        akka.remote.ArteryControlFormats.SystemMessageDeliveryAckOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAckOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.SystemMessageDeliveryAck.class, akka.remote.ArteryControlFormats.SystemMessageDeliveryAck.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck.class, org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.SystemMessageDeliveryAck.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getFromFieldBuilder();
         }
@@ -5992,19 +5992,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_SystemMessageDeliveryAck_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.SystemMessageDeliveryAck getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.SystemMessageDeliveryAck.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.SystemMessageDeliveryAck build() {
-        akka.remote.ArteryControlFormats.SystemMessageDeliveryAck result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck build() {
+        org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6012,8 +6012,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.SystemMessageDeliveryAck buildPartial() {
-        akka.remote.ArteryControlFormats.SystemMessageDeliveryAck result = new akka.remote.ArteryControlFormats.SystemMessageDeliveryAck(this);
+      public org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck result = new org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6039,44 +6039,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.SystemMessageDeliveryAck) {
-          return mergeFrom((akka.remote.ArteryControlFormats.SystemMessageDeliveryAck)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.SystemMessageDeliveryAck other) {
-        if (other == akka.remote.ArteryControlFormats.SystemMessageDeliveryAck.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck.getDefaultInstance()) return this;
         if (other.hasSeqNo()) {
           setSeqNo(other.getSeqNo());
         }
@@ -6104,14 +6104,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.SystemMessageDeliveryAck parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.SystemMessageDeliveryAck) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6159,9 +6159,9 @@ public final class ArteryControlFormats {
         return this;
       }
 
-      private akka.remote.ArteryControlFormats.UniqueAddress from_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.UniqueAddress from_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> fromBuilder_;
       /**
        * required .UniqueAddress from = 2;
        * @return Whether the from field is set.
@@ -6173,9 +6173,9 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 2;
        * @return The from.
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress getFrom() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getFrom() {
         if (fromBuilder_ == null) {
-          return from_ == null ? akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+          return from_ == null ? org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         } else {
           return fromBuilder_.getMessage();
         }
@@ -6183,7 +6183,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 2;
        */
-      public Builder setFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder setFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6200,7 +6200,7 @@ public final class ArteryControlFormats {
        * required .UniqueAddress from = 2;
        */
       public Builder setFrom(
-          akka.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder builderForValue) {
         if (fromBuilder_ == null) {
           from_ = builderForValue.build();
           onChanged();
@@ -6213,13 +6213,13 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 2;
        */
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.UniqueAddress value) {
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress value) {
         if (fromBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               from_ != null &&
-              from_ != akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
+              from_ != org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) {
             from_ =
-              akka.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder(from_).mergeFrom(value).buildPartial();
           } else {
             from_ = value;
           }
@@ -6246,7 +6246,7 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 2;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder getFromBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getFromFieldBuilder().getBuilder();
@@ -6254,23 +6254,23 @@ public final class ArteryControlFormats {
       /**
        * required .UniqueAddress from = 2;
        */
-      public akka.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder getFromOrBuilder() {
         if (fromBuilder_ != null) {
           return fromBuilder_.getMessageOrBuilder();
         } else {
           return from_ == null ?
-              akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance() : from_;
         }
       }
       /**
        * required .UniqueAddress from = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder> 
           getFromFieldBuilder() {
         if (fromBuilder_ == null) {
-          fromBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.UniqueAddress, akka.remote.ArteryControlFormats.UniqueAddress.Builder, akka.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
+          fromBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder, org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder>(
                   getFrom(),
                   getParentForChildren(),
                   isClean());
@@ -6280,13 +6280,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -6295,37 +6295,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:SystemMessageDeliveryAck)
-    private static final akka.remote.ArteryControlFormats.SystemMessageDeliveryAck DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.SystemMessageDeliveryAck();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck();
     }
 
-    public static akka.remote.ArteryControlFormats.SystemMessageDeliveryAck getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public SystemMessageDeliveryAck parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new SystemMessageDeliveryAck(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.SystemMessageDeliveryAck getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.SystemMessageDeliveryAck getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6333,7 +6333,7 @@ public final class ArteryControlFormats {
 
   public interface AddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Address)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string protocol = 1;
@@ -6349,7 +6349,7 @@ public final class ArteryControlFormats {
      * required string protocol = 1;
      * @return The bytes for protocol.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes();
 
     /**
@@ -6366,7 +6366,7 @@ public final class ArteryControlFormats {
      * required string system = 2;
      * @return The bytes for system.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes();
 
     /**
@@ -6383,7 +6383,7 @@ public final class ArteryControlFormats {
      * required string hostname = 3;
      * @return The bytes for hostname.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes();
 
     /**
@@ -6406,12 +6406,12 @@ public final class ArteryControlFormats {
    * Protobuf type {@code Address}
    */
   public  static final class Address extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Address)
       AddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Address.newBuilder() to construct.
-    private Address(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Address(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Address() {
@@ -6423,26 +6423,26 @@ public final class ArteryControlFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Address();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Address(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -6452,19 +6452,19 @@ public final class ArteryControlFormats {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               protocol_ = bs;
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               system_ = bs;
               break;
             }
             case 26: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000004;
               hostname_ = bs;
               break;
@@ -6483,27 +6483,27 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_Address_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_Address_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_Address_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_Address_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.Address.class, akka.remote.ArteryControlFormats.Address.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.Address.class, org.apache.pekko.remote.ArteryControlFormats.Address.Builder.class);
     }
 
     private int bitField0_;
@@ -6525,8 +6525,8 @@ public final class ArteryControlFormats {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           protocol_ = s;
@@ -6538,17 +6538,17 @@ public final class ArteryControlFormats {
      * required string protocol = 1;
      * @return The bytes for protocol.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getProtocolBytes() {
       java.lang.Object ref = protocol_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         protocol_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -6570,8 +6570,8 @@ public final class ArteryControlFormats {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           system_ = s;
@@ -6583,17 +6583,17 @@ public final class ArteryControlFormats {
      * required string system = 2;
      * @return The bytes for system.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getSystemBytes() {
       java.lang.Object ref = system_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         system_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -6615,8 +6615,8 @@ public final class ArteryControlFormats {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           hostname_ = s;
@@ -6628,17 +6628,17 @@ public final class ArteryControlFormats {
      * required string hostname = 3;
      * @return The bytes for hostname.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getHostnameBytes() {
       java.lang.Object ref = hostname_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         hostname_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -6687,16 +6687,16 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, protocol_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, protocol_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, system_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, system_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, hostname_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 3, hostname_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeUInt32(4, port_);
@@ -6711,16 +6711,16 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, protocol_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, protocol_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, system_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, system_);
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, hostname_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(3, hostname_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt32Size(4, port_);
       }
       size += unknownFields.getSerializedSize();
@@ -6733,10 +6733,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.Address)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.Address)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.Address other = (akka.remote.ArteryControlFormats.Address) obj;
+      org.apache.pekko.remote.ArteryControlFormats.Address other = (org.apache.pekko.remote.ArteryControlFormats.Address) obj;
 
       if (hasProtocol() != other.hasProtocol()) return false;
       if (hasProtocol()) {
@@ -6790,73 +6790,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.Address parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.Address parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Address parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.Address parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Address parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.Address parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Address parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.Address parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Address parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.Address parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.Address parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.Address parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -6865,7 +6865,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.Address prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.Address prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6876,7 +6876,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -6889,34 +6889,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code Address}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Address)
-        akka.remote.ArteryControlFormats.AddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_Address_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_Address_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_Address_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.Address.class, akka.remote.ArteryControlFormats.Address.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.Address.class, org.apache.pekko.remote.ArteryControlFormats.Address.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.Address.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.Address.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -6935,19 +6935,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_Address_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_Address_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.Address getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.Address.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.Address getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.Address build() {
-        akka.remote.ArteryControlFormats.Address result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.Address build() {
+        org.apache.pekko.remote.ArteryControlFormats.Address result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6955,8 +6955,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.Address buildPartial() {
-        akka.remote.ArteryControlFormats.Address result = new akka.remote.ArteryControlFormats.Address(this);
+      public org.apache.pekko.remote.ArteryControlFormats.Address buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.Address result = new org.apache.pekko.remote.ArteryControlFormats.Address(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6986,44 +6986,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.Address) {
-          return mergeFrom((akka.remote.ArteryControlFormats.Address)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.Address) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.Address)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.Address other) {
-        if (other == akka.remote.ArteryControlFormats.Address.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.Address other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance()) return this;
         if (other.hasProtocol()) {
           bitField0_ |= 0x00000001;
           protocol_ = other.protocol_;
@@ -7066,14 +7066,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.Address parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.Address parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.Address) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.Address) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7099,8 +7099,8 @@ public final class ArteryControlFormats {
       public java.lang.String getProtocol() {
         java.lang.Object ref = protocol_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             protocol_ = s;
@@ -7114,17 +7114,17 @@ public final class ArteryControlFormats {
        * required string protocol = 1;
        * @return The bytes for protocol.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getProtocolBytes() {
         java.lang.Object ref = protocol_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           protocol_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -7158,7 +7158,7 @@ public final class ArteryControlFormats {
        * @return This builder for chaining.
        */
       public Builder setProtocolBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7183,8 +7183,8 @@ public final class ArteryControlFormats {
       public java.lang.String getSystem() {
         java.lang.Object ref = system_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             system_ = s;
@@ -7198,17 +7198,17 @@ public final class ArteryControlFormats {
        * required string system = 2;
        * @return The bytes for system.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getSystemBytes() {
         java.lang.Object ref = system_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           system_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -7242,7 +7242,7 @@ public final class ArteryControlFormats {
        * @return This builder for chaining.
        */
       public Builder setSystemBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7267,8 +7267,8 @@ public final class ArteryControlFormats {
       public java.lang.String getHostname() {
         java.lang.Object ref = hostname_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             hostname_ = s;
@@ -7282,17 +7282,17 @@ public final class ArteryControlFormats {
        * required string hostname = 3;
        * @return The bytes for hostname.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getHostnameBytes() {
         java.lang.Object ref = hostname_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           hostname_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -7326,7 +7326,7 @@ public final class ArteryControlFormats {
        * @return This builder for chaining.
        */
       public Builder setHostnameBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -7374,13 +7374,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -7389,37 +7389,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:Address)
-    private static final akka.remote.ArteryControlFormats.Address DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.Address DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.Address();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.Address();
     }
 
-    public static akka.remote.ArteryControlFormats.Address getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.Address getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
    
-        PARSER = new akka.protobufv3.internal.AbstractParser
    () {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
    
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser
    () {
       @java.lang.Override
       public Address parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Address(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser
     parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser
     parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser
     getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser
     getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.Address getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.Address getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7427,7 +7427,7 @@ public final class ArteryControlFormats {
 
   public interface UniqueAddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:UniqueAddress)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Address address = 1;
@@ -7438,11 +7438,11 @@ public final class ArteryControlFormats {
      * required .Address address = 1;
      * @return The address.
      */
-    akka.remote.ArteryControlFormats.Address getAddress();
+    org.apache.pekko.remote.ArteryControlFormats.Address getAddress();
     /**
      * required .Address address = 1;
      */
-    akka.remote.ArteryControlFormats.AddressOrBuilder getAddressOrBuilder();
+    org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder getAddressOrBuilder();
 
     /**
      * required uint64 uid = 2;
@@ -7464,12 +7464,12 @@ public final class ArteryControlFormats {
    * Protobuf type {@code UniqueAddress}
    */
   public  static final class UniqueAddress extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:UniqueAddress)
       UniqueAddressOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use UniqueAddress.newBuilder() to construct.
-    private UniqueAddress(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private UniqueAddress(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private UniqueAddress() {
@@ -7478,26 +7478,26 @@ public final class ArteryControlFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new UniqueAddress();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private UniqueAddress(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -7507,11 +7507,11 @@ public final class ArteryControlFormats {
               done = true;
               break;
             case 10: {
-              akka.remote.ArteryControlFormats.Address.Builder subBuilder = null;
+              org.apache.pekko.remote.ArteryControlFormats.Address.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = address_.toBuilder();
               }
-              address_ = input.readMessage(akka.remote.ArteryControlFormats.Address.PARSER, extensionRegistry);
+              address_ = input.readMessage(org.apache.pekko.remote.ArteryControlFormats.Address.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(address_);
                 address_ = subBuilder.buildPartial();
@@ -7533,32 +7533,32 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_UniqueAddress_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_UniqueAddress_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_UniqueAddress_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_UniqueAddress_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.UniqueAddress.class, akka.remote.ArteryControlFormats.UniqueAddress.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.class, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder.class);
     }
 
     private int bitField0_;
     public static final int ADDRESS_FIELD_NUMBER = 1;
-    private akka.remote.ArteryControlFormats.Address address_;
+    private org.apache.pekko.remote.ArteryControlFormats.Address address_;
     /**
      * required .Address address = 1;
      * @return Whether the address field is set.
@@ -7570,14 +7570,14 @@ public final class ArteryControlFormats {
      * required .Address address = 1;
      * @return The address.
      */
-    public akka.remote.ArteryControlFormats.Address getAddress() {
-      return address_ == null ? akka.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.remote.ArteryControlFormats.Address getAddress() {
+      return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
     }
     /**
      * required .Address address = 1;
      */
-    public akka.remote.ArteryControlFormats.AddressOrBuilder getAddressOrBuilder() {
-      return address_ == null ? akka.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
+    public org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder getAddressOrBuilder() {
+      return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
     }
 
     public static final int UID_FIELD_NUMBER = 2;
@@ -7621,7 +7621,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getAddress());
@@ -7639,11 +7639,11 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getAddress());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(2, uid_);
       }
       size += unknownFields.getSerializedSize();
@@ -7656,10 +7656,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.UniqueAddress)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.UniqueAddress)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.UniqueAddress other = (akka.remote.ArteryControlFormats.UniqueAddress) obj;
+      org.apache.pekko.remote.ArteryControlFormats.UniqueAddress other = (org.apache.pekko.remote.ArteryControlFormats.UniqueAddress) obj;
 
       if (hasAddress() != other.hasAddress()) return false;
       if (hasAddress()) {
@@ -7688,7 +7688,7 @@ public final class ArteryControlFormats {
       }
       if (hasUid()) {
         hash = (37 * hash) + UID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getUid());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -7696,73 +7696,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.UniqueAddress parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -7771,7 +7771,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.UniqueAddress prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7782,7 +7782,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -7795,34 +7795,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code UniqueAddress}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:UniqueAddress)
-        akka.remote.ArteryControlFormats.UniqueAddressOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.UniqueAddressOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_UniqueAddress_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_UniqueAddress_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_UniqueAddress_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_UniqueAddress_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.UniqueAddress.class, akka.remote.ArteryControlFormats.UniqueAddress.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.class, org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.UniqueAddress.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getAddressFieldBuilder();
         }
@@ -7842,19 +7842,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_UniqueAddress_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_UniqueAddress_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.UniqueAddress getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.UniqueAddress build() {
-        akka.remote.ArteryControlFormats.UniqueAddress result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress build() {
+        org.apache.pekko.remote.ArteryControlFormats.UniqueAddress result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7862,8 +7862,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.UniqueAddress buildPartial() {
-        akka.remote.ArteryControlFormats.UniqueAddress result = new akka.remote.ArteryControlFormats.UniqueAddress(this);
+      public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.UniqueAddress result = new org.apache.pekko.remote.ArteryControlFormats.UniqueAddress(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -7889,44 +7889,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.UniqueAddress) {
-          return mergeFrom((akka.remote.ArteryControlFormats.UniqueAddress)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.UniqueAddress) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.UniqueAddress)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.UniqueAddress other) {
-        if (other == akka.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.UniqueAddress other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.UniqueAddress.getDefaultInstance()) return this;
         if (other.hasAddress()) {
           mergeAddress(other.getAddress());
         }
@@ -7954,14 +7954,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.UniqueAddress parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.UniqueAddress parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.UniqueAddress) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.UniqueAddress) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7972,9 +7972,9 @@ public final class ArteryControlFormats {
       }
       private int bitField0_;
 
-      private akka.remote.ArteryControlFormats.Address address_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.Address, akka.remote.ArteryControlFormats.Address.Builder, akka.remote.ArteryControlFormats.AddressOrBuilder> addressBuilder_;
+      private org.apache.pekko.remote.ArteryControlFormats.Address address_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.Address, org.apache.pekko.remote.ArteryControlFormats.Address.Builder, org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder> addressBuilder_;
       /**
        * required .Address address = 1;
        * @return Whether the address field is set.
@@ -7986,9 +7986,9 @@ public final class ArteryControlFormats {
        * required .Address address = 1;
        * @return The address.
        */
-      public akka.remote.ArteryControlFormats.Address getAddress() {
+      public org.apache.pekko.remote.ArteryControlFormats.Address getAddress() {
         if (addressBuilder_ == null) {
-          return address_ == null ? akka.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
+          return address_ == null ? org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
         } else {
           return addressBuilder_.getMessage();
         }
@@ -7996,7 +7996,7 @@ public final class ArteryControlFormats {
       /**
        * required .Address address = 1;
        */
-      public Builder setAddress(akka.remote.ArteryControlFormats.Address value) {
+      public Builder setAddress(org.apache.pekko.remote.ArteryControlFormats.Address value) {
         if (addressBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8013,7 +8013,7 @@ public final class ArteryControlFormats {
        * required .Address address = 1;
        */
       public Builder setAddress(
-          akka.remote.ArteryControlFormats.Address.Builder builderForValue) {
+          org.apache.pekko.remote.ArteryControlFormats.Address.Builder builderForValue) {
         if (addressBuilder_ == null) {
           address_ = builderForValue.build();
           onChanged();
@@ -8026,13 +8026,13 @@ public final class ArteryControlFormats {
       /**
        * required .Address address = 1;
        */
-      public Builder mergeAddress(akka.remote.ArteryControlFormats.Address value) {
+      public Builder mergeAddress(org.apache.pekko.remote.ArteryControlFormats.Address value) {
         if (addressBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               address_ != null &&
-              address_ != akka.remote.ArteryControlFormats.Address.getDefaultInstance()) {
+              address_ != org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance()) {
             address_ =
-              akka.remote.ArteryControlFormats.Address.newBuilder(address_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ArteryControlFormats.Address.newBuilder(address_).mergeFrom(value).buildPartial();
           } else {
             address_ = value;
           }
@@ -8059,7 +8059,7 @@ public final class ArteryControlFormats {
       /**
        * required .Address address = 1;
        */
-      public akka.remote.ArteryControlFormats.Address.Builder getAddressBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.Address.Builder getAddressBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getAddressFieldBuilder().getBuilder();
@@ -8067,23 +8067,23 @@ public final class ArteryControlFormats {
       /**
        * required .Address address = 1;
        */
-      public akka.remote.ArteryControlFormats.AddressOrBuilder getAddressOrBuilder() {
+      public org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder getAddressOrBuilder() {
         if (addressBuilder_ != null) {
           return addressBuilder_.getMessageOrBuilder();
         } else {
           return address_ == null ?
-              akka.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
+              org.apache.pekko.remote.ArteryControlFormats.Address.getDefaultInstance() : address_;
         }
       }
       /**
        * required .Address address = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ArteryControlFormats.Address, akka.remote.ArteryControlFormats.Address.Builder, akka.remote.ArteryControlFormats.AddressOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ArteryControlFormats.Address, org.apache.pekko.remote.ArteryControlFormats.Address.Builder, org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder> 
           getAddressFieldBuilder() {
         if (addressBuilder_ == null) {
-          addressBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ArteryControlFormats.Address, akka.remote.ArteryControlFormats.Address.Builder, akka.remote.ArteryControlFormats.AddressOrBuilder>(
+          addressBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ArteryControlFormats.Address, org.apache.pekko.remote.ArteryControlFormats.Address.Builder, org.apache.pekko.remote.ArteryControlFormats.AddressOrBuilder>(
                   getAddress(),
                   getParentForChildren(),
                   isClean());
@@ -8130,13 +8130,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -8145,37 +8145,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:UniqueAddress)
-    private static final akka.remote.ArteryControlFormats.UniqueAddress DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.UniqueAddress DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.UniqueAddress();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.UniqueAddress();
     }
 
-    public static akka.remote.ArteryControlFormats.UniqueAddress getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public UniqueAddress parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new UniqueAddress(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.UniqueAddress getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.UniqueAddress getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8183,7 +8183,7 @@ public final class ArteryControlFormats {
 
   public interface ArteryHeartbeatRspOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ArteryHeartbeatRsp)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required uint64 uid = 1;
@@ -8205,12 +8205,12 @@ public final class ArteryControlFormats {
    * Protobuf type {@code ArteryHeartbeatRsp}
    */
   public  static final class ArteryHeartbeatRsp extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ArteryHeartbeatRsp)
       ArteryHeartbeatRspOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ArteryHeartbeatRsp.newBuilder() to construct.
-    private ArteryHeartbeatRsp(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ArteryHeartbeatRsp(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ArteryHeartbeatRsp() {
@@ -8219,26 +8219,26 @@ public final class ArteryControlFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ArteryHeartbeatRsp();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ArteryHeartbeatRsp(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8261,27 +8261,27 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.ArteryHeartbeatRsp.class, akka.remote.ArteryControlFormats.ArteryHeartbeatRsp.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp.class, org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp.Builder.class);
     }
 
     private int bitField0_;
@@ -8318,7 +8318,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeUInt64(1, uid_);
@@ -8333,7 +8333,7 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeUInt64Size(1, uid_);
       }
       size += unknownFields.getSerializedSize();
@@ -8346,10 +8346,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.ArteryHeartbeatRsp)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.ArteryHeartbeatRsp other = (akka.remote.ArteryControlFormats.ArteryHeartbeatRsp) obj;
+      org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp other = (org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp) obj;
 
       if (hasUid() != other.hasUid()) return false;
       if (hasUid()) {
@@ -8369,7 +8369,7 @@ public final class ArteryControlFormats {
       hash = (19 * hash) + getDescriptor().hashCode();
       if (hasUid()) {
         hash = (37 * hash) + UID_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashLong(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashLong(
             getUid());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -8377,73 +8377,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -8452,7 +8452,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.ArteryHeartbeatRsp prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8463,7 +8463,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -8476,34 +8476,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code ArteryHeartbeatRsp}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ArteryHeartbeatRsp)
-        akka.remote.ArteryControlFormats.ArteryHeartbeatRspOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRspOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.ArteryHeartbeatRsp.class, akka.remote.ArteryControlFormats.ArteryHeartbeatRsp.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp.class, org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.ArteryHeartbeatRsp.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -8516,19 +8516,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_ArteryHeartbeatRsp_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.ArteryHeartbeatRsp getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.ArteryHeartbeatRsp.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.ArteryHeartbeatRsp build() {
-        akka.remote.ArteryControlFormats.ArteryHeartbeatRsp result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp build() {
+        org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8536,8 +8536,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.ArteryHeartbeatRsp buildPartial() {
-        akka.remote.ArteryControlFormats.ArteryHeartbeatRsp result = new akka.remote.ArteryControlFormats.ArteryHeartbeatRsp(this);
+      public org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp result = new org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -8555,44 +8555,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.ArteryHeartbeatRsp) {
-          return mergeFrom((akka.remote.ArteryControlFormats.ArteryHeartbeatRsp)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.ArteryHeartbeatRsp other) {
-        if (other == akka.remote.ArteryControlFormats.ArteryHeartbeatRsp.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp.getDefaultInstance()) return this;
         if (other.hasUid()) {
           setUid(other.getUid());
         }
@@ -8611,14 +8611,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.ArteryHeartbeatRsp parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.ArteryHeartbeatRsp) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -8667,13 +8667,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -8682,37 +8682,37 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:ArteryHeartbeatRsp)
-    private static final akka.remote.ArteryControlFormats.ArteryHeartbeatRsp DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.ArteryHeartbeatRsp();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp();
     }
 
-    public static akka.remote.ArteryControlFormats.ArteryHeartbeatRsp getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ArteryHeartbeatRsp parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ArteryHeartbeatRsp(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.ArteryHeartbeatRsp getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.ArteryHeartbeatRsp getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8720,7 +8720,7 @@ public final class ArteryControlFormats {
 
   public interface FlushAckOrBuilder extends
       // @@protoc_insertion_point(interface_extends:FlushAck)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * optional int32 expectedAcks = 1;
@@ -8737,12 +8737,12 @@ public final class ArteryControlFormats {
    * Protobuf type {@code FlushAck}
    */
   public  static final class FlushAck extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:FlushAck)
       FlushAckOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use FlushAck.newBuilder() to construct.
-    private FlushAck(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private FlushAck(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private FlushAck() {
@@ -8751,26 +8751,26 @@ public final class ArteryControlFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new FlushAck();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private FlushAck(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -8793,27 +8793,27 @@ public final class ArteryControlFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ArteryControlFormats.internal_static_FlushAck_descriptor;
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_FlushAck_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ArteryControlFormats.internal_static_FlushAck_fieldAccessorTable
+      return org.apache.pekko.remote.ArteryControlFormats.internal_static_FlushAck_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ArteryControlFormats.FlushAck.class, akka.remote.ArteryControlFormats.FlushAck.Builder.class);
+              org.apache.pekko.remote.ArteryControlFormats.FlushAck.class, org.apache.pekko.remote.ArteryControlFormats.FlushAck.Builder.class);
     }
 
     private int bitField0_;
@@ -8846,7 +8846,7 @@ public final class ArteryControlFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeInt32(1, expectedAcks_);
@@ -8861,7 +8861,7 @@ public final class ArteryControlFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(1, expectedAcks_);
       }
       size += unknownFields.getSerializedSize();
@@ -8874,10 +8874,10 @@ public final class ArteryControlFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ArteryControlFormats.FlushAck)) {
+      if (!(obj instanceof org.apache.pekko.remote.ArteryControlFormats.FlushAck)) {
         return super.equals(obj);
       }
-      akka.remote.ArteryControlFormats.FlushAck other = (akka.remote.ArteryControlFormats.FlushAck) obj;
+      org.apache.pekko.remote.ArteryControlFormats.FlushAck other = (org.apache.pekko.remote.ArteryControlFormats.FlushAck) obj;
 
       if (hasExpectedAcks() != other.hasExpectedAcks()) return false;
       if (hasExpectedAcks()) {
@@ -8904,73 +8904,73 @@ public final class ArteryControlFormats {
       return hash;
     }
 
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseDelimitedFrom(
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ArteryControlFormats.FlushAck parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -8979,7 +8979,7 @@ public final class ArteryControlFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ArteryControlFormats.FlushAck prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ArteryControlFormats.FlushAck prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8990,7 +8990,7 @@ public final class ArteryControlFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -8998,34 +8998,34 @@ public final class ArteryControlFormats {
      * Protobuf type {@code FlushAck}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:FlushAck)
-        akka.remote.ArteryControlFormats.FlushAckOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ArteryControlFormats.FlushAckOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ArteryControlFormats.internal_static_FlushAck_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_FlushAck_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ArteryControlFormats.internal_static_FlushAck_fieldAccessorTable
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_FlushAck_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ArteryControlFormats.FlushAck.class, akka.remote.ArteryControlFormats.FlushAck.Builder.class);
+                org.apache.pekko.remote.ArteryControlFormats.FlushAck.class, org.apache.pekko.remote.ArteryControlFormats.FlushAck.Builder.class);
       }
 
-      // Construct using akka.remote.ArteryControlFormats.FlushAck.newBuilder()
+      // Construct using org.apache.pekko.remote.ArteryControlFormats.FlushAck.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -9038,19 +9038,19 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ArteryControlFormats.internal_static_FlushAck_descriptor;
+        return org.apache.pekko.remote.ArteryControlFormats.internal_static_FlushAck_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.FlushAck getDefaultInstanceForType() {
-        return akka.remote.ArteryControlFormats.FlushAck.getDefaultInstance();
+      public org.apache.pekko.remote.ArteryControlFormats.FlushAck getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ArteryControlFormats.FlushAck.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.FlushAck build() {
-        akka.remote.ArteryControlFormats.FlushAck result = buildPartial();
+      public org.apache.pekko.remote.ArteryControlFormats.FlushAck build() {
+        org.apache.pekko.remote.ArteryControlFormats.FlushAck result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9058,8 +9058,8 @@ public final class ArteryControlFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ArteryControlFormats.FlushAck buildPartial() {
-        akka.remote.ArteryControlFormats.FlushAck result = new akka.remote.ArteryControlFormats.FlushAck(this);
+      public org.apache.pekko.remote.ArteryControlFormats.FlushAck buildPartial() {
+        org.apache.pekko.remote.ArteryControlFormats.FlushAck result = new org.apache.pekko.remote.ArteryControlFormats.FlushAck(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -9077,44 +9077,44 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ArteryControlFormats.FlushAck) {
-          return mergeFrom((akka.remote.ArteryControlFormats.FlushAck)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ArteryControlFormats.FlushAck) {
+          return mergeFrom((org.apache.pekko.remote.ArteryControlFormats.FlushAck)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ArteryControlFormats.FlushAck other) {
-        if (other == akka.remote.ArteryControlFormats.FlushAck.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ArteryControlFormats.FlushAck other) {
+        if (other == org.apache.pekko.remote.ArteryControlFormats.FlushAck.getDefaultInstance()) return this;
         if (other.hasExpectedAcks()) {
           setExpectedAcks(other.getExpectedAcks());
         }
@@ -9130,14 +9130,14 @@ public final class ArteryControlFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ArteryControlFormats.FlushAck parsedMessage = null;
+        org.apache.pekko.remote.ArteryControlFormats.FlushAck parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ArteryControlFormats.FlushAck) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ArteryControlFormats.FlushAck) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -9186,13 +9186,13 @@ public final class ArteryControlFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -9201,103 +9201,103 @@ public final class ArteryControlFormats {
     }
 
     // @@protoc_insertion_point(class_scope:FlushAck)
-    private static final akka.remote.ArteryControlFormats.FlushAck DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ArteryControlFormats.FlushAck DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ArteryControlFormats.FlushAck();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ArteryControlFormats.FlushAck();
     }
 
-    public static akka.remote.ArteryControlFormats.FlushAck getDefaultInstance() {
+    public static org.apache.pekko.remote.ArteryControlFormats.FlushAck getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public FlushAck parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new FlushAck(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ArteryControlFormats.FlushAck getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ArteryControlFormats.FlushAck getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
   }
 
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Quarantined_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Quarantined_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_MessageWithAddress_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_MessageWithAddress_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_HandshakeReq_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_HandshakeReq_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_CompressionTableAdvertisement_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_CompressionTableAdvertisement_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_CompressionTableAdvertisementAck_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_CompressionTableAdvertisementAck_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_SystemMessageEnvelope_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_SystemMessageEnvelope_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_SystemMessageDeliveryAck_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_SystemMessageDeliveryAck_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_Address_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_Address_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_UniqueAddress_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_UniqueAddress_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_ArteryHeartbeatRsp_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_ArteryHeartbeatRsp_fieldAccessorTable;
-  private static final akka.protobufv3.internal.Descriptors.Descriptor
+  private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
     internal_static_FlushAck_descriptor;
   private static final 
-    akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
       internal_static_FlushAck_fieldAccessorTable;
 
-  public static akka.protobufv3.internal.Descriptors.FileDescriptor
+  public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static  akka.protobufv3.internal.Descriptors.FileDescriptor
+  private static  org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -9322,76 +9322,77 @@ public final class ArteryControlFormats {
       "\014\n\004port\030\004 \002(\r\"7\n\rUniqueAddress\022\031\n\007addres" +
       "s\030\001 \002(\0132\010.Address\022\013\n\003uid\030\002 \002(\004\"!\n\022Artery" +
       "HeartbeatRsp\022\013\n\003uid\030\001 \002(\004\" \n\010FlushAck\022\024\n" +
-      "\014expectedAcks\030\001 \001(\005B\017\n\013akka.remoteH\001"
+      "\014expectedAcks\030\001 \001(\005B\033\n\027org.apache.pekko." +
+      "remoteH\001"
     };
-    descriptor = akka.protobufv3.internal.Descriptors.FileDescriptor
+    descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new akka.protobufv3.internal.Descriptors.FileDescriptor[] {
+        new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
         });
     internal_static_Quarantined_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Quarantined_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Quarantined_descriptor,
         new java.lang.String[] { "From", "To", });
     internal_static_MessageWithAddress_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_MessageWithAddress_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MessageWithAddress_descriptor,
         new java.lang.String[] { "Address", });
     internal_static_HandshakeReq_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_HandshakeReq_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HandshakeReq_descriptor,
         new java.lang.String[] { "From", "To", });
     internal_static_CompressionTableAdvertisement_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_CompressionTableAdvertisement_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CompressionTableAdvertisement_descriptor,
         new java.lang.String[] { "From", "OriginUid", "TableVersion", "Keys", "Values", });
     internal_static_CompressionTableAdvertisementAck_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_CompressionTableAdvertisementAck_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CompressionTableAdvertisementAck_descriptor,
         new java.lang.String[] { "From", "Version", });
     internal_static_SystemMessageEnvelope_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_SystemMessageEnvelope_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SystemMessageEnvelope_descriptor,
         new java.lang.String[] { "Message", "SerializerId", "MessageManifest", "SeqNo", "AckReplyTo", });
     internal_static_SystemMessageDeliveryAck_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_SystemMessageDeliveryAck_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SystemMessageDeliveryAck_descriptor,
         new java.lang.String[] { "SeqNo", "From", });
     internal_static_Address_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_Address_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Address_descriptor,
         new java.lang.String[] { "Protocol", "System", "Hostname", "Port", });
     internal_static_UniqueAddress_descriptor =
       getDescriptor().getMessageTypes().get(8);
     internal_static_UniqueAddress_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UniqueAddress_descriptor,
         new java.lang.String[] { "Address", "Uid", });
     internal_static_ArteryHeartbeatRsp_descriptor =
       getDescriptor().getMessageTypes().get(9);
     internal_static_ArteryHeartbeatRsp_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ArteryHeartbeatRsp_descriptor,
         new java.lang.String[] { "Uid", });
     internal_static_FlushAck_descriptor =
       getDescriptor().getMessageTypes().get(10);
     internal_static_FlushAck_fieldAccessorTable = new
-      akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
         internal_static_FlushAck_descriptor,
         new java.lang.String[] { "ExpectedAcks", });
   }
diff --git a/akka-remote/src/main/java/akka/remote/ContainerFormats.java b/akka-remote/src/main/java/org/apache/pekko/remote/ContainerFormats.java
similarity index 60%
rename from akka-remote/src/main/java/akka/remote/ContainerFormats.java
rename to akka-remote/src/main/java/org/apache/pekko/remote/ContainerFormats.java
index f61f324c4e..c29e29abd5 100644
--- a/akka-remote/src/main/java/akka/remote/ContainerFormats.java
+++ b/akka-remote/src/main/java/org/apache/pekko/remote/ContainerFormats.java
@@ -5,24 +5,24 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ContainerFormats.proto
 
-package akka.remote;
+package org.apache.pekko.remote;
 
 public final class ContainerFormats {
   private ContainerFormats() {}
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistryLite registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
   }
 
   public static void registerAllExtensions(
-      akka.protobufv3.internal.ExtensionRegistry registry) {
+      org.apache.pekko.protobufv3.internal.ExtensionRegistry registry) {
     registerAllExtensions(
-        (akka.protobufv3.internal.ExtensionRegistryLite) registry);
+        (org.apache.pekko.protobufv3.internal.ExtensionRegistryLite) registry);
   }
   /**
    * Protobuf enum {@code PatternType}
    */
   public enum PatternType
-      implements akka.protobufv3.internal.ProtocolMessageEnum {
+      implements org.apache.pekko.protobufv3.internal.ProtocolMessageEnum {
     /**
      * PARENT = 0;
      */
@@ -78,35 +78,35 @@ public final class ContainerFormats {
       }
     }
 
-    public static akka.protobufv3.internal.Internal.EnumLiteMap
+    public static org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap
         internalGetValueMap() {
       return internalValueMap;
     }
-    private static final akka.protobufv3.internal.Internal.EnumLiteMap<
+    private static final org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap<
         PatternType> internalValueMap =
-          new akka.protobufv3.internal.Internal.EnumLiteMap() {
+          new org.apache.pekko.protobufv3.internal.Internal.EnumLiteMap() {
             public PatternType findValueByNumber(int number) {
               return PatternType.forNumber(number);
             }
           };
 
-    public final akka.protobufv3.internal.Descriptors.EnumValueDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-    public final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final akka.protobufv3.internal.Descriptors.EnumDescriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.EnumDescriptor
         getDescriptor() {
-      return akka.remote.ContainerFormats.getDescriptor().getEnumTypes().get(0);
+      return org.apache.pekko.remote.ContainerFormats.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final PatternType[] VALUES = values();
 
     public static PatternType valueOf(
-        akka.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
+        org.apache.pekko.protobufv3.internal.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
         throw new java.lang.IllegalArgumentException(
           "EnumValueDescriptor is not for this type.");
@@ -125,7 +125,7 @@ public final class ContainerFormats {
 
   public interface SelectionEnvelopeOrBuilder extends
       // @@protoc_insertion_point(interface_extends:SelectionEnvelope)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required bytes enclosedMessage = 1;
@@ -136,7 +136,7 @@ public final class ContainerFormats {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
-    akka.protobufv3.internal.ByteString getEnclosedMessage();
+    org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage();
 
     /**
      * required int32 serializerId = 2;
@@ -152,12 +152,12 @@ public final class ContainerFormats {
     /**
      * repeated .Selection pattern = 3;
      */
-    java.util.List 
+    java.util.List 
         getPatternList();
     /**
      * repeated .Selection pattern = 3;
      */
-    akka.remote.ContainerFormats.Selection getPattern(int index);
+    org.apache.pekko.remote.ContainerFormats.Selection getPattern(int index);
     /**
      * repeated .Selection pattern = 3;
      */
@@ -165,12 +165,12 @@ public final class ContainerFormats {
     /**
      * repeated .Selection pattern = 3;
      */
-    java.util.List 
+    java.util.List 
         getPatternOrBuilderList();
     /**
      * repeated .Selection pattern = 3;
      */
-    akka.remote.ContainerFormats.SelectionOrBuilder getPatternOrBuilder(
+    org.apache.pekko.remote.ContainerFormats.SelectionOrBuilder getPatternOrBuilder(
         int index);
 
     /**
@@ -182,7 +182,7 @@ public final class ContainerFormats {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
-    akka.protobufv3.internal.ByteString getMessageManifest();
+    org.apache.pekko.protobufv3.internal.ByteString getMessageManifest();
 
     /**
      * 
    @@ -207,43 +207,43 @@ public final class ContainerFormats {
    * Protobuf type {@code SelectionEnvelope}
    */
   public  static final class SelectionEnvelope extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:SelectionEnvelope)
       SelectionEnvelopeOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use SelectionEnvelope.newBuilder() to construct.
-    private SelectionEnvelope(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private SelectionEnvelope(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private SelectionEnvelope() {
-      enclosedMessage_ = akka.protobufv3.internal.ByteString.EMPTY;
+      enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       pattern_ = java.util.Collections.emptyList();
-      messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new SelectionEnvelope();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private SelectionEnvelope(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -264,11 +264,11 @@ public final class ContainerFormats {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                pattern_ = new java.util.ArrayList();
+                pattern_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
               pattern_.add(
-                  input.readMessage(akka.remote.ContainerFormats.Selection.PARSER, extensionRegistry));
+                  input.readMessage(org.apache.pekko.remote.ContainerFormats.Selection.PARSER, extensionRegistry));
               break;
             }
             case 34: {
@@ -290,10 +290,10 @@ public final class ContainerFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
@@ -303,22 +303,22 @@ public final class ContainerFormats {
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ContainerFormats.internal_static_SelectionEnvelope_descriptor;
+      return org.apache.pekko.remote.ContainerFormats.internal_static_SelectionEnvelope_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ContainerFormats.internal_static_SelectionEnvelope_fieldAccessorTable
+      return org.apache.pekko.remote.ContainerFormats.internal_static_SelectionEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ContainerFormats.SelectionEnvelope.class, akka.remote.ContainerFormats.SelectionEnvelope.Builder.class);
+              org.apache.pekko.remote.ContainerFormats.SelectionEnvelope.class, org.apache.pekko.remote.ContainerFormats.SelectionEnvelope.Builder.class);
     }
 
     private int bitField0_;
     public static final int ENCLOSEDMESSAGE_FIELD_NUMBER = 1;
-    private akka.protobufv3.internal.ByteString enclosedMessage_;
+    private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_;
     /**
      * required bytes enclosedMessage = 1;
      * @return Whether the enclosedMessage field is set.
@@ -330,7 +330,7 @@ public final class ContainerFormats {
      * required bytes enclosedMessage = 1;
      * @return The enclosedMessage.
      */
-    public akka.protobufv3.internal.ByteString getEnclosedMessage() {
+    public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
       return enclosedMessage_;
     }
 
@@ -352,17 +352,17 @@ public final class ContainerFormats {
     }
 
     public static final int PATTERN_FIELD_NUMBER = 3;
-    private java.util.List pattern_;
+    private java.util.List pattern_;
     /**
      * repeated .Selection pattern = 3;
      */
-    public java.util.List getPatternList() {
+    public java.util.List getPatternList() {
       return pattern_;
     }
     /**
      * repeated .Selection pattern = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getPatternOrBuilderList() {
       return pattern_;
     }
@@ -375,19 +375,19 @@ public final class ContainerFormats {
     /**
      * repeated .Selection pattern = 3;
      */
-    public akka.remote.ContainerFormats.Selection getPattern(int index) {
+    public org.apache.pekko.remote.ContainerFormats.Selection getPattern(int index) {
       return pattern_.get(index);
     }
     /**
      * repeated .Selection pattern = 3;
      */
-    public akka.remote.ContainerFormats.SelectionOrBuilder getPatternOrBuilder(
+    public org.apache.pekko.remote.ContainerFormats.SelectionOrBuilder getPatternOrBuilder(
         int index) {
       return pattern_.get(index);
     }
 
     public static final int MESSAGEMANIFEST_FIELD_NUMBER = 4;
-    private akka.protobufv3.internal.ByteString messageManifest_;
+    private org.apache.pekko.protobufv3.internal.ByteString messageManifest_;
     /**
      * optional bytes messageManifest = 4;
      * @return Whether the messageManifest field is set.
@@ -399,7 +399,7 @@ public final class ContainerFormats {
      * optional bytes messageManifest = 4;
      * @return The messageManifest.
      */
-    public akka.protobufv3.internal.ByteString getMessageManifest() {
+    public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
       return messageManifest_;
     }
 
@@ -454,7 +454,7 @@ public final class ContainerFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, enclosedMessage_);
@@ -481,23 +481,23 @@ public final class ContainerFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(1, enclosedMessage_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeInt32Size(2, serializerId_);
       }
       for (int i = 0; i < pattern_.size(); i++) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(3, pattern_.get(i));
       }
       if (((bitField0_ & 0x00000004) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBytesSize(4, messageManifest_);
       }
       if (((bitField0_ & 0x00000008) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeBoolSize(5, wildcardFanOut_);
       }
       size += unknownFields.getSerializedSize();
@@ -510,10 +510,10 @@ public final class ContainerFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ContainerFormats.SelectionEnvelope)) {
+      if (!(obj instanceof org.apache.pekko.remote.ContainerFormats.SelectionEnvelope)) {
         return super.equals(obj);
       }
-      akka.remote.ContainerFormats.SelectionEnvelope other = (akka.remote.ContainerFormats.SelectionEnvelope) obj;
+      org.apache.pekko.remote.ContainerFormats.SelectionEnvelope other = (org.apache.pekko.remote.ContainerFormats.SelectionEnvelope) obj;
 
       if (hasEnclosedMessage() != other.hasEnclosedMessage()) return false;
       if (hasEnclosedMessage()) {
@@ -566,7 +566,7 @@ public final class ContainerFormats {
       }
       if (hasWildcardFanOut()) {
         hash = (37 * hash) + WILDCARDFANOUT_FIELD_NUMBER;
-        hash = (53 * hash) + akka.protobufv3.internal.Internal.hashBoolean(
+        hash = (53 * hash) + org.apache.pekko.protobufv3.internal.Internal.hashBoolean(
             getWildcardFanOut());
       }
       hash = (29 * hash) + unknownFields.hashCode();
@@ -574,73 +574,73 @@ public final class ContainerFormats {
       return hash;
     }
 
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseDelimitedFrom(
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.SelectionEnvelope parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -649,7 +649,7 @@ public final class ContainerFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ContainerFormats.SelectionEnvelope prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ContainerFormats.SelectionEnvelope prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -660,7 +660,7 @@ public final class ContainerFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -668,34 +668,34 @@ public final class ContainerFormats {
      * Protobuf type {@code SelectionEnvelope}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:SelectionEnvelope)
-        akka.remote.ContainerFormats.SelectionEnvelopeOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ContainerFormats.SelectionEnvelopeOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ContainerFormats.internal_static_SelectionEnvelope_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_SelectionEnvelope_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ContainerFormats.internal_static_SelectionEnvelope_fieldAccessorTable
+        return org.apache.pekko.remote.ContainerFormats.internal_static_SelectionEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ContainerFormats.SelectionEnvelope.class, akka.remote.ContainerFormats.SelectionEnvelope.Builder.class);
+                org.apache.pekko.remote.ContainerFormats.SelectionEnvelope.class, org.apache.pekko.remote.ContainerFormats.SelectionEnvelope.Builder.class);
       }
 
-      // Construct using akka.remote.ContainerFormats.SelectionEnvelope.newBuilder()
+      // Construct using org.apache.pekko.remote.ContainerFormats.SelectionEnvelope.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getPatternFieldBuilder();
         }
@@ -703,7 +703,7 @@ public final class ContainerFormats {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        enclosedMessage_ = akka.protobufv3.internal.ByteString.EMPTY;
+        enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         serializerId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -713,7 +713,7 @@ public final class ContainerFormats {
         } else {
           patternBuilder_.clear();
         }
-        messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+        messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000008);
         wildcardFanOut_ = false;
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -721,19 +721,19 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ContainerFormats.internal_static_SelectionEnvelope_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_SelectionEnvelope_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.SelectionEnvelope getDefaultInstanceForType() {
-        return akka.remote.ContainerFormats.SelectionEnvelope.getDefaultInstance();
+      public org.apache.pekko.remote.ContainerFormats.SelectionEnvelope getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ContainerFormats.SelectionEnvelope.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.SelectionEnvelope build() {
-        akka.remote.ContainerFormats.SelectionEnvelope result = buildPartial();
+      public org.apache.pekko.remote.ContainerFormats.SelectionEnvelope build() {
+        org.apache.pekko.remote.ContainerFormats.SelectionEnvelope result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -741,8 +741,8 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.SelectionEnvelope buildPartial() {
-        akka.remote.ContainerFormats.SelectionEnvelope result = new akka.remote.ContainerFormats.SelectionEnvelope(this);
+      public org.apache.pekko.remote.ContainerFormats.SelectionEnvelope buildPartial() {
+        org.apache.pekko.remote.ContainerFormats.SelectionEnvelope result = new org.apache.pekko.remote.ContainerFormats.SelectionEnvelope(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -781,44 +781,44 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ContainerFormats.SelectionEnvelope) {
-          return mergeFrom((akka.remote.ContainerFormats.SelectionEnvelope)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ContainerFormats.SelectionEnvelope) {
+          return mergeFrom((org.apache.pekko.remote.ContainerFormats.SelectionEnvelope)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ContainerFormats.SelectionEnvelope other) {
-        if (other == akka.remote.ContainerFormats.SelectionEnvelope.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.SelectionEnvelope other) {
+        if (other == org.apache.pekko.remote.ContainerFormats.SelectionEnvelope.getDefaultInstance()) return this;
         if (other.hasEnclosedMessage()) {
           setEnclosedMessage(other.getEnclosedMessage());
         }
@@ -844,7 +844,7 @@ public final class ContainerFormats {
               pattern_ = other.pattern_;
               bitField0_ = (bitField0_ & ~0x00000004);
               patternBuilder_ = 
-                akka.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                org.apache.pekko.protobufv3.internal.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getPatternFieldBuilder() : null;
             } else {
               patternBuilder_.addAllMessages(other.pattern_);
@@ -880,14 +880,14 @@ public final class ContainerFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ContainerFormats.SelectionEnvelope parsedMessage = null;
+        org.apache.pekko.remote.ContainerFormats.SelectionEnvelope parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ContainerFormats.SelectionEnvelope) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ContainerFormats.SelectionEnvelope) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -898,7 +898,7 @@ public final class ContainerFormats {
       }
       private int bitField0_;
 
-      private akka.protobufv3.internal.ByteString enclosedMessage_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString enclosedMessage_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * required bytes enclosedMessage = 1;
        * @return Whether the enclosedMessage field is set.
@@ -910,7 +910,7 @@ public final class ContainerFormats {
        * required bytes enclosedMessage = 1;
        * @return The enclosedMessage.
        */
-      public akka.protobufv3.internal.ByteString getEnclosedMessage() {
+      public org.apache.pekko.protobufv3.internal.ByteString getEnclosedMessage() {
         return enclosedMessage_;
       }
       /**
@@ -918,7 +918,7 @@ public final class ContainerFormats {
        * @param value The enclosedMessage to set.
        * @return This builder for chaining.
        */
-      public Builder setEnclosedMessage(akka.protobufv3.internal.ByteString value) {
+      public Builder setEnclosedMessage(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -975,22 +975,22 @@ public final class ContainerFormats {
         return this;
       }
 
-      private java.util.List pattern_ =
+      private java.util.List pattern_ =
         java.util.Collections.emptyList();
       private void ensurePatternIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          pattern_ = new java.util.ArrayList(pattern_);
+          pattern_ = new java.util.ArrayList(pattern_);
           bitField0_ |= 0x00000004;
          }
       }
 
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.remote.ContainerFormats.Selection, akka.remote.ContainerFormats.Selection.Builder, akka.remote.ContainerFormats.SelectionOrBuilder> patternBuilder_;
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Selection, org.apache.pekko.remote.ContainerFormats.Selection.Builder, org.apache.pekko.remote.ContainerFormats.SelectionOrBuilder> patternBuilder_;
 
       /**
        * repeated .Selection pattern = 3;
        */
-      public java.util.List getPatternList() {
+      public java.util.List getPatternList() {
         if (patternBuilder_ == null) {
           return java.util.Collections.unmodifiableList(pattern_);
         } else {
@@ -1010,7 +1010,7 @@ public final class ContainerFormats {
       /**
        * repeated .Selection pattern = 3;
        */
-      public akka.remote.ContainerFormats.Selection getPattern(int index) {
+      public org.apache.pekko.remote.ContainerFormats.Selection getPattern(int index) {
         if (patternBuilder_ == null) {
           return pattern_.get(index);
         } else {
@@ -1021,7 +1021,7 @@ public final class ContainerFormats {
        * repeated .Selection pattern = 3;
        */
       public Builder setPattern(
-          int index, akka.remote.ContainerFormats.Selection value) {
+          int index, org.apache.pekko.remote.ContainerFormats.Selection value) {
         if (patternBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1038,7 +1038,7 @@ public final class ContainerFormats {
        * repeated .Selection pattern = 3;
        */
       public Builder setPattern(
-          int index, akka.remote.ContainerFormats.Selection.Builder builderForValue) {
+          int index, org.apache.pekko.remote.ContainerFormats.Selection.Builder builderForValue) {
         if (patternBuilder_ == null) {
           ensurePatternIsMutable();
           pattern_.set(index, builderForValue.build());
@@ -1051,7 +1051,7 @@ public final class ContainerFormats {
       /**
        * repeated .Selection pattern = 3;
        */
-      public Builder addPattern(akka.remote.ContainerFormats.Selection value) {
+      public Builder addPattern(org.apache.pekko.remote.ContainerFormats.Selection value) {
         if (patternBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1068,7 +1068,7 @@ public final class ContainerFormats {
        * repeated .Selection pattern = 3;
        */
       public Builder addPattern(
-          int index, akka.remote.ContainerFormats.Selection value) {
+          int index, org.apache.pekko.remote.ContainerFormats.Selection value) {
         if (patternBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1085,7 +1085,7 @@ public final class ContainerFormats {
        * repeated .Selection pattern = 3;
        */
       public Builder addPattern(
-          akka.remote.ContainerFormats.Selection.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.Selection.Builder builderForValue) {
         if (patternBuilder_ == null) {
           ensurePatternIsMutable();
           pattern_.add(builderForValue.build());
@@ -1099,7 +1099,7 @@ public final class ContainerFormats {
        * repeated .Selection pattern = 3;
        */
       public Builder addPattern(
-          int index, akka.remote.ContainerFormats.Selection.Builder builderForValue) {
+          int index, org.apache.pekko.remote.ContainerFormats.Selection.Builder builderForValue) {
         if (patternBuilder_ == null) {
           ensurePatternIsMutable();
           pattern_.add(index, builderForValue.build());
@@ -1113,10 +1113,10 @@ public final class ContainerFormats {
        * repeated .Selection pattern = 3;
        */
       public Builder addAllPattern(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (patternBuilder_ == null) {
           ensurePatternIsMutable();
-          akka.protobufv3.internal.AbstractMessageLite.Builder.addAll(
+          org.apache.pekko.protobufv3.internal.AbstractMessageLite.Builder.addAll(
               values, pattern_);
           onChanged();
         } else {
@@ -1153,14 +1153,14 @@ public final class ContainerFormats {
       /**
        * repeated .Selection pattern = 3;
        */
-      public akka.remote.ContainerFormats.Selection.Builder getPatternBuilder(
+      public org.apache.pekko.remote.ContainerFormats.Selection.Builder getPatternBuilder(
           int index) {
         return getPatternFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Selection pattern = 3;
        */
-      public akka.remote.ContainerFormats.SelectionOrBuilder getPatternOrBuilder(
+      public org.apache.pekko.remote.ContainerFormats.SelectionOrBuilder getPatternOrBuilder(
           int index) {
         if (patternBuilder_ == null) {
           return pattern_.get(index);  } else {
@@ -1170,7 +1170,7 @@ public final class ContainerFormats {
       /**
        * repeated .Selection pattern = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getPatternOrBuilderList() {
         if (patternBuilder_ != null) {
           return patternBuilder_.getMessageOrBuilderList();
@@ -1181,31 +1181,31 @@ public final class ContainerFormats {
       /**
        * repeated .Selection pattern = 3;
        */
-      public akka.remote.ContainerFormats.Selection.Builder addPatternBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Selection.Builder addPatternBuilder() {
         return getPatternFieldBuilder().addBuilder(
-            akka.remote.ContainerFormats.Selection.getDefaultInstance());
+            org.apache.pekko.remote.ContainerFormats.Selection.getDefaultInstance());
       }
       /**
        * repeated .Selection pattern = 3;
        */
-      public akka.remote.ContainerFormats.Selection.Builder addPatternBuilder(
+      public org.apache.pekko.remote.ContainerFormats.Selection.Builder addPatternBuilder(
           int index) {
         return getPatternFieldBuilder().addBuilder(
-            index, akka.remote.ContainerFormats.Selection.getDefaultInstance());
+            index, org.apache.pekko.remote.ContainerFormats.Selection.getDefaultInstance());
       }
       /**
        * repeated .Selection pattern = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getPatternBuilderList() {
         return getPatternFieldBuilder().getBuilderList();
       }
-      private akka.protobufv3.internal.RepeatedFieldBuilderV3<
-          akka.remote.ContainerFormats.Selection, akka.remote.ContainerFormats.Selection.Builder, akka.remote.ContainerFormats.SelectionOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Selection, org.apache.pekko.remote.ContainerFormats.Selection.Builder, org.apache.pekko.remote.ContainerFormats.SelectionOrBuilder> 
           getPatternFieldBuilder() {
         if (patternBuilder_ == null) {
-          patternBuilder_ = new akka.protobufv3.internal.RepeatedFieldBuilderV3<
-              akka.remote.ContainerFormats.Selection, akka.remote.ContainerFormats.Selection.Builder, akka.remote.ContainerFormats.SelectionOrBuilder>(
+          patternBuilder_ = new org.apache.pekko.protobufv3.internal.RepeatedFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Selection, org.apache.pekko.remote.ContainerFormats.Selection.Builder, org.apache.pekko.remote.ContainerFormats.SelectionOrBuilder>(
                   pattern_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
@@ -1215,7 +1215,7 @@ public final class ContainerFormats {
         return patternBuilder_;
       }
 
-      private akka.protobufv3.internal.ByteString messageManifest_ = akka.protobufv3.internal.ByteString.EMPTY;
+      private org.apache.pekko.protobufv3.internal.ByteString messageManifest_ = org.apache.pekko.protobufv3.internal.ByteString.EMPTY;
       /**
        * optional bytes messageManifest = 4;
        * @return Whether the messageManifest field is set.
@@ -1227,7 +1227,7 @@ public final class ContainerFormats {
        * optional bytes messageManifest = 4;
        * @return The messageManifest.
        */
-      public akka.protobufv3.internal.ByteString getMessageManifest() {
+      public org.apache.pekko.protobufv3.internal.ByteString getMessageManifest() {
         return messageManifest_;
       }
       /**
@@ -1235,7 +1235,7 @@ public final class ContainerFormats {
        * @param value The messageManifest to set.
        * @return This builder for chaining.
        */
-      public Builder setMessageManifest(akka.protobufv3.internal.ByteString value) {
+      public Builder setMessageManifest(org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -1309,13 +1309,13 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -1324,37 +1324,37 @@ public final class ContainerFormats {
     }
 
     // @@protoc_insertion_point(class_scope:SelectionEnvelope)
-    private static final akka.remote.ContainerFormats.SelectionEnvelope DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ContainerFormats.SelectionEnvelope DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ContainerFormats.SelectionEnvelope();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ContainerFormats.SelectionEnvelope();
     }
 
-    public static akka.remote.ContainerFormats.SelectionEnvelope getDefaultInstance() {
+    public static org.apache.pekko.remote.ContainerFormats.SelectionEnvelope getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public SelectionEnvelope parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new SelectionEnvelope(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ContainerFormats.SelectionEnvelope getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ContainerFormats.SelectionEnvelope getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1362,7 +1362,7 @@ public final class ContainerFormats {
 
   public interface SelectionOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Selection)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .PatternType type = 1;
@@ -1373,7 +1373,7 @@ public final class ContainerFormats {
      * required .PatternType type = 1;
      * @return The type.
      */
-    akka.remote.ContainerFormats.PatternType getType();
+    org.apache.pekko.remote.ContainerFormats.PatternType getType();
 
     /**
      * optional string matcher = 2;
@@ -1389,19 +1389,19 @@ public final class ContainerFormats {
      * optional string matcher = 2;
      * @return The bytes for matcher.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getMatcherBytes();
   }
   /**
    * Protobuf type {@code Selection}
    */
   public  static final class Selection extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Selection)
       SelectionOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Selection.newBuilder() to construct.
-    private Selection(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Selection(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Selection() {
@@ -1412,26 +1412,26 @@ public final class ContainerFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Selection();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Selection(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1443,7 +1443,7 @@ public final class ContainerFormats {
             case 8: {
               int rawValue = input.readEnum();
                 @SuppressWarnings("deprecation")
-              akka.remote.ContainerFormats.PatternType value = akka.remote.ContainerFormats.PatternType.valueOf(rawValue);
+              org.apache.pekko.remote.ContainerFormats.PatternType value = org.apache.pekko.remote.ContainerFormats.PatternType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -1453,7 +1453,7 @@ public final class ContainerFormats {
               break;
             }
             case 18: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
               matcher_ = bs;
               break;
@@ -1467,27 +1467,27 @@ public final class ContainerFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ContainerFormats.internal_static_Selection_descriptor;
+      return org.apache.pekko.remote.ContainerFormats.internal_static_Selection_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ContainerFormats.internal_static_Selection_fieldAccessorTable
+      return org.apache.pekko.remote.ContainerFormats.internal_static_Selection_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ContainerFormats.Selection.class, akka.remote.ContainerFormats.Selection.Builder.class);
+              org.apache.pekko.remote.ContainerFormats.Selection.class, org.apache.pekko.remote.ContainerFormats.Selection.Builder.class);
     }
 
     private int bitField0_;
@@ -1504,10 +1504,10 @@ public final class ContainerFormats {
      * required .PatternType type = 1;
      * @return The type.
      */
-    public akka.remote.ContainerFormats.PatternType getType() {
+    public org.apache.pekko.remote.ContainerFormats.PatternType getType() {
       @SuppressWarnings("deprecation")
-      akka.remote.ContainerFormats.PatternType result = akka.remote.ContainerFormats.PatternType.valueOf(type_);
-      return result == null ? akka.remote.ContainerFormats.PatternType.PARENT : result;
+      org.apache.pekko.remote.ContainerFormats.PatternType result = org.apache.pekko.remote.ContainerFormats.PatternType.valueOf(type_);
+      return result == null ? org.apache.pekko.remote.ContainerFormats.PatternType.PARENT : result;
     }
 
     public static final int MATCHER_FIELD_NUMBER = 2;
@@ -1528,8 +1528,8 @@ public final class ContainerFormats {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           matcher_ = s;
@@ -1541,17 +1541,17 @@ public final class ContainerFormats {
      * optional string matcher = 2;
      * @return The bytes for matcher.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getMatcherBytes() {
       java.lang.Object ref = matcher_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         matcher_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -1571,13 +1571,13 @@ public final class ContainerFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeEnum(1, type_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, matcher_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 2, matcher_);
       }
       unknownFields.writeTo(output);
     }
@@ -1589,11 +1589,11 @@ public final class ContainerFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeEnumSize(1, type_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, matcher_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(2, matcher_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1605,10 +1605,10 @@ public final class ContainerFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ContainerFormats.Selection)) {
+      if (!(obj instanceof org.apache.pekko.remote.ContainerFormats.Selection)) {
         return super.equals(obj);
       }
-      akka.remote.ContainerFormats.Selection other = (akka.remote.ContainerFormats.Selection) obj;
+      org.apache.pekko.remote.ContainerFormats.Selection other = (org.apache.pekko.remote.ContainerFormats.Selection) obj;
 
       if (hasType() != other.hasType()) return false;
       if (hasType()) {
@@ -1643,73 +1643,73 @@ public final class ContainerFormats {
       return hash;
     }
 
-    public static akka.remote.ContainerFormats.Selection parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.Selection parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Selection parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.Selection parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Selection parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.Selection parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Selection parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.Selection parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Selection parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.Selection parseDelimitedFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Selection parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.Selection parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ContainerFormats.Selection parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -1718,7 +1718,7 @@ public final class ContainerFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ContainerFormats.Selection prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ContainerFormats.Selection prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1729,7 +1729,7 @@ public final class ContainerFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1737,34 +1737,34 @@ public final class ContainerFormats {
      * Protobuf type {@code Selection}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Selection)
-        akka.remote.ContainerFormats.SelectionOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ContainerFormats.SelectionOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ContainerFormats.internal_static_Selection_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_Selection_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ContainerFormats.internal_static_Selection_fieldAccessorTable
+        return org.apache.pekko.remote.ContainerFormats.internal_static_Selection_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ContainerFormats.Selection.class, akka.remote.ContainerFormats.Selection.Builder.class);
+                org.apache.pekko.remote.ContainerFormats.Selection.class, org.apache.pekko.remote.ContainerFormats.Selection.Builder.class);
       }
 
-      // Construct using akka.remote.ContainerFormats.Selection.newBuilder()
+      // Construct using org.apache.pekko.remote.ContainerFormats.Selection.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -1779,19 +1779,19 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ContainerFormats.internal_static_Selection_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_Selection_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.Selection getDefaultInstanceForType() {
-        return akka.remote.ContainerFormats.Selection.getDefaultInstance();
+      public org.apache.pekko.remote.ContainerFormats.Selection getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ContainerFormats.Selection.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.Selection build() {
-        akka.remote.ContainerFormats.Selection result = buildPartial();
+      public org.apache.pekko.remote.ContainerFormats.Selection build() {
+        org.apache.pekko.remote.ContainerFormats.Selection result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1799,8 +1799,8 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.Selection buildPartial() {
-        akka.remote.ContainerFormats.Selection result = new akka.remote.ContainerFormats.Selection(this);
+      public org.apache.pekko.remote.ContainerFormats.Selection buildPartial() {
+        org.apache.pekko.remote.ContainerFormats.Selection result = new org.apache.pekko.remote.ContainerFormats.Selection(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1822,44 +1822,44 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ContainerFormats.Selection) {
-          return mergeFrom((akka.remote.ContainerFormats.Selection)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ContainerFormats.Selection) {
+          return mergeFrom((org.apache.pekko.remote.ContainerFormats.Selection)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ContainerFormats.Selection other) {
-        if (other == akka.remote.ContainerFormats.Selection.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.Selection other) {
+        if (other == org.apache.pekko.remote.ContainerFormats.Selection.getDefaultInstance()) return this;
         if (other.hasType()) {
           setType(other.getType());
         }
@@ -1883,14 +1883,14 @@ public final class ContainerFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ContainerFormats.Selection parsedMessage = null;
+        org.apache.pekko.remote.ContainerFormats.Selection parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ContainerFormats.Selection) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ContainerFormats.Selection) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1913,17 +1913,17 @@ public final class ContainerFormats {
        * required .PatternType type = 1;
        * @return The type.
        */
-      public akka.remote.ContainerFormats.PatternType getType() {
+      public org.apache.pekko.remote.ContainerFormats.PatternType getType() {
         @SuppressWarnings("deprecation")
-        akka.remote.ContainerFormats.PatternType result = akka.remote.ContainerFormats.PatternType.valueOf(type_);
-        return result == null ? akka.remote.ContainerFormats.PatternType.PARENT : result;
+        org.apache.pekko.remote.ContainerFormats.PatternType result = org.apache.pekko.remote.ContainerFormats.PatternType.valueOf(type_);
+        return result == null ? org.apache.pekko.remote.ContainerFormats.PatternType.PARENT : result;
       }
       /**
        * required .PatternType type = 1;
        * @param value The type to set.
        * @return This builder for chaining.
        */
-      public Builder setType(akka.remote.ContainerFormats.PatternType value) {
+      public Builder setType(org.apache.pekko.remote.ContainerFormats.PatternType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1958,8 +1958,8 @@ public final class ContainerFormats {
       public java.lang.String getMatcher() {
         java.lang.Object ref = matcher_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             matcher_ = s;
@@ -1973,17 +1973,17 @@ public final class ContainerFormats {
        * optional string matcher = 2;
        * @return The bytes for matcher.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getMatcherBytes() {
         java.lang.Object ref = matcher_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           matcher_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -2017,7 +2017,7 @@ public final class ContainerFormats {
        * @return This builder for chaining.
        */
       public Builder setMatcherBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2028,13 +2028,13 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2043,37 +2043,37 @@ public final class ContainerFormats {
     }
 
     // @@protoc_insertion_point(class_scope:Selection)
-    private static final akka.remote.ContainerFormats.Selection DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ContainerFormats.Selection DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ContainerFormats.Selection();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ContainerFormats.Selection();
     }
 
-    public static akka.remote.ContainerFormats.Selection getDefaultInstance() {
+    public static org.apache.pekko.remote.ContainerFormats.Selection getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Selection parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Selection(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ContainerFormats.Selection getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ContainerFormats.Selection getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2081,7 +2081,7 @@ public final class ContainerFormats {
 
   public interface IdentifyOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Identify)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Payload messageId = 1;
@@ -2092,22 +2092,22 @@ public final class ContainerFormats {
      * required .Payload messageId = 1;
      * @return The messageId.
      */
-    akka.remote.ContainerFormats.Payload getMessageId();
+    org.apache.pekko.remote.ContainerFormats.Payload getMessageId();
     /**
      * required .Payload messageId = 1;
      */
-    akka.remote.ContainerFormats.PayloadOrBuilder getMessageIdOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageIdOrBuilder();
   }
   /**
    * Protobuf type {@code Identify}
    */
   public  static final class Identify extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Identify)
       IdentifyOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Identify.newBuilder() to construct.
-    private Identify(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Identify(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Identify() {
@@ -2116,26 +2116,26 @@ public final class ContainerFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Identify();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Identify(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2145,11 +2145,11 @@ public final class ContainerFormats {
               done = true;
               break;
             case 10: {
-              akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = messageId_.toBuilder();
               }
-              messageId_ = input.readMessage(akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+              messageId_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(messageId_);
                 messageId_ = subBuilder.buildPartial();
@@ -2166,32 +2166,32 @@ public final class ContainerFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ContainerFormats.internal_static_Identify_descriptor;
+      return org.apache.pekko.remote.ContainerFormats.internal_static_Identify_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ContainerFormats.internal_static_Identify_fieldAccessorTable
+      return org.apache.pekko.remote.ContainerFormats.internal_static_Identify_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ContainerFormats.Identify.class, akka.remote.ContainerFormats.Identify.Builder.class);
+              org.apache.pekko.remote.ContainerFormats.Identify.class, org.apache.pekko.remote.ContainerFormats.Identify.Builder.class);
     }
 
     private int bitField0_;
     public static final int MESSAGEID_FIELD_NUMBER = 1;
-    private akka.remote.ContainerFormats.Payload messageId_;
+    private org.apache.pekko.remote.ContainerFormats.Payload messageId_;
     /**
      * required .Payload messageId = 1;
      * @return Whether the messageId field is set.
@@ -2203,14 +2203,14 @@ public final class ContainerFormats {
      * required .Payload messageId = 1;
      * @return The messageId.
      */
-    public akka.remote.ContainerFormats.Payload getMessageId() {
-      return messageId_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
+    public org.apache.pekko.remote.ContainerFormats.Payload getMessageId() {
+      return messageId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
     }
     /**
      * required .Payload messageId = 1;
      */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getMessageIdOrBuilder() {
-      return messageId_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageIdOrBuilder() {
+      return messageId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -2233,7 +2233,7 @@ public final class ContainerFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getMessageId());
@@ -2248,7 +2248,7 @@ public final class ContainerFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getMessageId());
       }
       size += unknownFields.getSerializedSize();
@@ -2261,10 +2261,10 @@ public final class ContainerFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ContainerFormats.Identify)) {
+      if (!(obj instanceof org.apache.pekko.remote.ContainerFormats.Identify)) {
         return super.equals(obj);
       }
-      akka.remote.ContainerFormats.Identify other = (akka.remote.ContainerFormats.Identify) obj;
+      org.apache.pekko.remote.ContainerFormats.Identify other = (org.apache.pekko.remote.ContainerFormats.Identify) obj;
 
       if (hasMessageId() != other.hasMessageId()) return false;
       if (hasMessageId()) {
@@ -2291,73 +2291,73 @@ public final class ContainerFormats {
       return hash;
     }
 
-    public static akka.remote.ContainerFormats.Identify parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.Identify parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Identify parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.Identify parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Identify parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.Identify parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Identify parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.Identify parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Identify parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.Identify parseDelimitedFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Identify parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.Identify parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ContainerFormats.Identify parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -2366,7 +2366,7 @@ public final class ContainerFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ContainerFormats.Identify prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ContainerFormats.Identify prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2377,7 +2377,7 @@ public final class ContainerFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2385,34 +2385,34 @@ public final class ContainerFormats {
      * Protobuf type {@code Identify}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Identify)
-        akka.remote.ContainerFormats.IdentifyOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ContainerFormats.IdentifyOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ContainerFormats.internal_static_Identify_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_Identify_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ContainerFormats.internal_static_Identify_fieldAccessorTable
+        return org.apache.pekko.remote.ContainerFormats.internal_static_Identify_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ContainerFormats.Identify.class, akka.remote.ContainerFormats.Identify.Builder.class);
+                org.apache.pekko.remote.ContainerFormats.Identify.class, org.apache.pekko.remote.ContainerFormats.Identify.Builder.class);
       }
 
-      // Construct using akka.remote.ContainerFormats.Identify.newBuilder()
+      // Construct using org.apache.pekko.remote.ContainerFormats.Identify.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getMessageIdFieldBuilder();
         }
@@ -2430,19 +2430,19 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ContainerFormats.internal_static_Identify_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_Identify_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.Identify getDefaultInstanceForType() {
-        return akka.remote.ContainerFormats.Identify.getDefaultInstance();
+      public org.apache.pekko.remote.ContainerFormats.Identify getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ContainerFormats.Identify.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.Identify build() {
-        akka.remote.ContainerFormats.Identify result = buildPartial();
+      public org.apache.pekko.remote.ContainerFormats.Identify build() {
+        org.apache.pekko.remote.ContainerFormats.Identify result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2450,8 +2450,8 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.Identify buildPartial() {
-        akka.remote.ContainerFormats.Identify result = new akka.remote.ContainerFormats.Identify(this);
+      public org.apache.pekko.remote.ContainerFormats.Identify buildPartial() {
+        org.apache.pekko.remote.ContainerFormats.Identify result = new org.apache.pekko.remote.ContainerFormats.Identify(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2473,44 +2473,44 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ContainerFormats.Identify) {
-          return mergeFrom((akka.remote.ContainerFormats.Identify)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ContainerFormats.Identify) {
+          return mergeFrom((org.apache.pekko.remote.ContainerFormats.Identify)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ContainerFormats.Identify other) {
-        if (other == akka.remote.ContainerFormats.Identify.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.Identify other) {
+        if (other == org.apache.pekko.remote.ContainerFormats.Identify.getDefaultInstance()) return this;
         if (other.hasMessageId()) {
           mergeMessageId(other.getMessageId());
         }
@@ -2532,14 +2532,14 @@ public final class ContainerFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ContainerFormats.Identify parsedMessage = null;
+        org.apache.pekko.remote.ContainerFormats.Identify parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ContainerFormats.Identify) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ContainerFormats.Identify) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2550,9 +2550,9 @@ public final class ContainerFormats {
       }
       private int bitField0_;
 
-      private akka.remote.ContainerFormats.Payload messageId_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> messageIdBuilder_;
+      private org.apache.pekko.remote.ContainerFormats.Payload messageId_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> messageIdBuilder_;
       /**
        * required .Payload messageId = 1;
        * @return Whether the messageId field is set.
@@ -2564,9 +2564,9 @@ public final class ContainerFormats {
        * required .Payload messageId = 1;
        * @return The messageId.
        */
-      public akka.remote.ContainerFormats.Payload getMessageId() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getMessageId() {
         if (messageIdBuilder_ == null) {
-          return messageId_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
+          return messageId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
         } else {
           return messageIdBuilder_.getMessage();
         }
@@ -2574,7 +2574,7 @@ public final class ContainerFormats {
       /**
        * required .Payload messageId = 1;
        */
-      public Builder setMessageId(akka.remote.ContainerFormats.Payload value) {
+      public Builder setMessageId(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageIdBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2591,7 +2591,7 @@ public final class ContainerFormats {
        * required .Payload messageId = 1;
        */
       public Builder setMessageId(
-          akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (messageIdBuilder_ == null) {
           messageId_ = builderForValue.build();
           onChanged();
@@ -2604,13 +2604,13 @@ public final class ContainerFormats {
       /**
        * required .Payload messageId = 1;
        */
-      public Builder mergeMessageId(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergeMessageId(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (messageIdBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               messageId_ != null &&
-              messageId_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              messageId_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             messageId_ =
-              akka.remote.ContainerFormats.Payload.newBuilder(messageId_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(messageId_).mergeFrom(value).buildPartial();
           } else {
             messageId_ = value;
           }
@@ -2637,7 +2637,7 @@ public final class ContainerFormats {
       /**
        * required .Payload messageId = 1;
        */
-      public akka.remote.ContainerFormats.Payload.Builder getMessageIdBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getMessageIdBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getMessageIdFieldBuilder().getBuilder();
@@ -2645,23 +2645,23 @@ public final class ContainerFormats {
       /**
        * required .Payload messageId = 1;
        */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getMessageIdOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageIdOrBuilder() {
         if (messageIdBuilder_ != null) {
           return messageIdBuilder_.getMessageOrBuilder();
         } else {
           return messageId_ == null ?
-              akka.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
+              org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : messageId_;
         }
       }
       /**
        * required .Payload messageId = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> 
           getMessageIdFieldBuilder() {
         if (messageIdBuilder_ == null) {
-          messageIdBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder>(
+          messageIdBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getMessageId(),
                   getParentForChildren(),
                   isClean());
@@ -2671,13 +2671,13 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -2686,37 +2686,37 @@ public final class ContainerFormats {
     }
 
     // @@protoc_insertion_point(class_scope:Identify)
-    private static final akka.remote.ContainerFormats.Identify DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ContainerFormats.Identify DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ContainerFormats.Identify();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ContainerFormats.Identify();
     }
 
-    public static akka.remote.ContainerFormats.Identify getDefaultInstance() {
+    public static org.apache.pekko.remote.ContainerFormats.Identify getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public Identify parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new Identify(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ContainerFormats.Identify getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ContainerFormats.Identify getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2724,7 +2724,7 @@ public final class ContainerFormats {
 
   public interface ActorIdentityOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ActorIdentity)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required .Payload correlationId = 1;
@@ -2735,11 +2735,11 @@ public final class ContainerFormats {
      * required .Payload correlationId = 1;
      * @return The correlationId.
      */
-    akka.remote.ContainerFormats.Payload getCorrelationId();
+    org.apache.pekko.remote.ContainerFormats.Payload getCorrelationId();
     /**
      * required .Payload correlationId = 1;
      */
-    akka.remote.ContainerFormats.PayloadOrBuilder getCorrelationIdOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getCorrelationIdOrBuilder();
 
     /**
      * optional .ActorRef ref = 2;
@@ -2750,22 +2750,22 @@ public final class ContainerFormats {
      * optional .ActorRef ref = 2;
      * @return The ref.
      */
-    akka.remote.ContainerFormats.ActorRef getRef();
+    org.apache.pekko.remote.ContainerFormats.ActorRef getRef();
     /**
      * optional .ActorRef ref = 2;
      */
-    akka.remote.ContainerFormats.ActorRefOrBuilder getRefOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getRefOrBuilder();
   }
   /**
    * Protobuf type {@code ActorIdentity}
    */
   public  static final class ActorIdentity extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ActorIdentity)
       ActorIdentityOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ActorIdentity.newBuilder() to construct.
-    private ActorIdentity(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ActorIdentity(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ActorIdentity() {
@@ -2774,26 +2774,26 @@ public final class ContainerFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ActorIdentity();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ActorIdentity(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2803,11 +2803,11 @@ public final class ContainerFormats {
               done = true;
               break;
             case 10: {
-              akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = correlationId_.toBuilder();
               }
-              correlationId_ = input.readMessage(akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+              correlationId_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(correlationId_);
                 correlationId_ = subBuilder.buildPartial();
@@ -2816,11 +2816,11 @@ public final class ContainerFormats {
               break;
             }
             case 18: {
-              akka.remote.ContainerFormats.ActorRef.Builder subBuilder = null;
+              org.apache.pekko.remote.ContainerFormats.ActorRef.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) != 0)) {
                 subBuilder = ref_.toBuilder();
               }
-              ref_ = input.readMessage(akka.remote.ContainerFormats.ActorRef.PARSER, extensionRegistry);
+              ref_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.ActorRef.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(ref_);
                 ref_ = subBuilder.buildPartial();
@@ -2837,32 +2837,32 @@ public final class ContainerFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ContainerFormats.internal_static_ActorIdentity_descriptor;
+      return org.apache.pekko.remote.ContainerFormats.internal_static_ActorIdentity_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ContainerFormats.internal_static_ActorIdentity_fieldAccessorTable
+      return org.apache.pekko.remote.ContainerFormats.internal_static_ActorIdentity_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ContainerFormats.ActorIdentity.class, akka.remote.ContainerFormats.ActorIdentity.Builder.class);
+              org.apache.pekko.remote.ContainerFormats.ActorIdentity.class, org.apache.pekko.remote.ContainerFormats.ActorIdentity.Builder.class);
     }
 
     private int bitField0_;
     public static final int CORRELATIONID_FIELD_NUMBER = 1;
-    private akka.remote.ContainerFormats.Payload correlationId_;
+    private org.apache.pekko.remote.ContainerFormats.Payload correlationId_;
     /**
      * required .Payload correlationId = 1;
      * @return Whether the correlationId field is set.
@@ -2874,18 +2874,18 @@ public final class ContainerFormats {
      * required .Payload correlationId = 1;
      * @return The correlationId.
      */
-    public akka.remote.ContainerFormats.Payload getCorrelationId() {
-      return correlationId_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
+    public org.apache.pekko.remote.ContainerFormats.Payload getCorrelationId() {
+      return correlationId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
     }
     /**
      * required .Payload correlationId = 1;
      */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getCorrelationIdOrBuilder() {
-      return correlationId_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getCorrelationIdOrBuilder() {
+      return correlationId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
     }
 
     public static final int REF_FIELD_NUMBER = 2;
-    private akka.remote.ContainerFormats.ActorRef ref_;
+    private org.apache.pekko.remote.ContainerFormats.ActorRef ref_;
     /**
      * optional .ActorRef ref = 2;
      * @return Whether the ref field is set.
@@ -2897,14 +2897,14 @@ public final class ContainerFormats {
      * optional .ActorRef ref = 2;
      * @return The ref.
      */
-    public akka.remote.ContainerFormats.ActorRef getRef() {
-      return ref_ == null ? akka.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
+    public org.apache.pekko.remote.ContainerFormats.ActorRef getRef() {
+      return ref_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
     }
     /**
      * optional .ActorRef ref = 2;
      */
-    public akka.remote.ContainerFormats.ActorRefOrBuilder getRefOrBuilder() {
-      return ref_ == null ? akka.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
+    public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getRefOrBuilder() {
+      return ref_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -2933,7 +2933,7 @@ public final class ContainerFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getCorrelationId());
@@ -2951,11 +2951,11 @@ public final class ContainerFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getCorrelationId());
       }
       if (((bitField0_ & 0x00000002) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(2, getRef());
       }
       size += unknownFields.getSerializedSize();
@@ -2968,10 +2968,10 @@ public final class ContainerFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ContainerFormats.ActorIdentity)) {
+      if (!(obj instanceof org.apache.pekko.remote.ContainerFormats.ActorIdentity)) {
         return super.equals(obj);
       }
-      akka.remote.ContainerFormats.ActorIdentity other = (akka.remote.ContainerFormats.ActorIdentity) obj;
+      org.apache.pekko.remote.ContainerFormats.ActorIdentity other = (org.apache.pekko.remote.ContainerFormats.ActorIdentity) obj;
 
       if (hasCorrelationId() != other.hasCorrelationId()) return false;
       if (hasCorrelationId()) {
@@ -3007,73 +3007,73 @@ public final class ContainerFormats {
       return hash;
     }
 
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseDelimitedFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.ActorIdentity parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3082,7 +3082,7 @@ public final class ContainerFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ContainerFormats.ActorIdentity prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ContainerFormats.ActorIdentity prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3093,7 +3093,7 @@ public final class ContainerFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3101,34 +3101,34 @@ public final class ContainerFormats {
      * Protobuf type {@code ActorIdentity}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ActorIdentity)
-        akka.remote.ContainerFormats.ActorIdentityOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ContainerFormats.ActorIdentityOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ContainerFormats.internal_static_ActorIdentity_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_ActorIdentity_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ContainerFormats.internal_static_ActorIdentity_fieldAccessorTable
+        return org.apache.pekko.remote.ContainerFormats.internal_static_ActorIdentity_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ContainerFormats.ActorIdentity.class, akka.remote.ContainerFormats.ActorIdentity.Builder.class);
+                org.apache.pekko.remote.ContainerFormats.ActorIdentity.class, org.apache.pekko.remote.ContainerFormats.ActorIdentity.Builder.class);
       }
 
-      // Construct using akka.remote.ContainerFormats.ActorIdentity.newBuilder()
+      // Construct using org.apache.pekko.remote.ContainerFormats.ActorIdentity.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getCorrelationIdFieldBuilder();
           getRefFieldBuilder();
@@ -3153,19 +3153,19 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ContainerFormats.internal_static_ActorIdentity_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_ActorIdentity_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.ActorIdentity getDefaultInstanceForType() {
-        return akka.remote.ContainerFormats.ActorIdentity.getDefaultInstance();
+      public org.apache.pekko.remote.ContainerFormats.ActorIdentity getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ContainerFormats.ActorIdentity.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.ActorIdentity build() {
-        akka.remote.ContainerFormats.ActorIdentity result = buildPartial();
+      public org.apache.pekko.remote.ContainerFormats.ActorIdentity build() {
+        org.apache.pekko.remote.ContainerFormats.ActorIdentity result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3173,8 +3173,8 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.ActorIdentity buildPartial() {
-        akka.remote.ContainerFormats.ActorIdentity result = new akka.remote.ContainerFormats.ActorIdentity(this);
+      public org.apache.pekko.remote.ContainerFormats.ActorIdentity buildPartial() {
+        org.apache.pekko.remote.ContainerFormats.ActorIdentity result = new org.apache.pekko.remote.ContainerFormats.ActorIdentity(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3204,44 +3204,44 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ContainerFormats.ActorIdentity) {
-          return mergeFrom((akka.remote.ContainerFormats.ActorIdentity)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ContainerFormats.ActorIdentity) {
+          return mergeFrom((org.apache.pekko.remote.ContainerFormats.ActorIdentity)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ContainerFormats.ActorIdentity other) {
-        if (other == akka.remote.ContainerFormats.ActorIdentity.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.ActorIdentity other) {
+        if (other == org.apache.pekko.remote.ContainerFormats.ActorIdentity.getDefaultInstance()) return this;
         if (other.hasCorrelationId()) {
           mergeCorrelationId(other.getCorrelationId());
         }
@@ -3271,14 +3271,14 @@ public final class ContainerFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ContainerFormats.ActorIdentity parsedMessage = null;
+        org.apache.pekko.remote.ContainerFormats.ActorIdentity parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ContainerFormats.ActorIdentity) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ContainerFormats.ActorIdentity) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3289,9 +3289,9 @@ public final class ContainerFormats {
       }
       private int bitField0_;
 
-      private akka.remote.ContainerFormats.Payload correlationId_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> correlationIdBuilder_;
+      private org.apache.pekko.remote.ContainerFormats.Payload correlationId_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> correlationIdBuilder_;
       /**
        * required .Payload correlationId = 1;
        * @return Whether the correlationId field is set.
@@ -3303,9 +3303,9 @@ public final class ContainerFormats {
        * required .Payload correlationId = 1;
        * @return The correlationId.
        */
-      public akka.remote.ContainerFormats.Payload getCorrelationId() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getCorrelationId() {
         if (correlationIdBuilder_ == null) {
-          return correlationId_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
+          return correlationId_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
         } else {
           return correlationIdBuilder_.getMessage();
         }
@@ -3313,7 +3313,7 @@ public final class ContainerFormats {
       /**
        * required .Payload correlationId = 1;
        */
-      public Builder setCorrelationId(akka.remote.ContainerFormats.Payload value) {
+      public Builder setCorrelationId(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (correlationIdBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3330,7 +3330,7 @@ public final class ContainerFormats {
        * required .Payload correlationId = 1;
        */
       public Builder setCorrelationId(
-          akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (correlationIdBuilder_ == null) {
           correlationId_ = builderForValue.build();
           onChanged();
@@ -3343,13 +3343,13 @@ public final class ContainerFormats {
       /**
        * required .Payload correlationId = 1;
        */
-      public Builder mergeCorrelationId(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergeCorrelationId(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (correlationIdBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               correlationId_ != null &&
-              correlationId_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              correlationId_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             correlationId_ =
-              akka.remote.ContainerFormats.Payload.newBuilder(correlationId_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(correlationId_).mergeFrom(value).buildPartial();
           } else {
             correlationId_ = value;
           }
@@ -3376,7 +3376,7 @@ public final class ContainerFormats {
       /**
        * required .Payload correlationId = 1;
        */
-      public akka.remote.ContainerFormats.Payload.Builder getCorrelationIdBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getCorrelationIdBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getCorrelationIdFieldBuilder().getBuilder();
@@ -3384,23 +3384,23 @@ public final class ContainerFormats {
       /**
        * required .Payload correlationId = 1;
        */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getCorrelationIdOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getCorrelationIdOrBuilder() {
         if (correlationIdBuilder_ != null) {
           return correlationIdBuilder_.getMessageOrBuilder();
         } else {
           return correlationId_ == null ?
-              akka.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
+              org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : correlationId_;
         }
       }
       /**
        * required .Payload correlationId = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> 
           getCorrelationIdFieldBuilder() {
         if (correlationIdBuilder_ == null) {
-          correlationIdBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder>(
+          correlationIdBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getCorrelationId(),
                   getParentForChildren(),
                   isClean());
@@ -3409,9 +3409,9 @@ public final class ContainerFormats {
         return correlationIdBuilder_;
       }
 
-      private akka.remote.ContainerFormats.ActorRef ref_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.ActorRef, akka.remote.ContainerFormats.ActorRef.Builder, akka.remote.ContainerFormats.ActorRefOrBuilder> refBuilder_;
+      private org.apache.pekko.remote.ContainerFormats.ActorRef ref_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.ActorRef, org.apache.pekko.remote.ContainerFormats.ActorRef.Builder, org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder> refBuilder_;
       /**
        * optional .ActorRef ref = 2;
        * @return Whether the ref field is set.
@@ -3423,9 +3423,9 @@ public final class ContainerFormats {
        * optional .ActorRef ref = 2;
        * @return The ref.
        */
-      public akka.remote.ContainerFormats.ActorRef getRef() {
+      public org.apache.pekko.remote.ContainerFormats.ActorRef getRef() {
         if (refBuilder_ == null) {
-          return ref_ == null ? akka.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
+          return ref_ == null ? org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
         } else {
           return refBuilder_.getMessage();
         }
@@ -3433,7 +3433,7 @@ public final class ContainerFormats {
       /**
        * optional .ActorRef ref = 2;
        */
-      public Builder setRef(akka.remote.ContainerFormats.ActorRef value) {
+      public Builder setRef(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
         if (refBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3450,7 +3450,7 @@ public final class ContainerFormats {
        * optional .ActorRef ref = 2;
        */
       public Builder setRef(
-          akka.remote.ContainerFormats.ActorRef.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.ActorRef.Builder builderForValue) {
         if (refBuilder_ == null) {
           ref_ = builderForValue.build();
           onChanged();
@@ -3463,13 +3463,13 @@ public final class ContainerFormats {
       /**
        * optional .ActorRef ref = 2;
        */
-      public Builder mergeRef(akka.remote.ContainerFormats.ActorRef value) {
+      public Builder mergeRef(org.apache.pekko.remote.ContainerFormats.ActorRef value) {
         if (refBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
               ref_ != null &&
-              ref_ != akka.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
+              ref_ != org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) {
             ref_ =
-              akka.remote.ContainerFormats.ActorRef.newBuilder(ref_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder(ref_).mergeFrom(value).buildPartial();
           } else {
             ref_ = value;
           }
@@ -3496,7 +3496,7 @@ public final class ContainerFormats {
       /**
        * optional .ActorRef ref = 2;
        */
-      public akka.remote.ContainerFormats.ActorRef.Builder getRefBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.ActorRef.Builder getRefBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getRefFieldBuilder().getBuilder();
@@ -3504,23 +3504,23 @@ public final class ContainerFormats {
       /**
        * optional .ActorRef ref = 2;
        */
-      public akka.remote.ContainerFormats.ActorRefOrBuilder getRefOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder getRefOrBuilder() {
         if (refBuilder_ != null) {
           return refBuilder_.getMessageOrBuilder();
         } else {
           return ref_ == null ?
-              akka.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
+              org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance() : ref_;
         }
       }
       /**
        * optional .ActorRef ref = 2;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.ActorRef, akka.remote.ContainerFormats.ActorRef.Builder, akka.remote.ContainerFormats.ActorRefOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.ActorRef, org.apache.pekko.remote.ContainerFormats.ActorRef.Builder, org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder> 
           getRefFieldBuilder() {
         if (refBuilder_ == null) {
-          refBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.ActorRef, akka.remote.ContainerFormats.ActorRef.Builder, akka.remote.ContainerFormats.ActorRefOrBuilder>(
+          refBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.ActorRef, org.apache.pekko.remote.ContainerFormats.ActorRef.Builder, org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder>(
                   getRef(),
                   getParentForChildren(),
                   isClean());
@@ -3530,13 +3530,13 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -3545,37 +3545,37 @@ public final class ContainerFormats {
     }
 
     // @@protoc_insertion_point(class_scope:ActorIdentity)
-    private static final akka.remote.ContainerFormats.ActorIdentity DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ContainerFormats.ActorIdentity DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ContainerFormats.ActorIdentity();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ContainerFormats.ActorIdentity();
     }
 
-    public static akka.remote.ContainerFormats.ActorIdentity getDefaultInstance() {
+    public static org.apache.pekko.remote.ContainerFormats.ActorIdentity getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ActorIdentity parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ActorIdentity(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ContainerFormats.ActorIdentity getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ContainerFormats.ActorIdentity getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3583,7 +3583,7 @@ public final class ContainerFormats {
 
   public interface ActorRefOrBuilder extends
       // @@protoc_insertion_point(interface_extends:ActorRef)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * required string path = 1;
@@ -3599,19 +3599,19 @@ public final class ContainerFormats {
      * required string path = 1;
      * @return The bytes for path.
      */
-    akka.protobufv3.internal.ByteString
+    org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes();
   }
   /**
    * Protobuf type {@code ActorRef}
    */
   public  static final class ActorRef extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:ActorRef)
       ActorRefOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use ActorRef.newBuilder() to construct.
-    private ActorRef(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private ActorRef(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private ActorRef() {
@@ -3621,26 +3621,26 @@ public final class ContainerFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new ActorRef();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private ActorRef(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -3650,7 +3650,7 @@ public final class ContainerFormats {
               done = true;
               break;
             case 10: {
-              akka.protobufv3.internal.ByteString bs = input.readBytes();
+              org.apache.pekko.protobufv3.internal.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
               path_ = bs;
               break;
@@ -3664,27 +3664,27 @@ public final class ContainerFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ContainerFormats.internal_static_ActorRef_descriptor;
+      return org.apache.pekko.remote.ContainerFormats.internal_static_ActorRef_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ContainerFormats.internal_static_ActorRef_fieldAccessorTable
+      return org.apache.pekko.remote.ContainerFormats.internal_static_ActorRef_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ContainerFormats.ActorRef.class, akka.remote.ContainerFormats.ActorRef.Builder.class);
+              org.apache.pekko.remote.ContainerFormats.ActorRef.class, org.apache.pekko.remote.ContainerFormats.ActorRef.Builder.class);
     }
 
     private int bitField0_;
@@ -3706,8 +3706,8 @@ public final class ContainerFormats {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        akka.protobufv3.internal.ByteString bs = 
-            (akka.protobufv3.internal.ByteString) ref;
+        org.apache.pekko.protobufv3.internal.ByteString bs = 
+            (org.apache.pekko.protobufv3.internal.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           path_ = s;
@@ -3719,17 +3719,17 @@ public final class ContainerFormats {
      * required string path = 1;
      * @return The bytes for path.
      */
-    public akka.protobufv3.internal.ByteString
+    public org.apache.pekko.protobufv3.internal.ByteString
         getPathBytes() {
       java.lang.Object ref = path_;
       if (ref instanceof java.lang.String) {
-        akka.protobufv3.internal.ByteString b = 
-            akka.protobufv3.internal.ByteString.copyFromUtf8(
+        org.apache.pekko.protobufv3.internal.ByteString b = 
+            org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
         path_ = b;
         return b;
       } else {
-        return (akka.protobufv3.internal.ByteString) ref;
+        return (org.apache.pekko.protobufv3.internal.ByteString) ref;
       }
     }
 
@@ -3749,10 +3749,10 @@ public final class ContainerFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
-        akka.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, path_);
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, path_);
       }
       unknownFields.writeTo(output);
     }
@@ -3764,7 +3764,7 @@ public final class ContainerFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, path_);
+        size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, path_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -3776,10 +3776,10 @@ public final class ContainerFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ContainerFormats.ActorRef)) {
+      if (!(obj instanceof org.apache.pekko.remote.ContainerFormats.ActorRef)) {
         return super.equals(obj);
       }
-      akka.remote.ContainerFormats.ActorRef other = (akka.remote.ContainerFormats.ActorRef) obj;
+      org.apache.pekko.remote.ContainerFormats.ActorRef other = (org.apache.pekko.remote.ContainerFormats.ActorRef) obj;
 
       if (hasPath() != other.hasPath()) return false;
       if (hasPath()) {
@@ -3806,73 +3806,73 @@ public final class ContainerFormats {
       return hash;
     }
 
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseDelimitedFrom(
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.ActorRef parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -3881,7 +3881,7 @@ public final class ContainerFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ContainerFormats.ActorRef prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ContainerFormats.ActorRef prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3892,7 +3892,7 @@ public final class ContainerFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3900,34 +3900,34 @@ public final class ContainerFormats {
      * Protobuf type {@code ActorRef}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:ActorRef)
-        akka.remote.ContainerFormats.ActorRefOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ContainerFormats.ActorRefOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ContainerFormats.internal_static_ActorRef_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_ActorRef_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ContainerFormats.internal_static_ActorRef_fieldAccessorTable
+        return org.apache.pekko.remote.ContainerFormats.internal_static_ActorRef_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ContainerFormats.ActorRef.class, akka.remote.ContainerFormats.ActorRef.Builder.class);
+                org.apache.pekko.remote.ContainerFormats.ActorRef.class, org.apache.pekko.remote.ContainerFormats.ActorRef.Builder.class);
       }
 
-      // Construct using akka.remote.ContainerFormats.ActorRef.newBuilder()
+      // Construct using org.apache.pekko.remote.ContainerFormats.ActorRef.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
         }
       }
@@ -3940,19 +3940,19 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ContainerFormats.internal_static_ActorRef_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_ActorRef_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.ActorRef getDefaultInstanceForType() {
-        return akka.remote.ContainerFormats.ActorRef.getDefaultInstance();
+      public org.apache.pekko.remote.ContainerFormats.ActorRef getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.ActorRef build() {
-        akka.remote.ContainerFormats.ActorRef result = buildPartial();
+      public org.apache.pekko.remote.ContainerFormats.ActorRef build() {
+        org.apache.pekko.remote.ContainerFormats.ActorRef result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3960,8 +3960,8 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.ActorRef buildPartial() {
-        akka.remote.ContainerFormats.ActorRef result = new akka.remote.ContainerFormats.ActorRef(this);
+      public org.apache.pekko.remote.ContainerFormats.ActorRef buildPartial() {
+        org.apache.pekko.remote.ContainerFormats.ActorRef result = new org.apache.pekko.remote.ContainerFormats.ActorRef(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3979,44 +3979,44 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ContainerFormats.ActorRef) {
-          return mergeFrom((akka.remote.ContainerFormats.ActorRef)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ContainerFormats.ActorRef) {
+          return mergeFrom((org.apache.pekko.remote.ContainerFormats.ActorRef)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ContainerFormats.ActorRef other) {
-        if (other == akka.remote.ContainerFormats.ActorRef.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.ActorRef other) {
+        if (other == org.apache.pekko.remote.ContainerFormats.ActorRef.getDefaultInstance()) return this;
         if (other.hasPath()) {
           bitField0_ |= 0x00000001;
           path_ = other.path_;
@@ -4037,14 +4037,14 @@ public final class ContainerFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ContainerFormats.ActorRef parsedMessage = null;
+        org.apache.pekko.remote.ContainerFormats.ActorRef parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ContainerFormats.ActorRef) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ContainerFormats.ActorRef) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4070,8 +4070,8 @@ public final class ContainerFormats {
       public java.lang.String getPath() {
         java.lang.Object ref = path_;
         if (!(ref instanceof java.lang.String)) {
-          akka.protobufv3.internal.ByteString bs =
-              (akka.protobufv3.internal.ByteString) ref;
+          org.apache.pekko.protobufv3.internal.ByteString bs =
+              (org.apache.pekko.protobufv3.internal.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             path_ = s;
@@ -4085,17 +4085,17 @@ public final class ContainerFormats {
        * required string path = 1;
        * @return The bytes for path.
        */
-      public akka.protobufv3.internal.ByteString
+      public org.apache.pekko.protobufv3.internal.ByteString
           getPathBytes() {
         java.lang.Object ref = path_;
         if (ref instanceof String) {
-          akka.protobufv3.internal.ByteString b = 
-              akka.protobufv3.internal.ByteString.copyFromUtf8(
+          org.apache.pekko.protobufv3.internal.ByteString b = 
+              org.apache.pekko.protobufv3.internal.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
           path_ = b;
           return b;
         } else {
-          return (akka.protobufv3.internal.ByteString) ref;
+          return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
       /**
@@ -4129,7 +4129,7 @@ public final class ContainerFormats {
        * @return This builder for chaining.
        */
       public Builder setPathBytes(
-          akka.protobufv3.internal.ByteString value) {
+          org.apache.pekko.protobufv3.internal.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -4140,13 +4140,13 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -4155,37 +4155,37 @@ public final class ContainerFormats {
     }
 
     // @@protoc_insertion_point(class_scope:ActorRef)
-    private static final akka.remote.ContainerFormats.ActorRef DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ContainerFormats.ActorRef DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ContainerFormats.ActorRef();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ContainerFormats.ActorRef();
     }
 
-    public static akka.remote.ContainerFormats.ActorRef getDefaultInstance() {
+    public static org.apache.pekko.remote.ContainerFormats.ActorRef getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser
-        PARSER = new akka.protobufv3.internal.AbstractParser() {
+    @java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser
+        PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser() {
       @java.lang.Override
       public ActorRef parsePartialFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-          throws akka.protobufv3.internal.InvalidProtocolBufferException {
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
         return new ActorRef(input, extensionRegistry);
       }
     };
 
-    public static akka.protobufv3.internal.Parser parser() {
+    public static org.apache.pekko.protobufv3.internal.Parser parser() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.protobufv3.internal.Parser getParserForType() {
+    public org.apache.pekko.protobufv3.internal.Parser getParserForType() {
       return PARSER;
     }
 
     @java.lang.Override
-    public akka.remote.ContainerFormats.ActorRef getDefaultInstanceForType() {
+    public org.apache.pekko.remote.ContainerFormats.ActorRef getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4193,7 +4193,7 @@ public final class ContainerFormats {
 
   public interface OptionOrBuilder extends
       // @@protoc_insertion_point(interface_extends:Option)
-      akka.protobufv3.internal.MessageOrBuilder {
+      org.apache.pekko.protobufv3.internal.MessageOrBuilder {
 
     /**
      * optional .Payload value = 1;
@@ -4204,22 +4204,22 @@ public final class ContainerFormats {
      * optional .Payload value = 1;
      * @return The value.
      */
-    akka.remote.ContainerFormats.Payload getValue();
+    org.apache.pekko.remote.ContainerFormats.Payload getValue();
     /**
      * optional .Payload value = 1;
      */
-    akka.remote.ContainerFormats.PayloadOrBuilder getValueOrBuilder();
+    org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getValueOrBuilder();
   }
   /**
    * Protobuf type {@code Option}
    */
   public  static final class Option extends
-      akka.protobufv3.internal.GeneratedMessageV3 implements
+      org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:Option)
       OptionOrBuilder {
   private static final long serialVersionUID = 0L;
     // Use Option.newBuilder() to construct.
-    private Option(akka.protobufv3.internal.GeneratedMessageV3.Builder builder) {
+    private Option(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private Option() {
@@ -4228,26 +4228,26 @@ public final class ContainerFormats {
     @java.lang.Override
     @SuppressWarnings({"unused"})
     protected java.lang.Object newInstance(
-        akka.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
       return new Option();
     }
 
     @java.lang.Override
-    public final akka.protobufv3.internal.UnknownFieldSet
+    public final org.apache.pekko.protobufv3.internal.UnknownFieldSet
     getUnknownFields() {
       return this.unknownFields;
     }
     private Option(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       this();
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
       int mutable_bitField0_ = 0;
-      akka.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
-          akka.protobufv3.internal.UnknownFieldSet.newBuilder();
+      org.apache.pekko.protobufv3.internal.UnknownFieldSet.Builder unknownFields =
+          org.apache.pekko.protobufv3.internal.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -4257,11 +4257,11 @@ public final class ContainerFormats {
               done = true;
               break;
             case 10: {
-              akka.remote.ContainerFormats.Payload.Builder subBuilder = null;
+              org.apache.pekko.remote.ContainerFormats.Payload.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) != 0)) {
                 subBuilder = value_.toBuilder();
               }
-              value_ = input.readMessage(akka.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
+              value_ = input.readMessage(org.apache.pekko.remote.ContainerFormats.Payload.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(value_);
                 value_ = subBuilder.buildPartial();
@@ -4278,32 +4278,32 @@ public final class ContainerFormats {
             }
           }
         }
-      } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
+      } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new akka.protobufv3.internal.InvalidProtocolBufferException(
+        throw new org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-    public static final akka.protobufv3.internal.Descriptors.Descriptor
+    public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return akka.remote.ContainerFormats.internal_static_Option_descriptor;
+      return org.apache.pekko.remote.ContainerFormats.internal_static_Option_descriptor;
     }
 
     @java.lang.Override
-    protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+    protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.remote.ContainerFormats.internal_static_Option_fieldAccessorTable
+      return org.apache.pekko.remote.ContainerFormats.internal_static_Option_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              akka.remote.ContainerFormats.Option.class, akka.remote.ContainerFormats.Option.Builder.class);
+              org.apache.pekko.remote.ContainerFormats.Option.class, org.apache.pekko.remote.ContainerFormats.Option.Builder.class);
     }
 
     private int bitField0_;
     public static final int VALUE_FIELD_NUMBER = 1;
-    private akka.remote.ContainerFormats.Payload value_;
+    private org.apache.pekko.remote.ContainerFormats.Payload value_;
     /**
      * optional .Payload value = 1;
      * @return Whether the value field is set.
@@ -4315,14 +4315,14 @@ public final class ContainerFormats {
      * optional .Payload value = 1;
      * @return The value.
      */
-    public akka.remote.ContainerFormats.Payload getValue() {
-      return value_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
+    public org.apache.pekko.remote.ContainerFormats.Payload getValue() {
+      return value_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
     }
     /**
      * optional .Payload value = 1;
      */
-    public akka.remote.ContainerFormats.PayloadOrBuilder getValueOrBuilder() {
-      return value_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
+    public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getValueOrBuilder() {
+      return value_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -4343,7 +4343,7 @@ public final class ContainerFormats {
     }
 
     @java.lang.Override
-    public void writeTo(akka.protobufv3.internal.CodedOutputStream output)
+    public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
                         throws java.io.IOException {
       if (((bitField0_ & 0x00000001) != 0)) {
         output.writeMessage(1, getValue());
@@ -4358,7 +4358,7 @@ public final class ContainerFormats {
 
       size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
-        size += akka.protobufv3.internal.CodedOutputStream
+        size += org.apache.pekko.protobufv3.internal.CodedOutputStream
           .computeMessageSize(1, getValue());
       }
       size += unknownFields.getSerializedSize();
@@ -4371,10 +4371,10 @@ public final class ContainerFormats {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof akka.remote.ContainerFormats.Option)) {
+      if (!(obj instanceof org.apache.pekko.remote.ContainerFormats.Option)) {
         return super.equals(obj);
       }
-      akka.remote.ContainerFormats.Option other = (akka.remote.ContainerFormats.Option) obj;
+      org.apache.pekko.remote.ContainerFormats.Option other = (org.apache.pekko.remote.ContainerFormats.Option) obj;
 
       if (hasValue() != other.hasValue()) return false;
       if (hasValue()) {
@@ -4401,73 +4401,73 @@ public final class ContainerFormats {
       return hash;
     }
 
-    public static akka.remote.ContainerFormats.Option parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(
         java.nio.ByteBuffer data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.Option parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(
         java.nio.ByteBuffer data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Option parseFrom(
-        akka.protobufv3.internal.ByteString data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.Option parseFrom(
-        akka.protobufv3.internal.ByteString data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(
+        org.apache.pekko.protobufv3.internal.ByteString data,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Option parseFrom(byte[] data)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(byte[] data)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static akka.remote.ContainerFormats.Option parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(
         byte[] data,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
-        throws akka.protobufv3.internal.InvalidProtocolBufferException {
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Option parseFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.Option parseFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Option parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.Option parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.Option parseDelimitedFrom(
+    public static org.apache.pekko.remote.ContainerFormats.Option parseDelimitedFrom(
         java.io.InputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static akka.remote.ContainerFormats.Option parseFrom(
-        akka.protobufv3.internal.CodedInputStream input)
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static akka.remote.ContainerFormats.Option parseFrom(
-        akka.protobufv3.internal.CodedInputStream input,
-        akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+    public static org.apache.pekko.remote.ContainerFormats.Option parseFrom(
+        org.apache.pekko.protobufv3.internal.CodedInputStream input,
+        org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return akka.protobufv3.internal.GeneratedMessageV3
+      return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -4476,7 +4476,7 @@ public final class ContainerFormats {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(akka.remote.ContainerFormats.Option prototype) {
+    public static Builder newBuilder(org.apache.pekko.remote.ContainerFormats.Option prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4487,7 +4487,7 @@ public final class ContainerFormats {
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4495,34 +4495,34 @@ public final class ContainerFormats {
      * Protobuf type {@code Option}
      */
     public static final class Builder extends
-        akka.protobufv3.internal.GeneratedMessageV3.Builder implements
+        org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:Option)
-        akka.remote.ContainerFormats.OptionOrBuilder {
-      public static final akka.protobufv3.internal.Descriptors.Descriptor
+        org.apache.pekko.remote.ContainerFormats.OptionOrBuilder {
+      public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return akka.remote.ContainerFormats.internal_static_Option_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_Option_descriptor;
       }
 
       @java.lang.Override
-      protected akka.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
+      protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.remote.ContainerFormats.internal_static_Option_fieldAccessorTable
+        return org.apache.pekko.remote.ContainerFormats.internal_static_Option_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                akka.remote.ContainerFormats.Option.class, akka.remote.ContainerFormats.Option.Builder.class);
+                org.apache.pekko.remote.ContainerFormats.Option.class, org.apache.pekko.remote.ContainerFormats.Option.Builder.class);
       }
 
-      // Construct using akka.remote.ContainerFormats.Option.newBuilder()
+      // Construct using org.apache.pekko.remote.ContainerFormats.Option.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          akka.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
+          org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (akka.protobufv3.internal.GeneratedMessageV3
+        if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getValueFieldBuilder();
         }
@@ -4540,19 +4540,19 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.protobufv3.internal.Descriptors.Descriptor
+      public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.remote.ContainerFormats.internal_static_Option_descriptor;
+        return org.apache.pekko.remote.ContainerFormats.internal_static_Option_descriptor;
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.Option getDefaultInstanceForType() {
-        return akka.remote.ContainerFormats.Option.getDefaultInstance();
+      public org.apache.pekko.remote.ContainerFormats.Option getDefaultInstanceForType() {
+        return org.apache.pekko.remote.ContainerFormats.Option.getDefaultInstance();
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.Option build() {
-        akka.remote.ContainerFormats.Option result = buildPartial();
+      public org.apache.pekko.remote.ContainerFormats.Option build() {
+        org.apache.pekko.remote.ContainerFormats.Option result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4560,8 +4560,8 @@ public final class ContainerFormats {
       }
 
       @java.lang.Override
-      public akka.remote.ContainerFormats.Option buildPartial() {
-        akka.remote.ContainerFormats.Option result = new akka.remote.ContainerFormats.Option(this);
+      public org.apache.pekko.remote.ContainerFormats.Option buildPartial() {
+        org.apache.pekko.remote.ContainerFormats.Option result = new org.apache.pekko.remote.ContainerFormats.Option(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4583,44 +4583,44 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public Builder setField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.setField(field, value);
       }
       @java.lang.Override
       public Builder clearField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field) {
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
       @java.lang.Override
       public Builder clearOneof(
-          akka.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
+          org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
       @java.lang.Override
       public Builder setRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
       @java.lang.Override
       public Builder addRepeatedField(
-          akka.protobufv3.internal.Descriptors.FieldDescriptor field,
+          org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
       @java.lang.Override
-      public Builder mergeFrom(akka.protobufv3.internal.Message other) {
-        if (other instanceof akka.remote.ContainerFormats.Option) {
-          return mergeFrom((akka.remote.ContainerFormats.Option)other);
+      public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
+        if (other instanceof org.apache.pekko.remote.ContainerFormats.Option) {
+          return mergeFrom((org.apache.pekko.remote.ContainerFormats.Option)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.remote.ContainerFormats.Option other) {
-        if (other == akka.remote.ContainerFormats.Option.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.apache.pekko.remote.ContainerFormats.Option other) {
+        if (other == org.apache.pekko.remote.ContainerFormats.Option.getDefaultInstance()) return this;
         if (other.hasValue()) {
           mergeValue(other.getValue());
         }
@@ -4641,14 +4641,14 @@ public final class ContainerFormats {
 
       @java.lang.Override
       public Builder mergeFrom(
-          akka.protobufv3.internal.CodedInputStream input,
-          akka.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
+          org.apache.pekko.protobufv3.internal.CodedInputStream input,
+          org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        akka.remote.ContainerFormats.Option parsedMessage = null;
+        org.apache.pekko.remote.ContainerFormats.Option parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (akka.protobufv3.internal.InvalidProtocolBufferException e) {
-          parsedMessage = (akka.remote.ContainerFormats.Option) e.getUnfinishedMessage();
+        } catch (org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException e) {
+          parsedMessage = (org.apache.pekko.remote.ContainerFormats.Option) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4659,9 +4659,9 @@ public final class ContainerFormats {
       }
       private int bitField0_;
 
-      private akka.remote.ContainerFormats.Payload value_;
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> valueBuilder_;
+      private org.apache.pekko.remote.ContainerFormats.Payload value_;
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> valueBuilder_;
       /**
        * optional .Payload value = 1;
        * @return Whether the value field is set.
@@ -4673,9 +4673,9 @@ public final class ContainerFormats {
        * optional .Payload value = 1;
        * @return The value.
        */
-      public akka.remote.ContainerFormats.Payload getValue() {
+      public org.apache.pekko.remote.ContainerFormats.Payload getValue() {
         if (valueBuilder_ == null) {
-          return value_ == null ? akka.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
+          return value_ == null ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
         } else {
           return valueBuilder_.getMessage();
         }
@@ -4683,7 +4683,7 @@ public final class ContainerFormats {
       /**
        * optional .Payload value = 1;
        */
-      public Builder setValue(akka.remote.ContainerFormats.Payload value) {
+      public Builder setValue(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (valueBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4700,7 +4700,7 @@ public final class ContainerFormats {
        * optional .Payload value = 1;
        */
       public Builder setValue(
-          akka.remote.ContainerFormats.Payload.Builder builderForValue) {
+          org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
         if (valueBuilder_ == null) {
           value_ = builderForValue.build();
           onChanged();
@@ -4713,13 +4713,13 @@ public final class ContainerFormats {
       /**
        * optional .Payload value = 1;
        */
-      public Builder mergeValue(akka.remote.ContainerFormats.Payload value) {
+      public Builder mergeValue(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (valueBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
               value_ != null &&
-              value_ != akka.remote.ContainerFormats.Payload.getDefaultInstance()) {
+              value_ != org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()) {
             value_ =
-              akka.remote.ContainerFormats.Payload.newBuilder(value_).mergeFrom(value).buildPartial();
+              org.apache.pekko.remote.ContainerFormats.Payload.newBuilder(value_).mergeFrom(value).buildPartial();
           } else {
             value_ = value;
           }
@@ -4746,7 +4746,7 @@ public final class ContainerFormats {
       /**
        * optional .Payload value = 1;
        */
-      public akka.remote.ContainerFormats.Payload.Builder getValueBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.Payload.Builder getValueBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getValueFieldBuilder().getBuilder();
@@ -4754,23 +4754,23 @@ public final class ContainerFormats {
       /**
        * optional .Payload value = 1;
        */
-      public akka.remote.ContainerFormats.PayloadOrBuilder getValueOrBuilder() {
+      public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getValueOrBuilder() {
         if (valueBuilder_ != null) {
           return valueBuilder_.getMessageOrBuilder();
         } else {
           return value_ == null ?
-              akka.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
+              org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance() : value_;
         }
       }
       /**
        * optional .Payload value = 1;
        */
-      private akka.protobufv3.internal.SingleFieldBuilderV3<
-          akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder> 
+      private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+          org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> 
           getValueFieldBuilder() {
         if (valueBuilder_ == null) {
-          valueBuilder_ = new akka.protobufv3.internal.SingleFieldBuilderV3<
-              akka.remote.ContainerFormats.Payload, akka.remote.ContainerFormats.Payload.Builder, akka.remote.ContainerFormats.PayloadOrBuilder>(
+          valueBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
+              org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
                   getValue(),
                   getParentForChildren(),
                   isClean());
@@ -4780,13 +4780,13 @@ public final class ContainerFormats {
       }
       @java.lang.Override
       public final Builder setUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-          final akka.protobufv3.internal.UnknownFieldSet unknownFields) {
+          final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
@@ -4795,37 +4795,37 @@ public final class ContainerFormats {
     }
 
     // @@protoc_insertion_point(class_scope:Option)
-    private static final akka.remote.ContainerFormats.Option DEFAULT_INSTANCE;
+    private static final org.apache.pekko.remote.ContainerFormats.Option DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new akka.remote.ContainerFormats.Option();
+      DEFAULT_INSTANCE = new org.apache.pekko.remote.ContainerFormats.Option();
     }
 
-    public static akka.remote.ContainerFormats.Option getDefaultInstance() {
+    public static org.apache.pekko.remote.ContainerFormats.Option getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated public static final akka.protobufv3.internal.Parser